oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output_init: renamed parameter "error" to "error_r"

Browse Source 
It's a double pointer.
This commit is contained in:
Max Kellermann 2009-10-20 21:26:28 +02:00
parent 097e200a97
commit 9cd2129eeb
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/output_control.h
View File

@ -38,7 +38,7 @@ audio_output_quark(void)
bool bool
audio_output_init(struct audio_output *ao, const struct config_param *param, audio_output_init(struct audio_output *ao, const struct config_param *param,
GError **error); GError **error_r);
/** /**
* Opens or closes the device, depending on the "enabled" flag. * Opens or closes the device, depending on the "enabled" flag.

14
src/output_init.c
View File

@ -121,7 +121,7 @@ audio_output_load_mixer(const struct config_param *param,
bool bool
audio_output_init(struct audio_output *ao, const struct config_param *param, audio_output_init(struct audio_output *ao, const struct config_param *param,
GError **error) GError **error_r)
{ {
const struct audio_output_plugin *plugin = NULL; const struct audio_output_plugin *plugin = NULL;
@ -130,14 +130,14 @@ audio_output_init(struct audio_output *ao, const struct config_param *param,
p = config_get_block_string(param, AUDIO_OUTPUT_TYPE, NULL); p = config_get_block_string(param, AUDIO_OUTPUT_TYPE, NULL);
if (p == NULL) { if (p == NULL) {
g_set_error(error, audio_output_quark(), 0, g_set_error(error_r, audio_output_quark(), 0,
"Missing \"type\" configuration"); "Missing \"type\" configuration");
return false; return false;
} }
plugin = audio_output_plugin_get(p); plugin = audio_output_plugin_get(p);
if (plugin == NULL) { if (plugin == NULL) {
g_set_error(error, audio_output_quark(), 0, g_set_error(error_r, audio_output_quark(), 0,
"No such audio output plugin: %s", p); "No such audio output plugin: %s", p);
return false; return false;
} }
@ -145,7 +145,7 @@ audio_output_init(struct audio_output *ao, const struct config_param *param,
ao->name = config_get_block_string(param, AUDIO_OUTPUT_NAME, ao->name = config_get_block_string(param, AUDIO_OUTPUT_NAME,
NULL); NULL);
if (ao->name == NULL) { if (ao->name == NULL) {
g_set_error(error, audio_output_quark(), 0, g_set_error(error_r, audio_output_quark(), 0,
"Missing \"name\" configuration"); "Missing \"name\" configuration");
return false; return false;
} }
@ -156,7 +156,7 @@ audio_output_init(struct audio_output *ao, const struct config_param *param,
if (p != NULL) { if (p != NULL) {
bool success = bool success =
audio_format_parse(&ao->out_audio_format, audio_format_parse(&ao->out_audio_format,
p, error); p, error_r);
if (!success) if (!success)
return false; return false;
} }
@ -164,7 +164,7 @@ audio_output_init(struct audio_output *ao, const struct config_param *param,
g_warning("No \"%s\" defined in config file\n", g_warning("No \"%s\" defined in config file\n",
CONF_AUDIO_OUTPUT); CONF_AUDIO_OUTPUT);
plugin = audio_output_detect(error); plugin = audio_output_detect(error_r);
if (plugin == NULL) if (plugin == NULL)
return false; return false;
@ -194,7 +194,7 @@ audio_output_init(struct audio_output *ao, const struct config_param *param,
ao->data = ao_plugin_init(plugin, ao->data = ao_plugin_init(plugin,
ao->config_audio_format ao->config_audio_format
? &ao->out_audio_format : NULL, ? &ao->out_audio_format : NULL,
param, error); param, error_r);
if (ao->data == NULL) if (ao->data == NULL)
return false; return false;