diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-30 22:53:12 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-30 22:53:12 +0100 |
| commit | 5ed9f02c4de0a8ddb7649e0541a8d6f32f61b3f8 (patch) | |
| tree | 32094f443903b1c128f2336278f120f896091001 /src/OutputInit.cxx | |
| parent | 378ebad1c8d7079b41319600f13c1c884d6c693a (diff) | |
| download | mpd-5ed9f02c4de0a8ddb7649e0541a8d6f32f61b3f8.tar.gz mpd-5ed9f02c4de0a8ddb7649e0541a8d6f32f61b3f8.tar.xz mpd-5ed9f02c4de0a8ddb7649e0541a8d6f32f61b3f8.zip | |
TagPool, ...: include cleanup
Diffstat (limited to '')
| -rw-r--r-- | src/OutputInit.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/OutputInit.cxx b/src/OutputInit.cxx index 0d3dd05ad..0e9f851b2 100644 --- a/src/OutputInit.cxx +++ b/src/OutputInit.cxx @@ -20,6 +20,7 @@ #include "config.h" #include "OutputControl.hxx" #include "OutputList.hxx" +#include "OutputError.hxx" #include "FilterConfig.hxx" #include "output_api.h" #include "AudioParser.hxx" @@ -65,7 +66,7 @@ audio_output_detect(GError **error) return plugin; } - g_set_error(error, audio_output_quark(), 0, + g_set_error(error, output_quark(), 0, "Unable to detect an audio device"); return NULL; } @@ -148,7 +149,7 @@ ao_base_init(struct audio_output *ao, ao->name = config_get_block_string(param, AUDIO_OUTPUT_NAME, NULL); if (ao->name == NULL) { - g_set_error(error_r, audio_output_quark(), 0, + g_set_error(error_r, output_quark(), 0, "Missing \"name\" configuration"); return false; } @@ -274,7 +275,7 @@ audio_output_setup(struct audio_output *ao, const struct config_param *param, g_warning("No such mixer for output '%s'", ao->name); } else if (strcmp(replay_gain_handler, "software") != 0 && ao->replay_gain_filter != NULL) { - g_set_error(error_r, audio_output_quark(), 0, + g_set_error(error_r, output_quark(), 0, "Invalid \"replay_gain_handler\" value"); return false; } @@ -301,14 +302,14 @@ audio_output_new(const struct config_param *param, p = config_get_block_string(param, AUDIO_OUTPUT_TYPE, NULL); if (p == NULL) { - g_set_error(error_r, audio_output_quark(), 0, + g_set_error(error_r, output_quark(), 0, "Missing \"type\" configuration"); return nullptr; } plugin = audio_output_plugin_get(p); if (plugin == NULL) { - g_set_error(error_r, audio_output_quark(), 0, + g_set_error(error_r, output_quark(), 0, "No such audio output plugin: %s", p); return nullptr; } |