From d35d2b269f77a0c4ec5fac9ac2df6d107b5b2d6d Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 8 Aug 2012 22:22:00 +0200
Subject: player_control: rename player_error enum values
---
src/player_control.c | 12 ++++++------
src/player_control.h | 14 +++++++++++---
src/player_thread.c | 8 ++++----
src/playlist.c | 6 +++---
4 files changed, 24 insertions(+), 16 deletions(-)
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");
}
diff --git a/src/player_control.h b/src/player_control.h
index 0a62b774a..5d1c0ba3b 100644
--- a/src/player_control.h
+++ b/src/player_control.h
@@ -66,9 +66,17 @@ enum player_command {
};
enum player_error {
- PLAYER_ERROR_NOERROR = 0,
- PLAYER_ERROR_FILE,
- PLAYER_ERROR_AUDIO,
+ PLAYER_ERROR_NONE = 0,
+
+ /**
+ * The decoder has failed to decode the song.
+ */
+ PLAYER_ERROR_DECODER,
+
+ /**
+ * The audio output has failed.
+ */
+ PLAYER_ERROR_OUTPUT,
};
struct player_status {
diff --git a/src/player_thread.c b/src/player_thread.c
index c0243fa00..102401d6d 100644
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -238,7 +238,7 @@ player_wait_for_decoder(struct player *player)
if (decoder_lock_has_failed(dc)) {
player_lock(pc);
pc->errored_song = dc->song;
- pc->error = PLAYER_ERROR_FILE;
+ pc->error = PLAYER_ERROR_DECODER;
pc->next_song = NULL;
player_unlock(pc);
@@ -322,7 +322,7 @@ player_open_output(struct player *player)
player->paused = true;
player_lock(pc);
- pc->error = PLAYER_ERROR_AUDIO;
+ pc->error = PLAYER_ERROR_OUTPUT;
pc->state = PLAYER_STATE_PAUSE;
player_unlock(pc);
@@ -353,7 +353,7 @@ player_check_decoder_startup(struct player *player)
player_lock(pc);
pc->errored_song = dc->song;
- pc->error = PLAYER_ERROR_FILE;
+ pc->error = PLAYER_ERROR_DECODER;
player_unlock(pc);
return false;
@@ -789,7 +789,7 @@ play_next_chunk(struct player *player)
player_lock(pc);
- pc->error = PLAYER_ERROR_AUDIO;
+ pc->error = PLAYER_ERROR_OUTPUT;
/* pause: the user may resume playback as soon as an
audio output becomes available */
diff --git a/src/playlist.c b/src/playlist.c
index d14c26aa7..6b8866941 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -259,13 +259,13 @@ playlist_resume_playback(struct playlist *playlist, struct player_control *pc)
assert(pc_get_state(pc) == PLAYER_STATE_STOP);
error = pc_get_error(pc);
- if (error == PLAYER_ERROR_NOERROR)
+ if (error == PLAYER_ERROR_NONE)
playlist->error_count = 0;
else
++playlist->error_count;
- if ((playlist->stop_on_error && error != PLAYER_ERROR_NOERROR) ||
- error == PLAYER_ERROR_AUDIO ||
+ if ((playlist->stop_on_error && error != PLAYER_ERROR_NONE) ||
+ error == PLAYER_ERROR_OUTPUT ||
playlist->error_count >= queue_length(&playlist->queue))
/* too many errors, or critical error: stop
playback */
--
cgit v1.2.3