Renamed CONFIG_HWCODEC and MASNONE to the more appropriate CONFIG_CODEC and SWCODEC, respectively.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7416 a1c6a512-1295-4272-9138-f99709370657

6 files changed, 10 insertions, 10 deletions

diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index 1b98967ac1..cf62ee7203 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -66,7 +66,7 @@ nim.c
 alpine_cdc.c
 #endif
 
-#if CONFIG_HWCODEC == MASNONE /* software codec platforms */
+#if CONFIG_CODEC == SWCODEC /* software codec platforms */
 iriverify.c
 wav2wv.c
 midi2wav.c
diff --git a/apps/plugins/oscillograph.c b/apps/plugins/oscillograph.c
index 1512e11389..069ef44247 100644
--- a/apps/plugins/oscillograph.c
+++ b/apps/plugins/oscillograph.c
@@ -20,7 +20,7 @@
 
 #ifdef HAVE_LCD_BITMAP
 #ifndef SIMULATOR /* don't want this code in the simulator */
-#if CONFIG_HWCODEC != MASNONE /* only for MAS-targets */
+#if CONFIG_CODEC != SWCODEC /* only for MAS-targets */
 
 /* The different drawing modes */
 #define DRAW_MODE_FILLED  0
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index f5e5189e2e..b3b081d861 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -23,7 +23,7 @@
 #include "plugin.h"
 
 #ifdef HAVE_LCD_BITMAP /* and also not for the Player */
-#if CONFIG_HWCODEC != MASNONE /* only for MAS-targets */
+#if CONFIG_CODEC != SWCODEC /* only for MAS-targets */
 
 /* The different drawing modes */
 #define DRAW_MODE_FILLED  0
diff --git a/apps/plugins/rockboy/rbsound.c b/apps/plugins/rockboy/rbsound.c
index 529cf6e733..139c33d037 100644
--- a/apps/plugins/rockboy/rbsound.c
+++ b/apps/plugins/rockboy/rbsound.c
@@ -15,7 +15,7 @@ rcvar_t pcm_exports[] =
             RCV_END
 };
 
-/*#if CONFIG_HWCODEC == MASNONE && !defined(SIMULATOR)
+/*#if CONFIG_CODEC == SWCODEC && !defined(SIMULATOR)
  * disabled cause it crashes with current audio implementation.. no sound.
  */
 #if 0
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c
index 9317419c23..35562f99fc 100644
--- a/apps/plugins/splitedit.c
+++ b/apps/plugins/splitedit.c
@@ -269,7 +269,7 @@ static void update_icons(void)
         LCD_WIDTH/3 + LCD_WIDTH/3 / 2 - BMPWIDTH/2, LCD_HEIGHT - BMPHEIGHT,
         BMPWIDTH, BMPHEIGHT);
 
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
     /* The scale icon */
     rb->lcd_mono_bitmap(SCALE_BMP[rb->peak_meter_get_use_dbfs() ? 1 : 0],
         2 *LCD_WIDTH/3 + LCD_WIDTH/3 / 2 - BMPWIDTH/2, LCD_HEIGHT - BMPHEIGHT,
@@ -909,7 +909,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split,
             {
                 /* read volume info */
                 unsigned short volume;
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
                 volume = rb->mas_codec_readreg(0x0c);
                 volume += rb->mas_codec_readreg(0x0d);
                 volume = volume / 2;
@@ -1074,7 +1074,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split,
                 lastx = time_to_xpos(mp3->elapsed);
                 break;
 
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
 #ifdef SPLITEDIT_SPEED100
             case SPLITEDIT_SPEED150:
                 rb->sound_set_pitch(1500);
@@ -1133,7 +1133,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split,
                 break;
 
             case SPLITEDIT_SCALE:
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
                 rb->peak_meter_set_use_dbfs(!rb->peak_meter_get_use_dbfs());
 #endif
                 splitedit_invalidate_osci();
@@ -1202,7 +1202,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split,
                 }
             }
         }
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
 #ifdef SPLITEDIT_SPEED100
         rb->sound_set_pitch(1000); /* make sure to reset pitch */
 #endif
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index c2db45ed88..80621d2fd3 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -17,7 +17,7 @@
  **************************************************************************/
 #include "plugin.h"
 
-#if defined(HAVE_LCD_BITMAP) && (CONFIG_HWCODEC != MASNONE)
+#if defined(HAVE_LCD_BITMAP) && (CONFIG_CODEC != SWCODEC)
 
 /* variable button definitions */
 #if CONFIG_KEYPAD == RECORDER_PAD