[Feature][ZXW-41] merged 0601 version
Change-Id: I667af6bb09d65581d455b73f8984c160b2c67ad8
diff --git a/ap/lib/libtinyalsa/audio_mixer_ctrl.c b/ap/lib/libtinyalsa/audio_mixer_ctrl.c
index c4ffb76..3ec6fe3 100755
--- a/ap/lib/libtinyalsa/audio_mixer_ctrl.c
+++ b/ap/lib/libtinyalsa/audio_mixer_ctrl.c
@@ -1718,7 +1718,7 @@
string = mixer_ctl_get_enum_string(ctl, val);
if(string == NULL){
- fprintf(stderr, "Invalid string=%d\n",string);
+ fprintf(stderr, "err, string is NULL \n");
return -2;
}
printf("%s: string=%s !\n",__func__,string);
diff --git a/ap/lib/libtinyalsa/tinyalsa_voice_ref.c b/ap/lib/libtinyalsa/tinyalsa_voice_ref.c
index 3e4923b..9cdc264 100644
--- a/ap/lib/libtinyalsa/tinyalsa_voice_ref.c
+++ b/ap/lib/libtinyalsa/tinyalsa_voice_ref.c
@@ -33,7 +33,7 @@
voice_mixer = mixer_open(0);
if(!voice_mixer)
{
- printf("zte voice_mixer open failed!");
+ printf("voice_mixer open failed!");
goto err_ret;
}
@@ -60,26 +60,26 @@
voicePcmOut = pcm_open(0, 1, PCM_OUT, &config_voice);
if(!voicePcmOut || !pcm_is_ready(voicePcmOut))
{
- printf( "zte voicePcmOut open failed!");
+ printf( "voicePcmOut open failed!");
goto err_ret;
}
voicePcmIn = pcm_open(0, 1, PCM_IN, &config_voice);
if(!voicePcmIn || !pcm_is_ready(voicePcmIn))
{
- printf( "zte voicePcmIn open failed!");
+ printf( "voicePcmIn open failed!");
goto err_ret;
}
if(0 != pcm_prepare(voicePcmOut))
{
- printf("zte voicePcmOut pcm_prepare failed!");
+ printf("voicePcmOut pcm_prepare failed!");
goto err_ret;
}
if(0 != pcm_prepare(voicePcmIn))
{
- printf("zte voicePcmIn pcm_prepare failed!");
+ printf("voicePcmIn pcm_prepare failed!");
goto err_ret;
}
return 0;