commit 22eabce30f89a7cd18995d15128326ec816dcd33
author Eric Laurent <elaurent@google.com> Thu Oct 06 15:46:25 2011 -0700
committer Eric Laurent <elaurent@google.com> Thu Oct 06 15:46:25 2011 -0700
tree fdfba83c5f0c0cd6fe7c9bbef3e1c430be2e9873
parent f30bf3a794ef2ffdd3559f6c29cb67dffceb0eb7

Fix issue 5415809: increase HP volume for TTY.

Increase headphones volume to -2dB when TTY mode is full or VCO
as per Samsung's request.

Change-Id: I92da179b487c87d07bc363f7344c20cc8779abd6

audio/audio_hw.c

diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 48947cb..99c746b 100755
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -160,6 +160,7 @@
 #define HEADSET_VOLUME_EUROPE -12
 #define HEADPHONE_VOLUME_DEFAULT -6
 #define HEADPHONE_VOLUME_EUROPE -6 /* allow louder output for headphones */
+#define HEADPHONE_VOLUME_TTY -2
 
 #define EARPIECE_VOLUME_TORO 2
 #define EARPIECE_VOLUME_MAGURO 6
@@ -714,22 +715,28 @@
         mixer_ctl_set_value(adev->mixer_ctls.amic_ul_volume, channel, volume);
 }
 
-static void set_output_volumes(struct tuna_audio_device *adev)
+static void set_output_volumes(struct tuna_audio_device *adev, bool tty_volume)
 {
     unsigned int channel;
     int speaker_volume;
     int headset_volume;
     int earpiece_volume;
 
+    if (tty_volume)
+        headset_volume = HEADPHONE_VOLUME_TTY;
+    else if (adev->devices & AUDIO_DEVICE_OUT_WIRED_HEADSET) {
+        if (adev->headphone_volume_europe)
+            headset_volume = HEADSET_VOLUME_EUROPE;
+        else
+            headset_volume = HEADSET_VOLUME_DEFAULT;
+    } else {
+        if (adev->headphone_volume_europe)
+            headset_volume = HEADPHONE_VOLUME_EUROPE;
+        else
+            headset_volume = HEADPHONE_VOLUME_DEFAULT;
+    }
     speaker_volume = adev->mode == AUDIO_MODE_IN_CALL ? VOICE_CALL_SPEAKER_VOLUME :
                                                         NORMAL_SPEAKER_VOLUME;
-    headset_volume = adev->devices & AUDIO_DEVICE_OUT_WIRED_HEADSET ?
-                                                        (adev->headphone_volume_europe ?
-                                                            HEADSET_VOLUME_EUROPE :
-                                                            HEADSET_VOLUME_DEFAULT) :
-                                                        (adev->headphone_volume_europe ?
-                                                                HEADPHONE_VOLUME_EUROPE :
-                                                                HEADPHONE_VOLUME_DEFAULT);
     earpiece_volume = adev->earpiece_volume_toro ? EARPIECE_VOLUME_TORO :
                                                    EARPIECE_VOLUME_MAGURO;
 
@@ -812,6 +819,7 @@
     int bt_on;
     int dl1_on;
     int sidetone_capture_on = 0;
+    bool tty_volume = false;
 
     headset_on = adev->devices & AUDIO_DEVICE_OUT_WIRED_HEADSET;
     headphone_on = adev->devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE;
@@ -829,6 +837,7 @@
                 headset_on = 0;
                 speaker_on = 0;
                 earpiece_on = 0;
+                tty_volume = true;
                 break;
             case TTY_MODE_HCO:
                 /* rx path to device speaker */
@@ -866,7 +875,7 @@
     set_route_by_array(adev->mixer, hs_output, headset_on | headphone_on);
     set_route_by_array(adev->mixer, hf_output, speaker_on);
 
-    set_output_volumes(adev);
+    set_output_volumes(adev, tty_volume);
 
     /* Special case: select input path if in a call, otherwise
        in_set_parameters is used to update the input route