devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Codec loader fixed. Now switching between different codecs should work

Browse source 
better.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6694 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Miika Pekkarinen 2005-06-12 18:16:35 +00:00
parent b56f42494b
commit e0037adfae
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
apps/playback.c
View file

@ -1145,10 +1145,7 @@ bool codec_request_next_track_callback(void)
track_ridx = 0; track_ridx = 0;
if (track_ridx == track_widx && tracks[track_ridx].filerem == 0) { if (track_ridx == track_widx && tracks[track_ridx].filerem == 0) {
if (ci.reload_codec) { logf("No more tracks");
} else {
logf("No more tracks");
}
new_track = 0; new_track = 0;
return false; return false;
} }
@ -1256,7 +1253,7 @@ void codec_thread(void)
ci.stop_codec = false; ci.stop_codec = false;
wrap = (int)&codecbuf[codecbuflen] - (int)cur_ti->codecbuf; wrap = (int)&codecbuf[codecbuflen] - (int)cur_ti->codecbuf;
status = codec_load_ram(cur_ti->codecbuf, codecsize, status = codec_load_ram(cur_ti->codecbuf, codecsize,
&ci, &codecbuf[0], codecbuflen); &ci, &codecbuf[0], wrap);
break ; break ;
#ifndef SIMULATOR #ifndef SIMULATOR
@ -1272,7 +1269,8 @@ void codec_thread(void)
case CODEC_LOAD: case CODEC_LOAD:
if (status != PLUGIN_OK) { if (status != PLUGIN_OK) {
logf("Codec failure"); logf("Codec failure");
// playing = false; splash(HZ*2, true, "Codec failure");
playing = false;
} else { } else {
logf("Codec finished"); logf("Codec finished");
} }

2
apps/plugin.c
View file

@ -347,7 +347,7 @@ int codec_load_ram(char* pluginptr, size_t size, void *parameter, void* ptr2, si
size -= copy_n; size -= copy_n;
if (size > 0) { if (size > 0) {
memcpy(ptr2, &pluginptr[copy_n], size); memcpy(&pluginbuf[copy_n], ptr2, size);
} }
} }