Merge lp:~thomas-voss/qtubuntu-media/disconnect-from-playback-status-changed-signal-on-destruction into lp:qtubuntu-media

[Thomas Voß]

Cut event connections on destruction.

Cut event connections on destruction.

[Michał Sawicz (saviq)]

Submit against trunk

review: Needs Resubmitting

[lp:~thomas-voss/qtubuntu-media/disconnect-from-playback-status-changed-signal-on-destruction]

52. By Thomas Voß on 2014-10-31

Adjust naming of member to match project guidelines.
Disconnect signal as early as possible during destruction.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:51
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/67/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-amd64-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-armhf-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-i386-ci/18/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/67/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:52
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/68/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-i386-ci/19/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/68/rebuild

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

LGTM

review: Approve

=== modified file 'src/aal/aalmediaplayerservice.cpp'
--- src/aal/aalmediaplayerservice.cpp	2014-10-16 02:17:27 +0000
+++ src/aal/aalmediaplayerservice.cpp	2014-10-31 13:07:22 +0000
@@ -55,11 +55,14 @@
 core::ubuntu::media::Player::PlaybackCompleteCb empty_playback_complete_cb = [](void*)
 {
 };
+
+core::Signal<void> the_void;
 }
 
 AalMediaPlayerService::AalMediaPlayerService(QObject *parent):
     QMediaService(parent),
     m_hubPlayerSession(NULL),
+    m_playbackStatusChangedConnection(the_void.connect([](){})),
     m_videoOutputReady(false),
     m_mediaPlayerControlRef(0),
     m_videoOutputRef(0),
@@ -83,12 +86,14 @@
     createMediaPlayerControl();
     createVideoRendererControl();
 
-    m_hubPlayerSession->playback_status_changed().connect(
+    m_playbackStatusChangedConnection = m_hubPlayerSession->playback_status_changed().connect(
             std::bind(&AalMediaPlayerService::onPlaybackStatusChanged, this, _1));
 }
 
 AalMediaPlayerService::~AalMediaPlayerService()
 {
+    m_playbackStatusChangedConnection.disconnect();
+
     deleteMediaPlayerControl();
     deleteVideoRendererControl();
 }

=== modified file 'src/aal/aalmediaplayerservice.h'
--- src/aal/aalmediaplayerservice.h	2014-10-16 02:17:27 +0000
+++ src/aal/aalmediaplayerservice.h	2014-10-31 13:07:22 +0000
@@ -111,6 +111,7 @@
 
     std::shared_ptr<core::ubuntu::media::Service> m_hubService;
     std::shared_ptr<core::ubuntu::media::Player> m_hubPlayerSession;
+    core::Connection m_playbackStatusChangedConnection;
 
     AalMediaPlayerControl *m_mediaPlayerControl;
     AalVideoRendererControl *m_videoOutput;

=== modified file 'src/aal/aalmediaplayerserviceplugin.cpp'
--- src/aal/aalmediaplayerserviceplugin.cpp	2014-10-15 09:26:40 +0000
+++ src/aal/aalmediaplayerserviceplugin.cpp	2014-10-31 13:07:22 +0000
@@ -26,6 +26,7 @@
 
 QMediaService* AalServicePlugin::create(QString const& key)
 {
+    qDebug() << Q_FUNC_INFO << key;
     if (key == QLatin1String(Q_MEDIASERVICE_MEDIAPLAYER))
         return new AalMediaPlayerService();
     else
@@ -36,6 +37,7 @@
 
 void AalServicePlugin::release(QMediaService *service)
 {
+    qDebug() << Q_FUNC_INFO << service;
     Q_UNUSED(service);
     delete service;
 }