diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/SOURCES | 2 | ||||
-rw-r--r-- | apps/plugins/oscillograph.c | 2 | ||||
-rw-r--r-- | apps/plugins/oscilloscope.c | 2 | ||||
-rw-r--r-- | apps/plugins/rockboy/rbsound.c | 2 | ||||
-rw-r--r-- | apps/plugins/splitedit.c | 10 | ||||
-rw-r--r-- | apps/plugins/vu_meter.c | 2 |
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 | |||
66 | alpine_cdc.c | 66 | alpine_cdc.c |
67 | #endif | 67 | #endif |
68 | 68 | ||
69 | #if CONFIG_HWCODEC == MASNONE /* software codec platforms */ | 69 | #if CONFIG_CODEC == SWCODEC /* software codec platforms */ |
70 | iriverify.c | 70 | iriverify.c |
71 | wav2wv.c | 71 | wav2wv.c |
72 | midi2wav.c | 72 | 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 @@ | |||
20 | 20 | ||
21 | #ifdef HAVE_LCD_BITMAP | 21 | #ifdef HAVE_LCD_BITMAP |
22 | #ifndef SIMULATOR /* don't want this code in the simulator */ | 22 | #ifndef SIMULATOR /* don't want this code in the simulator */ |
23 | #if CONFIG_HWCODEC != MASNONE /* only for MAS-targets */ | 23 | #if CONFIG_CODEC != SWCODEC /* only for MAS-targets */ |
24 | 24 | ||
25 | /* The different drawing modes */ | 25 | /* The different drawing modes */ |
26 | #define DRAW_MODE_FILLED 0 | 26 | #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 @@ | |||
23 | #include "plugin.h" | 23 | #include "plugin.h" |
24 | 24 | ||
25 | #ifdef HAVE_LCD_BITMAP /* and also not for the Player */ | 25 | #ifdef HAVE_LCD_BITMAP /* and also not for the Player */ |
26 | #if CONFIG_HWCODEC != MASNONE /* only for MAS-targets */ | 26 | #if CONFIG_CODEC != SWCODEC /* only for MAS-targets */ |
27 | 27 | ||
28 | /* The different drawing modes */ | 28 | /* The different drawing modes */ |
29 | #define DRAW_MODE_FILLED 0 | 29 | #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[] = | |||
15 | RCV_END | 15 | RCV_END |
16 | }; | 16 | }; |
17 | 17 | ||
18 | /*#if CONFIG_HWCODEC == MASNONE && !defined(SIMULATOR) | 18 | /*#if CONFIG_CODEC == SWCODEC && !defined(SIMULATOR) |
19 | * disabled cause it crashes with current audio implementation.. no sound. | 19 | * disabled cause it crashes with current audio implementation.. no sound. |
20 | */ | 20 | */ |
21 | #if 0 | 21 | #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) | |||
269 | LCD_WIDTH/3 + LCD_WIDTH/3 / 2 - BMPWIDTH/2, LCD_HEIGHT - BMPHEIGHT, | 269 | LCD_WIDTH/3 + LCD_WIDTH/3 / 2 - BMPWIDTH/2, LCD_HEIGHT - BMPHEIGHT, |
270 | BMPWIDTH, BMPHEIGHT); | 270 | BMPWIDTH, BMPHEIGHT); |
271 | 271 | ||
272 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 272 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
273 | /* The scale icon */ | 273 | /* The scale icon */ |
274 | rb->lcd_mono_bitmap(SCALE_BMP[rb->peak_meter_get_use_dbfs() ? 1 : 0], | 274 | rb->lcd_mono_bitmap(SCALE_BMP[rb->peak_meter_get_use_dbfs() ? 1 : 0], |
275 | 2 *LCD_WIDTH/3 + LCD_WIDTH/3 / 2 - BMPWIDTH/2, LCD_HEIGHT - BMPHEIGHT, | 275 | 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, | |||
909 | { | 909 | { |
910 | /* read volume info */ | 910 | /* read volume info */ |
911 | unsigned short volume; | 911 | unsigned short volume; |
912 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 912 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
913 | volume = rb->mas_codec_readreg(0x0c); | 913 | volume = rb->mas_codec_readreg(0x0c); |
914 | volume += rb->mas_codec_readreg(0x0d); | 914 | volume += rb->mas_codec_readreg(0x0d); |
915 | volume = volume / 2; | 915 | volume = volume / 2; |
@@ -1074,7 +1074,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split, | |||
1074 | lastx = time_to_xpos(mp3->elapsed); | 1074 | lastx = time_to_xpos(mp3->elapsed); |
1075 | break; | 1075 | break; |
1076 | 1076 | ||
1077 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 1077 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
1078 | #ifdef SPLITEDIT_SPEED100 | 1078 | #ifdef SPLITEDIT_SPEED100 |
1079 | case SPLITEDIT_SPEED150: | 1079 | case SPLITEDIT_SPEED150: |
1080 | rb->sound_set_pitch(1500); | 1080 | rb->sound_set_pitch(1500); |
@@ -1133,7 +1133,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split, | |||
1133 | break; | 1133 | break; |
1134 | 1134 | ||
1135 | case SPLITEDIT_SCALE: | 1135 | case SPLITEDIT_SCALE: |
1136 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 1136 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
1137 | rb->peak_meter_set_use_dbfs(!rb->peak_meter_get_use_dbfs()); | 1137 | rb->peak_meter_set_use_dbfs(!rb->peak_meter_get_use_dbfs()); |
1138 | #endif | 1138 | #endif |
1139 | splitedit_invalidate_osci(); | 1139 | splitedit_invalidate_osci(); |
@@ -1202,7 +1202,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split, | |||
1202 | } | 1202 | } |
1203 | } | 1203 | } |
1204 | } | 1204 | } |
1205 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 1205 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
1206 | #ifdef SPLITEDIT_SPEED100 | 1206 | #ifdef SPLITEDIT_SPEED100 |
1207 | rb->sound_set_pitch(1000); /* make sure to reset pitch */ | 1207 | rb->sound_set_pitch(1000); /* make sure to reset pitch */ |
1208 | #endif | 1208 | #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 @@ | |||
17 | **************************************************************************/ | 17 | **************************************************************************/ |
18 | #include "plugin.h" | 18 | #include "plugin.h" |
19 | 19 | ||
20 | #if defined(HAVE_LCD_BITMAP) && (CONFIG_HWCODEC != MASNONE) | 20 | #if defined(HAVE_LCD_BITMAP) && (CONFIG_CODEC != SWCODEC) |
21 | 21 | ||
22 | /* variable button definitions */ | 22 | /* variable button definitions */ |
23 | #if CONFIG_KEYPAD == RECORDER_PAD | 23 | #if CONFIG_KEYPAD == RECORDER_PAD |