aboutsummaryrefslogtreecommitdiffstats
path: root/src/PlayerCommands.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-10-17 19:34:59 +0200
committerMax Kellermann <max@duempel.org>2013-10-17 19:34:59 +0200
commitffea268d2e0a36fbc7a16f5fe14c7554a2eb56b3 (patch)
treec60a7be32e42d0cdcc7108aa64e513916b575d46 /src/PlayerCommands.cxx
parent8e676db633aa8888c8408a91ef219d2261ef42e2 (diff)
downloadmpd-ffea268d2e0a36fbc7a16f5fe14c7554a2eb56b3.tar.gz
mpd-ffea268d2e0a36fbc7a16f5fe14c7554a2eb56b3.tar.xz
mpd-ffea268d2e0a36fbc7a16f5fe14c7554a2eb56b3.zip
PlayerControl: GetError() returns an Error, not a char*
Diffstat (limited to 'src/PlayerCommands.cxx')
-rw-r--r--src/PlayerCommands.cxx10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/PlayerCommands.cxx b/src/PlayerCommands.cxx
index 8b69c6597..9f427d121 100644
--- a/src/PlayerCommands.cxx
+++ b/src/PlayerCommands.cxx
@@ -32,8 +32,6 @@
#include "AudioFormat.hxx"
#include "ReplayGainConfig.hxx"
-#include <glib.h>
-
#define COMMAND_STATUS_STATE "state"
#define COMMAND_STATUS_REPEAT "repeat"
#define COMMAND_STATUS_SINGLE "single"
@@ -190,13 +188,11 @@ handle_status(Client *client,
updateJobId);
}
- char *error = client->player_control->GetErrorMessage();
- if (error != NULL) {
+ Error error = client->player_control->LockGetError();
+ if (error.IsDefined())
client_printf(client,
COMMAND_STATUS_ERROR ": %s\n",
- error);
- g_free(error);
- }
+ error.GetMessage());
song = playlist.GetNextPosition();
if (song >= 0) {