diff options
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 088cf8e099..2e4cea0704 100644 --- a/apps/recorder/peakmeter.c +++ b/apps/recorder/peakmeter.c | |||
@@ -33,11 +33,11 @@ | |||
33 | #include "lang.h" | 33 | #include "lang.h" |
34 | #include "peakmeter.h" | 34 | #include "peakmeter.h" |
35 | 35 | ||
36 | #if CONFIG_HWCODEC == MASNONE | 36 | #if CONFIG_CODEC == SWCODEC |
37 | #include "pcm_playback.h" | 37 | #include "pcm_playback.h" |
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | #if !defined(SIMULATOR) && CONFIG_HWCODEC != MASNONE | 40 | #if !defined(SIMULATOR) && CONFIG_CODEC != SWCODEC |
41 | /* Data source */ | 41 | /* Data source */ |
42 | static int pm_src_left = MAS_REG_DQPEAK_L; | 42 | static int pm_src_left = MAS_REG_DQPEAK_L; |
43 | static int pm_src_right = MAS_REG_DQPEAK_R; | 43 | static int pm_src_right = MAS_REG_DQPEAK_R; |
@@ -490,7 +490,7 @@ void peak_meter_playback(bool playback) | |||
490 | { | 490 | { |
491 | #ifdef SIMULATOR | 491 | #ifdef SIMULATOR |
492 | (void)playback; | 492 | (void)playback; |
493 | #elif CONFIG_HWCODEC == MASNONE | 493 | #elif CONFIG_CODEC == SWCODEC |
494 | /* FIX: not for the sw-based ones yes */ | 494 | /* FIX: not for the sw-based ones yes */ |
495 | (void)playback; | 495 | (void)playback; |
496 | #else | 496 | #else |
@@ -530,7 +530,7 @@ void peak_meter_peek(void) | |||
530 | #ifdef SIMULATOR | 530 | #ifdef SIMULATOR |
531 | pm_cur_left = left = 8000; | 531 | pm_cur_left = left = 8000; |
532 | pm_cur_right = right = 9000; | 532 | pm_cur_right = right = 9000; |
533 | #elif CONFIG_HWCODEC == MASNONE | 533 | #elif CONFIG_CODEC == SWCODEC |
534 | pcm_calculate_peaks(&pm_cur_left, &pm_cur_right); | 534 | pcm_calculate_peaks(&pm_cur_left, &pm_cur_right); |
535 | left = pm_cur_left; | 535 | left = pm_cur_left; |
536 | right = pm_cur_right; | 536 | right = pm_cur_right; |
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index a0280ecf1f..68d36dddd3 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -55,7 +55,7 @@ | |||
55 | 55 | ||
56 | #ifdef CONFIG_TUNER | 56 | #ifdef CONFIG_TUNER |
57 | 57 | ||
58 | #if CONFIG_HWCODEC == MASNONE | 58 | #if CONFIG_CODEC == SWCODEC |
59 | #include "uda1380.h" | 59 | #include "uda1380.h" |
60 | #include "pcm_record.h" | 60 | #include "pcm_record.h" |
61 | #endif | 61 | #endif |
@@ -213,14 +213,14 @@ bool radio_screen(void) | |||
213 | radio_load_presets(); | 213 | radio_load_presets(); |
214 | 214 | ||
215 | #ifndef SIMULATOR | 215 | #ifndef SIMULATOR |
216 | #if CONFIG_HWCODEC != MASNONE | 216 | #if CONFIG_CODEC != SWCODEC |
217 | if(rec_create_directory() > 0) | 217 | if(rec_create_directory() > 0) |
218 | have_recorded = true; | 218 | have_recorded = true; |
219 | #endif | 219 | #endif |
220 | 220 | ||
221 | audio_stop(); | 221 | audio_stop(); |
222 | 222 | ||
223 | #if CONFIG_HWCODEC != MASNONE | 223 | #if CONFIG_CODEC != SWCODEC |
224 | mpeg_init_recording(); | 224 | mpeg_init_recording(); |
225 | 225 | ||
226 | sound_settings_apply(); | 226 | sound_settings_apply(); |
@@ -497,7 +497,7 @@ bool radio_screen(void) | |||
497 | } | 497 | } |
498 | 498 | ||
499 | #ifndef SIMULATOR | 499 | #ifndef SIMULATOR |
500 | #if CONFIG_HWCODEC != MASNONE | 500 | #if CONFIG_CODEC != SWCODEC |
501 | seconds = mpeg_recorded_time() / HZ; | 501 | seconds = mpeg_recorded_time() / HZ; |
502 | #endif | 502 | #endif |
503 | #endif | 503 | #endif |
@@ -580,7 +580,7 @@ bool radio_screen(void) | |||
580 | } | 580 | } |
581 | } | 581 | } |
582 | 582 | ||
583 | #if CONFIG_HWCODEC != MASNONE | 583 | #if CONFIG_CODEC != SWCODEC |
584 | audio_init_playback(); | 584 | audio_init_playback(); |
585 | #endif | 585 | #endif |
586 | 586 | ||
@@ -588,7 +588,7 @@ bool radio_screen(void) | |||
588 | 588 | ||
589 | if(keep_playing) | 589 | if(keep_playing) |
590 | { | 590 | { |
591 | #if CONFIG_HWCODEC != MASNONE | 591 | #if CONFIG_CODEC != SWCODEC |
592 | /* Enable the Left and right A/D Converter */ | 592 | /* Enable the Left and right A/D Converter */ |
593 | mpeg_set_recording_gain(sound_default(SOUND_LEFT_GAIN), | 593 | mpeg_set_recording_gain(sound_default(SOUND_LEFT_GAIN), |
594 | sound_default(SOUND_RIGHT_GAIN), false); | 594 | sound_default(SOUND_RIGHT_GAIN), false); |
@@ -599,7 +599,7 @@ bool radio_screen(void) | |||
599 | else | 599 | else |
600 | { | 600 | { |
601 | radio_stop(); | 601 | radio_stop(); |
602 | #if CONFIG_HWCODEC == MASNONE | 602 | #if CONFIG_CODEC == SWCODEC |
603 | pcmrec_set_mux(0); /* Line In */ | 603 | pcmrec_set_mux(0); /* Line In */ |
604 | #endif | 604 | #endif |
605 | } | 605 | } |
@@ -880,7 +880,7 @@ bool handle_radio_presets(void) | |||
880 | } | 880 | } |
881 | 881 | ||
882 | #ifndef SIMULATOR | 882 | #ifndef SIMULATOR |
883 | #if CONFIG_HWCODEC != MASNONE | 883 | #if CONFIG_CODEC != SWCODEC |
884 | static bool fm_recording_settings(void) | 884 | static bool fm_recording_settings(void) |
885 | { | 885 | { |
886 | bool ret; | 886 | bool ret; |
@@ -959,7 +959,7 @@ bool radio_menu(void) | |||
959 | #endif | 959 | #endif |
960 | { monomode_menu_string , toggle_mono_mode }, | 960 | { monomode_menu_string , toggle_mono_mode }, |
961 | { ID2P(LANG_SOUND_SETTINGS) , sound_menu }, | 961 | { ID2P(LANG_SOUND_SETTINGS) , sound_menu }, |
962 | #if !defined(SIMULATOR) && (CONFIG_HWCODEC != MASNONE) | 962 | #if !defined(SIMULATOR) && (CONFIG_CODEC != SWCODEC) |
963 | { ID2P(LANG_RECORDING_SETTINGS) , fm_recording_settings}, | 963 | { ID2P(LANG_RECORDING_SETTINGS) , fm_recording_settings}, |
964 | #endif | 964 | #endif |
965 | }; | 965 | }; |