Merge lp:~thomas-voss/media-hub/disconnect-signal-translation-layer-on-destruction into lp:media-hub

[Thomas Voß]

Disconnect signal translation layer on destruction.

Disconnect signal translation layer on destruction.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:87
http://jenkins.qa.ubuntu.com/job/media-hub-ci/155/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-amd64-ci/97/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-armhf-ci/96/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-i386-ci/95/console

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

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/media-hub/disconnect-signal-translation-layer-on-destruction]

88. By Thomas Voß on 2014-11-03

Init disconnect tokens on construction.

89. By Thomas Voß on 2014-11-03

Add missing ,.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:89
http://jenkins.qa.ubuntu.com/job/media-hub-ci/156/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-amd64-ci/98/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-armhf-ci/97/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-i386-ci/96/console

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

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

You can achieve the same effect by changing the position of struct dbus to be the last element in Signals, but this works too.

review: Approve

[lp:~thomas-voss/media-hub/disconnect-signal-translation-layer-on-destruction]

90. By Thomas Voß on 2014-11-04

Ensure remote signals are destroyed first.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:90
http://jenkins.qa.ubuntu.com/job/media-hub-ci/159/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-amd64-ci/101/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-armhf-ci/100/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-i386-ci/99/console

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

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/media-hub/disconnect-signal-translation-layer-on-destruction]

91. By Thomas Voß on 2014-11-05

Bump build-dep version on dbus-cpp.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:91
http://jenkins.qa.ubuntu.com/job/media-hub-ci/160/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-amd64-ci/102/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-armhf-ci/101/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-i386-ci/100/console

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

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

Yep.

review: Approve

[Ricardo Salveti (rsalveti)]

LGTM

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-10-23 21:25:38 +0000
+++ debian/control	2014-11-05 07:41:46 +0000
@@ -20,7 +20,7 @@
                libboost-program-options-dev (>=1.53),
                libboost-system-dev (>=1.53),
                libdbus-1-dev,
-               libdbus-cpp-dev (>= 4.1.0),
+               libdbus-cpp-dev (>= 4.2.0),
                libgoogle-glog-dev,
                libhybris-dev (>=0.1.0+git20131207+e452e83-0ubuntu28),
                libprocess-cpp-dev,

=== modified file 'src/core/media/player_stub.cpp'
--- src/core/media/player_stub.cpp	2014-10-22 20:08:22 +0000
+++ src/core/media/player_stub.cpp	2014-11-05 07:41:46 +0000
@@ -179,19 +179,19 @@
                 const std::shared_ptr<DBusEndOfStreamSignal>& eos,
                 const std::shared_ptr<DBusPlaybackStatusChangedSignal>& status,
                 const std::shared_ptr<DBusVideoDimensionChangedSignal>& d)
-            : dbus
+            : playback_complete_cb(nullptr),
+              playback_complete_context(nullptr),
+              seeked_to(),
+              end_of_stream(),
+              playback_status_changed(),
+              video_dimension_changed(),
+              dbus
               {
                   seeked,
                   eos,
                   status,
                   d
-              },
-              playback_complete_cb(nullptr),
-              playback_complete_context(nullptr),
-              seeked_to(),
-              end_of_stream(),
-              playback_status_changed(),
-              video_dimension_changed()
+              }
         {
             dbus.seeked_to->connect([this](std::uint64_t value)
             {
@@ -218,15 +218,7 @@
                 std::cout << "VideoDimensionChanged signal arrived via the bus." << std::endl;
                 video_dimension_changed(mask);
             });
-        }
-
-        struct DBus
-        {
-            std::shared_ptr<DBusSeekedToSignal> seeked_to;
-            std::shared_ptr<DBusEndOfStreamSignal> end_of_stream;
-            std::shared_ptr<DBusPlaybackStatusChangedSignal> playback_status_changed;
-            std::shared_ptr<DBusVideoDimensionChangedSignal> video_dimension_changed;
-        } dbus;
+        }       
 
         void set_playback_complete_cb(PlaybackCompleteCb cb, void *context)
         {
@@ -240,6 +232,14 @@
         core::Signal<void> end_of_stream;
         core::Signal<media::Player::PlaybackStatus> playback_status_changed;
         core::Signal<uint64_t> video_dimension_changed;
+
+        struct DBus
+        {
+            std::shared_ptr<DBusSeekedToSignal> seeked_to;
+            std::shared_ptr<DBusEndOfStreamSignal> end_of_stream;
+            std::shared_ptr<DBusPlaybackStatusChangedSignal> playback_status_changed;
+            std::shared_ptr<DBusVideoDimensionChangedSignal> video_dimension_changed;
+        } dbus;
     } signals;
 };