commit d7657374cb9debe9e4763a5f9dce8b5088f82884
author UK KIM <w0806.kim@samsung.com> Sat Feb 19 04:08:30 2011 +0900
committer Simon Wilson <simonwilson@google.com> Thu Mar 03 17:02:41 2011 -0800
tree 9997863c87a347ed5ebfdc9ab6adc1c85b3e5930
parent 1c87a6f0e59ddb9110de4795439a36d00ae70638

SOUND: set incall volume when user starts call.

modem side doesn't store volume setting when device is rebooted.
When audio mode is incall, set current voice volume to modem.
Current incall volume is stored when upper layer sets or AudioService is started.

Change-Id: Icfeb0273dda55354e207d464884ef99f41c5fdec
Signed-off-by: UK KIM <w0806.kim@samsung.com>

libaudio/AudioHardware.cpp

diff --git a/libaudio/AudioHardware.cpp b/libaudio/AudioHardware.cpp
index 45f0a2d..753c413 100644
--- a/libaudio/AudioHardware.cpp
+++ b/libaudio/AudioHardware.cpp
@@ -86,6 +86,7 @@
     mPcmOpenCnt(0),
     mMixerOpenCnt(0),
     mInCallAudioMode(false),
+    mVoiceVol(1.0f),
     mInputSource(AUDIO_SOURCE_DEFAULT),
     mBluetoothNrec(true),
     mTTYMode(TTY_MODE_OFF),
@@ -384,6 +385,7 @@
             openPcmOut_l();
             openMixer_l();
             setInputSource_l(AUDIO_SOURCE_DEFAULT);
+            setVoiceVolume_l(mVoiceVol);
             mInCallAudioMode = true;
         }
         if (mMode == AudioSystem::MODE_NORMAL && mInCallAudioMode) {
@@ -541,12 +543,21 @@
     return AudioStreamInALSA::getBufferSize(sampleRate, channelCount);
 }
 
-
 status_t AudioHardware::setVoiceVolume(float volume)
 {
-    LOGD("### setVoiceVolume");
-
     AutoMutex lock(mLock);
+
+    setVoiceVolume_l(volume);
+
+    return NO_ERROR;
+}
+
+void AudioHardware::setVoiceVolume_l(float volume)
+{
+    LOGD("### setVoiceVolume_l");
+
+    mVoiceVol = volume;
+
     if ( (AudioSystem::MODE_IN_CALL == mMode) && (mSecRilLibHandle) &&
          (connectRILDIfRequired() == OK) ) {
 
@@ -590,7 +601,6 @@
         setCallVolume(mRilClient, type, int_volume);
     }
 
-    return NO_ERROR;
 }
 
 status_t AudioHardware::setMasterVolume(float volume)

libaudio/AudioHardware.h

diff --git a/libaudio/AudioHardware.h b/libaudio/AudioHardware.h
index a23e6c9..c4f04e8 100644
--- a/libaudio/AudioHardware.h
+++ b/libaudio/AudioHardware.h
@@ -119,6 +119,8 @@
 
             status_t setInputSource_l(audio_source source);
 
+            void setVoiceVolume_l(float volume);
+
     static uint32_t    getInputSampleRate(uint32_t sampleRate);
            sp <AudioStreamInALSA> getActiveInput_l();
 
@@ -154,6 +156,7 @@
     uint32_t        mPcmOpenCnt;
     uint32_t        mMixerOpenCnt;
     bool            mInCallAudioMode;
+    float           mVoiceVol;
 
     audio_source    mInputSource;
     bool            mBluetoothNrec;