diff options
| -rw-r--r-- | ril/libsecril-client/secril-client.cpp | 13 | ||||
| -rw-r--r-- | ril/libsecril-client/secril-client.h | 17 |
2 files changed, 3 insertions, 27 deletions
diff --git a/ril/libsecril-client/secril-client.cpp b/ril/libsecril-client/secril-client.cpp index 61f046d..e215710 100644 --- a/ril/libsecril-client/secril-client.cpp +++ b/ril/libsecril-client/secril-client.cpp @@ -668,7 +668,7 @@ int SetCallVolume(HRilClient client, SoundType type, int vol_level) { * Set external sound device path for noise reduction. */ extern "C" -int SetCallAudioPath(HRilClient client, AudioPath path, ExtraVolume mode) { +int SetCallAudioPath(HRilClient client, AudioPath path) { RilClientPrv *client_prv; int ret; char data[6] = {0,}; @@ -696,7 +696,6 @@ int SetCallAudioPath(HRilClient client, AudioPath path, ExtraVolume mode) { data[2] = 0x00; // data length data[3] = 0x06; // data length data[4] = ConvertAudioPath(path); // audio path - data[5] = mode; // ExtraVolume RegisterRequestCompleteHandler(client, REQ_SET_AUDIO_PATH, NULL); @@ -1187,20 +1186,10 @@ static char ConvertAudioPath(AudioPath path) { return OEM_SND_AUDIO_PATH_SPEAKER; case SOUND_AUDIO_PATH_BLUETOOTH: return OEM_SND_AUDIO_PATH_BLUETOOTH; - case SOUND_AUDIO_PATH_STEREO_BT: - return OEM_SND_AUDIO_PATH_STEREO_BLUETOOTH; case SOUND_AUDIO_PATH_HEADPHONE: return OEM_SND_AUDIO_PATH_HEADPHONE; case SOUND_AUDIO_PATH_BLUETOOTH_NO_NR: return OEM_SND_AUDIO_PATH_BT_NSEC_OFF; - case SOUND_AUDIO_PATH_MIC1: - return OEM_SND_AUDIO_PATH_MIC1; - case SOUND_AUDIO_PATH_MIC2: - return OEM_SND_AUDIO_PATH_MIC2; - case SOUND_AUDIO_PATH_BLUETOOTH_WB: - return OEM_SND_AUDIO_PATH_BT_WB; - case SOUND_AUDIO_PATH_BLUETOOTH_WB_NO_NR: - return OEM_SND_AUDIO_PATH_BT_WB_NSEC_OFF; default: return OEM_SND_AUDIO_PATH_HANDSET; diff --git a/ril/libsecril-client/secril-client.h b/ril/libsecril-client/secril-client.h index fb1729c..df6696b 100644 --- a/ril/libsecril-client/secril-client.h +++ b/ril/libsecril-client/secril-client.h @@ -142,24 +142,11 @@ typedef enum _AudioPath { SOUND_AUDIO_PATH_HEADSET, SOUND_AUDIO_PATH_SPEAKER, SOUND_AUDIO_PATH_BLUETOOTH, - SOUND_AUDIO_PATH_STEREO_BT, - SOUND_AUDIO_PATH_HEADPHONE, SOUND_AUDIO_PATH_BLUETOOTH_NO_NR, - SOUND_AUDIO_PATH_MIC1, - SOUND_AUDIO_PATH_MIC2, - SOUND_AUDIO_PATH_BLUETOOTH_WB, - SOUND_AUDIO_PATH_BLUETOOTH_WB_NO_NR + SOUND_AUDIO_PATH_HEADPHONE } AudioPath; /** - * ExtraVolume - */ -typedef enum _ExtraVolume { - ORIGINAL_PATH, - EXTRA_VOLUME_PATH -} ExtraVolume; - -/** * Clock adjustment parameters. */ typedef enum _SoundClockCondition { @@ -244,7 +231,7 @@ int SetCallVolume(HRilClient client, SoundType type, int vol_level); /** * Set external sound device path for noise reduction. */ -int SetCallAudioPath(HRilClient client, AudioPath path, ExtraVolume mode); +int SetCallAudioPath(HRilClient client, AudioPath path); /** * Set modem clock to master or slave. |