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

FatalError: new library to replace mpd_error.h

Browse Source
This commit is contained in:
Max Kellermann
2013-08-07 09:35:30 +02:00
parent 67e44b0f2c
commit a27d105dcd
15 changed files with 222 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/OutputAll.cxx
+6 -6
View File
@@ -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);
}
}
}