diff options
| author | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-05-25 15:56:32 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-05-25 15:56:32 -0700 |
| commit | 7be9070b950af25142e064e57e1c281b08574747 (patch) | |
| tree | 48e77240162518def4401ab25a9dde4ae2e614c9 | |
| parent | 316262907d9cdd18363506163731fa15ccf4cae8 (diff) | |
| parent | 487c86bd61fccd3449975ba496794269fe9f938e (diff) | |
| download | device_samsung_galaxys2-common-7be9070b950af25142e064e57e1c281b08574747.zip device_samsung_galaxys2-common-7be9070b950af25142e064e57e1c281b08574747.tar.gz device_samsung_galaxys2-common-7be9070b950af25142e064e57e1c281b08574747.tar.bz2 | |
Merge "Mixer: Set the next elements routes when one failed" into cm-10.1
| -rw-r--r-- | tinyalsa_audio/mixer.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tinyalsa_audio/mixer.c b/tinyalsa_audio/mixer.c index e8742c6..a3daaa2 100644 --- a/tinyalsa_audio/mixer.c +++ b/tinyalsa_audio/mixer.c @@ -518,7 +518,7 @@ void tinyalsa_mixer_config_start(void *data, const XML_Char *elem, mixer_data->type = MIXER_DATA_TYPE_WRITE; list->data = (void *) mixer_data; } else { - LOGE("Missing device/path for elem: %s", elem); + ALOGE("Missing device/path for elem: %s", elem); return; } @@ -530,7 +530,7 @@ void tinyalsa_mixer_config_start(void *data, const XML_Char *elem, i++; mixer_data->value = strdup((char *) attr[i]); } else { - LOGE("Unknown write attr: %s", attr[i]); + ALOGE("Unknown write attr: %s", attr[i]); } } @@ -751,7 +751,7 @@ int tinyalsa_mixer_set_route_write(struct tinyalsa_mixer *mixer, if(mixer_data->type != MIXER_DATA_TYPE_WRITE) return -1; - LOGD("Writing %s to %s", mixer_data->value, mixer_data->name); + ALOGD("Writing %s to %s", mixer_data->value, mixer_data->name); asprintf(&buffer, "%s\n", mixer_data->value); if(buffer == NULL) @@ -792,16 +792,19 @@ int tinyalsa_mixer_set_route_list(struct tinyalsa_mixer *mixer, struct list_head if(rc < 0) { ALOGE("Unable to set control!"); return -1; + ALOGE("Unable to set control!"); + goto list_continue; } } } else if(mixer_data->type == MIXER_DATA_TYPE_WRITE) { rc = tinyalsa_mixer_set_route_write(mixer, mixer_data); if(rc < 0) { - LOGE("Unable to write!"); - return -1; + ALOGE("Unable to write!"); + goto list_continue; } } +list_continue: if(list->next != NULL) list = list->next; else |