diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-05-12 15:52:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-12 15:52:12 -0700 |
| commit | 5149f107b6556b48aa6260dc413459b0aaeaac39 (patch) | |
| tree | 97e3899c19dc0b61e8fc68a8ae831f7301e2d866 | |
| parent | 77e827c40377da3a654a0b42b870b7733629a1ad (diff) | |
| parent | ac0aafc3bc0043b37d21e9063f8589e19327946a (diff) | |
| download | frameworks_av-5149f107b6556b48aa6260dc413459b0aaeaac39.zip frameworks_av-5149f107b6556b48aa6260dc413459b0aaeaac39.tar.gz frameworks_av-5149f107b6556b48aa6260dc413459b0aaeaac39.tar.bz2 | |
am 20fd3f0d: am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
* commit '20fd3f0d83d4665a6ac33a10f4a48a0f6f159068':
Tweak audio APIs for better forward/backward/sideways compatibility.
| -rw-r--r-- | include/media/EffectApi.h | 6 | ||||
| -rw-r--r-- | 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 b97c22e..6e6660c 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 2b08ab5..dff9f33 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -5717,10 +5717,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) |