From da94c346a5b5f3ef7d36b031309aa438194e4957 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Thu, 12 May 2011 09:46:49 -0700 Subject: Tweak audio APIs for better forward/backward/sideways compatibility. Change-Id: I293e99107aed260db68edccad35cdc15ed88c1d3 --- include/media/EffectApi.h | 6 +++--- services/audioflinger/AudioFlinger.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/media/EffectApi.h b/include/media/EffectApi.h index b97c22ebb624..6e6660cfd47b 100644 --- a/include/media/EffectApi.h +++ b/include/media/EffectApi.h @@ -602,9 +602,9 @@ enum audio_device_e { // Audio mode enum audio_mode_e { - AUDIO_MODE_NORMAL, // device idle - AUDIO_MODE_RINGTONE, // device ringing - AUDIO_MODE_IN_CALL // audio call connected (VoIP or telephony) + AUDIO_EFFECT_MODE_NORMAL, // device idle + AUDIO_EFFECT_MODE_RINGTONE, // device ringing + AUDIO_EFFECT_MODE_IN_CALL // audio call connected (VoIP or telephony) }; // Values for "accessMode" field of buffer_config_t: diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 5935bf9e7f14..c68e20d63040 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -5808,10 +5808,10 @@ uint32_t AudioFlinger::EffectModule::deviceAudioSystemToEffectApi(uint32_t devic // update this table when AudioSystem::audio_mode or audio_mode_e (in EffectApi.h) are modified const uint32_t AudioFlinger::EffectModule::sModeConvTable[] = { - AUDIO_MODE_NORMAL, // AudioSystem::MODE_NORMAL - AUDIO_MODE_RINGTONE, // AudioSystem::MODE_RINGTONE - AUDIO_MODE_IN_CALL, // AudioSystem::MODE_IN_CALL - AUDIO_MODE_IN_CALL // AudioSystem::MODE_IN_COMMUNICATION, same conversion as for MODE_IN_CALL + AUDIO_EFFECT_MODE_NORMAL, // AudioSystem::MODE_NORMAL + AUDIO_EFFECT_MODE_RINGTONE, // AudioSystem::MODE_RINGTONE + AUDIO_EFFECT_MODE_IN_CALL, // AudioSystem::MODE_IN_CALL + AUDIO_EFFECT_MODE_IN_CALL // AudioSystem::MODE_IN_COMMUNICATION, same conversion as for MODE_IN_CALL }; int AudioFlinger::EffectModule::modeAudioSystemToEffectApi(uint32_t mode) -- cgit v1.2.3-59-g8ed1b