diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/a52towav.c | 12 | ||||
-rw-r--r-- | apps/plugins/flac2wav.c | 4 | ||||
-rw-r--r-- | apps/plugins/lib/xxx2wav.h | 9 | ||||
-rw-r--r-- | apps/plugins/vorbis2wav.c | 2 |
4 files changed, 5 insertions, 22 deletions
diff --git a/apps/plugins/a52towav.c b/apps/plugins/a52towav.c index 1bf4fe391f..4e6150b2f2 100644 --- a/apps/plugins/a52towav.c +++ b/apps/plugins/a52towav.c | |||
@@ -66,9 +66,7 @@ void ao_play(file_info_struct* file_info,sample_t* samples,int flags) { | |||
66 | int16_samples[2*i+1] = LE_S16(convert (samples[i+256])); | 66 | int16_samples[2*i+1] = LE_S16(convert (samples[i+256])); |
67 | } | 67 | } |
68 | } else { | 68 | } else { |
69 | #ifdef SIMULATOR | 69 | DEBUGF("ERROR: unsupported format: %d\n",flags); |
70 | printf("ERROR: unsupported format: %d\n",flags); | ||
71 | #endif | ||
72 | } | 70 | } |
73 | 71 | ||
74 | /* FIX: Buffer the disk write to write larger amounts at one */ | 72 | /* FIX: Buffer the disk write to write larger amounts at one */ |
@@ -108,9 +106,7 @@ void a52_decode_data (file_info_struct* file_info, uint8_t * start, uint8_t * en | |||
108 | 106 | ||
109 | length = a52_syncinfo (buf, &flags, &sample_rate, &bit_rate); | 107 | length = a52_syncinfo (buf, &flags, &sample_rate, &bit_rate); |
110 | if (!length) { | 108 | if (!length) { |
111 | #ifdef SIMULATOR | 109 | DEBUGF("skip\n"); |
112 | printf("skip\n"); | ||
113 | #endif | ||
114 | for (bufptr = buf; bufptr < buf + 6; bufptr++) | 110 | for (bufptr = buf; bufptr < buf + 6; bufptr++) |
115 | bufptr[0] = bufptr[1]; | 111 | bufptr[0] = bufptr[1]; |
116 | continue; | 112 | continue; |
@@ -149,9 +145,7 @@ void a52_decode_data (file_info_struct* file_info, uint8_t * start, uint8_t * en | |||
149 | bufpos = buf + 7; | 145 | bufpos = buf + 7; |
150 | continue; | 146 | continue; |
151 | error: | 147 | error: |
152 | #ifdef SIMULATOR | 148 | DEBUGF("error\n"); |
153 | printf ("error\n"); | ||
154 | #endif | ||
155 | bufptr = buf; | 149 | bufptr = buf; |
156 | bufpos = buf + 7; | 150 | bufpos = buf + 7; |
157 | } | 151 | } |
diff --git a/apps/plugins/flac2wav.c b/apps/plugins/flac2wav.c index f68f3204f4..84b5ed15b2 100644 --- a/apps/plugins/flac2wav.c +++ b/apps/plugins/flac2wav.c | |||
@@ -64,9 +64,7 @@ FLAC__StreamDecoderWriteStatus flac_write_handler(const FLAC__SeekableStreamDeco | |||
64 | 64 | ||
65 | if (samples*frame->header.channels > (FLAC_MAX_SUPPORTED_BLOCKSIZE*FLAC_MAX_SUPPORTED_CHANNELS)) { | 65 | if (samples*frame->header.channels > (FLAC_MAX_SUPPORTED_BLOCKSIZE*FLAC_MAX_SUPPORTED_CHANNELS)) { |
66 | // ERROR!!! | 66 | // ERROR!!! |
67 | #ifdef SIMULATOR | 67 | DEBUGF("ERROR: samples*frame->header.channels=%d\n",samples*frame->header.channels); |
68 | printf("ERROR: samples*frame->header.channels=%d\n",samples*frame->header.channels); | ||
69 | #endif | ||
70 | return(FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE); | 68 | return(FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE); |
71 | } | 69 | } |
72 | 70 | ||
diff --git a/apps/plugins/lib/xxx2wav.h b/apps/plugins/lib/xxx2wav.h index 501aaa3933..e89361c46a 100644 --- a/apps/plugins/lib/xxx2wav.h +++ b/apps/plugins/lib/xxx2wav.h | |||
@@ -19,15 +19,6 @@ | |||
19 | 19 | ||
20 | /* Various "helper functions" common to all the xxx2wav decoder plugins */ | 20 | /* Various "helper functions" common to all the xxx2wav decoder plugins */ |
21 | 21 | ||
22 | |||
23 | /* A macro to enable printf for the simulator only */ | ||
24 | |||
25 | #ifdef SIMULATOR | ||
26 | #define dprintf(...) printf(__VA_ARGS__) | ||
27 | #else | ||
28 | #define dprintf(...) | ||
29 | #endif | ||
30 | |||
31 | /* the main data structure of the program */ | 22 | /* the main data structure of the program */ |
32 | typedef struct { | 23 | typedef struct { |
33 | int infile; | 24 | int infile; |
diff --git a/apps/plugins/vorbis2wav.c b/apps/plugins/vorbis2wav.c index 93c1be6a98..e61bc617f6 100644 --- a/apps/plugins/vorbis2wav.c +++ b/apps/plugins/vorbis2wav.c | |||
@@ -141,7 +141,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) | |||
141 | if (n==0) { | 141 | if (n==0) { |
142 | eof=1; | 142 | eof=1; |
143 | } else if (n < 0) { | 143 | } else if (n < 0) { |
144 | dprintf("Error decoding frame\n"); | 144 | DEBUGF("Error decoding frame\n"); |
145 | } else { | 145 | } else { |
146 | file_info.frames_decoded++; | 146 | file_info.frames_decoded++; |
147 | #if BYTE_ORDER == BIG_ENDIAN | 147 | #if BYTE_ORDER == BIG_ENDIAN |