forked from len0rd/rockbox
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
This commit is contained in:
parent
99a0598c28
commit
d6c054575b
56 changed files with 248 additions and 248 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue