diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/main_menu.c | 2 | ||||
-rw-r--r-- | apps/recorder/radio.c | 2 | ||||
-rw-r--r-- | apps/recorder/radio.h | 2 | ||||
-rw-r--r-- | apps/settings.h | 8 | ||||
-rw-r--r-- | apps/settings_list.c | 6 | ||||
-rw-r--r-- | apps/sound_menu.c | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/apps/main_menu.c b/apps/main_menu.c index d9419c3a2b..e3cc88fdda 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -143,7 +143,7 @@ bool main_menu(void) | |||
143 | items[i].desc = ID2P(LANG_CUSTOM_THEME); | 143 | items[i].desc = ID2P(LANG_CUSTOM_THEME); |
144 | items[i++].function = custom_theme_browse; | 144 | items[i++].function = custom_theme_browse; |
145 | 145 | ||
146 | #ifdef CONFIG_TUNER | 146 | #if CONFIG_TUNER |
147 | if(radio_hardware_present()) { | 147 | if(radio_hardware_present()) { |
148 | items[i].desc = ID2P(LANG_FM_RADIO); | 148 | items[i].desc = ID2P(LANG_FM_RADIO); |
149 | items[i++].function = radio_screen; | 149 | items[i++].function = radio_screen; |
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index a1821de58f..5ee5be14fd 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -61,7 +61,7 @@ | |||
61 | #include "dir.h" | 61 | #include "dir.h" |
62 | #include "action.h" | 62 | #include "action.h" |
63 | 63 | ||
64 | #ifdef CONFIG_TUNER | 64 | #if CONFIG_TUNER |
65 | 65 | ||
66 | #if CONFIG_KEYPAD == RECORDER_PAD | 66 | #if CONFIG_KEYPAD == RECORDER_PAD |
67 | #define FM_RECORD | 67 | #define FM_RECORD |
diff --git a/apps/recorder/radio.h b/apps/recorder/radio.h index a4f9f1a978..bbc35b71aa 100644 --- a/apps/recorder/radio.h +++ b/apps/recorder/radio.h | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "fmradio.h" | 23 | #include "fmradio.h" |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | #ifdef CONFIG_TUNER | 26 | #if CONFIG_TUNER |
27 | void radio_load_presets(char *filename); | 27 | void radio_load_presets(char *filename); |
28 | void radio_init(void); | 28 | void radio_init(void); |
29 | bool radio_screen(void); | 29 | bool radio_screen(void); |
diff --git a/apps/settings.h b/apps/settings.h index af1d65d78f..52a45c18ae 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -273,7 +273,7 @@ struct system_status | |||
273 | #ifdef HAVE_DIRCACHE | 273 | #ifdef HAVE_DIRCACHE |
274 | int dircache_size; /* directory cache structure last size, 22 bits */ | 274 | int dircache_size; /* directory cache structure last size, 22 bits */ |
275 | #endif | 275 | #endif |
276 | #ifdef CONFIG_TUNER | 276 | #if CONFIG_TUNER |
277 | int last_frequency; /* Last frequency for resuming, in FREQ_STEP units, | 277 | int last_frequency; /* Last frequency for resuming, in FREQ_STEP units, |
278 | relative to MIN_FREQ */ | 278 | relative to MIN_FREQ */ |
279 | #endif | 279 | #endif |
@@ -404,7 +404,7 @@ struct user_settings | |||
404 | 404 | ||
405 | bool resume; /* resume option: 0=off, 1=on */ | 405 | bool resume; /* resume option: 0=off, 1=on */ |
406 | 406 | ||
407 | #ifdef CONFIG_TUNER | 407 | #if CONFIG_TUNER |
408 | unsigned char fmr_file[MAX_FILENAME+1]; /* last fmr preset */ | 408 | unsigned char fmr_file[MAX_FILENAME+1]; /* last fmr preset */ |
409 | #endif | 409 | #endif |
410 | unsigned char font_file[MAX_FILENAME+1]; /* last font */ | 410 | unsigned char font_file[MAX_FILENAME+1]; /* last font */ |
@@ -476,7 +476,7 @@ struct user_settings | |||
476 | bool fade_on_stop; /* fade on pause/unpause/stop */ | 476 | bool fade_on_stop; /* fade on pause/unpause/stop */ |
477 | bool caption_backlight; /* turn on backlight at end and start of track */ | 477 | bool caption_backlight; /* turn on backlight at end and start of track */ |
478 | 478 | ||
479 | #ifdef CONFIG_TUNER | 479 | #if CONFIG_TUNER |
480 | int fm_freq_step; /* Frequency step for manual tuning, in kHz */ | 480 | int fm_freq_step; /* Frequency step for manual tuning, in kHz */ |
481 | bool fm_force_mono; /* Forces Mono mode if true */ | 481 | bool fm_force_mono; /* Forces Mono mode if true */ |
482 | bool fm_full_range; /* Enables full 10MHz-160MHz range if true, else | 482 | bool fm_full_range; /* Enables full 10MHz-160MHz range if true, else |
@@ -663,7 +663,7 @@ struct user_settings | |||
663 | int unplug_rw; /* time in s to rewind when pausing */ | 663 | int unplug_rw; /* time in s to rewind when pausing */ |
664 | bool unplug_autoresume; /* disable auto-resume if no phones */ | 664 | bool unplug_autoresume; /* disable auto-resume if no phones */ |
665 | #endif | 665 | #endif |
666 | #ifdef CONFIG_TUNER | 666 | #if CONFIG_TUNER |
667 | int fm_region; | 667 | int fm_region; |
668 | #endif | 668 | #endif |
669 | bool audioscrobbler; /* Audioscrobbler logging */ | 669 | bool audioscrobbler; /* Audioscrobbler logging */ |
diff --git a/apps/settings_list.c b/apps/settings_list.c index ee70e8c40b..be693d1801 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -480,7 +480,7 @@ const struct settings_list settings[] = { | |||
480 | LANG_CAR_ADAPTER_MODE, false, "car adapter mode", NULL), | 480 | LANG_CAR_ADAPTER_MODE, false, "car adapter mode", NULL), |
481 | #endif | 481 | #endif |
482 | /* tuner */ | 482 | /* tuner */ |
483 | #ifdef CONFIG_TUNER | 483 | #if CONFIG_TUNER |
484 | OFFON_SETTING(0,fm_force_mono, LANG_FM_MONO_MODE, | 484 | OFFON_SETTING(0,fm_force_mono, LANG_FM_MONO_MODE, |
485 | false,"force fm mono", NULL), | 485 | false,"force fm mono", NULL), |
486 | SYSTEM_SETTING(NVRAM(4),last_frequency,0), | 486 | SYSTEM_SETTING(NVRAM(4),last_frequency,0), |
@@ -1022,7 +1022,7 @@ const struct settings_list settings[] = { | |||
1022 | OFFON_SETTING(0,unplug_autoresume,LANG_UNPLUG_DISABLE_AUTORESUME,false, | 1022 | OFFON_SETTING(0,unplug_autoresume,LANG_UNPLUG_DISABLE_AUTORESUME,false, |
1023 | "disable autoresume if phones not present",NULL), | 1023 | "disable autoresume if phones not present",NULL), |
1024 | #endif | 1024 | #endif |
1025 | #ifdef CONFIG_TUNER | 1025 | #if CONFIG_TUNER |
1026 | {F_T_INT,&global_settings.fm_region,LANG_FM_REGION,INT(0), | 1026 | {F_T_INT,&global_settings.fm_region,LANG_FM_REGION,INT(0), |
1027 | "fm_region","eu,us,jp,kr",UNUSED}, | 1027 | "fm_region","eu,us,jp,kr",UNUSED}, |
1028 | #endif | 1028 | #endif |
@@ -1036,7 +1036,7 @@ const struct settings_list settings[] = { | |||
1036 | #endif | 1036 | #endif |
1037 | 1037 | ||
1038 | /** settings not in the old config blocks **/ | 1038 | /** settings not in the old config blocks **/ |
1039 | #ifdef CONFIG_TUNER | 1039 | #if CONFIG_TUNER |
1040 | FILENAME_SETTING(0, fmr_file, "fmr", | 1040 | FILENAME_SETTING(0, fmr_file, "fmr", |
1041 | "", FMPRESET_PATH "/", ".fmr", MAX_FILENAME+1), | 1041 | "", FMPRESET_PATH "/", ".fmr", MAX_FILENAME+1), |
1042 | #endif | 1042 | #endif |
diff --git a/apps/sound_menu.c b/apps/sound_menu.c index 07f9d4b352..c75b527db7 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c | |||
@@ -41,7 +41,7 @@ | |||
41 | #include "sound.h" | 41 | #include "sound.h" |
42 | #ifdef HAVE_RECORDING | 42 | #ifdef HAVE_RECORDING |
43 | #include "audio.h" | 43 | #include "audio.h" |
44 | #ifdef CONFIG_TUNER | 44 | #if CONFIG_TUNER |
45 | #include "radio.h" | 45 | #include "radio.h" |
46 | #endif | 46 | #endif |
47 | #endif | 47 | #endif |