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

player_control: remove unused enum player_error values

Browse Source
This commit is contained in:
Max Kellermann 2012-08-08 21:44:18 +02:00
parent 16951099d1
commit fa84ed412d
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/player_control.c
View File

@ -253,12 +253,6 @@ pc_get_error_message(struct player_control *pc)
case PLAYER_ERROR_NOERROR: case PLAYER_ERROR_NOERROR:
return NULL; 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: case PLAYER_ERROR_FILE:
uri = pc_errored_song_uri(pc); uri = pc_errored_song_uri(pc);
error = g_strdup_printf("problems decoding \"%s\"", uri); error = g_strdup_printf("problems decoding \"%s\"", uri);
@ -267,15 +261,6 @@ pc_get_error_message(struct player_control *pc)
case PLAYER_ERROR_AUDIO: case PLAYER_ERROR_AUDIO:
return g_strdup("problems opening audio device"); 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); assert(false);

3
src/player_control.h
View File

@ -69,9 +69,6 @@ enum player_error {
PLAYER_ERROR_NOERROR = 0, PLAYER_ERROR_NOERROR = 0,
PLAYER_ERROR_FILE, PLAYER_ERROR_FILE,
PLAYER_ERROR_AUDIO, PLAYER_ERROR_AUDIO,
PLAYER_ERROR_SYSTEM,
PLAYER_ERROR_UNKTYPE,
PLAYER_ERROR_FILENOTFOUND,
}; };
struct player_status { struct player_status {

2
src/playlist.c
View File

@ -265,7 +265,7 @@ playlist_resume_playback(struct playlist *playlist, struct player_control *pc)
++playlist->error_count; ++playlist->error_count;
if ((playlist->stop_on_error && error != PLAYER_ERROR_NOERROR) || 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)) playlist->error_count >= queue_length(&playlist->queue))
/* too many errors, or critical error: stop /* too many errors, or critical error: stop
playback */ playback */