Merge lp:~jhodapp/media-hub/fix-1398047 into lp:media-hub

[Jim Hodapp]

Pause playback when recording begins.

Pause playback when recording begins.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Ricardo Mendoza (ricmm)]

LGTM

review: Approve

=== modified file 'src/core/media/service_implementation.cpp'
--- src/core/media/service_implementation.cpp	2014-11-25 16:35:48 +0000
+++ src/core/media/service_implementation.cpp	2015-01-07 20:44:06 +0000
@@ -88,7 +88,7 @@
                                     Private *p = reinterpret_cast<Private*>(userdata);
                                     pa_threaded_mainloop_signal(p->mainloop(), 0);
                                 }, this);
-                            
+
                             if (o)
                             {
                                 while (pa_operation_get_state(o) == PA_OPERATION_RUNNING)
@@ -105,7 +105,7 @@
                             pa_threaded_mainloop_unlock(pulse_mainloop);
                         }
                     }
-        
+
                     if (pulse_mainloop == nullptr)
                     {
                         pulse_mainloop = pa_threaded_mainloop_new();
@@ -117,16 +117,16 @@
                             pulse_mainloop = nullptr;
                         }
                     }
-                  
+
                     do {
                         create_pulse_context();
                     } while (pulse_context == nullptr);
-                    
+
                     // Wait for next instance death.
                     return false;
                 });
         }));
-        
+
         // Connect the property change signal that will allow media-hub to take appropriate action
         // when the battery level reaches critical
         auto stub_service = dbus::Service::use_service(bus, "com.canonical.indicator.power");
@@ -175,6 +175,9 @@
             if (disp_cookie > 0)
                 return;
 
+            // Make sure we pause all playback sessions so that it doesn't interfere with recorded audio
+            pause_playback();
+
             auto result = uscreen_session->invoke_method_synchronously<core::UScreen::keepDisplayOn, int>();
             if (result.is_error())
                 throw std::runtime_error(result.error().print());
@@ -287,7 +290,7 @@
                     p->pause_playback_if_necessary(i->index);
                     p->active_sink = new_sink;
                 }, this);
-     
+
         (void) o;
     }
 
@@ -311,7 +314,7 @@
     {
         if (pulse_context != nullptr)
             return;
-        
+
         active_sink = std::make_tuple(-1, -1, "");
 
         bool keep_going = true, ok = true;
@@ -397,13 +400,13 @@
 
                         if (eol)
                             return;
-                        
+
                         Private *p = reinterpret_cast<Private*>(userdata);
                         p->primary_idx = i->index;
                         p->update_wired_output();
                     }, this);
-            
-            update_active_sink(); 
+
+            update_active_sink();
 
             pa_context_set_subscribe_callback(pulse_context,
                     [](pa_context *context, pa_subscription_event_type_t t, uint32_t idx, void *userdata)
@@ -471,7 +474,8 @@
     int primary_idx;
 
     // Gets signaled when both the headphone jack is removed or an A2DP device is
-    // disconnected and playback needs pausing
+    // disconnected and playback needs pausing. Also gets signaled when recording
+    // begins.
     core::Signal<void> pause_playback;
     std::unique_ptr<CallMonitor> call_monitor;
     std::list<media::Player::PlayerKey> paused_sessions;