Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 00de7218: Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread

Browse Source 
Merge commit '00de721859ca291d0e212a6970f0bd8b3a2f8428' into gingerbread-plus-aosp

* commit '00de721859ca291d0e212a6970f0bd8b3a2f8428':
  Fixed bug in vlm effect bunde wrapper effect init function.
This commit is contained in:
Eric Laurent
2010-07-26 12:25:37 -07:00
committed by Android Git Automerger
parent 64f04a645e 00de721859
commit e80c30c6b5
1 changed files with 7 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
View File

@@ -2337,7 +2337,6 @@ extern "C" int Effect_command(effect_interface_t self,
void *pReplyData){ void *pReplyData){
EffectContext * pContext = (EffectContext *) self; EffectContext * pContext = (EffectContext *) self;
int retsize; int retsize;
int status = 0;
//LOGV("\t\nEffect_command start"); //LOGV("\t\nEffect_command start");
@@ -2371,54 +2370,29 @@ extern "C" int Effect_command(effect_interface_t self,
switch (cmdCode){ switch (cmdCode){
case EFFECT_CMD_INIT: 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"); //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT start");
if(pContext->EffectType == LVM_BASS_BOOST){ if(pContext->EffectType == LVM_BASS_BOOST){
//LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT for 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); android::BassSetStrength(pContext, 0);
} }
if(pContext->EffectType == LVM_VIRTUALIZER){ if(pContext->EffectType == LVM_VIRTUALIZER){
//LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT for 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); android::VirtualizerSetStrength(pContext, 0);
} }
if(pContext->EffectType == LVM_EQUALIZER){ if(pContext->EffectType == LVM_EQUALIZER){
//LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT for 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); android::EqualizerSetPreset(pContext, 0);
} }
if(pContext->EffectType == LVM_VOLUME){ if(pContext->EffectType == LVM_VOLUME){
//LOGV("\tEffect_command cmdCode Case: " //LOGV("\tEffect_command cmdCode Case: "
// "EFFECT_CMD_INIT start"); // "EFFECT_CMD_INIT start");
*(int *) pReplyData = android::VolumeSetVolumeLevel(pContext, 0);
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;
}
} }
break; break;