diff options
author | Eric Laurent <elaurent@google.com> | 2013-10-30 01:13:52 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-30 01:13:52 +0000 |
commit | 1c594b637df26499ce1dae2db34f2b3290efd838 (patch) | |
tree | 0d231e939a18d3f28f1e19658a7b7ed2e61ed1fb /services/audioflinger | |
parent | fd4779740ec3e9e865d5514464df26d015354388 (diff) | |
parent | d72b7c0180ee83fc3754629ed68fc5887a125c4c (diff) | |
download | frameworks_av-1c594b637df26499ce1dae2db34f2b3290efd838.zip frameworks_av-1c594b637df26499ce1dae2db34f2b3290efd838.tar.gz frameworks_av-1c594b637df26499ce1dae2db34f2b3290efd838.tar.bz2 |
Merge "audioflinger: enable effects after registration if needed" into klp-dev
Diffstat (limited to 'services/audioflinger')
-rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 2 | ||||
-rw-r--r-- | services/audioflinger/Tracks.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 6f6c2b6..3132e54 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -2340,6 +2340,7 @@ status_t AudioFlinger::moveEffectChain_l(int sessionId, strategy, sessionId, effect->id()); + AudioSystem::setEffectEnabled(effect->id(), effect->isEnabled()); } effect = chain->getEffectFromId_l(0); } @@ -2354,6 +2355,7 @@ status_t AudioFlinger::moveEffectChain_l(int sessionId, strategy, sessionId, removed[i]->id()); + AudioSystem::setEffectEnabled(effect->id(), effect->isEnabled()); } } } diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index 712c5a1..af04ce7 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -852,6 +852,7 @@ status_t AudioFlinger::PlaybackThread::Track::attachAuxEffect(int EffectId) dstChain->strategy(), AUDIO_SESSION_OUTPUT_MIX, effect->id()); + AudioSystem::setEffectEnabled(effect->id(), effect->isEnabled()); } status = playbackThread->attachAuxEffect(this, EffectId); } |