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/recorder | |
| 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/recorder')
| -rw-r--r-- | apps/recorder/peakmeter.c | 8 | ||||
| -rw-r--r-- | apps/recorder/radio.c | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c index 088cf8e..2e4cea0 100644 --- a/apps/recorder/peakmeter.c +++ b/apps/recorder/peakmeter.c @@ -33,11 +33,11 @@ #include "lang.h" #include "peakmeter.h" -#if CONFIG_HWCODEC == MASNONE +#if CONFIG_CODEC == SWCODEC #include "pcm_playback.h" #endif -#if !defined(SIMULATOR) && CONFIG_HWCODEC != MASNONE +#if !defined(SIMULATOR) && CONFIG_CODEC != SWCODEC /* Data source */ static int pm_src_left = MAS_REG_DQPEAK_L; static int pm_src_right = MAS_REG_DQPEAK_R; @@ -490,7 +490,7 @@ void peak_meter_playback(bool playback) { #ifdef SIMULATOR (void)playback; -#elif CONFIG_HWCODEC == MASNONE +#elif CONFIG_CODEC == SWCODEC /* FIX: not for the sw-based ones yes */ (void)playback; #else @@ -530,7 +530,7 @@ void peak_meter_peek(void) #ifdef SIMULATOR pm_cur_left = left = 8000; pm_cur_right = right = 9000; -#elif CONFIG_HWCODEC == MASNONE +#elif CONFIG_CODEC == SWCODEC pcm_calculate_peaks(&pm_cur_left, &pm_cur_right); left = pm_cur_left; right = pm_cur_right; diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index a0280ec..68d36dd 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c @@ -55,7 +55,7 @@ #ifdef CONFIG_TUNER -#if CONFIG_HWCODEC == MASNONE +#if CONFIG_CODEC == SWCODEC #include "uda1380.h" #include "pcm_record.h" #endif @@ -213,14 +213,14 @@ bool radio_screen(void) radio_load_presets(); #ifndef SIMULATOR -#if CONFIG_HWCODEC != MASNONE +#if CONFIG_CODEC != SWCODEC if(rec_create_directory() > 0) have_recorded = true; #endif audio_stop(); -#if CONFIG_HWCODEC != MASNONE +#if CONFIG_CODEC != SWCODEC mpeg_init_recording(); sound_settings_apply(); @@ -497,7 +497,7 @@ bool radio_screen(void) } #ifndef SIMULATOR -#if CONFIG_HWCODEC != MASNONE +#if CONFIG_CODEC != SWCODEC seconds = mpeg_recorded_time() / HZ; #endif #endif @@ -580,7 +580,7 @@ bool radio_screen(void) } } -#if CONFIG_HWCODEC != MASNONE +#if CONFIG_CODEC != SWCODEC audio_init_playback(); #endif @@ -588,7 +588,7 @@ bool radio_screen(void) if(keep_playing) { -#if CONFIG_HWCODEC != MASNONE +#if CONFIG_CODEC != SWCODEC /* Enable the Left and right A/D Converter */ mpeg_set_recording_gain(sound_default(SOUND_LEFT_GAIN), sound_default(SOUND_RIGHT_GAIN), false); @@ -599,7 +599,7 @@ bool radio_screen(void) else { radio_stop(); -#if CONFIG_HWCODEC == MASNONE +#if CONFIG_CODEC == SWCODEC pcmrec_set_mux(0); /* Line In */ #endif } @@ -880,7 +880,7 @@ bool handle_radio_presets(void) } #ifndef SIMULATOR -#if CONFIG_HWCODEC != MASNONE +#if CONFIG_CODEC != SWCODEC static bool fm_recording_settings(void) { bool ret; @@ -959,7 +959,7 @@ bool radio_menu(void) #endif { monomode_menu_string , toggle_mono_mode }, { ID2P(LANG_SOUND_SETTINGS) , sound_menu }, -#if !defined(SIMULATOR) && (CONFIG_HWCODEC != MASNONE) +#if !defined(SIMULATOR) && (CONFIG_CODEC != SWCODEC) { ID2P(LANG_RECORDING_SETTINGS) , fm_recording_settings}, #endif }; |