diff options
Diffstat (limited to '')
-rw-r--r-- | src/playlist.c | 8 | ||||
-rw-r--r-- | src/playlist_edit.c | 13 | ||||
-rw-r--r-- | src/playlist_print.c | 7 | ||||
-rw-r--r-- | src/playlist_print.h | 7 |
4 files changed, 4 insertions, 31 deletions
diff --git a/src/playlist.c b/src/playlist.c index 0c9eea92d..b2cb90d2f 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -258,14 +258,14 @@ playlist_resume_playback(struct playlist *playlist, struct player_control *pc) assert(playlist->playing); assert(pc_get_state(pc) == PLAYER_STATE_STOP); - error = pc_get_error(pc); - if (error == PLAYER_ERROR_NOERROR) + error = pc_get_error_type(pc); + 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 || error == PLAYER_ERROR_SYSTEM || + 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 */ diff --git a/src/playlist_edit.c b/src/playlist_edit.c index 7adbccd7c..1dfe68daa 100644 --- a/src/playlist_edit.c +++ b/src/playlist_edit.c @@ -45,14 +45,6 @@ playlist_clear(struct playlist *playlist, struct player_control *pc) { playlist_stop(playlist, pc); - /* make sure there are no references to allocated songs - anymore */ - for (unsigned i = 0; i < queue_length(&playlist->queue); i++) { - const struct song *song = queue_get(&playlist->queue, i); - if (!song_in_database(song)) - pc_song_deleted(pc, song); - } - queue_clear(&playlist->queue); playlist->current = -1; @@ -287,9 +279,6 @@ playlist_delete_internal(struct playlist *playlist, struct player_control *pc, /* now do it: remove the song */ - if (!song_in_database(queue_get(&playlist->queue, song))) - pc_song_deleted(pc, queue_get(&playlist->queue, song)); - queue_delete(&playlist->queue, song); /* update the "current" and "queued" variables */ @@ -363,8 +352,6 @@ playlist_delete_song(struct playlist *playlist, struct player_control *pc, for (int i = queue_length(&playlist->queue) - 1; i >= 0; --i) if (song == queue_get(&playlist->queue, i)) playlist_delete(playlist, pc, i); - - pc_song_deleted(pc, song); } enum playlist_result diff --git a/src/playlist_print.c b/src/playlist_print.c index a6bf84ccd..78f1cb294 100644 --- a/src/playlist_print.c +++ b/src/playlist_print.c @@ -94,13 +94,6 @@ playlist_print_find(struct client *client, const struct playlist *playlist, } void -playlist_print_search(struct client *client, const struct playlist *playlist, - const struct locate_item_list *list) -{ - queue_search(client, &playlist->queue, list); -} - -void playlist_print_changes_info(struct client *client, const struct playlist *playlist, uint32_t version) diff --git a/src/playlist_print.h b/src/playlist_print.h index d4f1911d2..20d3703d9 100644 --- a/src/playlist_print.h +++ b/src/playlist_print.h @@ -69,13 +69,6 @@ playlist_print_find(struct client *client, const struct playlist *playlist, const struct locate_item_list *list); /** - * Search for songs in the playlist. - */ -void -playlist_print_search(struct client *client, const struct playlist *playlist, - const struct locate_item_list *list); - -/** * Print detailed changes since the specified playlist version. */ void |