From 7b56110e5e74055d45753456034b333788823af4 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Fri, 18 Feb 2005 16:28:52 +0000 Subject: [PATCH] Build the codec plugins in the simulator - only tested for X11 git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6011 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/a52towav.c | 10 +++++----- apps/plugins/flac2wav.c | 6 +++--- apps/plugins/lib/xxx2wav.c | 2 +- apps/plugins/mpa2wav.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/plugins/a52towav.c b/apps/plugins/a52towav.c index f62106a8c3..1bf4fe391f 100644 --- a/apps/plugins/a52towav.c +++ b/apps/plugins/a52towav.c @@ -19,8 +19,8 @@ #include "plugin.h" -#if (CONFIG_HWCODEC == MASNONE) && !defined(SIMULATOR) -/* software codec platforms, not for simulator */ +#if (CONFIG_HWCODEC == MASNONE) +/* software codec platforms */ #include /* Needed by a52.h */ @@ -67,7 +67,7 @@ void ao_play(file_info_struct* file_info,sample_t* samples,int flags) { } } else { #ifdef SIMULATOR - fprintf(stderr,"ERROR: unsupported format: %d\n",flags); + printf("ERROR: unsupported format: %d\n",flags); #endif } @@ -109,7 +109,7 @@ void a52_decode_data (file_info_struct* file_info, uint8_t * start, uint8_t * en length = a52_syncinfo (buf, &flags, &sample_rate, &bit_rate); if (!length) { #ifdef SIMULATOR - fprintf (stderr, "skip\n"); + printf("skip\n"); #endif for (bufptr = buf; bufptr < buf + 6; bufptr++) bufptr[0] = bufptr[1]; @@ -150,7 +150,7 @@ void a52_decode_data (file_info_struct* file_info, uint8_t * start, uint8_t * en continue; error: #ifdef SIMULATOR - fprintf (stderr, "error\n"); + printf ("error\n"); #endif bufptr = buf; bufpos = buf + 7; diff --git a/apps/plugins/flac2wav.c b/apps/plugins/flac2wav.c index b9207eeafe..c90cf0d633 100644 --- a/apps/plugins/flac2wav.c +++ b/apps/plugins/flac2wav.c @@ -19,8 +19,8 @@ #include "plugin.h" -#if (CONFIG_HWCODEC == MASNONE) && !defined(SIMULATOR) -/* software codec platforms, not for simulator */ +#if (CONFIG_HWCODEC == MASNONE) +/* software codec platforms */ #include @@ -65,7 +65,7 @@ FLAC__StreamDecoderWriteStatus flac_write_handler(const FLAC__SeekableStreamDeco if (samples*frame->header.channels > (FLAC_MAX_SUPPORTED_BLOCKSIZE*FLAC_MAX_SUPPORTED_CHANNELS)) { // ERROR!!! #ifdef SIMULATOR - fprintf(stderr,"ERROR: samples*frame->header.channels=%d\n",samples*frame->header.channels); + printf("ERROR: samples*frame->header.channels=%d\n",samples*frame->header.channels); #endif return(FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE); } diff --git a/apps/plugins/lib/xxx2wav.c b/apps/plugins/lib/xxx2wav.c index b4be45347e..cc8c31a11e 100644 --- a/apps/plugins/lib/xxx2wav.c +++ b/apps/plugins/lib/xxx2wav.c @@ -19,7 +19,7 @@ /* Various "helper functions" common to all the xxx2wav decoder plugins */ -#if (CONFIG_HWCODEC == MASNONE) && !defined(SIMULATOR) +#if (CONFIG_HWCODEC == MASNONE) /* software codec platforms, not for simulator */ #include "plugin.h" diff --git a/apps/plugins/mpa2wav.c b/apps/plugins/mpa2wav.c index a4fbf79605..a8d7cc01dc 100644 --- a/apps/plugins/mpa2wav.c +++ b/apps/plugins/mpa2wav.c @@ -19,8 +19,8 @@ #include "plugin.h" -#if (CONFIG_HWCODEC == MASNONE) && !defined(SIMULATOR) -/* software codec platforms, not for simulator */ +#if (CONFIG_HWCODEC == MASNONE) +/* software codec platforms */ #include