Merge lp:~ricmm/media-hub/async-bus into lp:media-hub

[Ricardo Mendoza]

Spawn worker thread for bus signal listeners.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~ricmm/media-hub/async-bus]

30. By Ricardo Mendoza on 2014-04-09

Extend API to allow clients to register for EOS signals

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

=== modified file 'include/core/media/player.h'
--- include/core/media/player.h	2014-04-09 00:42:49 +0000
+++ include/core/media/player.h	2014-04-09 00:42:49 +0000
@@ -44,6 +44,7 @@
     /** Used to set a callback function to be called when a frame is ready to be rendered **/
     typedef void (*FrameAvailableCbHybris)(GLConsumerWrapperHybris wrapper, void *context);
     typedef void (*FrameAvailableCb)(void *context);
+    typedef void (*PlaybackCompleteCb)(void *context);
 
     struct Configuration;
 
@@ -90,6 +91,7 @@
 
     // TODO: Convert this to be a signal
     virtual void set_frame_available_callback(FrameAvailableCb cb, void *context) = 0;
+    virtual void set_playback_complete_callback(PlaybackCompleteCb cb, void *context) = 0;
 
     virtual const core::Property<bool>& can_play() const = 0;
     virtual const core::Property<bool>& can_pause() const = 0;

=== modified file 'src/core/media/player_implementation.cpp'
--- src/core/media/player_implementation.cpp	2014-04-09 00:42:49 +0000
+++ src/core/media/player_implementation.cpp	2014-04-09 00:42:49 +0000
@@ -188,6 +188,12 @@
     // This method is client-side only and is simply a no-op for the service side
 }
 
+void media::PlayerImplementation::set_playback_complete_callback(
+    UNUSED PlaybackCompleteCb cb, UNUSED void *context)
+{
+    // This method is client-side only and is simply a no-op for the service side
+}
+
 void media::PlayerImplementation::seek_to(const std::chrono::microseconds& ms)
 {
     d->engine->seek_to(ms);

=== modified file 'src/core/media/player_implementation.h'
--- src/core/media/player_implementation.h	2014-04-09 00:42:49 +0000
+++ src/core/media/player_implementation.h	2014-04-09 00:42:49 +0000
@@ -51,6 +51,7 @@
     virtual void pause();
     virtual void stop();
     virtual void set_frame_available_callback(FrameAvailableCb cb, void *context);
+    virtual void set_playback_complete_callback(PlaybackCompleteCb cb, void *context);
     virtual void seek_to(const std::chrono::microseconds& offset);
 
 private:

=== modified file 'src/core/media/player_stub.cpp'
--- src/core/media/player_stub.cpp	2014-04-09 00:42:49 +0000
+++ src/core/media/player_stub.cpp	2014-04-09 00:42:49 +0000
@@ -136,7 +136,7 @@
 
     FrameAvailableCb frame_available_cb;
     void *frame_available_context;
-
+ 
     dbus::Bus::Ptr bus;
     dbus::types::ObjectPath path;
     dbus::Object::Ptr object;
@@ -176,6 +176,8 @@
                   seeked,
                   eos
               },
+              playback_complete_cb(nullptr),
+              playback_complete_context(nullptr),
               seeked_to(),
               end_of_stream()
         {
@@ -187,6 +189,8 @@
             dbus.end_of_stream->connect([this]()
             {
                 std::cout << "EndOfStream signal arrived via the bus." << std::endl;
+                if (playback_complete_cb)
+                    playback_complete_cb(playback_complete_context);
                 end_of_stream();
             });
         }
@@ -196,6 +200,15 @@
             std::shared_ptr<DBusSeekedToSignal> seeked_to;
             std::shared_ptr<DBusEndOfStreamSignal> end_of_stream;
         } dbus;
+
+        void set_playback_complete_cb(PlaybackCompleteCb cb, void *context)
+        {
+            playback_complete_cb = cb;
+            playback_complete_context = context;
+        }
+
+        PlaybackCompleteCb playback_complete_cb;
+        void *playback_complete_context;
         core::Signal<uint64_t> seeked_to;
         core::Signal<void> end_of_stream;
     } signals;
@@ -207,6 +220,11 @@
         : dbus::Stub<Player>(the_session_bus()),
           d(new Private{parent, access_service(), object_path})
 {
+    auto bus = the_session_bus();
+    worker = std::move(std::thread([bus]()
+    {
+        bus->run();
+    }));
 }
 
 media::PlayerStub::~PlayerStub()
@@ -299,6 +317,11 @@
     d->set_frame_available_cb(cb, context);
 }
 
+void media::PlayerStub::set_playback_complete_callback(PlaybackCompleteCb cb, void *context)
+{
+    d->signals.set_playback_complete_cb(cb, context);
+}
+
 const core::Property<bool>& media::PlayerStub::can_play() const
 {
     return *d->properties.can_play;

=== modified file 'src/core/media/player_stub.h'
--- src/core/media/player_stub.h	2014-04-09 00:42:49 +0000
+++ src/core/media/player_stub.h	2014-04-09 00:42:49 +0000
@@ -55,6 +55,7 @@
     virtual void stop();
 
     virtual void set_frame_available_callback(FrameAvailableCb cb, void *context);
+    virtual void set_playback_complete_callback(PlaybackCompleteCb cb, void *context);
 
     virtual const core::Property<bool>& can_play() const;
     virtual const core::Property<bool>& can_pause() const;
@@ -85,6 +86,7 @@
   private:
     struct Private;
     std::unique_ptr<Private> d;
+    std::thread worker;
 };
 }
 }