diff options
author | Miika Pekkarinen <miipekk@ihme.org> | 2005-06-12 18:16:35 +0000 |
---|---|---|
committer | Miika Pekkarinen <miipekk@ihme.org> | 2005-06-12 18:16:35 +0000 |
commit | e0037adfaed8f8d17a7786f23772de4fd0b36110 (patch) | |
tree | 1b4c009bf8bb55133d85a10a6832c5f33e78a2e4 /apps/playback.c | |
parent | b56f42494b6ca785c36fc48ae5e662adaca21902 (diff) | |
download | rockbox-e0037adfaed8f8d17a7786f23772de4fd0b36110.tar.gz rockbox-e0037adfaed8f8d17a7786f23772de4fd0b36110.zip |
Codec loader fixed. Now switching between different codecs should work
better.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6694 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/playback.c')
-rw-r--r-- | apps/playback.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/apps/playback.c b/apps/playback.c index 391f5e9537..5454fd0e31 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -1145,10 +1145,7 @@ bool codec_request_next_track_callback(void) | |||
1145 | track_ridx = 0; | 1145 | track_ridx = 0; |
1146 | 1146 | ||
1147 | if (track_ridx == track_widx && tracks[track_ridx].filerem == 0) { | 1147 | if (track_ridx == track_widx && tracks[track_ridx].filerem == 0) { |
1148 | if (ci.reload_codec) { | 1148 | logf("No more tracks"); |
1149 | } else { | ||
1150 | logf("No more tracks"); | ||
1151 | } | ||
1152 | new_track = 0; | 1149 | new_track = 0; |
1153 | return false; | 1150 | return false; |
1154 | } | 1151 | } |
@@ -1256,7 +1253,7 @@ void codec_thread(void) | |||
1256 | ci.stop_codec = false; | 1253 | ci.stop_codec = false; |
1257 | wrap = (int)&codecbuf[codecbuflen] - (int)cur_ti->codecbuf; | 1254 | wrap = (int)&codecbuf[codecbuflen] - (int)cur_ti->codecbuf; |
1258 | status = codec_load_ram(cur_ti->codecbuf, codecsize, | 1255 | status = codec_load_ram(cur_ti->codecbuf, codecsize, |
1259 | &ci, &codecbuf[0], codecbuflen); | 1256 | &ci, &codecbuf[0], wrap); |
1260 | break ; | 1257 | break ; |
1261 | 1258 | ||
1262 | #ifndef SIMULATOR | 1259 | #ifndef SIMULATOR |
@@ -1272,7 +1269,8 @@ void codec_thread(void) | |||
1272 | case CODEC_LOAD: | 1269 | case CODEC_LOAD: |
1273 | if (status != PLUGIN_OK) { | 1270 | if (status != PLUGIN_OK) { |
1274 | logf("Codec failure"); | 1271 | logf("Codec failure"); |
1275 | // playing = false; | 1272 | splash(HZ*2, true, "Codec failure"); |
1273 | playing = false; | ||
1276 | } else { | 1274 | } else { |
1277 | logf("Codec finished"); | 1275 | logf("Codec finished"); |
1278 | } | 1276 | } |