diff options
author | Eric Laurent <elaurent@google.com> | 2010-07-26 10:09:54 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-26 10:09:54 -0700 |
commit | 00de721859ca291d0e212a6970f0bd8b3a2f8428 (patch) | |
tree | 83dbf1753d12ed8b44303a0d1e29a9656702fb5b | |
parent | 70736a6d92767258543bb03ac22a705535d86341 (diff) | |
parent | 1c454cc4c72c604f90ea43b7bbdd7683e212e44c (diff) | |
download | frameworks_base-00de721859ca291d0e212a6970f0bd8b3a2f8428.zip frameworks_base-00de721859ca291d0e212a6970f0bd8b3a2f8428.tar.gz frameworks_base-00de721859ca291d0e212a6970f0bd8b3a2f8428.tar.bz2 |
Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread
-rw-r--r-- | media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp index 6043dd5..5e91974 100644 --- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp +++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp @@ -2337,7 +2337,6 @@ extern "C" int Effect_command(effect_interface_t self, void *pReplyData){ EffectContext * pContext = (EffectContext *) self; int retsize; - int status = 0; //LOGV("\t\nEffect_command start"); @@ -2371,54 +2370,29 @@ extern "C" int Effect_command(effect_interface_t self, switch (cmdCode){ case EFFECT_CMD_INIT: + if (pReplyData == NULL || *replySize != sizeof(int)){ + LOGV("\tLVM_ERROR, EFFECT_CMD_INIT: ERROR for effect type %d", + pContext->EffectType); + return -EINVAL; + } + *(int *) pReplyData = 0; //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT start"); if(pContext->EffectType == LVM_BASS_BOOST){ //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT for LVM_BASS_BOOST"); - - if (pReplyData == NULL || *replySize != sizeof(int)){ - LOGV("\tLVM_ERROR : BassBoost_command cmdCode Case: " - "EFFECT_CMD_INIT: ERROR"); - return -EINVAL; - } - android::BassSetStrength(pContext, 0); } if(pContext->EffectType == LVM_VIRTUALIZER){ //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT for LVM_VIRTUALIZER"); - - if (pReplyData == NULL || *replySize != sizeof(int)){ - LOGV("\tLVM_ERROR : Virtualizer_command cmdCode Case: " - "EFFECT_CMD_INIT: ERROR"); - return -EINVAL; - } - android::VirtualizerSetStrength(pContext, 0); } if(pContext->EffectType == LVM_EQUALIZER){ //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT for LVM_EQUALIZER"); - - if (pReplyData == NULL || *replySize != sizeof(int)){ - LOGV("\tLVM_ERROR : Equalizer_command cmdCode Case: " - "EFFECT_CMD_INIT: ERROR"); - return -EINVAL; - } - android::EqualizerSetPreset(pContext, 0); } if(pContext->EffectType == LVM_VOLUME){ //LOGV("\tEffect_command cmdCode Case: " // "EFFECT_CMD_INIT start"); - - if (pReplyData == NULL || *replySize != sizeof(int)){ - LOGV("\tLVM_ERROR : Volume_command cmdCode Case: " - "EFFECT_CMD_INIT: ERROR"); - return -EINVAL; - } - - status = android::VolumeSetVolumeLevel(pContext, 0); - if(status == -EINVAL){ - return -EINVAL; - } + *(int *) pReplyData = android::VolumeSetVolumeLevel(pContext, 0); } break; |