From d29a11b7a8f4ce230e9385a44f352a559bde753f Mon Sep 17 00:00:00 2001
From: Nils Wallménius <nils@rockbox.org>
Date: Tue, 8 May 2012 16:34:26 +0200
Subject: Rename HAVE_PITCHSCREEN to HAVE_PITCHCONTROL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 lib/rbcodec/dsp/dsp_misc.c          | 8 ++++----
 lib/rbcodec/dsp/dsp_misc.h          | 4 ++--
 lib/rbcodec/dsp/dsp_proc_database.h | 2 +-
 lib/rbcodec/dsp/dsp_proc_settings.h | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib/rbcodec/dsp')

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)
 
 /** Pitch Settings **/
 
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
 static int32_t pitch_ratio = PITCH_SPEED_100;
 
 static void dsp_pitch_update(struct dsp_config *dsp)
@@ -183,7 +183,7 @@ void sound_set_pitch(int32_t percent)
     struct sample_io_data *data = (void *)dsp;
     dsp_configure(dsp, DSP_SWITCH_FREQUENCY, data->format.codec_frequency);
 }
-#endif /* HAVE_PITCHSCREEN */
+#endif /* HAVE_PITCHCONTROL */
 
 /* This is a null-processing stage that monitors as an enabled stage but never
  * becomes active in processing samples. It only hooks messages. */
@@ -208,7 +208,7 @@ static intptr_t misc_handler_configure(struct dsp_proc_entry *this,
         break;
 
     case DSP_RESET:
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
         dsp_pitch_update(dsp);
 #endif
         value = (intptr_t)NULL; /* Default gains */
@@ -216,7 +216,7 @@ static intptr_t misc_handler_configure(struct dsp_proc_entry *this,
         dsp_replaygain_set_gains((void *)value);
         break;
 
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
     case DSP_SET_FREQUENCY:
         dsp_pitch_update(dsp);
         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
 
 void dsp_replaygain_set_settings(const struct replaygain_settings *settings);
 
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
 void sound_set_pitch(int32_t ratio);
 int32_t sound_get_pitch(void);
-#endif /* HAVE_PITCHSCREEN */
+#endif /* HAVE_PITCHCONTROL */
 
 /* Callback for firmware layers to interface */
 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 @@
 DSP_PROC_DB_START
     DSP_PROC_DB_ITEM(MISC_HANDLER)  /* misc stuff (null stage) */
     DSP_PROC_DB_ITEM(PGA)           /* pre-gain amp */
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
     DSP_PROC_DB_ITEM(TIMESTRETCH)   /* time-stretching */
 #endif
     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 @@
 #include "dsp_misc.h"
 #include "eq.h"
 #include "pga.h"
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
 #include "tdspeed.h"
 #endif
 #ifdef HAVE_SW_TONE_CONTROLS
-- 
cgit v1.2.3