aboutsummaryrefslogtreecommitdiffstats
path: root/src/OutputAll.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-08-07 09:35:30 +0200
committerMax Kellermann <max@duempel.org>2013-08-07 10:08:36 +0200
commita27d105dcd1376c1df4ff16e388dfcfa3b355cc6 (patch)
tree6903bc549cc57250bea724bf800a3f7e6812841e /src/OutputAll.cxx
parent67e44b0f2c76a8c4913048fe3b8fe90116fa595b (diff)
downloadmpd-a27d105dcd1376c1df4ff16e388dfcfa3b355cc6.tar.gz
mpd-a27d105dcd1376c1df4ff16e388dfcfa3b355cc6.tar.xz
mpd-a27d105dcd1376c1df4ff16e388dfcfa3b355cc6.zip
FatalError: new library to replace mpd_error.h
Diffstat (limited to '')
-rw-r--r--src/OutputAll.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/OutputAll.cxx b/src/OutputAll.cxx
index 23fe9ae2d..c58f54597 100644
--- a/src/OutputAll.cxx
+++ b/src/OutputAll.cxx
@@ -26,7 +26,7 @@
#include "MusicBuffer.hxx"
#include "MusicPipe.hxx"
#include "MusicChunk.hxx"
-#include "mpd_error.h"
+#include "FatalError.hxx"
#include "conf.h"
#include "notify.hxx"
@@ -128,10 +128,10 @@ audio_output_all_init(struct player_control *pc)
struct audio_output *output = audio_output_new(*param, pc, &error);
if (output == NULL) {
if (param != NULL)
- MPD_ERROR("line %i: %s",
- param->line, error->message);
+ FormatFatalError("line %i: %s",
+ param->line, error->message);
else
- MPD_ERROR("%s", error->message);
+ FatalError(error);
}
audio_outputs[i] = output;
@@ -139,8 +139,8 @@ audio_output_all_init(struct player_control *pc)
/* require output names to be unique: */
for (j = 0; j < i; j++) {
if (!strcmp(output->name, audio_outputs[j]->name)) {
- MPD_ERROR("output devices with identical "
- "names: %s\n", output->name);
+ FormatFatalError("output devices with identical "
+ "names: %s", output->name);
}
}
}