diff options
-rw-r--r-- | apps/playback.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/apps/playback.c b/apps/playback.c index 1772d6e9d4..bce4b6b030 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -244,7 +244,6 @@ static enum filling_state filling; | |||
244 | 244 | ||
245 | /* Track change controls */ | 245 | /* Track change controls */ |
246 | static bool automatic_skip = false; /* Who initiated in-progress skip? (C/A-) */ | 246 | static bool automatic_skip = false; /* Who initiated in-progress skip? (C/A-) */ |
247 | static bool playlist_end = false; /* Has the current playlist ended? (A) */ | ||
248 | static bool dir_skip = false; /* Is a directory skip pending? (A) */ | 247 | static bool dir_skip = false; /* Is a directory skip pending? (A) */ |
249 | static bool new_playlist = false; /* Are we starting a new playlist? (A) */ | 248 | static bool new_playlist = false; /* Are we starting a new playlist? (A) */ |
250 | static int wps_offset = 0; /* Pending track change offset, to keep WPS responsive (A) */ | 249 | static int wps_offset = 0; /* Pending track change offset, to keep WPS responsive (A) */ |
@@ -1614,7 +1613,6 @@ static bool audio_load_track(size_t offset, bool start_play) | |||
1614 | if (!trackname) | 1613 | if (!trackname) |
1615 | { | 1614 | { |
1616 | logf("End-of-playlist"); | 1615 | logf("End-of-playlist"); |
1617 | playlist_end = true; | ||
1618 | memset(&lasttrack_id3, 0, sizeof(struct mp3entry)); | 1616 | memset(&lasttrack_id3, 0, sizeof(struct mp3entry)); |
1619 | filling = STATE_FINISHED; | 1617 | filling = STATE_FINISHED; |
1620 | return false; | 1618 | return false; |
@@ -1979,7 +1977,6 @@ static int audio_check_new_track(void) | |||
1979 | 1977 | ||
1980 | if (automatic_skip) | 1978 | if (automatic_skip) |
1981 | { | 1979 | { |
1982 | playlist_end = false; | ||
1983 | wps_offset = -ci.new_track; | 1980 | wps_offset = -ci.new_track; |
1984 | track_changed = true; | 1981 | track_changed = true; |
1985 | } | 1982 | } |
@@ -2074,7 +2071,7 @@ static void audio_stop_playback(void) | |||
2074 | { | 2071 | { |
2075 | struct mp3entry *id3 = NULL; | 2072 | struct mp3entry *id3 = NULL; |
2076 | 2073 | ||
2077 | if (!playlist_end || !ci.stop_codec) | 2074 | if (!ci.stop_codec) |
2078 | { | 2075 | { |
2079 | /* Set this early, the outside code yields and may allow the codec | 2076 | /* Set this early, the outside code yields and may allow the codec |
2080 | to try to wait for a reply on a buffer wait */ | 2077 | to try to wait for a reply on a buffer wait */ |
@@ -2121,7 +2118,6 @@ static void audio_play_start(size_t offset) | |||
2121 | audio_stop_codec_flush(); | 2118 | audio_stop_codec_flush(); |
2122 | 2119 | ||
2123 | track_changed = true; | 2120 | track_changed = true; |
2124 | playlist_end = false; | ||
2125 | 2121 | ||
2126 | playing = true; | 2122 | playing = true; |
2127 | 2123 | ||
@@ -2161,7 +2157,6 @@ static void audio_invalidate_tracks(void) | |||
2161 | if (audio_have_tracks()) | 2157 | if (audio_have_tracks()) |
2162 | { | 2158 | { |
2163 | last_peek_offset = 0; | 2159 | last_peek_offset = 0; |
2164 | playlist_end = false; | ||
2165 | track_widx = track_ridx; | 2160 | track_widx = track_ridx; |
2166 | 2161 | ||
2167 | /* Mark all other entries null (also buffered wrong metadata). */ | 2162 | /* Mark all other entries null (also buffered wrong metadata). */ |
@@ -2181,7 +2176,6 @@ static void audio_new_playlist(void) | |||
2181 | { | 2176 | { |
2182 | if (paused) | 2177 | if (paused) |
2183 | skipped_during_pause = true; | 2178 | skipped_during_pause = true; |
2184 | playlist_end = false; | ||
2185 | track_widx = track_ridx; | 2179 | track_widx = track_ridx; |
2186 | audio_clear_track_entries(); | 2180 | audio_clear_track_entries(); |
2187 | 2181 | ||
@@ -2206,7 +2200,6 @@ static void audio_initiate_track_change(long direction) | |||
2206 | { | 2200 | { |
2207 | logf("audio_initiate_track_change(%ld)", direction); | 2201 | logf("audio_initiate_track_change(%ld)", direction); |
2208 | 2202 | ||
2209 | playlist_end = false; | ||
2210 | ci.new_track += direction; | 2203 | ci.new_track += direction; |
2211 | wps_offset -= direction; | 2204 | wps_offset -= direction; |
2212 | if (paused) | 2205 | if (paused) |
@@ -2216,7 +2209,6 @@ static void audio_initiate_track_change(long direction) | |||
2216 | /* Called on manual dir skip */ | 2209 | /* Called on manual dir skip */ |
2217 | static void audio_initiate_dir_change(long direction) | 2210 | static void audio_initiate_dir_change(long direction) |
2218 | { | 2211 | { |
2219 | playlist_end = false; | ||
2220 | dir_skip = true; | 2212 | dir_skip = true; |
2221 | ci.new_track = direction; | 2213 | ci.new_track = direction; |
2222 | if (paused) | 2214 | if (paused) |
@@ -2402,7 +2394,6 @@ static void audio_thread(void) | |||
2402 | 2394 | ||
2403 | case Q_AUDIO_DIR_SKIP: | 2395 | case Q_AUDIO_DIR_SKIP: |
2404 | LOGFQUEUE("audio < Q_AUDIO_DIR_SKIP"); | 2396 | LOGFQUEUE("audio < Q_AUDIO_DIR_SKIP"); |
2405 | playlist_end = false; | ||
2406 | audio_initiate_dir_change(ev.data); | 2397 | audio_initiate_dir_change(ev.data); |
2407 | break; | 2398 | break; |
2408 | 2399 | ||