diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-04-07 21:38:51 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-04-07 21:38:51 +0000 |
commit | 39d9d8bab1e46c83df4a35f50d9217b6912b7097 (patch) | |
tree | e84916e2263ae7da193549973b93bf3d6fad6939 /apps/playback.c | |
parent | 4df825be4325919a843cdb1181bc435645212a51 (diff) | |
download | rockbox-39d9d8bab1e46c83df4a35f50d9217b6912b7097.tar.gz rockbox-39d9d8bab1e46c83df4a35f50d9217b6912b7097.zip |
Fix red and yellow. Move resume_index from mp3entry to playlist_info struct. Bump codec api.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29691 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/playback.c')
-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 457553067e..632fd05d3d 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -233,15 +233,6 @@ static void audio_stop_playback(void); | |||
233 | 233 | ||
234 | /**************************************/ | 234 | /**************************************/ |
235 | 235 | ||
236 | /** Playlist callback */ | ||
237 | |||
238 | /* This callback is required to update the resume index in case of changing | ||
239 | * a playlist and pausing/resuming before the next track change. */ | ||
240 | void playback_set_playlist_index(int index) | ||
241 | { | ||
242 | thistrack_id3->index = index; | ||
243 | } | ||
244 | |||
245 | /** Pcmbuf callbacks */ | 236 | /** Pcmbuf callbacks */ |
246 | 237 | ||
247 | /* Between the codec and PCM track change, we need to keep updating the | 238 | /* Between the codec and PCM track change, we need to keep updating the |
@@ -2216,7 +2207,7 @@ static void audio_thread(void) | |||
2216 | /* PCM track change done */ | 2207 | /* PCM track change done */ |
2217 | LOGFQUEUE("audio < Q_AUDIO_TRACK_CHANGED"); | 2208 | LOGFQUEUE("audio < Q_AUDIO_TRACK_CHANGED"); |
2218 | /* Set new playlist position for resuming. */ | 2209 | /* Set new playlist position for resuming. */ |
2219 | thistrack_id3->index = playlist_get_index(); | 2210 | playlist_update_resume_index(); |
2220 | if (filling != STATE_ENDING) | 2211 | if (filling != STATE_ENDING) |
2221 | audio_finalise_track_change(); | 2212 | audio_finalise_track_change(); |
2222 | else if (playing) | 2213 | else if (playing) |