summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-04-27 12:52:11 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-04-27 12:52:11 +0000
commit08bedf83051064c7dc9a7bb903ab9a34afe8d725 (patch)
treeac8606643c781d350b27b6a948579c9e718f8323 /apps
parent1a68986bc5d13db4508797700dff99638dccc88c (diff)
downloadrockbox-08bedf83051064c7dc9a7bb903ab9a34afe8d725.tar.gz
rockbox-08bedf83051064c7dc9a7bb903ab9a34afe8d725.tar.bz2
rockbox-08bedf83051064c7dc9a7bb903ab9a34afe8d725.zip
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
Diffstat (limited to 'apps')
-rw-r--r--apps/codecs/asap.c8
-rw-r--r--apps/codecs/atrac3_oma.c8
-rw-r--r--apps/codecs/atrac3_rm.c8
-rw-r--r--apps/codecs/cook.c8
-rw-r--r--apps/codecs/lib/codeclib.c10
-rw-r--r--apps/codecs/speex.c8
6 files changed, 40 insertions, 10 deletions
diff --git a/apps/codecs/asap.c b/apps/codecs/asap.c
index f12dc6a0c5..5d098eda15 100644
--- a/apps/codecs/asap.c
+++ b/apps/codecs/asap.c
@@ -29,6 +29,14 @@ CODEC_HEADER
static byte samples[CHUNK_SIZE] IBSS_ATTR; /* The sample buffer */
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 */
enum codec_status codec_run(void)
{
diff --git a/apps/codecs/atrac3_oma.c b/apps/codecs/atrac3_oma.c
index ab24783368..50f7c8f163 100644
--- a/apps/codecs/atrac3_oma.c
+++ b/apps/codecs/atrac3_oma.c
@@ -33,6 +33,14 @@ CODEC_HEADER
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 */
enum codec_status codec_run(void)
{
diff --git a/apps/codecs/atrac3_rm.c b/apps/codecs/atrac3_rm.c
index 1322e917ed..4c619898bb 100644
--- a/apps/codecs/atrac3_rm.c
+++ b/apps/codecs/atrac3_rm.c
@@ -41,6 +41,14 @@ static void init_rm(RMContext *rmctx)
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 */
enum codec_status codec_run(void)
{
diff --git a/apps/codecs/cook.c b/apps/codecs/cook.c
index a6b4a1153e..82739694d8 100644
--- a/apps/codecs/cook.c
+++ b/apps/codecs/cook.c
@@ -38,6 +38,14 @@ static void init_rm(RMContext *rmctx)
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 */
enum codec_status codec_run(void)
{
diff --git a/apps/codecs/lib/codeclib.c b/apps/codecs/lib/codeclib.c
index 443c0bbdcf..3a46f6d06b 100644
--- a/apps/codecs/lib/codeclib.c
+++ b/apps/codecs/lib/codeclib.c
@@ -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* 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)
{
mem_ptr = 0;
diff --git a/apps/codecs/speex.c b/apps/codecs/speex.c
index e394efc3d5..85ee9c422c 100644
--- a/apps/codecs/speex.c
+++ b/apps/codecs/speex.c
@@ -367,6 +367,14 @@ static void *process_header(spx_ogg_packet *op,
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 */
enum codec_status codec_run(void)
{