Merge lp:~phablet-team/media-hub/multiple-sessions into lp:media-hub

[Jim Hodapp]

* One Engine instance per PlayerImplementation instance instead of one global Engine instance
* Pause other playing sessions when starting playback of a new foreground player
* Emit a PlaybackStatusChanged signal so that qtubuntu-media knows when PlaybackStatus changes from underneath it
* Use GST_SEEK_FLAG_KEY_UNIT instead because seeking doesn't perform well enough with GST_SEEK_FLAG_ACCURATE

* One Engine instance per PlayerImplementation instance instead of one global Engine instance
* Pause other playing sessions when starting playback of a new foreground player
* Emit a PlaybackStatusChanged signal so that qtubuntu-media knows when PlaybackStatus changes from underneath it
* Use GST_SEEK_FLAG_KEY_UNIT instead because seeking doesn't perform well enough with GST_SEEK_FLAG_ACCURATE

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:60
http://jenkins.qa.ubuntu.com/job/media-hub-ci/58/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-trusty-amd64-ci/59/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-trusty-armhf-ci/58/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-trusty-i386-ci/58/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'include/core/media/player.h'
--- include/core/media/player.h	2014-04-28 14:20:04 +0000
+++ include/core/media/player.h	2014-04-28 14:20:05 +0000
@@ -39,6 +39,7 @@
   public:
     typedef double PlaybackRate;
     typedef double Volume;
+    typedef uint32_t PlayerKey;
     typedef void* GLConsumerWrapperHybris;
 
     /** Used to set a callback function to be called when a frame is ready to be rendered **/
@@ -78,6 +79,7 @@
     bool operator==(const Player&) const = delete;
 
     virtual std::shared_ptr<TrackList> track_list() = 0;
+    virtual PlayerKey key() const = 0;
 
     virtual bool open_uri(const Track::UriType& uri) = 0;
     virtual void create_video_sink(uint32_t texture_id) = 0;
@@ -118,6 +120,7 @@
 
     virtual const core::Signal<uint64_t>& seeked_to() const = 0;
     virtual const core::Signal<void>& end_of_stream() const = 0;
+    virtual core::Signal<PlaybackStatus>& playback_status_changed() = 0;
   protected:
     Player();
 

=== modified file 'include/core/media/service.h'
--- include/core/media/service.h	2014-01-13 21:51:14 +0000
+++ include/core/media/service.h	2014-04-28 14:20:05 +0000
@@ -43,6 +43,7 @@
     bool operator==(const Service&) const = delete;
 
     virtual std::shared_ptr<Player> create_session(const Player::Configuration&) = 0;
+    virtual void pause_other_sessions(Player::PlayerKey) = 0;
 
   protected:
     Service() = default;

=== modified file 'src/core/media/apparmor.h'
--- src/core/media/apparmor.h	2014-04-28 14:20:04 +0000
+++ src/core/media/apparmor.h	2014-04-28 14:20:05 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *      Author: Ricardo Mendoza <[e-mail]>
+ * Author: Jim Hodapp <[e-mail]>
  */
 
 #ifndef APPARMOR_H_DBUS_

=== modified file 'src/core/media/engine.h'
--- src/core/media/engine.h	2014-04-28 14:20:04 +0000
+++ src/core/media/engine.h	2014-04-28 14:20:05 +0000
@@ -18,6 +18,7 @@
 #ifndef CORE_UBUNTU_MEDIA_ENGINE_H_
 #define CORE_UBUNTU_MEDIA_ENGINE_H_
 
+#include <core/media/player.h>
 #include <core/media/track.h>
 
 #include <core/property.h>
@@ -118,6 +119,7 @@
     virtual const core::Signal<void>& about_to_finish_signal() const = 0;
     virtual const core::Signal<uint64_t>& seeked_to_signal() const = 0;
     virtual const core::Signal<void>& end_of_stream_signal() const = 0;
+    virtual const core::Signal<core::ubuntu::media::Player::PlaybackStatus>& playback_status_changed_signal() const = 0;
 };
 }
 }

=== modified file 'src/core/media/gstreamer/engine.cpp'
--- src/core/media/gstreamer/engine.cpp	2014-04-28 14:20:04 +0000
+++ src/core/media/gstreamer/engine.cpp	2014-04-28 14:20:05 +0000
@@ -28,6 +28,8 @@
 
 namespace media = core::ubuntu::media;
 
+using namespace std;
+
 namespace gstreamer
 {
 struct Init
@@ -239,10 +241,12 @@
     core::Signal<void> about_to_finish;
     core::Signal<uint64_t> seeked_to;
     core::Signal<void> end_of_stream;
+    core::Signal<media::Player::PlaybackStatus> playback_status_changed;
 };
 
 gstreamer::Engine::Engine() : d(new Private{})
 {
+    cout << "Creating a new Engine instance in " << __PRETTY_FUNCTION__ << endl;
     d->state = media::Engine::State::ready;
 }
 
@@ -279,8 +283,11 @@
     if (result)
     {
         d->state = media::Engine::State::playing;
+        d->playback_status_changed(media::Player::PlaybackStatus::playing);
     }
 
+    cout << "Engine: " << this << endl;
+
     return result;
 }
 
@@ -289,7 +296,10 @@
     auto result = d->playbin.set_state_and_wait(GST_STATE_NULL);
 
     if (result)
+    {
         d->state = media::Engine::State::stopped;
+        d->playback_status_changed(media::Player::PlaybackStatus::stopped);
+    }
 
     return result;
 }
@@ -299,7 +309,11 @@
     auto result = d->playbin.set_state_and_wait(GST_STATE_PAUSED);
 
     if (result)
+    {
         d->state = media::Engine::State::paused;
+        cout << "pause" << endl;
+        d->playback_status_changed(media::Player::PlaybackStatus::paused);
+    }
 
     return result;
 }
@@ -373,3 +387,8 @@
 {
     return d->end_of_stream;
 }
+
+const core::Signal<media::Player::PlaybackStatus>& gstreamer::Engine::playback_status_changed_signal() const
+{
+    return d->playback_status_changed;
+}

=== modified file 'src/core/media/gstreamer/engine.h'
--- src/core/media/gstreamer/engine.h	2014-04-28 14:20:04 +0000
+++ src/core/media/gstreamer/engine.h	2014-04-28 14:20:05 +0000
@@ -54,6 +54,7 @@
     const core::Signal<void>& about_to_finish_signal() const;
     const core::Signal<uint64_t>& seeked_to_signal() const;
     const core::Signal<void>& end_of_stream_signal() const;
+    const core::Signal<core::ubuntu::media::Player::PlaybackStatus>& playback_status_changed_signal() const;
 
 private:
     struct Private;

=== modified file 'src/core/media/gstreamer/playbin.h'
--- src/core/media/gstreamer/playbin.h	2014-04-28 14:20:04 +0000
+++ src/core/media/gstreamer/playbin.h	2014-04-28 14:20:05 +0000
@@ -20,6 +20,7 @@
 #define GSTREAMER_PLAYBIN_H_
 
 #include "bus.h"
+#include "../mpris/player.h"
 
 #include <hybris/media/media_codec_layer.h>
 #include <hybris/media/surface_texture_client_hybris.h>
@@ -30,6 +31,8 @@
 #include <chrono>
 #include <string>
 
+namespace media = core::ubuntu::media;
+
 namespace gstreamer
 {
 struct Playbin
@@ -312,8 +315,7 @@
         return gst_element_seek_simple(
                     pipeline,
                     GST_FORMAT_TIME,
-                    (GstSeekFlags)(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT |
-                                    GST_SEEK_FLAG_SNAP_BEFORE),
+                    (GstSeekFlags)(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT),
                     ms.count() * 1000);
     }
 
@@ -408,6 +410,7 @@
         core::Signal<Bus::Message::Detail::StateChanged> on_state_changed;
         core::Signal<uint64_t> on_seeked_to;
         core::Signal<void> on_end_of_stream;
+        core::Signal<media::Player::PlaybackStatus> on_playback_status_changed;
     } signals;
 };
 }

=== modified file 'src/core/media/mpris/player.h'
--- src/core/media/mpris/player.h	2014-04-28 14:20:04 +0000
+++ src/core/media/mpris/player.h	2014-04-28 14:20:05 +0000
@@ -55,12 +55,14 @@
     METHOD(Seek, Player, std::chrono::seconds(1))
     METHOD(SetPosition, Player, std::chrono::seconds(1))
     METHOD(CreateVideoSink, Player, std::chrono::seconds(1))
+    METHOD(Key, Player, std::chrono::seconds(1))
     METHOD(OpenUri, Player, std::chrono::seconds(1))
 
     struct Signals
     {
         SIGNAL(Seeked, Player, uint64_t)
         SIGNAL(EndOfStream, Player, void)
+        SIGNAL(PlaybackStatusChanged, Player, core::ubuntu::media::Player::PlaybackStatus)
     };
 
     struct Properties

=== modified file 'src/core/media/mpris/service.h'
--- src/core/media/mpris/service.h	2014-01-13 21:51:14 +0000
+++ src/core/media/mpris/service.h	2014-04-28 14:20:05 +0000
@@ -50,6 +50,7 @@
     };
 
     METHOD(CreateSession, Service, std::chrono::seconds(1))
+    METHOD(PauseOtherSessions, Service, std::chrono::seconds(1))
 };
 }
 

=== modified file 'src/core/media/player_implementation.cpp'
--- src/core/media/player_implementation.cpp	2014-04-28 14:20:04 +0000
+++ src/core/media/player_implementation.cpp	2014-04-28 14:20:05 +0000
@@ -22,24 +22,29 @@
 #include "engine.h"
 #include "track_list_implementation.h"
 
+#include "gstreamer/engine.h"
+
 #define UNUSED __attribute__((unused))
 
 namespace media = core::ubuntu::media;
 
+using namespace std;
+
 struct media::PlayerImplementation::Private
 {
     Private(PlayerImplementation* parent,
             const dbus::types::ObjectPath& session_path,
             const std::shared_ptr<media::Service>& service,
-            const std::shared_ptr<media::Engine>& engine)
+            PlayerImplementation::PlayerKey key)
         : parent(parent),
           service(service),
-          engine(engine),
+          engine(std::make_shared<gstreamer::Engine>()),
           session_path(session_path),
           track_list(
               new media::TrackListImplementation(
                   session_path.as_string() + "/TrackList",
-                  engine->meta_data_extractor()))
+                  engine->meta_data_extractor())),
+          key(key)
     {
         engine->state().changed().connect(
                     [parent](const Engine::State& state)
@@ -62,18 +67,19 @@
     std::shared_ptr<Engine> engine;
     dbus::types::ObjectPath session_path;
     std::shared_ptr<TrackListImplementation> track_list;
+    PlayerImplementation::PlayerKey key;
 };
 
 media::PlayerImplementation::PlayerImplementation(
         const dbus::types::ObjectPath& session_path,
         const std::shared_ptr<Service>& service,
-        const std::shared_ptr<Engine>& engine)
+        PlayerKey key)
     : media::PlayerSkeleton(session_path),
       d(new Private(
             this,
             session_path,
             service,
-            engine))
+            key))
 {
     // Initializing default values for properties
     can_play().set(true);
@@ -118,7 +124,7 @@
     };
     is_audio_source().install(audio_type_getter);
 
-    engine->about_to_finish_signal().connect([this]()
+    d->engine->about_to_finish_signal().connect([this]()
     {
         if (d->track_list->has_next())
         {
@@ -128,15 +134,20 @@
         }
     });
 
-    engine->seeked_to_signal().connect([this](uint64_t value)
+    d->engine->seeked_to_signal().connect([this](uint64_t value)
     {
         seeked_to()(value);
     });
 
-    engine->end_of_stream_signal().connect([this]()
+    d->engine->end_of_stream_signal().connect([this]()
     {
         end_of_stream()();
     });
+
+    d->engine->playback_status_changed_signal().connect([this](const Player::PlaybackStatus& status)
+    {
+        playback_status_changed()(status);
+    });
 }
 
 media::PlayerImplementation::~PlayerImplementation()
@@ -148,6 +159,12 @@
     return d->track_list;
 }
 
+// TODO: Convert this to be a property instead of sync call
+media::Player::PlayerKey media::PlayerImplementation::key() const
+{
+    return d->key;
+}
+
 bool media::PlayerImplementation::open_uri(const Track::UriType& uri)
 {
     return d->engine->open_resource_for_uri(uri);

=== modified file 'src/core/media/player_implementation.h'
--- src/core/media/player_implementation.h	2014-04-28 14:20:04 +0000
+++ src/core/media/player_implementation.h	2014-04-28 14:20:05 +0000
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2013-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License version 3,
@@ -37,10 +38,11 @@
     PlayerImplementation(
             const core::dbus::types::ObjectPath& session_path,
             const std::shared_ptr<Service>& service,
-            const std::shared_ptr<Engine>& engine);
+            PlayerKey key);
     ~PlayerImplementation();
 
     virtual std::shared_ptr<TrackList> track_list();
+    virtual PlayerKey key() const;
 
     virtual bool open_uri(const Track::UriType& uri);
     virtual void create_video_sink(uint32_t texture_id);

=== modified file 'src/core/media/player_skeleton.cpp'
--- src/core/media/player_skeleton.cpp	2014-04-28 14:20:04 +0000
+++ src/core/media/player_skeleton.cpp	2014-04-28 14:20:05 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License version 3,
@@ -63,7 +63,8 @@
           signals
           {
               object->get_signal<mpris::Player::Signals::Seeked>(),
-              object->get_signal<mpris::Player::Signals::EndOfStream>()
+              object->get_signal<mpris::Player::Signals::EndOfStream>(),
+              object->get_signal<mpris::Player::Signals::PlaybackStatusChanged>()
           }
     {
     }
@@ -219,6 +220,13 @@
         }
     }
 
+    void handle_key(const core::dbus::Message::Ptr& in)
+    {
+        auto reply = dbus::Message::make_method_return(in);
+        reply->writer() << impl->key();
+        impl->access_bus()->send(reply);
+    }
+
     void handle_open_uri(const core::dbus::Message::Ptr& in)
     {
         Track::UriType uri;
@@ -265,16 +273,20 @@
     {
         typedef core::dbus::Signal<mpris::Player::Signals::Seeked, mpris::Player::Signals::Seeked::ArgumentType> DBusSeekedToSignal;
         typedef core::dbus::Signal<mpris::Player::Signals::EndOfStream, mpris::Player::Signals::EndOfStream::ArgumentType> DBusEndOfStreamSignal;
+        typedef core::dbus::Signal<mpris::Player::Signals::PlaybackStatusChanged, mpris::Player::Signals::PlaybackStatusChanged::ArgumentType> DBusPlaybackStatusChangedSignal;
 
         Signals(const std::shared_ptr<DBusSeekedToSignal>& seeked,
-                const std::shared_ptr<DBusEndOfStreamSignal>& eos)
+                const std::shared_ptr<DBusEndOfStreamSignal>& eos,
+                const std::shared_ptr<DBusPlaybackStatusChangedSignal>& status)
             : dbus
               {
                   seeked,
-                  eos
+                  eos,
+                  status
               },
               seeked_to(),
-              end_of_stream()
+              end_of_stream(),
+              playback_status_changed()
         {
             seeked_to.connect([this](std::uint64_t value)
             {
@@ -285,15 +297,22 @@
             {
                 dbus.end_of_stream->emit();
             });
+
+            playback_status_changed.connect([this](const media::Player::PlaybackStatus& status)
+            {
+                dbus.playback_status_changed->emit(status);
+            });
         }
 
         struct DBus
         {
             std::shared_ptr<DBusSeekedToSignal> seeked_to;
             std::shared_ptr<DBusEndOfStreamSignal> end_of_stream;
+            std::shared_ptr<DBusPlaybackStatusChangedSignal> playback_status_changed;
         } dbus;
         core::Signal<uint64_t> seeked_to;
         core::Signal<void> end_of_stream;
+        core::Signal<media::Player::PlaybackStatus> playback_status_changed;
     } signals;
 
 };
@@ -335,6 +354,10 @@
         std::bind(&Private::handle_create_video_sink,
                   std::ref(d),
                   std::placeholders::_1));
+    d->object->install_method_handler<mpris::Player::Key>(
+        std::bind(&Private::handle_key,
+                  std::ref(d),
+                  std::placeholders::_1));
     d->object->install_method_handler<mpris::Player::OpenUri>(
         std::bind(&Private::handle_open_uri,
                   std::ref(d),
@@ -535,3 +558,8 @@
 {
     return d->signals.end_of_stream;
 }
+
+core::Signal<media::Player::PlaybackStatus>& media::PlayerSkeleton::playback_status_changed()
+{
+    return d->signals.playback_status_changed;
+}

=== modified file 'src/core/media/player_skeleton.h'
--- src/core/media/player_skeleton.h	2014-04-28 14:20:04 +0000
+++ src/core/media/player_skeleton.h	2014-04-28 14:20:05 +0000
@@ -68,6 +68,7 @@
 
     virtual const core::Signal<uint64_t>& seeked_to() const;
     virtual const core::Signal<void>& end_of_stream() const;
+    virtual core::Signal<PlaybackStatus>& playback_status_changed();
 
   protected:
     PlayerSkeleton(const core::dbus::types::ObjectPath& session_path);

=== modified file 'src/core/media/player_stub.cpp'
--- src/core/media/player_stub.cpp	2014-04-28 14:20:04 +0000
+++ src/core/media/player_stub.cpp	2014-04-28 14:20:05 +0000
@@ -80,7 +80,8 @@
                 signals
                 {
                     object->get_signal<mpris::Player::Signals::Seeked>(),
-                    object->get_signal<mpris::Player::Signals::EndOfStream>()
+                    object->get_signal<mpris::Player::Signals::EndOfStream>(),
+                    object->get_signal<mpris::Player::Signals::PlaybackStatusChanged>()
                 }
     {
     }
@@ -136,7 +137,7 @@
 
     FrameAvailableCb frame_available_cb;
     void *frame_available_context;
- 
+
     dbus::Bus::Ptr bus;
     dbus::types::ObjectPath path;
     dbus::Object::Ptr object;
@@ -168,18 +169,22 @@
     {
         typedef core::dbus::Signal<mpris::Player::Signals::Seeked, mpris::Player::Signals::Seeked::ArgumentType> DBusSeekedToSignal;
         typedef core::dbus::Signal<mpris::Player::Signals::EndOfStream, mpris::Player::Signals::EndOfStream::ArgumentType> DBusEndOfStreamSignal;
+        typedef core::dbus::Signal<mpris::Player::Signals::PlaybackStatusChanged, mpris::Player::Signals::PlaybackStatusChanged::ArgumentType> DBusPlaybackStatusChangedSignal;
 
         Signals(const std::shared_ptr<DBusSeekedToSignal>& seeked,
-                const std::shared_ptr<DBusEndOfStreamSignal>& eos)
+                const std::shared_ptr<DBusEndOfStreamSignal>& eos,
+                const std::shared_ptr<DBusPlaybackStatusChangedSignal>& status)
             : dbus
               {
                   seeked,
-                  eos
+                  eos,
+                  status
               },
               playback_complete_cb(nullptr),
               playback_complete_context(nullptr),
               seeked_to(),
-              end_of_stream()
+              end_of_stream(),
+              playback_status_changed()
         {
             dbus.seeked_to->connect([this](std::uint64_t value)
             {
@@ -194,12 +199,19 @@
                     playback_complete_cb(playback_complete_context);
                 end_of_stream();
             });
+
+            dbus.playback_status_changed->connect([this](const media::Player::PlaybackStatus& status)
+            {
+                std::cout << "PlaybackStatusChanged signal arrived via the bus." << std::endl;
+                playback_status_changed(status);
+            });
         }
 
         struct DBus
         {
             std::shared_ptr<DBusSeekedToSignal> seeked_to;
             std::shared_ptr<DBusEndOfStreamSignal> end_of_stream;
+            std::shared_ptr<DBusPlaybackStatusChangedSignal> playback_status_changed;
         } dbus;
 
         void set_playback_complete_cb(PlaybackCompleteCb cb, void *context)
@@ -212,6 +224,7 @@
         void *playback_complete_context;
         core::Signal<uint64_t> seeked_to;
         core::Signal<void> end_of_stream;
+        core::Signal<media::Player::PlaybackStatus> playback_status_changed;
     } signals;
 };
 
@@ -243,6 +256,13 @@
     return d->track_list;
 }
 
+media::Player::PlayerKey media::PlayerStub::key() const
+{
+    auto op = d->object->invoke_method_synchronously<mpris::Player::Key, media::Player::PlayerKey>();
+
+    return op.value();
+}
+
 bool media::PlayerStub::open_uri(const media::Track::UriType& uri)
 {
     auto op = d->object->invoke_method_synchronously<mpris::Player::OpenUri, bool>(uri);
@@ -437,3 +457,8 @@
 {
     return d->signals.end_of_stream;
 }
+
+core::Signal<media::Player::PlaybackStatus>& media::PlayerStub::playback_status_changed()
+{
+    return d->signals.playback_status_changed;
+}

=== modified file 'src/core/media/player_stub.h'
--- src/core/media/player_stub.h	2014-04-28 14:20:04 +0000
+++ src/core/media/player_stub.h	2014-04-28 14:20:05 +0000
@@ -43,6 +43,7 @@
     ~PlayerStub();
 
     virtual std::shared_ptr<TrackList> track_list();
+    virtual PlayerKey key() const;
 
     virtual bool open_uri(const Track::UriType& uri);
     virtual void create_video_sink(uint32_t texture_id);
@@ -82,6 +83,7 @@
 
     virtual const core::Signal<uint64_t>& seeked_to() const;
     virtual const core::Signal<void>& end_of_stream() const;
+    virtual core::Signal<PlaybackStatus>& playback_status_changed();
 
   private:
     struct Private;

=== modified file 'src/core/media/service_implementation.cpp'
--- src/core/media/service_implementation.cpp	2014-01-13 21:51:14 +0000
+++ src/core/media/service_implementation.cpp	2014-04-28 14:20:05 +0000
@@ -21,21 +21,63 @@
 #include "player_configuration.h"
 #include "player_implementation.h"
 
-#include "gstreamer/engine.h"
+#include <map>
 
 namespace media = core::ubuntu::media;
 
+using namespace std;
+
 struct media::ServiceImplementation::Private
 {
-    Private() : engine(std::make_shared<gstreamer::Engine>())
-    {
-    }
-    std::shared_ptr<media::Engine> engine;
+    Private()
+        : key_(0)
+    {
+    }
+
+    void track_player(const std::shared_ptr<media::Player>& player)
+    {
+        cout << __PRETTY_FUNCTION__ << endl;
+        cout << "key: " << key_ << endl;
+        player_map.insert(
+                std::pair<media::Player::PlayerKey,
+                std::shared_ptr<media::Player>>(key_, player));
+
+        ++key_;
+    }
+
+    inline media::Player::PlayerKey key() const
+    {
+        return key_;
+    }
+
+    void pause_other_sessions(media::Player::PlayerKey key)
+    {
+        cout << __PRETTY_FUNCTION__ << endl;
+        cout << "key: " << key << endl;
+
+        // TODO: Add a field to Player that is the type of player so that certain
+        // types of playback aren't paused below. E.g. a camera click sound shouldn't
+        // pause, nor should it pause background music sessions
+        for (auto& player_pair : player_map)
+        {
+            if (player_pair.second->playback_status() == Player::playing
+                    && player_pair.first != key)
+            {
+                cout << "Pausing player with key: " << player_pair.first << endl;
+                player_pair.second->pause();
+            }
+        }
+    }
+
+    // Used for Player instance management
+    std::map<media::Player::PlayerKey, std::shared_ptr<media::Player>> player_map;
+    media::Player::PlayerKey key_;
+
 };
 
 media::ServiceImplementation::ServiceImplementation() : d(new Private())
 {
-
+    cout << __PRETTY_FUNCTION__ << endl;
 }
 
 media::ServiceImplementation::~ServiceImplementation()
@@ -45,8 +87,13 @@
 std::shared_ptr<media::Player> media::ServiceImplementation::create_session(
         const media::Player::Configuration& conf)
 {
-    return std::make_shared<media::PlayerImplementation>(
-                conf.object_path,
-                shared_from_this(),
-                d->engine);
+    std::shared_ptr<media::Player> player = std::make_shared<media::PlayerImplementation>(
+            conf.object_path, shared_from_this(), d->key());
+    d->track_player(player);
+    return player;
+}
+
+void media::ServiceImplementation::pause_other_sessions(media::Player::PlayerKey key)
+{
+    d->pause_other_sessions(key);
 }

=== modified file 'src/core/media/service_implementation.h'
--- src/core/media/service_implementation.h	2014-01-13 21:51:14 +0000
+++ src/core/media/service_implementation.h	2014-04-28 14:20:05 +0000
@@ -27,6 +27,9 @@
 {
 namespace media
 {
+
+class Player;
+
 class ServiceImplementation : public ServiceSkeleton
 {
   public:
@@ -35,6 +38,8 @@
 
     std::shared_ptr<Player> create_session(const Player::Configuration&);
 
+    void pause_other_sessions(Player::PlayerKey key);
+
   private:
     struct Private;
     std::shared_ptr<Private> d;

=== modified file 'src/core/media/service_skeleton.cpp'
--- src/core/media/service_skeleton.cpp	2014-02-12 15:53:57 +0000
+++ src/core/media/service_skeleton.cpp	2014-04-28 14:20:05 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License version 3,
@@ -49,6 +49,11 @@
                         &Private::handle_create_session,
                         this,
                         std::placeholders::_1));
+        object->install_method_handler<mpris::Service::PauseOtherSessions>(
+                    std::bind(
+                        &Private::handle_pause_other_sessions,
+                        this,
+                        std::placeholders::_1));
     }
 
     void handle_create_session(const core::dbus::Message::Ptr& msg)
@@ -86,6 +91,17 @@
         }
     }
 
+    void handle_pause_other_sessions(const core::dbus::Message::Ptr& msg)
+    {
+        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        Player::PlayerKey key;
+        msg->reader() >> key;
+        impl->pause_other_sessions(key);
+
+        auto reply = dbus::Message::make_method_return(msg);
+        impl->access_bus()->send(reply);
+    }
+
     media::ServiceSkeleton* impl;
     dbus::Object::Ptr object;
 

=== modified file 'src/core/media/service_skeleton.h'
--- src/core/media/service_skeleton.h	2014-02-12 15:53:57 +0000
+++ src/core/media/service_skeleton.h	2014-04-28 14:20:05 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License version 3,

=== modified file 'src/core/media/service_stub.cpp'
--- src/core/media/service_stub.cpp	2014-02-12 15:53:57 +0000
+++ src/core/media/service_stub.cpp	2014-04-28 14:20:05 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License version 3,
@@ -47,13 +47,21 @@
 
 std::shared_ptr<media::Player> media::ServiceStub::create_session(const media::Player::Configuration&)
 {
-    auto op
-            = d->object->invoke_method_synchronously<
-                mpris::Service::CreateSession,
-                dbus::types::ObjectPath>();
+    auto op = d->object->invoke_method_synchronously<mpris::Service::CreateSession,
+         dbus::types::ObjectPath>();
 
     if (op.is_error())
         throw std::runtime_error("Problem creating session: " + op.error());
 
     return std::shared_ptr<media::Player>(new media::PlayerStub(shared_from_this(), op.value()));
 }
+
+void media::ServiceStub::pause_other_sessions(media::Player::PlayerKey key)
+{
+    std::cout << __PRETTY_FUNCTION__ << std::endl;
+    auto op = d->object->invoke_method_synchronously<mpris::Service::PauseOtherSessions,
+         void>(key);
+
+    if (op.is_error())
+        throw std::runtime_error("Problem pausing other sessions: " + op.error());
+}

=== modified file 'src/core/media/service_stub.h'
--- src/core/media/service_stub.h	2014-02-12 15:53:57 +0000
+++ src/core/media/service_stub.h	2014-04-28 14:20:05 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License version 3,
@@ -40,6 +40,7 @@
     ~ServiceStub();
 
     std::shared_ptr<Player> create_session(const Player::Configuration&);
+    void pause_other_sessions(Player::PlayerKey key);
 
   private:
     struct Private;