Merge lp:~rsalveti/media-hub/1409125 into lp:media-hub

[Ricardo Salveti]

* service_implementation: adding debug for call started/ended signals
* Make sure account and connection are available when setting up account manager (patch from Gustavo Boiko)
* call_monitor: don't check caps when hooking up on/off signals, until bug 1409125 is fixed
* Enable parallel building

* service_implementation: adding debug for call started/ended signals
* Make sure account and connection are available when setting up account manager (patch from Gustavo Boiko)
* call_monitor: don't check caps when hooking up on/off signals, until bug 1409125 is fixed

[lp:~rsalveti/media-hub/1409125]

108. By Ricardo Salveti on 2015-01-12

Making log line for call monitor similar to others

109. By Ricardo Salveti on 2015-01-12

call_monitor: remove debug on connection->status, not necessarily ready during boot

[Jim Hodapp (jhodapp)]

review: Needs Fixing (code)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:108
http://jenkins.qa.ubuntu.com/job/media-hub-ci/218/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/58/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/58/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/58/console

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

review: Needs Fixing (continuous-integration)

[lp:~rsalveti/media-hub/1409125]

110. By Ricardo Salveti on 2015-01-12

call_monitor: adding a reference for rev 107 in checkAndAddAccount

[Jim Hodapp (jhodapp)]

Looks good, thanks!

review: Approve (code)

=== modified file 'debian/rules'
--- debian/rules	2014-06-27 08:06:14 +0000
+++ debian/rules	2015-01-12 21:36:23 +0000
@@ -14,7 +14,7 @@
 export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
 
 %:
-	dh $@ --fail-missing -- -B build 
+	dh $@ --fail-missing --parallel -- -B build 
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
 
=== modified file 'src/core/media/call-monitor/call_monitor.cpp'
--- src/core/media/call-monitor/call_monitor.cpp	2015-01-07 22:30:45 +0000
+++ src/core/media/call-monitor/call_monitor.cpp	2015-01-12 21:36:23 +0000
@@ -80,7 +80,10 @@
 
 private Q_SLOTS:
     void accountManagerSetup() {
-        mAccountManager = Tp::AccountManager::create();
+        mAccountManager = Tp::AccountManager::create(Tp::AccountFactory::create(QDBusConnection::sessionBus(),
+                                                                                Tp::Account::FeatureCore),
+                                                     Tp::ConnectionFactory::create(QDBusConnection::sessionBus(),
+                                                                                   Tp::Connection::FeatureCore));
         connect(mAccountManager->becomeReady(),
                 SIGNAL(finished(Tp::PendingOperation*)),
                 SLOT(accountManagerReady(Tp::PendingOperation*)));
@@ -147,14 +150,13 @@
     void checkAndAddAccount(const Tp::AccountPtr& account)
     {
         Tp::ConnectionCapabilities caps = account->capabilities();
-
-        // anything call like, perhaps overkill?
-        if (caps.audioCalls() || caps.videoCalls() || caps.videoCallsWithAudio() || caps.streamedMediaCalls()) {
-            auto tcm = new TelepathyCallMonitor(account);
-            connect(tcm, SIGNAL(offHook()), SLOT(offHook()));
-            connect(tcm, SIGNAL(onHook()), SLOT(onHook()));
-            mCallMonitors.push_back(tcm);
-        }
+        // TODO: Later on we will need to filter for the right capabilities, and also allow dynamic account detection
+        // Don't check caps for now as a workaround for https://bugs.launchpad.net/ubuntu/+source/media-hub/+bug/1409125
+        // at least until we are able to find out the root cause of it (check rev 107 for the caps check)
+        auto tcm = new TelepathyCallMonitor(account);
+        connect(tcm, SIGNAL(offHook()), SLOT(offHook()));
+        connect(tcm, SIGNAL(onHook()), SLOT(onHook()));
+        mCallMonitors.push_back(tcm);
     }
 };
 }
@@ -168,6 +170,7 @@
             std::thread([this]() {
                 qt::core::world::build_and_run(0, nullptr, [this]() {
                     qt::core::world::enter_with_task([this]() {
+                        std::cout << "CallMonitor: Creating TelepathyBridge" << std::endl;
                         mBridge = new TelepathyBridge();
                         cv.notify_all();
                     });
@@ -208,9 +211,10 @@
 
 void CallMonitor::on_change(const std::function<void(CallMonitor::State)>& func)
 {
-    if (d->mBridge != nullptr)
+    if (d->mBridge != nullptr) {
+        std::cout << "CallMonitor: Setting up callback for TelepathyBridge on_change" << std::endl;
         d->mBridge->on_change(func);
-    else
+    } else
         std::cerr << "TelepathyBridge: Failed to hook on_change signal, bridge not yet set" << std::endl;
 }
 
 
=== modified file 'src/core/media/service_implementation.cpp'
--- src/core/media/service_implementation.cpp	2015-01-07 20:08:51 +0000
+++ src/core/media/service_implementation.cpp	2015-01-12 21:36:23 +0000
@@ -508,9 +508,11 @@
     d->call_monitor->on_change([this](CallMonitor::State state) {
         switch (state) {
         case CallMonitor::OffHook:
+            std::cout << "Got call started signal, pausing all multimedia sessions" << std::endl;
             pause_all_multimedia_sessions();
             break;
         case CallMonitor::OnHook:
+            std::cout << "Got call ended signal, resuming paused multimedia sessions" << std::endl;
             resume_paused_multimedia_sessions();
             break;
         }
@@ -600,6 +602,7 @@
                               && player->audio_stream_role() == media::Player::multimedia)
                           {
                               d->paused_sessions.push_back(key);
+                              std::cout << "Pausing Player with key: " << key << std::endl;
                               player->pause();
                           }
                       });