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

Removed unnecessary codec_api struct.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7551 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thom Johansen 2005-09-23 00:12:02 +00:00
parent 0647772826
commit bccf58621e
1 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
apps/codecs/wavpack.c
View file

@ -24,7 +24,6 @@
#include "lib/codeclib.h" #include "lib/codeclib.h"
#include "dsp.h" #include "dsp.h"
static struct codec_api *rb;
static struct codec_api *ci; static struct codec_api *ci;
#define BUFFER_SIZE 4096 #define BUFFER_SIZE 4096
@ -38,7 +37,7 @@ static long read_callback (void *buffer, long bytes)
return retval; return retval;
} }
#ifndef SIMULATOR #ifdef USE_IRAM
extern char iramcopy[]; extern char iramcopy[];
extern char iramstart[]; extern char iramstart[];
extern char iramend[]; extern char iramend[];
@ -54,11 +53,10 @@ enum codec_status codec_start(struct codec_api* api)
/* Generic codec initialisation */ /* Generic codec initialisation */
TEST_CODEC_API(api); TEST_CODEC_API(api);
rb = api;
ci = api; ci = api;
#ifndef SIMULATOR #ifdef USE_IRAM
rb->memcpy(iramstart, iramcopy, iramend-iramstart); ci->memcpy(iramstart, iramcopy, iramend-iramstart);
#endif #endif
ci->configure(CODEC_SET_FILEBUF_LIMIT, (int *)(1024*1024*10)); ci->configure(CODEC_SET_FILEBUF_LIMIT, (int *)(1024*1024*10));
@ -74,14 +72,14 @@ enum codec_status codec_start(struct codec_api* api)
if (codec_init(api)) if (codec_init(api))
return CODEC_ERROR; return CODEC_ERROR;
while (!*rb->taginfo_ready && !ci->stop_codec) while (!*ci->taginfo_ready && !ci->stop_codec)
ci->sleep(1); ci->sleep(1);
if (ci->id3->frequency != NATIVE_FREQUENCY || if (ci->id3->frequency != NATIVE_FREQUENCY ||
ci->global_settings->replaygain) { ci->global_settings->replaygain) {
ci->configure(CODEC_DSP_ENABLE, (bool *)true); ci->configure(CODEC_DSP_ENABLE, (bool *)true);
ci->configure(DSP_SET_FREQUENCY, (long *)(ci->id3->frequency)); ci->configure(DSP_SET_FREQUENCY, (long *)(ci->id3->frequency));
codec_set_replaygain(rb->id3); codec_set_replaygain(ci->id3);
} }
else else
ci->configure(CODEC_DSP_ENABLE, (bool *)false); ci->configure(CODEC_DSP_ENABLE, (bool *)false);
@ -127,7 +125,7 @@ enum codec_status codec_start(struct codec_api* api)
break; break;
ci->set_elapsed (WavpackGetSampleIndex (wpc) / sr_100 * 10); ci->set_elapsed (WavpackGetSampleIndex (wpc) / sr_100 * 10);
rb->yield (); ci->yield ();
} }
nsamples = WavpackUnpackSamples (wpc, temp_buffer, BUFFER_SIZE / 2); nsamples = WavpackUnpackSamples (wpc, temp_buffer, BUFFER_SIZE / 2);
@ -146,7 +144,7 @@ enum codec_status codec_start(struct codec_api* api)
*--dst = *--src; *--dst = *--src;
*--dst = *src; *--dst = *src;
if (!(count & 0x7f)) if (!(count & 0x7f))
rb->yield (); ci->yield ();
} }
} }
@ -159,7 +157,7 @@ enum codec_status codec_start(struct codec_api* api)
*dst++ = *src++ << 8; *dst++ = *src++ << 8;
*dst++ = *src++ << 8; *dst++ = *src++ << 8;
if (!(count & 0x7f)) if (!(count & 0x7f))
rb->yield (); ci->yield ();
} }
} }
else if (bps == 2) { else if (bps == 2) {
@ -171,7 +169,7 @@ enum codec_status codec_start(struct codec_api* api)
*dst++ = *src++; *dst++ = *src++;
*dst++ = *src++; *dst++ = *src++;
if (!(count & 0x7f)) if (!(count & 0x7f))
rb->yield (); ci->yield ();
} }
} }
else { else {
@ -184,7 +182,7 @@ enum codec_status codec_start(struct codec_api* api)
*dst++ = *src++ >> shift; *dst++ = *src++ >> shift;
*dst++ = *src++ >> shift; *dst++ = *src++ >> shift;
if (!(count & 0x7f)) if (!(count & 0x7f))
rb->yield (); ci->yield ();
} }
} }
@ -192,7 +190,7 @@ enum codec_status codec_start(struct codec_api* api)
break; break;
while (!ci->pcmbuf_insert ((char *) temp_buffer, nsamples * 4)) while (!ci->pcmbuf_insert ((char *) temp_buffer, nsamples * 4))
rb->sleep (1); ci->sleep (1);
ci->set_elapsed (WavpackGetSampleIndex (wpc) / sr_100 * 10); ci->set_elapsed (WavpackGetSampleIndex (wpc) / sr_100 * 10);
} }