Merge lp:~tiagosh/telepathy-ofono/fix-create-context-if-null into lp:telepathy-ofono

[Tiago Salem Herrmann]

Check and create PA context before using it.

Check and create PA context before using it.
This bug is reproduced on devices where telepathy-ofono starts before pulseaudio.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:155
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/191/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/49
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/49/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/49

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/191/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

=== modified file 'qpulseaudioengine.cpp'
--- qpulseaudioengine.cpp	2015-07-21 13:49:54 +0000
+++ qpulseaudioengine.cpp	2015-07-28 18:12:53 +0000
@@ -131,13 +131,13 @@
     createPulseContext();
 }
 
-void QPulseAudioEngineWorker::createPulseContext()
+bool QPulseAudioEngineWorker::createPulseContext()
 {
     bool keepGoing = true;
     bool ok = true;
 
     if (m_context)
-        return;
+        return true;
 
     m_mainLoopApi = pa_threaded_mainloop_get_api(m_mainLoop);
 
@@ -149,14 +149,14 @@
     if (!m_context) {
         qWarning("Unable to create new pulseaudio context");
         pa_threaded_mainloop_unlock(m_mainLoop);
-        return;
+        return false;
     }
 
     if (pa_context_connect(m_context, NULL, PA_CONTEXT_NOAUTOSPAWN, NULL) < 0) {
         qWarning("Unable to create a connection to the pulseaudio context");
         pa_threaded_mainloop_unlock(m_mainLoop);
         releasePulseContext();
-        return;
+        return false;
     }
 
     pa_threaded_mainloop_wait(m_mainLoop);
@@ -203,6 +203,7 @@
     }
 
     pa_threaded_mainloop_unlock(m_mainLoop);
+    return true;
 }
 
 
@@ -510,6 +511,9 @@
 
 void QPulseAudioEngineWorker::setCallMode(CallStatus callstatus, AudioMode audiomode)
 {
+    if (!createPulseContext()) {
+       return;
+    }
     CallStatus p_callstatus = m_callstatus;
     AudioMode p_audiomode = m_audiomode;
     AudioModes p_availableAudioModes = m_availableAudioModes;
@@ -614,6 +618,10 @@
 
 void QPulseAudioEngineWorker::setMicMute(bool muted)
 {
+    if (!createPulseContext()) {
+       return;
+    }
+ 
     m_micmute = muted;
 
     if (m_callstatus == CallEnded)

=== modified file 'qpulseaudioengine.h'
--- qpulseaudioengine.h	2015-07-14 18:00:20 +0000
+++ qpulseaudioengine.h	2015-07-28 18:12:53 +0000
@@ -60,7 +60,7 @@
 
     pa_threaded_mainloop *mainloop() { return m_mainLoop; }
     pa_context *context() { return m_context; }
-    void createPulseContext(void);
+    bool createPulseContext(void);
     int setupVoiceCall(void);
     void restoreVoiceCall(void);
     /* Callbacks to be used internally */