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

output_init: moved code to audio_output_detect()

Browse Source
This commit is contained in:
Max Kellermann 2009-03-01 13:31:32 +01:00
parent af66f666c6
commit cb942eeb45
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/output_init.c
View File

@ -41,6 +41,27 @@
if(bp) str = bp->value; \
}
static const struct audio_output_plugin *
audio_output_detect(void)
{
const struct audio_output_plugin *plugin;
unsigned i;
g_warning("Attempt to detect audio output device");
audio_output_plugins_for_each(plugin, i) {
if (plugin->test_default_device == NULL)
continue;
g_warning("Attempting to detect a %s audio device",
plugin->name);
if (ao_plugin_test_default_device(plugin))
return plugin;
}
return NULL;
}
bool
audio_output_init(struct audio_output *ao, const struct config_param *param)
{
@ -63,29 +84,18 @@ audio_output_init(struct audio_output *ao, const struct config_param *param)
"\"%s\" at line %i\n", type, param->line);
}
} else {
unsigned i;
g_warning("No \"%s\" defined in config file\n",
CONF_AUDIO_OUTPUT);
g_warning("Attempt to detect audio output device\n");
audio_output_plugins_for_each(plugin, i) {
if (plugin->test_default_device) {
g_warning("Attempting to detect a %s audio "
"device\n", plugin->name);
if (ao_plugin_test_default_device(plugin)) {
g_warning("Successfully detected a %s "
"audio device\n", plugin->name);
break;
}
}
}
plugin = audio_output_detect();
if (plugin == NULL) {
g_warning("Unable to detect an audio device\n");
g_warning("Unable to detect an audio device");
return false;
}
g_message("Successfully detected a %s audio device",
plugin->name);
name = "default detected output";
}