diff options
| author | Max Kellermann <max@duempel.org> | 2012-08-08 21:44:18 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-08-08 22:28:49 +0200 |
| commit | fa84ed412db4cc033989d1b60535dd6207e1ff23 (patch) | |
| tree | 0a652bea92db2de7c83fb05a646d06852dc72ef7 | |
| parent | 16951099d1154bee369aec1437fa85ecb1c3218e (diff) | |
player_control: remove unused enum player_error values
| -rw-r--r-- | src/player_control.c | 15 | ||||
| -rw-r--r-- | src/player_control.h | 3 | ||||
| -rw-r--r-- | src/playlist.c | 2 |
3 files changed, 1 insertions, 19 deletions
diff --git a/src/player_control.c b/src/player_control.c index 9201202a..1ea7adea 100644 --- a/src/player_control.c +++ b/src/player_control.c @@ -253,12 +253,6 @@ pc_get_error_message(struct player_control *pc) case PLAYER_ERROR_NOERROR: return NULL; - case PLAYER_ERROR_FILENOTFOUND: - uri = pc_errored_song_uri(pc); - error = g_strdup_printf("file \"%s\" does not exist or is inaccessible", uri); - g_free(uri); - return error; - case PLAYER_ERROR_FILE: uri = pc_errored_song_uri(pc); error = g_strdup_printf("problems decoding \"%s\"", uri); @@ -267,15 +261,6 @@ pc_get_error_message(struct player_control *pc) case PLAYER_ERROR_AUDIO: return g_strdup("problems opening audio device"); - - case PLAYER_ERROR_SYSTEM: - return g_strdup("system error occurred"); - - case PLAYER_ERROR_UNKTYPE: - uri = pc_errored_song_uri(pc); - error = g_strdup_printf("file type of \"%s\" is unknown", uri); - g_free(uri); - return error; } assert(false); diff --git a/src/player_control.h b/src/player_control.h index b1371df8..0a62b774 100644 --- a/src/player_control.h +++ b/src/player_control.h @@ -69,9 +69,6 @@ enum player_error { PLAYER_ERROR_NOERROR = 0, PLAYER_ERROR_FILE, PLAYER_ERROR_AUDIO, - PLAYER_ERROR_SYSTEM, - PLAYER_ERROR_UNKTYPE, - PLAYER_ERROR_FILENOTFOUND, }; struct player_status { diff --git a/src/playlist.c b/src/playlist.c index 0c9eea92..d14c26aa 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -265,7 +265,7 @@ playlist_resume_playback(struct playlist *playlist, struct player_control *pc) ++playlist->error_count; if ((playlist->stop_on_error && error != PLAYER_ERROR_NOERROR) || - error == PLAYER_ERROR_AUDIO || error == PLAYER_ERROR_SYSTEM || + error == PLAYER_ERROR_AUDIO || playlist->error_count >= queue_length(&playlist->queue)) /* too many errors, or critical error: stop playback */ |