[Merge] lp:~jhodapp/qtubuntu-media/fix-1438115-take2 into lp:qtubuntu-media

[Alfonso Sanchez-Beato]

See inline comment.

Diff comments:

> === modified file 'debian/control'
> --- debian/control	2015-04-10 16:19:34 +0000
> +++ debian/control	2015-05-15 13:29:26 +0000
> @@ -10,7 +10,7 @@
>                 libgl1-mesa-dev | libgl-dev,
>                 libgles2-mesa-dev,
>                 libhybris-dev (>= 0.1.0+git20131207+e452e83-0ubuntu13),
> -               libmedia-hub-dev (>= 3.1.0),
> +               libmedia-hub-dev (>= 3.2.0),
>                 libpulse-dev,
>                 libqt5opengl5-dev,
>                 libqtubuntu-media-signals-dev (>= 0.3+14.04.20140307-0ubuntu2),
> 
> === modified file 'src/aal/aalmediaplayerservice.cpp'
> --- src/aal/aalmediaplayerservice.cpp	2015-05-13 16:46:09 +0000
> +++ src/aal/aalmediaplayerservice.cpp	2015-05-15 13:29:26 +0000
> @@ -55,6 +55,7 @@
>      QMediaService(parent),
>      m_hubPlayerSession(NULL),
>      m_playbackStatusChangedConnection(the_void.connect([](){})),
> +    m_durationChangedConnection(the_void.connect([](){})),
>      m_errorConnection(the_void.connect([](){})),
>      m_mediaPlayerControl(nullptr),
>      m_videoOutput(nullptr),
> @@ -90,6 +91,10 @@
>              m_newStatus = status;
>              QMetaObject::invokeMethod(this, "onPlaybackStatusChanged", Qt::QueuedConnection);
>          });
> +    m_durationChangedConnection = m_hubPlayerSession->duration_changed().connect([this](uint64_t duration)
> +    {
> +        m_mediaPlayerControl->emitDurationChanged(duration / 1e6);

Some comment here about the units used by "duration" and by the argument of "emitDurationChanged" would be useful.

> +    });
>  
>      m_errorConnection = m_hubPlayerSession->error().connect(
>              std::bind(&AalMediaPlayerService::onError, this, _1));
> @@ -98,6 +103,7 @@
>  AalMediaPlayerService::~AalMediaPlayerService()
>  {
>      m_errorConnection.disconnect();
> +    m_durationChangedConnection.disconnect();
>      m_playbackStatusChangedConnection.disconnect();
>  
>      deleteMediaPlayerControl();
> 
> === modified file 'src/aal/aalmediaplayerservice.h'
> --- src/aal/aalmediaplayerservice.h	2015-03-19 21:14:12 +0000
> +++ src/aal/aalmediaplayerservice.h	2015-05-15 13:29:26 +0000
> @@ -130,6 +130,7 @@
>      std::shared_ptr<core::ubuntu::media::Service> m_hubService;
>      std::shared_ptr<core::ubuntu::media::Player> m_hubPlayerSession;
>      core::Connection m_playbackStatusChangedConnection;
> +    core::Connection m_durationChangedConnection;
>      core::Connection m_errorConnection;
>  
>      AalMediaPlayerControl *m_mediaPlayerControl;
> 
> === modified file 'unittests/player.cpp'
> --- unittests/player.cpp	2015-04-17 19:30:16 +0000
> +++ unittests/player.cpp	2015-05-15 13:29:26 +0000
> @@ -310,6 +310,12 @@
>      return ret;
>  }
>  
> +const core::Signal<uint64_t>& TestPlayer::duration_changed() const
> +{
> +    static const core::Signal<uint64_t> ret;
> +    return ret;
> +}
> +
>  const core::Signal<Player::Error>& TestPlayer::error() const
>  {
>      static core::Signal<Player::Error> ret;
> 
> === modified file 'unittests/player.h'
> --- unittests/player.h	2015-04-17 19:30:16 +0000
> +++ unittests/player.h	2015-05-15 13:29:26 +0000
> @@ -90,6 +90,7 @@
>      virtual const core::Signal<PlaybackStatus>& playback_status_changed() const;
>      virtual core::Signal<PlaybackStatus>& playback_status_changed();
>      virtual const core::Signal<core::ubuntu::media::video::Dimensions>& video_dimension_changed() const;
> +    virtual const core::Signal<uint64_t>& duration_changed() const;
>      virtual const core::Signal<Error>& error() const;
>  
>  private:
> 


-- 
https://code.launchpad.net/~jhodapp/qtubuntu-media/fix-1438115-take2/+merge/259178
Your team Ubuntu Phablet Team is subscribed to branch lp:qtubuntu-media.