Merge lp:~phablet-team/media-hub/fix-1506953 into lp:media-hub

[Jim Hodapp]

Emit a signal on the media-hub-client side when the dbus media-hub-server to client connection unregisters and re-registers.

Emit a signal on the media-hub-client side when the dbus media-hub-server to client connection unregisters and re-registers.

[lp:~phablet-team/media-hub/fix-1506953]

202. By Jim Hodapp on 2016-07-19

Merge with upstream

203. By Jim Hodapp on 2016-07-19

Version bump for API change

204. By Jim Hodapp on 2016-07-19

Get rid of unnecessary debug statements

[Konrad Zapałowicz (kzapalowicz)]

LGTM

review: Approve (code)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-07-07 19:06:48 +0000
+++ CMakeLists.txt	2016-07-19 21:22:30 +0000
@@ -20,11 +20,11 @@
   # we define the version to be 5.0.0
   if (${DISTRO_CODENAME} STREQUAL "vivid")
     set(UBUNTU_MEDIA_HUB_VERSION_MAJOR 4)
-    set(UBUNTU_MEDIA_HUB_VERSION_MINOR 4)
+    set(UBUNTU_MEDIA_HUB_VERSION_MINOR 5)
     set(UBUNTU_MEDIA_HUB_VERSION_PATCH 0)
   else ()
     set(UBUNTU_MEDIA_HUB_VERSION_MAJOR 5)
-    set(UBUNTU_MEDIA_HUB_VERSION_MINOR 1)
+    set(UBUNTU_MEDIA_HUB_VERSION_MINOR 2)
     set(UBUNTU_MEDIA_HUB_VERSION_PATCH 0)
   endif()
 endif()

=== modified file 'debian/changelog'
--- debian/changelog	2016-07-11 01:21:59 +0000
+++ debian/changelog	2016-07-19 21:22:30 +0000
@@ -1,3 +1,10 @@
+media-hub (4.5.0+16.10.20160711-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Emit client side signal when the dbus connection between
+    media-hub-server and -client unregisters/registers 
+
+ -- Jim Hodapp <[e-mail]>  Tue, 19 Jul 2016 17:15:35 -0400
+
 media-hub (4.4.0+16.10.20160711-0ubuntu1) yakkety; urgency=medium
 
   * Add support for buffering signal. 

=== modified file 'include/core/media/service.h'
--- include/core/media/service.h	2016-05-03 13:59:14 +0000
+++ include/core/media/service.h	2016-07-19 21:22:30 +0000
@@ -63,6 +63,11 @@
     /** @brief Pauses sessions other than the supplied one. */
     virtual void pause_other_sessions(Player::PlayerKey) = 0;
 
+    /** @brief Signals when the media-hub server disappears from the bus **/
+    virtual const core::Signal<void>& service_disconnected() const = 0;
+    /** @brief Signals when the media-hub server reappears from the bus **/
+    virtual const core::Signal<void>& service_reconnected() const = 0;
+
   protected:
     Service() = default;
 };

=== modified file 'include/core/media/track.h'
--- include/core/media/track.h	2016-07-11 01:21:38 +0000
+++ include/core/media/track.h	2016-07-19 21:22:30 +0000
@@ -26,7 +26,6 @@
 #include <string>
 #include <vector>
 
-
 namespace core
 {
 namespace ubuntu

=== modified file 'src/core/media/player_stub.cpp'
--- src/core/media/player_stub.cpp	2016-06-16 02:34:40 +0000
+++ src/core/media/player_stub.cpp	2016-07-19 21:22:30 +0000
@@ -268,11 +268,13 @@
                         dbus::types::ObjectPath(
                             d->object->path().as_string() + "/TrackList")));
     }
+
     return d->track_list;
 }
 
 media::Player::PlayerKey media::PlayerStub::key() const
 {
+    MH_DEBUG("key(): %s", d->key);
     return d->key;
 }
 

=== modified file 'src/core/media/service_implementation.cpp'
--- src/core/media/service_implementation.cpp	2016-05-03 13:59:14 +0000
+++ src/core/media/service_implementation.cpp	2016-07-19 21:22:30 +0000
@@ -183,6 +183,7 @@
 std::shared_ptr<media::Player> media::ServiceImplementation::create_session(
         const media::Player::Configuration& conf)
 {
+    // Create a new Player
     auto player = std::make_shared<media::PlayerImplementation<media::PlayerSkeleton>>
                     (media::PlayerImplementation<media::PlayerSkeleton>::Configuration
     {
@@ -360,3 +361,17 @@
         d->resume_key = std::numeric_limits<std::uint32_t>::max();
     }
 }
+
+const core::Signal<void>& media::ServiceImplementation::service_disconnected() const
+{
+    throw std::runtime_error("This signal is only accessible from the ServiceStub");
+    static const core::Signal<void> s;
+    return s;
+}
+
+const core::Signal<void>& media::ServiceImplementation::service_reconnected() const
+{
+    throw std::runtime_error("This signal is only accessible from the ServiceStub");
+    static const core::Signal<void> s;
+    return s;
+}

=== modified file 'src/core/media/service_implementation.h'
--- src/core/media/service_implementation.h	2016-05-03 13:59:14 +0000
+++ src/core/media/service_implementation.h	2016-07-19 21:22:30 +0000
@@ -51,6 +51,9 @@
     std::shared_ptr<Player> resume_session(Player::PlayerKey key);
     void pause_other_sessions(Player::PlayerKey key);
 
+    const core::Signal<void>& service_disconnected() const;
+    const core::Signal<void>& service_reconnected() const;
+
 private:
     void pause_all_multimedia_sessions(bool resume_play_after_phonecall);
     void resume_paused_multimedia_sessions(bool resume_video_sessions = true);

=== modified file 'src/core/media/service_skeleton.cpp'
--- src/core/media/service_skeleton.cpp	2016-06-06 20:28:50 +0000
+++ src/core/media/service_skeleton.cpp	2016-07-19 21:22:30 +0000
@@ -935,3 +935,17 @@
 {
     access_bus()->stop();
 }
+
+const core::Signal<void>& media::ServiceSkeleton::service_disconnected() const
+{
+    throw std::runtime_error("This signal is only accessible from the ServiceStub");
+    static const core::Signal<void> s;
+    return s;
+}
+
+const core::Signal<void>& media::ServiceSkeleton::service_reconnected() const
+{
+    throw std::runtime_error("This signal is only accessible from the ServiceStub");
+    static const core::Signal<void> s;
+    return s;
+}

=== modified file 'src/core/media/service_skeleton.h'
--- src/core/media/service_skeleton.h	2016-05-03 15:22:12 +0000
+++ src/core/media/service_skeleton.h	2016-07-19 21:22:30 +0000
@@ -67,6 +67,9 @@
     void run();
     void stop();
 
+    virtual const core::Signal<void>& service_disconnected() const;
+    virtual const core::Signal<void>& service_reconnected() const;
+
   private:
     struct Private;
     std::shared_ptr<Private> d;

=== modified file 'src/core/media/service_stub.cpp'
--- src/core/media/service_stub.cpp	2016-05-03 13:59:14 +0000
+++ src/core/media/service_stub.cpp	2016-07-19 21:22:30 +0000
@@ -24,26 +24,46 @@
 
 #include "mpris/service.h"
 
+#include "core/media/logger/logger.h"
+
 namespace dbus = core::dbus;
 namespace media = core::ubuntu::media;
 
-struct media::ServiceStub::Private
-{
-    dbus::Object::Ptr object;
-};
-
 media::ServiceStub::ServiceStub()
     : core::dbus::Stub<media::Service>(the_session_bus()),
-      d(new Private{
+      object(
         access_service()->object_for_path(
             dbus::types::ObjectPath(
-                dbus::traits::Service<media::Service>::object_path()))})
+                dbus::traits::Service<media::Service>::object_path()))
+        ),
+      daemon(the_session_bus()),
+      service_watcher_reg(
+          daemon.make_service_watcher(dbus::traits::Service<media::Service>::interface_name(),
+                        dbus::DBus::WatchMode::registration)
+          ),
+      service_watcher_unreg(
+          daemon.make_service_watcher(dbus::traits::Service<media::Service>::interface_name(),
+                        dbus::DBus::WatchMode::unregistration)
+          )
 {
     auto bus = the_session_bus();
     worker = std::move(std::thread([bus]()
     {
         bus->run();
     }));
+
+    service_watcher_reg->service_registered().connect(
+        [&]()
+        {
+            MH_DEBUG("media-hub service registered");
+            signals.service_reconnected();
+        });
+    service_watcher_unreg->service_unregistered().connect(
+        [&]()
+        {
+            MH_DEBUG("media-hub service unregistered");
+            signals.service_disconnected();
+        });
 }
 
 media::ServiceStub::~ServiceStub()
@@ -57,7 +77,7 @@
 
 std::shared_ptr<media::Player> media::ServiceStub::create_session(const media::Player::Configuration&)
 {
-    auto op = d->object->invoke_method_synchronously<mpris::Service::CreateSession,
+    const auto op = object->invoke_method_synchronously<mpris::Service::CreateSession,
          std::tuple<dbus::types::ObjectPath, std::string>>();
 
     if (op.is_error())
@@ -72,18 +92,20 @@
     });
 }
 
-void media::ServiceStub::detach_session(const std::string& uuid, const media::Player::Configuration&)
+void media::ServiceStub::detach_session(const std::string& uuid,
+        const media::Player::Configuration&)
 {
-    auto op = d->object->invoke_method_synchronously<mpris::Service::DetachSession,
+    const auto op = object->invoke_method_synchronously<mpris::Service::DetachSession,
          void>(uuid);
 
     if (op.is_error())
         throw std::runtime_error("Problem detaching session: " + op.error());
 }
 
-std::shared_ptr<media::Player> media::ServiceStub::reattach_session(const std::string& uuid, const media::Player::Configuration&)
+std::shared_ptr<media::Player> media::ServiceStub::reattach_session(const std::string& uuid,
+        const media::Player::Configuration&)
 {
-    auto op = d->object->invoke_method_synchronously<mpris::Service::ReattachSession,
+    const auto op = object->invoke_method_synchronously<mpris::Service::ReattachSession,
          dbus::types::ObjectPath>(uuid);
 
     if (op.is_error())
@@ -98,18 +120,20 @@
     });
 }
 
-void media::ServiceStub::destroy_session(const std::string& uuid, const media::Player::Configuration&)
+void media::ServiceStub::destroy_session(const std::string& uuid,
+        const media::Player::Configuration&)
 {
-    auto op = d->object->invoke_method_synchronously<mpris::Service::DestroySession,
+    const auto op = object->invoke_method_synchronously<mpris::Service::DestroySession,
          void>(uuid);
 
     if (op.is_error())
         throw std::runtime_error("Problem destroying session: " + op.error());
 }
 
-std::shared_ptr<media::Player> media::ServiceStub::create_fixed_session(const std::string& name, const media::Player::Configuration&)
+std::shared_ptr<media::Player> media::ServiceStub::create_fixed_session(const std::string& name,
+        const media::Player::Configuration&)
 {
-    auto op = d->object->invoke_method_synchronously<mpris::Service::CreateFixedSession,
+    const auto op = object->invoke_method_synchronously<mpris::Service::CreateFixedSession,
          dbus::types::ObjectPath>(name);
 
     if (op.is_error())
@@ -125,7 +149,7 @@
 
 std::shared_ptr<media::Player> media::ServiceStub::resume_session(media::Player::PlayerKey key)
 {
-    auto op = d->object->invoke_method_synchronously<mpris::Service::ResumeSession,
+    const auto op = object->invoke_method_synchronously<mpris::Service::ResumeSession,
          dbus::types::ObjectPath>(key);
 
     if (op.is_error())
@@ -141,9 +165,19 @@
 
 void media::ServiceStub::pause_other_sessions(media::Player::PlayerKey key)
 {
-    auto op = d->object->invoke_method_synchronously<mpris::Service::PauseOtherSessions,
+    const auto op = object->invoke_method_synchronously<mpris::Service::PauseOtherSessions,
          void>(key);
 
     if (op.is_error())
         throw std::runtime_error("Problem pausing other sessions: " + op.error());
 }
+
+const core::Signal<void>& media::ServiceStub::service_disconnected() const
+{
+    return signals.service_disconnected;
+}
+
+const core::Signal<void>& media::ServiceStub::service_reconnected() const
+{
+    return signals.service_reconnected;
+}

=== modified file 'src/core/media/service_stub.h'
--- src/core/media/service_stub.h	2016-05-03 13:59:14 +0000
+++ src/core/media/service_stub.h	2016-07-19 21:22:30 +0000
@@ -23,9 +23,12 @@
 
 #include "service_traits.h"
 
+#include <core/dbus/bus.h>
+#include <core/dbus/service_watcher.h>
 #include <core/dbus/stub.h>
 
 #include <memory>
+#include <string>
 
 namespace core
 {
@@ -47,10 +50,21 @@
     std::shared_ptr<Player> resume_session(Player::PlayerKey key);
     void pause_other_sessions(Player::PlayerKey key);
 
+    virtual const core::Signal<void>& service_disconnected() const;
+    virtual const core::Signal<void>& service_reconnected() const;
+
   private:
-    struct Private;
-    std::unique_ptr<Private> d;
+    dbus::Object::Ptr object;
+    dbus::DBus daemon;
+    dbus::ServiceWatcher::Ptr service_watcher_reg;
+    dbus::ServiceWatcher::Ptr service_watcher_unreg;
     std::thread worker;
+
+    struct Signals
+    {
+        core::Signal<void> service_disconnected;
+        core::Signal<void> service_reconnected;
+    } signals;
 };
 }
 }