From d35d2b269f77a0c4ec5fac9ac2df6d107b5b2d6d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 8 Aug 2012 22:22:00 +0200 Subject: player_control: rename player_error enum values --- src/player_control.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/player_control.c') diff --git a/src/player_control.c b/src/player_control.c index 1ea7adea8..f2e31fb37 100644 --- a/src/player_control.c +++ b/src/player_control.c @@ -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"); } -- cgit v1.2.3