diff options
author | Nils Wallménius <nils@rockbox.org> | 2012-05-08 16:34:26 +0200 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2012-05-09 14:32:38 +0200 |
commit | d29a11b7a8f4ce230e9385a44f352a559bde753f (patch) | |
tree | 6fb4dc1699be894e5495dd862941606442239bfc /lib | |
parent | d26a35d10b9e2f808b0e4880d5b5d1a2963258e9 (diff) | |
download | rockbox-d29a11b7a8f4ce230e9385a44f352a559bde753f.tar.gz rockbox-d29a11b7a8f4ce230e9385a44f352a559bde753f.zip |
Rename HAVE_PITCHSCREEN to HAVE_PITCHCONTROL
Also move the definition to config.h
Change-Id: I36bb5020c5e06b2344292bc05e8c13ccc7a6a1ff
Reviewed-on: http://gerrit.rockbox.org/234
Reviewed-by: Nils Wallménius <nils@rockbox.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/rbcodec/SOURCES | 2 | ||||
-rw-r--r-- | lib/rbcodec/dsp/dsp_misc.c | 8 | ||||
-rw-r--r-- | lib/rbcodec/dsp/dsp_misc.h | 4 | ||||
-rw-r--r-- | lib/rbcodec/dsp/dsp_proc_database.h | 2 | ||||
-rw-r--r-- | lib/rbcodec/dsp/dsp_proc_settings.h | 2 | ||||
-rw-r--r-- | lib/rbcodec/rbcodecconfig-example.h | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/lib/rbcodec/SOURCES b/lib/rbcodec/SOURCES index c293f3c028..2762636b43 100644 --- a/lib/rbcodec/SOURCES +++ b/lib/rbcodec/SOURCES | |||
@@ -14,7 +14,7 @@ dsp/dsp_sample_output.c | |||
14 | dsp/eq.c | 14 | dsp/eq.c |
15 | dsp/lin_resample.c | 15 | dsp/lin_resample.c |
16 | dsp/pga.c | 16 | dsp/pga.c |
17 | # ifdef HAVE_PITCHSCREEN | 17 | # ifdef HAVE_PITCHCONTROL |
18 | dsp/tdspeed.c | 18 | dsp/tdspeed.c |
19 | # endif | 19 | # endif |
20 | # ifdef HAVE_SW_TONE_CONTROLS | 20 | # ifdef HAVE_SW_TONE_CONTROLS |
diff --git a/lib/rbcodec/dsp/dsp_misc.c b/lib/rbcodec/dsp/dsp_misc.c index c87a1d528e..1083215c17 100644 --- a/lib/rbcodec/dsp/dsp_misc.c +++ b/lib/rbcodec/dsp/dsp_misc.c | |||
@@ -158,7 +158,7 @@ void dsp_replaygain_set_settings(const struct replaygain_settings *settings) | |||
158 | 158 | ||
159 | /** Pitch Settings **/ | 159 | /** Pitch Settings **/ |
160 | 160 | ||
161 | #ifdef HAVE_PITCHSCREEN | 161 | #ifdef HAVE_PITCHCONTROL |
162 | static int32_t pitch_ratio = PITCH_SPEED_100; | 162 | static int32_t pitch_ratio = PITCH_SPEED_100; |
163 | 163 | ||
164 | static void dsp_pitch_update(struct dsp_config *dsp) | 164 | static void dsp_pitch_update(struct dsp_config *dsp) |
@@ -183,7 +183,7 @@ void sound_set_pitch(int32_t percent) | |||
183 | struct sample_io_data *data = (void *)dsp; | 183 | struct sample_io_data *data = (void *)dsp; |
184 | dsp_configure(dsp, DSP_SWITCH_FREQUENCY, data->format.codec_frequency); | 184 | dsp_configure(dsp, DSP_SWITCH_FREQUENCY, data->format.codec_frequency); |
185 | } | 185 | } |
186 | #endif /* HAVE_PITCHSCREEN */ | 186 | #endif /* HAVE_PITCHCONTROL */ |
187 | 187 | ||
188 | /* This is a null-processing stage that monitors as an enabled stage but never | 188 | /* This is a null-processing stage that monitors as an enabled stage but never |
189 | * becomes active in processing samples. It only hooks messages. */ | 189 | * becomes active in processing samples. It only hooks messages. */ |
@@ -208,7 +208,7 @@ static intptr_t misc_handler_configure(struct dsp_proc_entry *this, | |||
208 | break; | 208 | break; |
209 | 209 | ||
210 | case DSP_RESET: | 210 | case DSP_RESET: |
211 | #ifdef HAVE_PITCHSCREEN | 211 | #ifdef HAVE_PITCHCONTROL |
212 | dsp_pitch_update(dsp); | 212 | dsp_pitch_update(dsp); |
213 | #endif | 213 | #endif |
214 | value = (intptr_t)NULL; /* Default gains */ | 214 | value = (intptr_t)NULL; /* Default gains */ |
@@ -216,7 +216,7 @@ static intptr_t misc_handler_configure(struct dsp_proc_entry *this, | |||
216 | dsp_replaygain_set_gains((void *)value); | 216 | dsp_replaygain_set_gains((void *)value); |
217 | break; | 217 | break; |
218 | 218 | ||
219 | #ifdef HAVE_PITCHSCREEN | 219 | #ifdef HAVE_PITCHCONTROL |
220 | case DSP_SET_FREQUENCY: | 220 | case DSP_SET_FREQUENCY: |
221 | dsp_pitch_update(dsp); | 221 | dsp_pitch_update(dsp); |
222 | break; | 222 | break; |
diff --git a/lib/rbcodec/dsp/dsp_misc.h b/lib/rbcodec/dsp/dsp_misc.h index 1c84fd5a11..d658374eaf 100644 --- a/lib/rbcodec/dsp/dsp_misc.h +++ b/lib/rbcodec/dsp/dsp_misc.h | |||
@@ -54,10 +54,10 @@ struct dsp_replay_gains | |||
54 | 54 | ||
55 | void dsp_replaygain_set_settings(const struct replaygain_settings *settings); | 55 | void dsp_replaygain_set_settings(const struct replaygain_settings *settings); |
56 | 56 | ||
57 | #ifdef HAVE_PITCHSCREEN | 57 | #ifdef HAVE_PITCHCONTROL |
58 | void sound_set_pitch(int32_t ratio); | 58 | void sound_set_pitch(int32_t ratio); |
59 | int32_t sound_get_pitch(void); | 59 | int32_t sound_get_pitch(void); |
60 | #endif /* HAVE_PITCHSCREEN */ | 60 | #endif /* HAVE_PITCHCONTROL */ |
61 | 61 | ||
62 | /* Callback for firmware layers to interface */ | 62 | /* Callback for firmware layers to interface */ |
63 | int dsp_callback(int msg, intptr_t param); | 63 | int dsp_callback(int msg, intptr_t param); |
diff --git a/lib/rbcodec/dsp/dsp_proc_database.h b/lib/rbcodec/dsp/dsp_proc_database.h index 55f10e684b..c4c93ef2d9 100644 --- a/lib/rbcodec/dsp/dsp_proc_database.h +++ b/lib/rbcodec/dsp/dsp_proc_database.h | |||
@@ -37,7 +37,7 @@ | |||
37 | DSP_PROC_DB_START | 37 | DSP_PROC_DB_START |
38 | DSP_PROC_DB_ITEM(MISC_HANDLER) /* misc stuff (null stage) */ | 38 | DSP_PROC_DB_ITEM(MISC_HANDLER) /* misc stuff (null stage) */ |
39 | DSP_PROC_DB_ITEM(PGA) /* pre-gain amp */ | 39 | DSP_PROC_DB_ITEM(PGA) /* pre-gain amp */ |
40 | #ifdef HAVE_PITCHSCREEN | 40 | #ifdef HAVE_PITCHCONTROL |
41 | DSP_PROC_DB_ITEM(TIMESTRETCH) /* time-stretching */ | 41 | DSP_PROC_DB_ITEM(TIMESTRETCH) /* time-stretching */ |
42 | #endif | 42 | #endif |
43 | DSP_PROC_DB_ITEM(RESAMPLE) /* resampler providing NATIVE_FREQUENCY */ | 43 | DSP_PROC_DB_ITEM(RESAMPLE) /* resampler providing NATIVE_FREQUENCY */ |
diff --git a/lib/rbcodec/dsp/dsp_proc_settings.h b/lib/rbcodec/dsp/dsp_proc_settings.h index 10bc671b72..26f603b8b1 100644 --- a/lib/rbcodec/dsp/dsp_proc_settings.h +++ b/lib/rbcodec/dsp/dsp_proc_settings.h | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "dsp_misc.h" | 28 | #include "dsp_misc.h" |
29 | #include "eq.h" | 29 | #include "eq.h" |
30 | #include "pga.h" | 30 | #include "pga.h" |
31 | #ifdef HAVE_PITCHSCREEN | 31 | #ifdef HAVE_PITCHCONTROL |
32 | #include "tdspeed.h" | 32 | #include "tdspeed.h" |
33 | #endif | 33 | #endif |
34 | #ifdef HAVE_SW_TONE_CONTROLS | 34 | #ifdef HAVE_SW_TONE_CONTROLS |
diff --git a/lib/rbcodec/rbcodecconfig-example.h b/lib/rbcodec/rbcodecconfig-example.h index ad0f296a23..2e14f53202 100644 --- a/lib/rbcodec/rbcodecconfig-example.h +++ b/lib/rbcodec/rbcodecconfig-example.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef RBCODECCONFIG_H_INCLUDED | 1 | #ifndef RBCODECCONFIG_H_INCLUDED |
2 | #define RBCODECCONFIG_H_INCLUDED | 2 | #define RBCODECCONFIG_H_INCLUDED |
3 | 3 | ||
4 | #define HAVE_PITCHSCREEN | 4 | #define HAVE_PITCHCONTROL |
5 | //#define HAVE_SW_VOLUME_CONTROL | 5 | //#define HAVE_SW_VOLUME_CONTROL |
6 | #define HAVE_SW_TONE_CONTROLS | 6 | #define HAVE_SW_TONE_CONTROLS |
7 | #define HAVE_ALBUMART | 7 | #define HAVE_ALBUMART |