diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2013-05-05 00:48:40 -0400 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2013-05-05 00:48:40 -0400 |
commit | 3fd25dcbed6ef964b828698facf6cc15189441ca (patch) | |
tree | 80638257c551d1d8b063dca5a894f72603dfb0e9 /lib/rbcodec | |
parent | fd00d3cf4815e8a5bd5ec3df405e449b2bd0083a (diff) | |
download | rockbox-3fd25dcbed6ef964b828698facf6cc15189441ca.tar.gz rockbox-3fd25dcbed6ef964b828698facf6cc15189441ca.zip |
Purge the usage of DSP_SWITCH_FREQUENCY.
DSP_SWITCH_FREQUENCY has been deprecated and the same enumerated value
as DSP_SET_FREQUENCY since major DSP revisions were committed. This
task should have been performed much earlier but, oh well, do it now.
Change-Id: I3f30d651b894136a07c7e17f78fc16a7d98631ff
Diffstat (limited to 'lib/rbcodec')
-rw-r--r-- | lib/rbcodec/codecs/a52.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/a52_rm.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/aac.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/adx.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/aiff.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/alac.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/ape.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/au.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/flac.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/mpa.c | 4 | ||||
-rw-r--r-- | lib/rbcodec/codecs/mpc.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/raac.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/shorten.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/sid.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/smaf.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/tta.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/vorbis.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/vox.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/wav.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/wav64.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/wavpack.c | 2 | ||||
-rwxr-xr-x | lib/rbcodec/codecs/wma.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/wmapro.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/wmavoice.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/dsp/dsp_core.h | 1 | ||||
-rw-r--r-- | lib/rbcodec/test/warble.c | 2 |
26 files changed, 26 insertions, 27 deletions
diff --git a/lib/rbcodec/codecs/a52.c b/lib/rbcodec/codecs/a52.c index cb6e66dd05..77caaf87c1 100644 --- a/lib/rbcodec/codecs/a52.c +++ b/lib/rbcodec/codecs/a52.c | |||
@@ -142,7 +142,7 @@ enum codec_status codec_run(void) | |||
142 | if (codec_init()) | 142 | if (codec_init()) |
143 | return CODEC_ERROR; | 143 | return CODEC_ERROR; |
144 | 144 | ||
145 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); | 145 | ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency); |
146 | codec_set_replaygain(ci->id3); | 146 | codec_set_replaygain(ci->id3); |
147 | 147 | ||
148 | /* Intialise the A52 decoder and check for success */ | 148 | /* Intialise the A52 decoder and check for success */ |
diff --git a/lib/rbcodec/codecs/a52_rm.c b/lib/rbcodec/codecs/a52_rm.c index 2db126f5b1..42868437d8 100644 --- a/lib/rbcodec/codecs/a52_rm.c +++ b/lib/rbcodec/codecs/a52_rm.c | |||
@@ -157,7 +157,7 @@ enum codec_status codec_run(void) | |||
157 | 157 | ||
158 | resume_offset = ci->id3->offset; | 158 | resume_offset = ci->id3->offset; |
159 | 159 | ||
160 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); | 160 | ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency); |
161 | codec_set_replaygain(ci->id3); | 161 | codec_set_replaygain(ci->id3); |
162 | 162 | ||
163 | ci->seek_buffer(ci->id3->first_frame_offset); | 163 | ci->seek_buffer(ci->id3->first_frame_offset); |
diff --git a/lib/rbcodec/codecs/aac.c b/lib/rbcodec/codecs/aac.c index 365dca804d..c9cf737b48 100644 --- a/lib/rbcodec/codecs/aac.c +++ b/lib/rbcodec/codecs/aac.c | |||
@@ -84,7 +84,7 @@ enum codec_status codec_run(void) | |||
84 | 84 | ||
85 | file_offset = ci->id3->offset; | 85 | file_offset = ci->id3->offset; |
86 | 86 | ||
87 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); | 87 | ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency); |
88 | codec_set_replaygain(ci->id3); | 88 | codec_set_replaygain(ci->id3); |
89 | 89 | ||
90 | stream_create(&input_stream,ci); | 90 | stream_create(&input_stream,ci); |
diff --git a/lib/rbcodec/codecs/adx.c b/lib/rbcodec/codecs/adx.c index 83ced5add0..8a56320787 100644 --- a/lib/rbcodec/codecs/adx.c +++ b/lib/rbcodec/codecs/adx.c | |||
@@ -218,7 +218,7 @@ enum codec_status codec_run(void) | |||
218 | ci->set_elapsed(0); | 218 | ci->set_elapsed(0); |
219 | 219 | ||
220 | /* setup pcm buffer format */ | 220 | /* setup pcm buffer format */ |
221 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); | 221 | ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency); |
222 | if (channels == 2) { | 222 | if (channels == 2) { |
223 | ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); | 223 | ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); |
224 | } else if (channels == 1) { | 224 | } else if (channels == 1) { |
diff --git a/lib/rbcodec/codecs/aiff.c b/lib/rbcodec/codecs/aiff.c index 333bcd0455..3bedfa5760 100644 --- a/lib/rbcodec/codecs/aiff.c +++ b/lib/rbcodec/codecs/aiff.c | |||
@@ -234,7 +234,7 @@ enum codec_status codec_run(void) | |||
234 | return CODEC_ERROR; | 234 | return CODEC_ERROR; |
235 | } | 235 | } |
236 | 236 | ||
237 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); | 237 | ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency); |
238 | 238 | ||
239 | if (format.channels == 2) { | 239 | if (format.channels == 2) { |
240 | ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); | 240 | ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); |
diff --git a/lib/rbcodec/codecs/alac.c b/lib/rbcodec/codecs/alac.c index 144d796e5f..5eb6e001f7 100644 --- a/lib/rbcodec/codecs/alac.c +++ b/lib/rbcodec/codecs/alac.c | |||
@@ -64,7 +64,7 @@ enum codec_status codec_run(void) | |||
64 | return CODEC_ERROR; | 64 | return CODEC_ERROR; |
65 | } | 65 | } |
66 | 66 | ||
67 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); | 67 | ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency); |
68 | codec_set_replaygain(ci->id3); | 68 | codec_set_replaygain(ci->id3); |
69 | 69 | ||
70 | ci->seek_buffer(0); | 70 | ci->seek_buffer(0); |
diff --git a/lib/rbcodec/codecs/ape.c b/lib/rbcodec/codecs/ape.c index ed6ea21685..577e7b65e2 100644 --- a/lib/rbcodec/codecs/ape.c +++ b/lib/rbcodec/codecs/ape.c | |||
@@ -200,7 +200,7 @@ enum codec_status codec_run(void) | |||
200 | (ape_ctx.seektablefilepos + | 200 | (ape_ctx.seektablefilepos + |
201 | ape_ctx.numseekpoints * sizeof(uint32_t))); | 201 | ape_ctx.numseekpoints * sizeof(uint32_t))); |
202 | 202 | ||
203 | ci->configure(DSP_SWITCH_FREQUENCY, ape_ctx.samplerate); | 203 | ci->configure(DSP_SET_FREQUENCY, ape_ctx.samplerate); |
204 | ci->configure(DSP_SET_STEREO_MODE, ape_ctx.channels == 1 ? | 204 | ci->configure(DSP_SET_STEREO_MODE, ape_ctx.channels == 1 ? |
205 | STEREO_MONO : STEREO_NONINTERLEAVED); | 205 | STEREO_MONO : STEREO_NONINTERLEAVED); |
206 | codec_set_replaygain(ci->id3); | 206 | codec_set_replaygain(ci->id3); |
diff --git a/lib/rbcodec/codecs/au.c b/lib/rbcodec/codecs/au.c index cb75c7423d..7ae7fe3e94 100644 --- a/lib/rbcodec/codecs/au.c +++ b/lib/rbcodec/codecs/au.c | |||
@@ -225,7 +225,7 @@ enum codec_status codec_run(void) | |||
225 | return CODEC_ERROR; | 225 | return CODEC_ERROR; |
226 | } | 226 | } |
227 | 227 | ||
228 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); | 228 | ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency); |
229 | if (format.channels == 2) { | 229 | if (format.channels == 2) { |
230 | ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); | 230 | ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); |
231 | } else if (format.channels == 1) { | 231 | } else if (format.channels == 1) { |
diff --git a/lib/rbcodec/codecs/flac.c b/lib/rbcodec/codecs/flac.c index e8588d3c95..3c5545df08 100644 --- a/lib/rbcodec/codecs/flac.c +++ b/lib/rbcodec/codecs/flac.c | |||
@@ -476,7 +476,7 @@ enum codec_status codec_run(void) | |||
476 | return CODEC_ERROR; | 476 | return CODEC_ERROR; |
477 | } | 477 | } |
478 | 478 | ||
479 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); | 479 | ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency); |
480 | ci->configure(DSP_SET_STEREO_MODE, fc.channels == 1 ? | 480 | ci->configure(DSP_SET_STEREO_MODE, fc.channels == 1 ? |
481 | STEREO_MONO : STEREO_NONINTERLEAVED); | 481 | STEREO_MONO : STEREO_NONINTERLEAVED); |
482 | codec_set_replaygain(ci->id3); | 482 | codec_set_replaygain(ci->id3); |
diff --git a/lib/rbcodec/codecs/mpa.c b/lib/rbcodec/codecs/mpa.c index f9bf7e600f..07db248099 100644 --- a/lib/rbcodec/codecs/mpa.c +++ b/lib/rbcodec/codecs/mpa.c | |||
@@ -342,7 +342,7 @@ enum codec_status codec_run(void) | |||
342 | 342 | ||
343 | file_end = 0; | 343 | file_end = 0; |
344 | 344 | ||
345 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); | 345 | ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency); |
346 | current_frequency = ci->id3->frequency; | 346 | current_frequency = ci->id3->frequency; |
347 | codec_set_replaygain(ci->id3); | 347 | codec_set_replaygain(ci->id3); |
348 | 348 | ||
@@ -475,7 +475,7 @@ enum codec_status codec_run(void) | |||
475 | /* Check if sample rate and stereo settings changed in this frame. */ | 475 | /* Check if sample rate and stereo settings changed in this frame. */ |
476 | if (frame.header.samplerate != current_frequency) { | 476 | if (frame.header.samplerate != current_frequency) { |
477 | current_frequency = frame.header.samplerate; | 477 | current_frequency = frame.header.samplerate; |
478 | ci->configure(DSP_SWITCH_FREQUENCY, current_frequency); | 478 | ci->configure(DSP_SET_FREQUENCY, current_frequency); |
479 | } | 479 | } |
480 | if (MAD_NCHANNELS(&frame.header) == 2) { | 480 | if (MAD_NCHANNELS(&frame.header) == 2) { |
481 | if (current_stereo_mode != STEREO_NONINTERLEAVED) { | 481 | if (current_stereo_mode != STEREO_NONINTERLEAVED) { |
diff --git a/lib/rbcodec/codecs/mpc.c b/lib/rbcodec/codecs/mpc.c index b2628f988e..9db40242dc 100644 --- a/lib/rbcodec/codecs/mpc.c +++ b/lib/rbcodec/codecs/mpc.c | |||
@@ -102,7 +102,7 @@ enum codec_status codec_run(void) | |||
102 | 102 | ||
103 | byterate = (mpc_uint32_t)(info.average_bitrate) / 8; | 103 | byterate = (mpc_uint32_t)(info.average_bitrate) / 8; |
104 | frequency = info.sample_freq / 100; /* 0.1 kHz accuracy */ | 104 | frequency = info.sample_freq / 100; /* 0.1 kHz accuracy */ |
105 | ci->configure(DSP_SWITCH_FREQUENCY, info.sample_freq); | 105 | ci->configure(DSP_SET_FREQUENCY, info.sample_freq); |
106 | 106 | ||
107 | /* Remark: rockbox offset is the file offset in bytes. So, estimate the | 107 | /* Remark: rockbox offset is the file offset in bytes. So, estimate the |
108 | * sample seek position from the file offset, the sampling frequency and | 108 | * sample seek position from the file offset, the sampling frequency and |
diff --git a/lib/rbcodec/codecs/raac.c b/lib/rbcodec/codecs/raac.c index 0ef7e715bc..523560b63e 100644 --- a/lib/rbcodec/codecs/raac.c +++ b/lib/rbcodec/codecs/raac.c | |||
@@ -79,7 +79,7 @@ enum codec_status codec_run(void) | |||
79 | ci->seek_buffer(0); | 79 | ci->seek_buffer(0); |
80 | 80 | ||
81 | init_rm(&rmctx); | 81 | init_rm(&rmctx); |
82 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); | 82 | ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency); |
83 | codec_set_replaygain(ci->id3); | 83 | codec_set_replaygain(ci->id3); |
84 | 84 | ||
85 | /* initialise the sound converter */ | 85 | /* initialise the sound converter */ |
diff --git a/lib/rbcodec/codecs/shorten.c b/lib/rbcodec/codecs/shorten.c index a8ab3f30a0..aa4acdad4a 100644 --- a/lib/rbcodec/codecs/shorten.c +++ b/lib/rbcodec/codecs/shorten.c | |||
@@ -82,7 +82,7 @@ enum codec_status codec_run(void) | |||
82 | } | 82 | } |
83 | 83 | ||
84 | ci->id3->frequency = sc.sample_rate; | 84 | ci->id3->frequency = sc.sample_rate; |
85 | ci->configure(DSP_SWITCH_FREQUENCY, sc.sample_rate); | 85 | ci->configure(DSP_SET_FREQUENCY, sc.sample_rate); |
86 | 86 | ||
87 | if (sc.sample_rate) { | 87 | if (sc.sample_rate) { |
88 | ci->id3->length = (sc.totalsamples / sc.sample_rate) * 1000; | 88 | ci->id3->length = (sc.totalsamples / sc.sample_rate) * 1000; |
diff --git a/lib/rbcodec/codecs/sid.c b/lib/rbcodec/codecs/sid.c index 9b19a20ba7..1a6d04155d 100644 --- a/lib/rbcodec/codecs/sid.c +++ b/lib/rbcodec/codecs/sid.c | |||
@@ -1235,7 +1235,7 @@ enum codec_status codec_main(enum codec_entry_call_reason reason) | |||
1235 | { | 1235 | { |
1236 | if (reason == CODEC_LOAD) { | 1236 | if (reason == CODEC_LOAD) { |
1237 | /* Make use of 44.1khz */ | 1237 | /* Make use of 44.1khz */ |
1238 | ci->configure(DSP_SWITCH_FREQUENCY, SAMPLE_RATE); | 1238 | ci->configure(DSP_SET_FREQUENCY, SAMPLE_RATE); |
1239 | /* Sample depth is 28 bit host endian */ | 1239 | /* Sample depth is 28 bit host endian */ |
1240 | ci->configure(DSP_SET_SAMPLE_DEPTH, 28); | 1240 | ci->configure(DSP_SET_SAMPLE_DEPTH, 28); |
1241 | /* Mono output */ | 1241 | /* Mono output */ |
diff --git a/lib/rbcodec/codecs/smaf.c b/lib/rbcodec/codecs/smaf.c index 0203d1b4e3..d56aa0a860 100644 --- a/lib/rbcodec/codecs/smaf.c +++ b/lib/rbcodec/codecs/smaf.c | |||
@@ -394,7 +394,7 @@ enum codec_status codec_run(void) | |||
394 | return CODEC_ERROR; | 394 | return CODEC_ERROR; |
395 | } | 395 | } |
396 | 396 | ||
397 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); | 397 | ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency); |
398 | 398 | ||
399 | if (format.channels == 2) { | 399 | if (format.channels == 2) { |
400 | ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); | 400 | ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); |
diff --git a/lib/rbcodec/codecs/tta.c b/lib/rbcodec/codecs/tta.c index dda33b3f5e..564496a14e 100644 --- a/lib/rbcodec/codecs/tta.c +++ b/lib/rbcodec/codecs/tta.c | |||
@@ -67,7 +67,7 @@ enum codec_status codec_run(void) | |||
67 | 67 | ||
68 | codec_set_replaygain(ci->id3); | 68 | codec_set_replaygain(ci->id3); |
69 | 69 | ||
70 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); | 70 | ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency); |
71 | if (info.NCH == 2) { | 71 | if (info.NCH == 2) { |
72 | ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); | 72 | ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); |
73 | } else if (info.NCH == 1) { | 73 | } else if (info.NCH == 1) { |
diff --git a/lib/rbcodec/codecs/vorbis.c b/lib/rbcodec/codecs/vorbis.c index 944dd6d60c..c09d2cea6d 100644 --- a/lib/rbcodec/codecs/vorbis.c +++ b/lib/rbcodec/codecs/vorbis.c | |||
@@ -91,7 +91,7 @@ static bool vorbis_set_codec_parameters(OggVorbis_File *vf) | |||
91 | return false; | 91 | return false; |
92 | } | 92 | } |
93 | 93 | ||
94 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); | 94 | ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency); |
95 | codec_set_replaygain(ci->id3); | 95 | codec_set_replaygain(ci->id3); |
96 | 96 | ||
97 | if (vi->channels == 2) { | 97 | if (vi->channels == 2) { |
diff --git a/lib/rbcodec/codecs/vox.c b/lib/rbcodec/codecs/vox.c index 279d003162..66979e2911 100644 --- a/lib/rbcodec/codecs/vox.c +++ b/lib/rbcodec/codecs/vox.c | |||
@@ -119,7 +119,7 @@ enum codec_status codec_run(void) | |||
119 | return CODEC_ERROR; | 119 | return CODEC_ERROR; |
120 | } | 120 | } |
121 | 121 | ||
122 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); | 122 | ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency); |
123 | ci->configure(DSP_SET_STEREO_MODE, STEREO_MONO); | 123 | ci->configure(DSP_SET_STEREO_MODE, STEREO_MONO); |
124 | 124 | ||
125 | /* make sure we're at the correct offset */ | 125 | /* make sure we're at the correct offset */ |
diff --git a/lib/rbcodec/codecs/wav.c b/lib/rbcodec/codecs/wav.c index d20331bc6c..cc65ab83b2 100644 --- a/lib/rbcodec/codecs/wav.c +++ b/lib/rbcodec/codecs/wav.c | |||
@@ -350,7 +350,7 @@ enum codec_status codec_run(void) | |||
350 | return CODEC_ERROR; | 350 | return CODEC_ERROR; |
351 | } | 351 | } |
352 | 352 | ||
353 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); | 353 | ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency); |
354 | if (format.channels == 2) { | 354 | if (format.channels == 2) { |
355 | ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); | 355 | ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); |
356 | } else if (format.channels == 1) { | 356 | } else if (format.channels == 1) { |
diff --git a/lib/rbcodec/codecs/wav64.c b/lib/rbcodec/codecs/wav64.c index 184f39bf18..9b3b2d38e4 100644 --- a/lib/rbcodec/codecs/wav64.c +++ b/lib/rbcodec/codecs/wav64.c | |||
@@ -352,7 +352,7 @@ enum codec_status codec_run(void) | |||
352 | return CODEC_ERROR; | 352 | return CODEC_ERROR; |
353 | } | 353 | } |
354 | 354 | ||
355 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); | 355 | ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency); |
356 | if (format.channels == 2) { | 356 | if (format.channels == 2) { |
357 | ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); | 357 | ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); |
358 | } else if (format.channels == 1) { | 358 | } else if (format.channels == 1) { |
diff --git a/lib/rbcodec/codecs/wavpack.c b/lib/rbcodec/codecs/wavpack.c index 4d42391fc1..c0cdafabac 100644 --- a/lib/rbcodec/codecs/wavpack.c +++ b/lib/rbcodec/codecs/wavpack.c | |||
@@ -68,7 +68,7 @@ enum codec_status codec_run(void) | |||
68 | if (!wpc) | 68 | if (!wpc) |
69 | return CODEC_ERROR; | 69 | return CODEC_ERROR; |
70 | 70 | ||
71 | ci->configure(DSP_SWITCH_FREQUENCY, WavpackGetSampleRate (wpc)); | 71 | ci->configure(DSP_SET_FREQUENCY, WavpackGetSampleRate (wpc)); |
72 | codec_set_replaygain(ci->id3); | 72 | codec_set_replaygain(ci->id3); |
73 | /* bps = WavpackGetBytesPerSample (wpc); */ | 73 | /* bps = WavpackGetBytesPerSample (wpc); */ |
74 | nchans = WavpackGetReducedChannels (wpc); | 74 | nchans = WavpackGetReducedChannels (wpc); |
diff --git a/lib/rbcodec/codecs/wma.c b/lib/rbcodec/codecs/wma.c index 36e4285916..9039f81429 100755 --- a/lib/rbcodec/codecs/wma.c +++ b/lib/rbcodec/codecs/wma.c | |||
@@ -96,7 +96,7 @@ restart_track: | |||
96 | ci->set_elapsed(elapsedtime); | 96 | ci->set_elapsed(elapsedtime); |
97 | 97 | ||
98 | resume_offset = 0; | 98 | resume_offset = 0; |
99 | ci->configure(DSP_SWITCH_FREQUENCY, wfx.rate); | 99 | ci->configure(DSP_SET_FREQUENCY, wfx.rate); |
100 | ci->configure(DSP_SET_STEREO_MODE, wfx.channels == 1 ? | 100 | ci->configure(DSP_SET_STEREO_MODE, wfx.channels == 1 ? |
101 | STEREO_MONO : STEREO_NONINTERLEAVED); | 101 | STEREO_MONO : STEREO_NONINTERLEAVED); |
102 | codec_set_replaygain(ci->id3); | 102 | codec_set_replaygain(ci->id3); |
diff --git a/lib/rbcodec/codecs/wmapro.c b/lib/rbcodec/codecs/wmapro.c index bab3b5a027..d99ca1aa9e 100644 --- a/lib/rbcodec/codecs/wmapro.c +++ b/lib/rbcodec/codecs/wmapro.c | |||
@@ -65,7 +65,7 @@ restart_track: | |||
65 | saves us from parsing it again here. */ | 65 | saves us from parsing it again here. */ |
66 | memcpy(&wfx, ci->id3->toc, sizeof(wfx)); | 66 | memcpy(&wfx, ci->id3->toc, sizeof(wfx)); |
67 | 67 | ||
68 | ci->configure(DSP_SWITCH_FREQUENCY, wfx.rate); | 68 | ci->configure(DSP_SET_FREQUENCY, wfx.rate); |
69 | ci->configure(DSP_SET_STEREO_MODE, wfx.channels == 1 ? | 69 | ci->configure(DSP_SET_STEREO_MODE, wfx.channels == 1 ? |
70 | STEREO_MONO : STEREO_NONINTERLEAVED); | 70 | STEREO_MONO : STEREO_NONINTERLEAVED); |
71 | codec_set_replaygain(ci->id3); | 71 | codec_set_replaygain(ci->id3); |
diff --git a/lib/rbcodec/codecs/wmavoice.c b/lib/rbcodec/codecs/wmavoice.c index 9cf5a49f1a..214e0737e7 100644 --- a/lib/rbcodec/codecs/wmavoice.c +++ b/lib/rbcodec/codecs/wmavoice.c | |||
@@ -90,7 +90,7 @@ restart_track: | |||
90 | memset(&avctx, 0, sizeof(AVCodecContext)); | 90 | memset(&avctx, 0, sizeof(AVCodecContext)); |
91 | memset(&avpkt, 0, sizeof(AVPacket)); | 91 | memset(&avpkt, 0, sizeof(AVPacket)); |
92 | 92 | ||
93 | ci->configure(DSP_SWITCH_FREQUENCY, wfx.rate); | 93 | ci->configure(DSP_SET_FREQUENCY, wfx.rate); |
94 | ci->configure(DSP_SET_STEREO_MODE, wfx.channels == 1 ? | 94 | ci->configure(DSP_SET_STEREO_MODE, wfx.channels == 1 ? |
95 | STEREO_MONO : STEREO_INTERLEAVED); | 95 | STEREO_MONO : STEREO_INTERLEAVED); |
96 | codec_set_replaygain(ci->id3); | 96 | codec_set_replaygain(ci->id3); |
diff --git a/lib/rbcodec/dsp/dsp_core.h b/lib/rbcodec/dsp/dsp_core.h index 713190debc..d3cfdd133c 100644 --- a/lib/rbcodec/dsp/dsp_core.h +++ b/lib/rbcodec/dsp/dsp_core.h | |||
@@ -35,7 +35,6 @@ enum dsp_settings | |||
35 | DSP_INIT, /* For dsp_init */ | 35 | DSP_INIT, /* For dsp_init */ |
36 | DSP_RESET, | 36 | DSP_RESET, |
37 | DSP_SET_FREQUENCY, | 37 | DSP_SET_FREQUENCY, |
38 | DSP_SWITCH_FREQUENCY = DSP_SET_FREQUENCY, /* deprecated */ | ||
39 | DSP_SET_SAMPLE_DEPTH, | 38 | DSP_SET_SAMPLE_DEPTH, |
40 | DSP_SET_STEREO_MODE, | 39 | DSP_SET_STEREO_MODE, |
41 | DSP_FLUSH, | 40 | DSP_FLUSH, |
diff --git a/lib/rbcodec/test/warble.c b/lib/rbcodec/test/warble.c index 93fe286f2d..6aabf95d17 100644 --- a/lib/rbcodec/test/warble.c +++ b/lib/rbcodec/test/warble.c | |||
@@ -577,7 +577,7 @@ static void ci_configure(int setting, intptr_t value) | |||
577 | dsp_configure(ci.dsp, setting, value); | 577 | dsp_configure(ci.dsp, setting, value); |
578 | } else { | 578 | } else { |
579 | if (setting == DSP_SET_FREQUENCY | 579 | if (setting == DSP_SET_FREQUENCY |
580 | || setting == DSP_SWITCH_FREQUENCY) | 580 | || setting == DSP_SET_FREQUENCY) |
581 | format.freq = value; | 581 | format.freq = value; |
582 | else if (setting == DSP_SET_SAMPLE_DEPTH) | 582 | else if (setting == DSP_SET_SAMPLE_DEPTH) |
583 | format.depth = value; | 583 | format.depth = value; |