forked from len0rd/rockbox
removed the use of the 2nd argument to codec_start() since no codec used
it anymore git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6814 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
1f3d08d600
commit
31efab4909
9 changed files with 12 additions and 11 deletions
|
@ -297,7 +297,7 @@ const struct codec_api ci = {
|
||||||
|
|
||||||
int codec_load_ram(char* codecptr, size_t size, void* ptr2, size_t bufwrap)
|
int codec_load_ram(char* codecptr, size_t size, void* ptr2, size_t bufwrap)
|
||||||
{
|
{
|
||||||
enum codec_status (*codec_start)(const struct codec_api* api, void* param);
|
enum codec_status (*codec_start)(const struct codec_api* api);
|
||||||
int copy_n;
|
int copy_n;
|
||||||
int status;
|
int status;
|
||||||
|
|
||||||
|
@ -316,7 +316,7 @@ int codec_load_ram(char* codecptr, size_t size, void* ptr2, size_t bufwrap)
|
||||||
codec_start = (void*)&codecbuf;
|
codec_start = (void*)&codecbuf;
|
||||||
|
|
||||||
invalidate_icache();
|
invalidate_icache();
|
||||||
status = codec_start(&ci, NULL);
|
status = codec_start(&ci);
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
|
@ -397,7 +397,7 @@ int codec_load_file(const char* codec);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* defined by the codec */
|
/* defined by the codec */
|
||||||
enum codec_status codec_start(struct codec_api* rockbox, void* parameter)
|
enum codec_status codec_start(struct codec_api* rockbox)
|
||||||
__attribute__ ((section (".entry")));
|
__attribute__ ((section (".entry")));
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -155,7 +155,7 @@ extern char iramend[];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* this is the codec entry point */
|
/* this is the codec entry point */
|
||||||
enum codec_status codec_start(struct codec_api* api, void* parm)
|
enum codec_status codec_start(struct codec_api* api)
|
||||||
{
|
{
|
||||||
size_t n;
|
size_t n;
|
||||||
unsigned char* filebuf;
|
unsigned char* filebuf;
|
||||||
|
|
|
@ -160,7 +160,7 @@ extern char iramend[];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* this is the codec entry point */
|
/* this is the codec entry point */
|
||||||
enum codec_status codec_start(struct codec_api* api, void* parm)
|
enum codec_status codec_start(struct codec_api* api)
|
||||||
{
|
{
|
||||||
struct codec_api* ci = api;
|
struct codec_api* ci = api;
|
||||||
FLAC__SeekableStreamDecoder* flacDecoder;
|
FLAC__SeekableStreamDecoder* flacDecoder;
|
||||||
|
|
|
@ -257,7 +257,7 @@ long resample(long *in, long *out, int num, struct resampler *s)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* this is the codec entry point */
|
/* this is the codec entry point */
|
||||||
enum codec_status codec_start(struct codec_api* api, void* parm)
|
enum codec_status codec_start(struct codec_api* api)
|
||||||
{
|
{
|
||||||
struct codec_api *ci = api;
|
struct codec_api *ci = api;
|
||||||
struct mp3info *info;
|
struct mp3info *info;
|
||||||
|
@ -279,7 +279,6 @@ enum codec_status codec_start(struct codec_api* api, void* parm)
|
||||||
struct resampler lr = { 0, 0, 0 }, rr = { 0, 0, 0 };
|
struct resampler lr = { 0, 0, 0 }, rr = { 0, 0, 0 };
|
||||||
long length;
|
long length;
|
||||||
/* Generic codec inititialisation */
|
/* Generic codec inititialisation */
|
||||||
(void)parm;
|
|
||||||
|
|
||||||
TEST_CODEC_API(api);
|
TEST_CODEC_API(api);
|
||||||
rb = api;
|
rb = api;
|
||||||
|
|
|
@ -93,7 +93,7 @@ extern char iramend[];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* this is the codec entry point */
|
/* this is the codec entry point */
|
||||||
enum codec_status codec_start(struct codec_api* api, void* parm)
|
enum codec_status codec_start(struct codec_api* api)
|
||||||
{
|
{
|
||||||
struct codec_api* ci = api;
|
struct codec_api* ci = api;
|
||||||
unsigned short Sample;
|
unsigned short Sample;
|
||||||
|
|
|
@ -46,6 +46,7 @@ char *strcat(char *dest, const char *src)
|
||||||
|
|
||||||
size_t read_handler(void *ptr, size_t size, size_t nmemb, void *datasource)
|
size_t read_handler(void *ptr, size_t size, size_t nmemb, void *datasource)
|
||||||
{
|
{
|
||||||
|
(void)datasource;
|
||||||
return rb->read_filebuf(ptr, nmemb*size);
|
return rb->read_filebuf(ptr, nmemb*size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -66,6 +67,7 @@ int close_handler(void *datasource)
|
||||||
|
|
||||||
long tell_handler(void *datasource)
|
long tell_handler(void *datasource)
|
||||||
{
|
{
|
||||||
|
(void)datasource;
|
||||||
return rb->curpos;
|
return rb->curpos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,7 +82,7 @@ extern char iramend[];
|
||||||
static char pcmbuf[4096] IDATA_ATTR;
|
static char pcmbuf[4096] IDATA_ATTR;
|
||||||
|
|
||||||
/* this is the codec entry point */
|
/* this is the codec entry point */
|
||||||
enum codec_status codec_start(struct codec_api* api, void* parm)
|
enum codec_status codec_start(struct codec_api* api)
|
||||||
{
|
{
|
||||||
ov_callbacks callbacks;
|
ov_callbacks callbacks;
|
||||||
OggVorbis_File vf;
|
OggVorbis_File vf;
|
||||||
|
|
|
@ -33,7 +33,7 @@ extern char iramend[];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* this is the codec entry point */
|
/* this is the codec entry point */
|
||||||
enum codec_status codec_start(struct codec_api* api, void* parm)
|
enum codec_status codec_start(struct codec_api* api)
|
||||||
{
|
{
|
||||||
struct codec_api* rb = api;
|
struct codec_api* rb = api;
|
||||||
struct codec_api* ci = api;
|
struct codec_api* ci = api;
|
||||||
|
|
|
@ -42,7 +42,7 @@ extern char iramend[];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* this is the codec entry point */
|
/* this is the codec entry point */
|
||||||
enum codec_status codec_start(struct codec_api* api, void* parm)
|
enum codec_status codec_start(struct codec_api* api)
|
||||||
{
|
{
|
||||||
WavpackContext *wpc;
|
WavpackContext *wpc;
|
||||||
char error [80];
|
char error [80];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue