diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-05-01 11:42:41 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-05-01 11:42:41 +0000 |
commit | e75018ad66658c968b50767847ea1ed5408897ba (patch) | |
tree | 83096f55f8d89521e8938ac355722579abff72df /apps/codecs | |
parent | 5e57edf2632eb69b0749a9af984fa399a487bec4 (diff) | |
download | rockbox-e75018ad66658c968b50767847ea1ed5408897ba.tar.gz rockbox-e75018ad66658c968b50767847ea1ed5408897ba.zip |
Fix several 'variable set but not used' warnings reported from GCC 4.6.0.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29805 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/aiff.c | 5 | ||||
-rw-r--r-- | apps/codecs/libasf/asf.c | 20 | ||||
-rw-r--r-- | apps/codecs/libspeex/cb_search.c | 3 | ||||
-rw-r--r-- | apps/codecs/libspeex/nb_celp.c | 15 | ||||
-rw-r--r-- | apps/codecs/libwma/wmadeci.c | 3 | ||||
-rw-r--r-- | apps/codecs/sid.c | 5 | ||||
-rw-r--r-- | apps/codecs/speex.c | 4 | ||||
-rw-r--r-- | apps/codecs/wavpack.c | 7 | ||||
-rw-r--r-- | apps/codecs/wmapro.c | 7 |
9 files changed, 35 insertions, 34 deletions
diff --git a/apps/codecs/aiff.c b/apps/codecs/aiff.c index 3fc137eaeb..a8185b4910 100644 --- a/apps/codecs/aiff.c +++ b/apps/codecs/aiff.c | |||
@@ -77,7 +77,9 @@ enum codec_status codec_run(void) | |||
77 | { | 77 | { |
78 | struct pcm_format format; | 78 | struct pcm_format format; |
79 | uint32_t bytesdone, decodedsamples; | 79 | uint32_t bytesdone, decodedsamples; |
80 | /* rockbox: comment 'set but unused' variables | ||
80 | uint32_t num_sample_frames = 0; | 81 | uint32_t num_sample_frames = 0; |
82 | */ | ||
81 | size_t n; | 83 | size_t n; |
82 | int bufcount; | 84 | int bufcount; |
83 | int endofstream; | 85 | int endofstream; |
@@ -146,8 +148,11 @@ enum codec_status codec_run(void) | |||
146 | /* num_channels */ | 148 | /* num_channels */ |
147 | format.channels = ((buf[8]<<8)|buf[9]); | 149 | format.channels = ((buf[8]<<8)|buf[9]); |
148 | /* num_sample_frames */ | 150 | /* num_sample_frames */ |
151 | /* | ||
149 | num_sample_frames = ((buf[10]<<24)|(buf[11]<<16)|(buf[12]<<8) | 152 | num_sample_frames = ((buf[10]<<24)|(buf[11]<<16)|(buf[12]<<8) |
150 | |buf[13]); | 153 | |buf[13]); |
154 | */ | ||
155 | |||
151 | /* sample_size */ | 156 | /* sample_size */ |
152 | format.bitspersample = ((buf[14]<<8)|buf[15]); | 157 | format.bitspersample = ((buf[14]<<8)|buf[15]); |
153 | /* sample_rate (don't use last 4 bytes, only integer fs) */ | 158 | /* sample_rate (don't use last 4 bytes, only integer fs) */ |
diff --git a/apps/codecs/libasf/asf.c b/apps/codecs/libasf/asf.c index a7e4bca307..4e3235a422 100644 --- a/apps/codecs/libasf/asf.c +++ b/apps/codecs/libasf/asf.c | |||
@@ -59,16 +59,18 @@ int asf_read_packet(uint8_t** audiobuf, int* audiobufsize, int* packetlength, | |||
59 | uint8_t* datap; | 59 | uint8_t* datap; |
60 | uint32_t length; | 60 | uint32_t length; |
61 | uint32_t padding_length; | 61 | uint32_t padding_length; |
62 | /* rockbox: comment 'set but unused' variables | ||
62 | uint32_t send_time; | 63 | uint32_t send_time; |
63 | uint16_t duration; | 64 | uint16_t duration; |
65 | uint32_t media_object_number; | ||
66 | uint32_t media_object_offset; | ||
67 | */ | ||
64 | uint16_t payload_count; | 68 | uint16_t payload_count; |
65 | int payload_length_type; | 69 | int payload_length_type; |
66 | uint32_t payload_hdrlen; | 70 | uint32_t payload_hdrlen; |
67 | int payload_datalen; | 71 | int payload_datalen; |
68 | int multiple; | 72 | int multiple; |
69 | uint32_t replicated_length; | 73 | uint32_t replicated_length; |
70 | uint32_t media_object_number; | ||
71 | uint32_t media_object_offset; | ||
72 | uint32_t bytesread = 0; | 74 | uint32_t bytesread = 0; |
73 | uint8_t* buf; | 75 | uint8_t* buf; |
74 | size_t bufsize; | 76 | size_t bufsize; |
@@ -133,9 +135,9 @@ int asf_read_packet(uint8_t** audiobuf, int* audiobufsize, int* packetlength, | |||
133 | datap += GETLEN2b((packet_flags >> 1) & 0x03); | 135 | datap += GETLEN2b((packet_flags >> 1) & 0x03); |
134 | padding_length = GETVALUE2b((packet_flags >> 3) & 0x03, datap); | 136 | padding_length = GETVALUE2b((packet_flags >> 3) & 0x03, datap); |
135 | datap += GETLEN2b((packet_flags >> 3) & 0x03); | 137 | datap += GETLEN2b((packet_flags >> 3) & 0x03); |
136 | send_time = get_long_le(datap); | 138 | /* send_time = get_long_le(datap); */ |
137 | datap += 4; | 139 | datap += 4; |
138 | duration = get_short_le(datap); | 140 | /* duration = get_short_le(datap); */ |
139 | datap += 2; | 141 | datap += 2; |
140 | /*DEBUGF("and duration %d ms\n", duration);*/ | 142 | /*DEBUGF("and duration %d ms\n", duration);*/ |
141 | 143 | ||
@@ -225,9 +227,9 @@ int asf_read_packet(uint8_t** audiobuf, int* audiobufsize, int* packetlength, | |||
225 | } | 227 | } |
226 | 228 | ||
227 | bytesread += payload_hdrlen; | 229 | bytesread += payload_hdrlen; |
228 | media_object_number = GETVALUE2b((packet_property >> 4) & 0x03, datap); | 230 | /* media_object_number = GETVALUE2b((packet_property >> 4) & 0x03, datap); */ |
229 | datap += GETLEN2b((packet_property >> 4) & 0x03); | 231 | datap += GETLEN2b((packet_property >> 4) & 0x03); |
230 | media_object_offset = GETVALUE2b((packet_property >> 2) & 0x03, datap); | 232 | /* media_object_offset = GETVALUE2b((packet_property >> 2) & 0x03, datap); */ |
231 | datap += GETLEN2b((packet_property >> 2) & 0x03); | 233 | datap += GETLEN2b((packet_property >> 2) & 0x03); |
232 | replicated_length = GETVALUE2b(packet_property & 0x03, datap); | 234 | replicated_length = GETVALUE2b(packet_property & 0x03, datap); |
233 | datap += GETLEN2b(packet_property & 0x03); | 235 | datap += GETLEN2b(packet_property & 0x03); |
@@ -299,8 +301,10 @@ int asf_get_timestamp(int *duration) | |||
299 | int datalen; | 301 | int datalen; |
300 | uint8_t data[18]; | 302 | uint8_t data[18]; |
301 | uint8_t* datap; | 303 | uint8_t* datap; |
304 | /* rockbox: comment 'set but unused' variables | ||
302 | uint32_t length; | 305 | uint32_t length; |
303 | uint32_t padding_length; | 306 | uint32_t padding_length; |
307 | */ | ||
304 | uint32_t send_time; | 308 | uint32_t send_time; |
305 | static int packet_count = 0; | 309 | static int packet_count = 0; |
306 | 310 | ||
@@ -359,13 +363,13 @@ int asf_get_timestamp(int *duration) | |||
359 | bytesread += datalen; | 363 | bytesread += datalen; |
360 | 364 | ||
361 | datap = data; | 365 | datap = data; |
362 | length = GETVALUE2b((packet_flags >> 5) & 0x03, datap); | 366 | /* length = GETVALUE2b((packet_flags >> 5) & 0x03, datap); */ |
363 | datap += GETLEN2b((packet_flags >> 5) & 0x03); | 367 | datap += GETLEN2b((packet_flags >> 5) & 0x03); |
364 | 368 | ||
365 | /* sequence value is not used */ | 369 | /* sequence value is not used */ |
366 | GETVALUE2b((packet_flags >> 1) & 0x03, datap); | 370 | GETVALUE2b((packet_flags >> 1) & 0x03, datap); |
367 | datap += GETLEN2b((packet_flags >> 1) & 0x03); | 371 | datap += GETLEN2b((packet_flags >> 1) & 0x03); |
368 | padding_length = GETVALUE2b((packet_flags >> 3) & 0x03, datap); | 372 | /* padding_length = GETVALUE2b((packet_flags >> 3) & 0x03, datap); */ |
369 | datap += GETLEN2b((packet_flags >> 3) & 0x03); | 373 | datap += GETLEN2b((packet_flags >> 3) & 0x03); |
370 | send_time = get_long_le(datap); | 374 | send_time = get_long_le(datap); |
371 | datap += 4; | 375 | datap += 4; |
diff --git a/apps/codecs/libspeex/cb_search.c b/apps/codecs/libspeex/cb_search.c index f9ff0a6784..35fe3a2f67 100644 --- a/apps/codecs/libspeex/cb_search.c +++ b/apps/codecs/libspeex/cb_search.c | |||
@@ -529,14 +529,13 @@ spx_int32_t *seed | |||
529 | VARDECL(int *ind); | 529 | VARDECL(int *ind); |
530 | VARDECL(int *signs); | 530 | VARDECL(int *signs); |
531 | const signed char *shape_cb; | 531 | const signed char *shape_cb; |
532 | int shape_cb_size, subvect_size, nb_subvect; | 532 | int subvect_size, nb_subvect; |
533 | const split_cb_params *params; | 533 | const split_cb_params *params; |
534 | int have_sign; | 534 | int have_sign; |
535 | 535 | ||
536 | params = (const split_cb_params *) par; | 536 | params = (const split_cb_params *) par; |
537 | subvect_size = params->subvect_size; | 537 | subvect_size = params->subvect_size; |
538 | nb_subvect = params->nb_subvect; | 538 | nb_subvect = params->nb_subvect; |
539 | shape_cb_size = 1<<params->shape_bits; | ||
540 | shape_cb = params->shape_cb; | 539 | shape_cb = params->shape_cb; |
541 | have_sign = params->have_sign; | 540 | have_sign = params->have_sign; |
542 | 541 | ||
diff --git a/apps/codecs/libspeex/nb_celp.c b/apps/codecs/libspeex/nb_celp.c index 90a5d1e991..98f5e2e240 100644 --- a/apps/codecs/libspeex/nb_celp.c +++ b/apps/codecs/libspeex/nb_celp.c | |||
@@ -1001,12 +1001,13 @@ void *nb_decoder_init(const SpeexMode *m) | |||
1001 | } | 1001 | } |
1002 | 1002 | ||
1003 | void nb_decoder_destroy(void *state) | 1003 | void nb_decoder_destroy(void *state) |
1004 | { | 1004 | { |
1005 | #if !(defined(VAR_ARRAYS) || defined (USE_ALLOCA)) | ||
1005 | DecState *st; | 1006 | DecState *st; |
1006 | st=(DecState*)state; | 1007 | st=(DecState*)state; |
1007 | |||
1008 | #if !(defined(VAR_ARRAYS) || defined (USE_ALLOCA)) | ||
1009 | speex_free_scratch(st->stack); | 1008 | speex_free_scratch(st->stack); |
1009 | #else | ||
1010 | (void)state; | ||
1010 | #endif | 1011 | #endif |
1011 | /* | 1012 | /* |
1012 | speex_free (st->excBuf); | 1013 | speex_free (st->excBuf); |
@@ -1315,7 +1316,6 @@ int nb_decode(void *state, SpeexBits *bits, void *vout) | |||
1315 | { | 1316 | { |
1316 | int offset; | 1317 | int offset; |
1317 | spx_word16_t *exc; | 1318 | spx_word16_t *exc; |
1318 | spx_word16_t *sp; | ||
1319 | spx_word16_t *innov_save = NULL; | 1319 | spx_word16_t *innov_save = NULL; |
1320 | spx_word16_t tmp; | 1320 | spx_word16_t tmp; |
1321 | 1321 | ||
@@ -1323,8 +1323,7 @@ int nb_decode(void *state, SpeexBits *bits, void *vout) | |||
1323 | offset = st->subframeSize*sub; | 1323 | offset = st->subframeSize*sub; |
1324 | /* Excitation */ | 1324 | /* Excitation */ |
1325 | exc=st->exc+offset; | 1325 | exc=st->exc+offset; |
1326 | /* Original signal */ | 1326 | |
1327 | sp=out+offset; | ||
1328 | if (st->innov_save) | 1327 | if (st->innov_save) |
1329 | innov_save = st->innov_save+offset; | 1328 | innov_save = st->innov_save+offset; |
1330 | 1329 | ||
@@ -1517,13 +1516,11 @@ int nb_decode(void *state, SpeexBits *bits, void *vout) | |||
1517 | { | 1516 | { |
1518 | int offset; | 1517 | int offset; |
1519 | spx_word16_t *sp; | 1518 | spx_word16_t *sp; |
1520 | spx_word16_t *exc; | 1519 | |
1521 | /* Offset relative to start of frame */ | 1520 | /* Offset relative to start of frame */ |
1522 | offset = st->subframeSize*sub; | 1521 | offset = st->subframeSize*sub; |
1523 | /* Original signal */ | 1522 | /* Original signal */ |
1524 | sp=out+offset; | 1523 | sp=out+offset; |
1525 | /* Excitation */ | ||
1526 | exc=st->exc+offset; | ||
1527 | 1524 | ||
1528 | /* LSP interpolation (quantized and unquantized) */ | 1525 | /* LSP interpolation (quantized and unquantized) */ |
1529 | lsp_interpolate(st->old_qlsp, qlsp, interp_qlsp, st->lpcSize, sub, st->nbSubframes); | 1526 | lsp_interpolate(st->old_qlsp, qlsp, interp_qlsp, st->lpcSize, sub, st->nbSubframes); |
diff --git a/apps/codecs/libwma/wmadeci.c b/apps/codecs/libwma/wmadeci.c index 98c10e486d..50a1b47405 100644 --- a/apps/codecs/libwma/wmadeci.c +++ b/apps/codecs/libwma/wmadeci.c | |||
@@ -598,7 +598,7 @@ static inline fixed32 pow_m1_4(WMADecodeContext *s, fixed32 x) | |||
598 | static void wma_lsp_to_curve_init(WMADecodeContext *s, int frame_len) | 598 | static void wma_lsp_to_curve_init(WMADecodeContext *s, int frame_len) |
599 | { | 599 | { |
600 | fixed32 wdel, a, b, temp2; | 600 | fixed32 wdel, a, b, temp2; |
601 | int i, m; | 601 | int i; |
602 | 602 | ||
603 | wdel = fixdiv32(itofix32(1), itofix32(frame_len)); | 603 | wdel = fixdiv32(itofix32(1), itofix32(frame_len)); |
604 | for (i=0; i<frame_len; ++i) | 604 | for (i=0; i<frame_len; ++i) |
@@ -620,7 +620,6 @@ static void wma_lsp_to_curve_init(WMADecodeContext *s, int frame_len) | |||
620 | /*double check this later*/ | 620 | /*double check this later*/ |
621 | for(i=(1 << LSP_POW_BITS) - 1;i>=0;i--) | 621 | for(i=(1 << LSP_POW_BITS) - 1;i>=0;i--) |
622 | { | 622 | { |
623 | m = (1 << LSP_POW_BITS) + i; | ||
624 | a = pow_a_table[ix++]<<4; | 623 | a = pow_a_table[ix++]<<4; |
625 | ((fixed32*)s->lsp_pow_m_table1)[i] = 2 * a - b; | 624 | ((fixed32*)s->lsp_pow_m_table1)[i] = 2 * a - b; |
626 | ((fixed32*)s->lsp_pow_m_table2)[i] = b - a; | 625 | ((fixed32*)s->lsp_pow_m_table2)[i] = b - a; |
diff --git a/apps/codecs/sid.c b/apps/codecs/sid.c index 0edbabe0b6..46c4a5408f 100644 --- a/apps/codecs/sid.c +++ b/apps/codecs/sid.c | |||
@@ -270,7 +270,6 @@ static inline unsigned char get_bit(unsigned long val, unsigned char b) | |||
270 | 270 | ||
271 | static inline int GenerateDigi(int sIn) | 271 | static inline int GenerateDigi(int sIn) |
272 | { | 272 | { |
273 | static int last_sample = 0; | ||
274 | static int sample = 0; | 273 | static int sample = 0; |
275 | 274 | ||
276 | if (!sample_active) return(sIn); | 275 | if (!sample_active) return(sIn); |
@@ -283,9 +282,7 @@ static inline int GenerateDigi(int sIn) | |||
283 | 282 | ||
284 | if (fracPos > mixing_frequency) | 283 | if (fracPos > mixing_frequency) |
285 | { | 284 | { |
286 | fracPos%=mixing_frequency; | 285 | fracPos%=mixing_frequency; |
287 | |||
288 | last_sample = sample; | ||
289 | 286 | ||
290 | // N�hstes Samples holen | 287 | // N�hstes Samples holen |
291 | if (sample_order == 0) { | 288 | if (sample_order == 0) { |
diff --git a/apps/codecs/speex.c b/apps/codecs/speex.c index 0a81993605..c01bcfdf9c 100644 --- a/apps/codecs/speex.c +++ b/apps/codecs/speex.c | |||
@@ -396,7 +396,9 @@ enum codec_status codec_run(void) | |||
396 | int samplerate = ci->id3->frequency; | 396 | int samplerate = ci->id3->frequency; |
397 | int extra_headers = 0; | 397 | int extra_headers = 0; |
398 | int stream_init = 0; | 398 | int stream_init = 0; |
399 | /* rockbox: comment 'set but unused' variables | ||
399 | int page_nb_packets; | 400 | int page_nb_packets; |
401 | */ | ||
400 | int frame_size; | 402 | int frame_size; |
401 | int packet_count = 0; | 403 | int packet_count = 0; |
402 | int lookahead; | 404 | int lookahead; |
@@ -465,7 +467,7 @@ next_page: | |||
465 | spx_ogg_stream_pagein(&os, &og); | 467 | spx_ogg_stream_pagein(&os, &og); |
466 | 468 | ||
467 | page_granule = spx_ogg_page_granulepos(&og); | 469 | page_granule = spx_ogg_page_granulepos(&og); |
468 | page_nb_packets = spx_ogg_page_packets(&og); | 470 | /* page_nb_packets = spx_ogg_page_packets(&og); */ |
469 | 471 | ||
470 | cur_granule = page_granule; | 472 | cur_granule = page_granule; |
471 | 473 | ||
diff --git a/apps/codecs/wavpack.c b/apps/codecs/wavpack.c index ccb9f41190..32f09d53e4 100644 --- a/apps/codecs/wavpack.c +++ b/apps/codecs/wavpack.c | |||
@@ -51,7 +51,10 @@ enum codec_status codec_run(void) | |||
51 | { | 51 | { |
52 | WavpackContext *wpc; | 52 | WavpackContext *wpc; |
53 | char error [80]; | 53 | char error [80]; |
54 | int bps, nchans, sr_100; | 54 | /* rockbox: comment 'set but unused' variables |
55 | int bps; | ||
56 | */ | ||
57 | int nchans, sr_100; | ||
55 | intptr_t param; | 58 | intptr_t param; |
56 | 59 | ||
57 | if (codec_init()) | 60 | if (codec_init()) |
@@ -67,7 +70,7 @@ enum codec_status codec_run(void) | |||
67 | 70 | ||
68 | ci->configure(DSP_SWITCH_FREQUENCY, WavpackGetSampleRate (wpc)); | 71 | ci->configure(DSP_SWITCH_FREQUENCY, WavpackGetSampleRate (wpc)); |
69 | codec_set_replaygain(ci->id3); | 72 | codec_set_replaygain(ci->id3); |
70 | bps = WavpackGetBytesPerSample (wpc); | 73 | /* bps = WavpackGetBytesPerSample (wpc); */ |
71 | nchans = WavpackGetReducedChannels (wpc); | 74 | nchans = WavpackGetReducedChannels (wpc); |
72 | ci->configure(DSP_SET_STEREO_MODE, nchans == 2 ? STEREO_INTERLEAVED : STEREO_MONO); | 75 | ci->configure(DSP_SET_STEREO_MODE, nchans == 2 ? STEREO_INTERLEAVED : STEREO_MONO); |
73 | sr_100 = ci->id3->frequency / 100; | 76 | sr_100 = ci->id3->frequency / 100; |
diff --git a/apps/codecs/wmapro.c b/apps/codecs/wmapro.c index b6a8e47f25..d451810216 100644 --- a/apps/codecs/wmapro.c +++ b/apps/codecs/wmapro.c | |||
@@ -44,7 +44,6 @@ enum codec_status codec_run(void) | |||
44 | { | 44 | { |
45 | uint32_t elapsedtime; | 45 | uint32_t elapsedtime; |
46 | asf_waveformatex_t wfx; /* Holds the stream properties */ | 46 | asf_waveformatex_t wfx; /* Holds the stream properties */ |
47 | size_t resume_offset; | ||
48 | int res; /* Return values from asf_read_packet() and decode_packet() */ | 47 | int res; /* Return values from asf_read_packet() and decode_packet() */ |
49 | uint8_t* audiobuf; /* Pointer to the payload of one wma pro packet */ | 48 | uint8_t* audiobuf; /* Pointer to the payload of one wma pro packet */ |
50 | int audiobufsize; /* Payload size */ | 49 | int audiobufsize; /* Payload size */ |
@@ -55,9 +54,6 @@ enum codec_status codec_run(void) | |||
55 | int size; /* Size of the input frame to the decoder */ | 54 | int size; /* Size of the input frame to the decoder */ |
56 | intptr_t param; | 55 | intptr_t param; |
57 | 56 | ||
58 | /* Remember the resume position */ | ||
59 | resume_offset = ci->id3->offset; | ||
60 | |||
61 | restart_track: | 57 | restart_track: |
62 | if (codec_init()) { | 58 | if (codec_init()) { |
63 | LOGF("(WMA PRO) Error: Error initialising codec\n"); | 59 | LOGF("(WMA PRO) Error: Error initialising codec\n"); |
@@ -82,12 +78,11 @@ restart_track: | |||
82 | ci->seek_buffer(ci->id3->first_frame_offset); | 78 | ci->seek_buffer(ci->id3->first_frame_offset); |
83 | 79 | ||
84 | elapsedtime = 0; | 80 | elapsedtime = 0; |
85 | resume_offset = 0; | ||
86 | 81 | ||
87 | /* The main decoding loop */ | 82 | /* The main decoding loop */ |
88 | 83 | ||
89 | while (pktcnt < wfx.numpackets) | 84 | while (pktcnt < wfx.numpackets) |
90 | { | 85 | { |
91 | enum codec_command_action action = ci->get_command(¶m); | 86 | enum codec_command_action action = ci->get_command(¶m); |
92 | 87 | ||
93 | if (action == CODEC_ACTION_HALT) | 88 | if (action == CODEC_ACTION_HALT) |