Merge lp:~rsalveti/telepathy-ofono/set_default_voicecall_volume into lp:telepathy-ofono

[Ricardo Salveti]

qpulseaudioengine: set default voicecall volume

qpulseaudioengine: set default voicecall volume

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
Yes, all available in silo 02 (https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-002)

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/telepathy-ofono) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
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:98
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/110/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-i386-ci/27

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

review: Approve (continuous-integration)

[lp:~rsalveti/telepathy-ofono/set_default_voicecall_volume]

99. By Ricardo Salveti on 2014-08-19

Don't mess with the internal call status variable

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/111/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-i386-ci/28

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Please make sure to install the extra packages (pulse and ubuntu-touch-session) available at https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-002.

This MR is also available in the same silo.

[lp:~rsalveti/telepathy-ofono/set_default_voicecall_volume]

100. By Ricardo Salveti on 2014-08-19

qpulseaudioengine: no need to make bt a special case for voice volume

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/112/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-armhf-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-i386-ci/29

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

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good to me.

--Checklist--

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	2014-08-04 15:47:30 +0000
+++ qpulseaudioengine.cpp	2014-08-19 06:45:34 +0000
@@ -26,6 +26,9 @@
 #define PULSEAUDIO_PROFILE_HSP "hsp"
 #define PULSEAUDIO_PROFILE_A2DP "a2dp"
 
+/* Default initial value also used by android */
+#define DEFAULT_VOICECALL_VOLUME 0.35
+
 QT_BEGIN_NAMESPACE
 
 static void contextStateCallbackInit(pa_context *context, void *userdata)
@@ -353,6 +356,17 @@
     return true;
 }
 
+void QPulseAudioEngine::setSinkVolume(const char *sink_name, const double volume)
+{
+    pa_cvolume cv;
+    pa_volume_t v = pa_sw_volume_from_linear(volume);
+
+    qDebug("Setting sink '%s' volume to '%f'", sink_name, volume);
+
+    pa_cvolume_set(&cv, 2, v);
+    pa_operation_unref(pa_context_set_sink_volume_by_name(m_context, sink_name, &cv, success_cb, this));
+}
+
 void QPulseAudioEngine::setupVoiceCall()
 {
     pa_operation *o;
@@ -428,21 +442,23 @@
 
 void QPulseAudioEngine::setCallMode(QPulseAudioEngine::CallStatus callstatus, QPulseAudioEngine::CallMode callmode)
 {
+    CallStatus p_callstatus = m_callstatus;
     pa_operation *o;
 
     /* Check if we need to save the current pulseaudio state (e.g. when starting a call) */
-    if ((callstatus != CallEnded) && (m_callstatus == CallEnded)) {
+    if ((callstatus != CallEnded) && (p_callstatus == CallEnded)) {
         setupVoiceCall();
     }
 
-    /* If we have an active call, update internal state (used later when updating sink/source ports */
+    /* If we have an active call, update internal state (used later when updating sink/source ports) */
     m_callstatus = callstatus;
     m_callmode = callmode;
 
     /* Switch the virtual card mode when call is active and not active
      * This needs to be done before sink/source gets updated, because after changing mode
      * it will automatically move to input/output-parking */
-    if ((m_callstatus == CallActive) && (m_voicecallcard != "") && (m_voicecallprofile != "")) {
+    if ((m_callstatus == CallActive) && (p_callstatus != CallActive) &&
+            (m_voicecallcard != "") && (m_voicecallprofile != "")) {
         qDebug("Setting PulseAudio card '%s' profile '%s'",
                 m_voicecallcard.c_str(), m_voicecallprofile.c_str());
         o = pa_context_set_card_profile_by_name(m_context,
@@ -482,6 +498,11 @@
         if (!handleOperation(o, "pa_context_set_sink_port_by_name"))
             return;
     }
+    /* Identify initial voice volume for the used port.
+     * Set to a default fixed value when starting and when changing ports */
+    if ((m_callstatus == CallActive) && (m_nametoset != "") &&
+                ((p_callstatus != CallActive) || (m_valuetoset != "")))
+        setSinkVolume(m_nametoset.c_str(), DEFAULT_VOICECALL_VOLUME);
 
     /* Same for source */
     m_nametoset = m_valuetoset = "";

=== modified file 'qpulseaudioengine.h'
--- qpulseaudioengine.h	2014-08-04 01:52:02 +0000
+++ qpulseaudioengine.h	2014-08-19 06:45:34 +0000
@@ -54,6 +54,7 @@
     void restoreVoiceCall(void);
     void setCallMode(CallStatus callstatus, CallMode callmode);
     void setMicMute(bool muted); /* True if muted, false if unmuted */
+    void setSinkVolume(const char *sink_name, const double volume);
 
     /* These four are only used internally */
     void cardInfoCallback(const pa_card_info *card);