forked from len0rd/rockbox
Having a default weak codec_main symbol doesn't seem to be working out for compiling the sim under cygwin in at least some cases. Just implement it explicitly in all cases.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29789 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
1a68986bc5
commit
08bedf8305
6 changed files with 40 additions and 10 deletions
|
@ -29,6 +29,14 @@ CODEC_HEADER
|
||||||
static byte samples[CHUNK_SIZE] IBSS_ATTR; /* The sample buffer */
|
static byte samples[CHUNK_SIZE] IBSS_ATTR; /* The sample buffer */
|
||||||
static ASAP_State asap; /* asap codec state */
|
static ASAP_State asap; /* asap codec state */
|
||||||
|
|
||||||
|
/* this is the codec entry point */
|
||||||
|
enum codec_status codec_main(enum codec_entry_call_reason reason)
|
||||||
|
{
|
||||||
|
/* Nothing to do */
|
||||||
|
return CODEC_OK;
|
||||||
|
(void)reason;
|
||||||
|
}
|
||||||
|
|
||||||
/* this is called for each file to process */
|
/* this is called for each file to process */
|
||||||
enum codec_status codec_run(void)
|
enum codec_status codec_run(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,6 +33,14 @@ CODEC_HEADER
|
||||||
|
|
||||||
static ATRAC3Context q IBSS_ATTR;
|
static ATRAC3Context q IBSS_ATTR;
|
||||||
|
|
||||||
|
/* this is the codec entry point */
|
||||||
|
enum codec_status codec_main(enum codec_entry_call_reason reason)
|
||||||
|
{
|
||||||
|
/* Nothing to do */
|
||||||
|
return CODEC_OK;
|
||||||
|
(void)reason;
|
||||||
|
}
|
||||||
|
|
||||||
/* this is called for each file to process */
|
/* this is called for each file to process */
|
||||||
enum codec_status codec_run(void)
|
enum codec_status codec_run(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -41,6 +41,14 @@ static void init_rm(RMContext *rmctx)
|
||||||
memcpy(ci->id3->id3v2buf, (char*)rmctx->codec_extradata, rmctx->extradata_size*sizeof(char));
|
memcpy(ci->id3->id3v2buf, (char*)rmctx->codec_extradata, rmctx->extradata_size*sizeof(char));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* this is the codec entry point */
|
||||||
|
enum codec_status codec_main(enum codec_entry_call_reason reason)
|
||||||
|
{
|
||||||
|
/* Nothing to do */
|
||||||
|
return CODEC_OK;
|
||||||
|
(void)reason;
|
||||||
|
}
|
||||||
|
|
||||||
/* this is called for each file to process */
|
/* this is called for each file to process */
|
||||||
enum codec_status codec_run(void)
|
enum codec_status codec_run(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -38,6 +38,14 @@ static void init_rm(RMContext *rmctx)
|
||||||
memcpy(rmctx, (void*)(( (intptr_t)ci->id3->id3v2buf + 3 ) &~ 3), sizeof(RMContext));
|
memcpy(rmctx, (void*)(( (intptr_t)ci->id3->id3v2buf + 3 ) &~ 3), sizeof(RMContext));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* this is the codec entry point */
|
||||||
|
enum codec_status codec_main(enum codec_entry_call_reason reason)
|
||||||
|
{
|
||||||
|
/* Nothing to do */
|
||||||
|
return CODEC_OK;
|
||||||
|
(void)reason;
|
||||||
|
}
|
||||||
|
|
||||||
/* this is called for each file to process */
|
/* this is called for each file to process */
|
||||||
enum codec_status codec_run(void)
|
enum codec_status codec_run(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,16 +33,6 @@ unsigned char* mp3buf; // The actual MP3 buffer from Rockbox
|
||||||
unsigned char* mallocbuf; // 512K from the start of MP3 buffer
|
unsigned char* mallocbuf; // 512K from the start of MP3 buffer
|
||||||
unsigned char* filebuf; // The rest of the MP3 buffer
|
unsigned char* filebuf; // The rest of the MP3 buffer
|
||||||
|
|
||||||
/* this is the default codec entry point for when nothing needs to be done
|
|
||||||
on load or unload */
|
|
||||||
enum codec_status __attribute__((weak))
|
|
||||||
codec_main(enum codec_entry_call_reason reason)
|
|
||||||
{
|
|
||||||
/* Nothing to do */
|
|
||||||
return CODEC_OK;
|
|
||||||
(void)reason;
|
|
||||||
}
|
|
||||||
|
|
||||||
int codec_init(void)
|
int codec_init(void)
|
||||||
{
|
{
|
||||||
mem_ptr = 0;
|
mem_ptr = 0;
|
||||||
|
|
|
@ -367,6 +367,14 @@ static void *process_header(spx_ogg_packet *op,
|
||||||
return st;
|
return st;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* this is the codec entry point */
|
||||||
|
enum codec_status codec_main(enum codec_entry_call_reason reason)
|
||||||
|
{
|
||||||
|
/* Nothing to do */
|
||||||
|
return CODEC_OK;
|
||||||
|
(void)reason;
|
||||||
|
}
|
||||||
|
|
||||||
/* this is called for each file to process */
|
/* this is called for each file to process */
|
||||||
enum codec_status codec_run(void)
|
enum codec_status codec_run(void)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue