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

player_control: rename player_error enum values

Browse Source
This commit is contained in:
Max Kellermann
2012-08-08 22:22:00 +02:00
parent fa84ed412d
commit d35d2b269f
4 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/player_control.c
+6 -6
View File
@@ -47,7 +47,7 @@ pc_new(unsigned buffer_chunks, unsigned int buffered_before_play)
pc->cond = g_cond_new();
pc->command = PLAYER_COMMAND_NONE;
pc->error = PLAYER_ERROR_NOERROR;
pc->error = PLAYER_ERROR_NONE;
pc->state = PLAYER_STATE_STOP;
pc->cross_fade_seconds = 0;
pc->mixramp_db = 0;
@@ -80,7 +80,7 @@ void
pc_song_deleted(struct player_control *pc, const struct song *song)
{
if (pc->errored_song == song) {
pc->error = PLAYER_ERROR_NOERROR;
pc->error = PLAYER_ERROR_NONE;
pc->errored_song = NULL;
}
}
@@ -232,7 +232,7 @@ void
pc_clear_error(struct player_control *pc)
{
player_lock(pc);
pc->error = PLAYER_ERROR_NOERROR;
pc->error = PLAYER_ERROR_NONE;
pc->errored_song = NULL;
player_unlock(pc);
}
@@ -250,16 +250,16 @@ pc_get_error_message(struct player_control *pc)
char *uri;
switch (pc->error) {
case PLAYER_ERROR_NOERROR:
case PLAYER_ERROR_NONE:
return NULL;
case PLAYER_ERROR_FILE:
case PLAYER_ERROR_DECODER:
uri = pc_errored_song_uri(pc);
error = g_strdup_printf("problems decoding \"%s\"", uri);
g_free(uri);
return error;
case PLAYER_ERROR_AUDIO:
case PLAYER_ERROR_OUTPUT:
return g_strdup("problems opening audio device");
}