diff options
Diffstat (limited to 'apps/codecs')
| -rw-r--r-- | apps/codecs/a52.c | 2 | ||||
| -rw-r--r-- | apps/codecs/aac.c | 4 | ||||
| -rw-r--r-- | apps/codecs/aiff.c | 2 | ||||
| -rw-r--r-- | apps/codecs/alac.c | 2 | ||||
| -rw-r--r-- | apps/codecs/flac.c | 2 | ||||
| -rw-r--r-- | apps/codecs/mpa.c | 2 | ||||
| -rw-r--r-- | apps/codecs/mpc.c | 2 | ||||
| -rw-r--r-- | apps/codecs/shorten.c | 2 | ||||
| -rw-r--r-- | apps/codecs/vorbis.c | 2 | ||||
| -rw-r--r-- | apps/codecs/wav.c | 2 | ||||
| -rw-r--r-- | apps/codecs/wavpack.c | 4 |
11 files changed, 13 insertions, 13 deletions
diff --git a/apps/codecs/a52.c b/apps/codecs/a52.c index 5a55d8b..8ad9d37 100644 --- a/apps/codecs/a52.c +++ b/apps/codecs/a52.c @@ -164,7 +164,7 @@ next_track: /* The main decoding loop */ samplesdone = 0; while (1) { - if (ci->stop_codec || ci->reload_codec) + if (ci->stop_codec || ci->new_track) break; if (ci->seek_time) { diff --git a/apps/codecs/aac.c b/apps/codecs/aac.c index ddaa07c..02d4606 100644 --- a/apps/codecs/aac.c +++ b/apps/codecs/aac.c @@ -68,7 +68,7 @@ enum codec_status codec_start(struct codec_api* api) ci->configure(DSP_SET_STEREO_MODE, (int *)STEREO_NONINTERLEAVED); ci->configure(DSP_SET_SAMPLE_DEPTH, (int *)(29)); - next_track: +next_track: if (codec_init(api)) { LOGF("FAAD: Error initialising codec\n"); @@ -122,7 +122,7 @@ enum codec_status codec_start(struct codec_api* api) /* The main decoding loop */ while (i < demux_res.num_sample_byte_sizes) { rb->yield(); - if (ci->stop_codec || ci->reload_codec) { + if (ci->stop_codec || ci->new_track) { break; } diff --git a/apps/codecs/aiff.c b/apps/codecs/aiff.c index 144f462..20d2dd3 100644 --- a/apps/codecs/aiff.c +++ b/apps/codecs/aiff.c @@ -219,7 +219,7 @@ next_track: while (!endofstream) { ci->yield(); - if (ci->stop_codec || ci->reload_codec) + if (ci->stop_codec || ci->new_track) break; if (ci->seek_time) { diff --git a/apps/codecs/alac.c b/apps/codecs/alac.c index 0db3c80..73f45fc 100644 --- a/apps/codecs/alac.c +++ b/apps/codecs/alac.c @@ -101,7 +101,7 @@ enum codec_status codec_start(struct codec_api* api) /* The main decoding loop */ while (i < demux_res.num_sample_byte_sizes) { rb->yield(); - if (ci->stop_codec || ci->reload_codec) { + if (ci->stop_codec || ci->new_track) { break; } diff --git a/apps/codecs/flac.c b/apps/codecs/flac.c index 2eec4da..cc2ce63 100644 --- a/apps/codecs/flac.c +++ b/apps/codecs/flac.c @@ -275,7 +275,7 @@ enum codec_status codec_start(struct codec_api* api) buf = ci->request_buffer(&bytesleft, MAX_FRAMESIZE); while (bytesleft) { ci->yield(); - if (ci->stop_codec || ci->reload_codec) { + if (ci->stop_codec || ci->new_track) { break; } diff --git a/apps/codecs/mpa.c b/apps/codecs/mpa.c index 787d669..7219095 100644 --- a/apps/codecs/mpa.c +++ b/apps/codecs/mpa.c @@ -155,7 +155,7 @@ enum codec_status codec_start(struct codec_api *api) int framelength; ci->yield(); - if (ci->stop_codec || ci->reload_codec) + if (ci->stop_codec || ci->new_track) break; if (ci->seek_time) { diff --git a/apps/codecs/mpc.c b/apps/codecs/mpc.c index 3d3a23e..4201b25 100644 --- a/apps/codecs/mpc.c +++ b/apps/codecs/mpc.c @@ -164,7 +164,7 @@ next_track: ci->seek_complete(); } #endif - if (ci->stop_codec || ci->reload_codec) + if (ci->stop_codec || ci->new_track) break; status = mpc_decoder_decode(&decoder, sample_buffer, NULL, NULL); diff --git a/apps/codecs/shorten.c b/apps/codecs/shorten.c index 2cfb4c9..03a0802 100644 --- a/apps/codecs/shorten.c +++ b/apps/codecs/shorten.c @@ -123,7 +123,7 @@ seek_start: buf = ci->request_buffer(&bytesleft, MAX_BUFFER_SIZE); while (bytesleft) { ci->yield(); - if (ci->stop_codec || ci->reload_codec) { + if (ci->stop_codec || ci->new_track) { break; } diff --git a/apps/codecs/vorbis.c b/apps/codecs/vorbis.c index fb50859..a9a2745 100644 --- a/apps/codecs/vorbis.c +++ b/apps/codecs/vorbis.c @@ -207,7 +207,7 @@ next_track: eof = 0; while (!eof) { rb->yield(); - if (rb->stop_codec || rb->reload_codec) + if (rb->stop_codec || rb->new_track) break; if (rb->seek_time) { diff --git a/apps/codecs/wav.c b/apps/codecs/wav.c index 70d4144..c89d121 100644 --- a/apps/codecs/wav.c +++ b/apps/codecs/wav.c @@ -432,7 +432,7 @@ next_track: while (!endofstream) { ci->yield(); - if (ci->stop_codec || ci->reload_codec) { + if (ci->stop_codec || ci->new_track) { break; } diff --git a/apps/codecs/wavpack.c b/apps/codecs/wavpack.c index febea1e..f864aa3 100644 --- a/apps/codecs/wavpack.c +++ b/apps/codecs/wavpack.c @@ -129,12 +129,12 @@ enum codec_status codec_start(struct codec_api* api) nsamples = WavpackUnpackSamples (wpc, temp_buffer, BUFFER_SIZE / nchans); - if (!nsamples || ci->stop_codec || ci->reload_codec) + if (!nsamples || ci->stop_codec || ci->new_track) break; ci->yield (); - if (ci->stop_codec || ci->reload_codec) + if (ci->stop_codec || ci->new_track) break; while (!ci->pcmbuf_insert ((char *) temp_buffer, nsamples * nchans * 4)) |