diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2005-08-29 21:15:27 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2005-08-29 21:15:27 +0000 |
| commit | d6c054575b4561b4c657565ecb4ff82565fa6c78 (patch) | |
| tree | c05a7f619a2580a8ae3ee29e863f076d1065c398 /apps/codecs.c | |
| parent | 99a0598c284471342fcda1fdcba90d4b666bfbb3 (diff) | |
| download | rockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.zip rockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.tar.gz rockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.tar.bz2 rockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.tar.xz | |
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
Diffstat (limited to 'apps/codecs.c')
| -rw-r--r-- | apps/codecs.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/apps/codecs.c b/apps/codecs.c index 0093da6..f7f271d 100644 --- a/apps/codecs.c +++ b/apps/codecs.c @@ -48,12 +48,12 @@ #include "system.h" #include "sound.h" #include "database.h" -#if (CONFIG_HWCODEC == MASNONE) +#if (CONFIG_CODEC == SWCODEC) #include "pcm_playback.h" #endif #ifdef SIMULATOR -#if CONFIG_HWCODEC == MASNONE +#if CONFIG_CODEC == SWCODEC unsigned char codecbuf[CODEC_SIZE]; #endif void *sim_codec_load_ram(char* codecptr, int size, @@ -161,10 +161,10 @@ struct codec_api ci = { mp3_play_pause, mp3_play_stop, mp3_is_playing, -#if CONFIG_HWCODEC != MASNONE +#if CONFIG_CODEC != SWCODEC bitswap, #endif -#if CONFIG_HWCODEC == MASNONE +#if CONFIG_CODEC == SWCODEC pcm_play_data, pcm_play_stop, pcm_set_frequency, @@ -188,24 +188,24 @@ struct codec_api ci = { audio_current_track, audio_flush_and_reload_tracks, audio_get_file_pos, -#if !defined(SIMULATOR) && (CONFIG_HWCODEC != MASNONE) +#if !defined(SIMULATOR) && (CONFIG_CODEC != SWCODEC) mpeg_get_last_header, #endif -#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) +#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) sound_set_pitch, #endif -#if !defined(SIMULATOR) && (CONFIG_HWCODEC != MASNONE) +#if !defined(SIMULATOR) && (CONFIG_CODEC != SWCODEC) /* MAS communication */ mas_readmem, mas_writemem, mas_readreg, mas_writereg, -#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) +#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) mas_codec_writereg, mas_codec_readreg, #endif -#endif /* !simulator and HWCODEC != MASNONE */ +#endif /* !simulator and HWCODEC != SWCODEC */ /* tag database */ &tagdbheader, @@ -232,7 +232,7 @@ struct codec_api ci = { find_next_frame, battery_level, battery_level_safe, -#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) +#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) peak_meter_scale_value, peak_meter_set_use_dbfs, peak_meter_get_use_dbfs, |