Merge lp:~phablet-team/media-hub/use-transact-method into lp:media-hub

[Ricardo Mendoza]

Migrate all Player DBus methods to use transact_method() instead of invoke_method_synchronously(), to prevent bus executor deadlocks.

[lp:~phablet-team/media-hub/use-transact-method]

128. By Ricardo Mendoza on 2015-03-16

Merge reqs

129. By Ricardo Mendoza on 2015-03-16

Merge req

130. By Ricardo Mendoza on 2015-03-16

Fix req

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:130
http://jenkins.qa.ubuntu.com/job/media-hub-ci/317/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/157
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/157/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/157

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

review: Approve (continuous-integration)

=== modified file 'src/core/media/player_stub.cpp'
--- src/core/media/player_stub.cpp	2015-03-16 15:44:12 +0000
+++ src/core/media/player_stub.cpp	2015-03-16 15:44:12 +0000
@@ -236,7 +236,7 @@
 
 bool media::PlayerStub::open_uri(const media::Track::UriType& uri)
 {
-    auto op = d->object->invoke_method_synchronously<mpris::Player::OpenUri, bool>(uri);
+    auto op = d->object->transact_method<mpris::Player::OpenUri, bool>(uri);
 
     return op.value();
 }
@@ -244,14 +244,14 @@
 
 bool media::PlayerStub::open_uri(const Track::UriType& uri, const Player::HeadersType& headers)
 {
-    auto op = d->object->invoke_method_synchronously<mpris::Player::OpenUriExtended, bool>(uri, headers);
+    auto op = d->object->transact_method<mpris::Player::OpenUriExtended, bool>(uri, headers);
 
     return op.value();
 }
 
 media::video::Sink::Ptr media::PlayerStub::create_gl_texture_video_sink(std::uint32_t texture_id)
 {
-    auto op = d->object->invoke_method_synchronously<mpris::Player::CreateVideoSink, void>(texture_id);
+    auto op = d->object->transact_method<mpris::Player::CreateVideoSink, void>(texture_id);
 
     if (op.is_error())
     {
@@ -266,7 +266,7 @@
 
 void media::PlayerStub::next()
 {
-    auto op = d->object->invoke_method_synchronously<mpris::Player::Next, void>();
+    auto op = d->object->transact_method<mpris::Player::Next, void>();
 
     if (op.is_error())
         throw std::runtime_error("Problem switching to next track on remote object");
@@ -274,7 +274,7 @@
 
 void media::PlayerStub::previous()
 {
-    auto op = d->object->invoke_method_synchronously<mpris::Player::Previous, void>();
+    auto op = d->object->transact_method<mpris::Player::Previous, void>();
 
     if (op.is_error())
         throw std::runtime_error("Problem switching to previous track on remote object");
@@ -282,7 +282,7 @@
 
 void media::PlayerStub::play()
 {
-    auto op = d->object->invoke_method_synchronously<mpris::Player::Play, void>();
+    auto op = d->object->transact_method<mpris::Player::Play, void>();
 
     if (op.is_error())
         throw std::runtime_error("Problem starting playback on remote object");
@@ -290,7 +290,7 @@
 
 void media::PlayerStub::pause()
 {
-    auto op = d->object->invoke_method_synchronously<mpris::Player::Pause, void>();
+    auto op = d->object->transact_method<mpris::Player::Pause, void>();
 
     if (op.is_error())
         throw std::runtime_error("Problem pausing playback on remote object");
@@ -298,7 +298,7 @@
 
 void media::PlayerStub::seek_to(const std::chrono::microseconds& offset)
 {
-    auto op = d->object->invoke_method_synchronously<mpris::Player::Seek, void, uint64_t>(offset.count());
+    auto op = d->object->transact_method<mpris::Player::Seek, void, uint64_t>(offset.count());
 
     if (op.is_error())
         throw std::runtime_error("Problem seeking on remote object");
@@ -306,7 +306,7 @@
 
 void media::PlayerStub::stop()
 {
-    auto op = d->object->invoke_method_synchronously<mpris::Player::Stop, void>();
+    auto op = d->object->transact_method<mpris::Player::Stop, void>();
 
     if (op.is_error())
         throw std::runtime_error("Problem stopping playback on remote object");