From 593cc00447af20197a1b7bc009af205a0f065576 Mon Sep 17 00:00:00 2001 From: Jörg Hohensohn Date: Tue, 28 Sep 2004 22:13:26 +0000 Subject: a hell of a commit: changed several HAVE_xx configuration flags into multiple choice values (keypad, tuner, CPU, h/w codec) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5126 a1c6a512-1295-4272-9138-f99709370657 --- apps/alarm_menu.c | 4 ++-- apps/debug_menu.c | 14 +++++++------- apps/main_menu.c | 12 ++++++------ apps/menu.h | 6 +++--- apps/playlist.c | 2 +- apps/plugin.c | 4 ++-- apps/plugin.h | 4 ++-- apps/plugins/battery_test.c | 2 +- apps/plugins/chessclock.c | 22 +++++++++++----------- apps/plugins/metronome.c | 6 +++--- apps/plugins/splitedit.c | 8 ++++---- apps/plugins/stopwatch.c | 8 ++++---- apps/plugins/viewer.c | 18 +++++++++--------- apps/recorder/keyboard.c | 4 ++-- apps/recorder/radio.c | 8 ++++---- apps/recorder/radio.h | 2 +- apps/recorder/recording.c | 4 ++-- apps/screens.c | 4 ++-- apps/screens.h | 2 +- apps/settings.c | 16 ++++++++-------- apps/settings.h | 10 +++++----- apps/settings_menu.c | 6 +++--- apps/sound_menu.c | 10 +++++----- apps/status.c | 2 +- apps/tree.c | 2 +- apps/tree.h | 6 +++--- apps/wps.c | 12 ++++++------ apps/wps.h | 2 +- 28 files changed, 100 insertions(+), 100 deletions(-) (limited to 'apps') diff --git a/apps/alarm_menu.c b/apps/alarm_menu.c index 6e2519bd38..20b2f51821 100644 --- a/apps/alarm_menu.c +++ b/apps/alarm_menu.c @@ -130,7 +130,7 @@ bool alarm_screen(void) h = 23; break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD /* inc(h) */ case BUTTON_UP: case BUTTON_UP | BUTTON_REPEAT: @@ -144,7 +144,7 @@ bool alarm_screen(void) break; #endif -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_OFF: #else case BUTTON_STOP: diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 26052d0b32..7a1c2a3df8 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -51,7 +51,7 @@ #include "widgets.h" #include "peakmeter.h" #endif -#ifdef HAVE_FMRADIO +#ifdef CONFIG_TUNER #include "radio.h" #endif @@ -790,7 +790,7 @@ bool dbg_mas(void) return false; } -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F bool dbg_mas_codec(void) { char buf[32]; @@ -999,7 +999,7 @@ bool view_battery(void) #endif -#ifdef HAVE_MAS3507D +#if CONFIG_HWCODEC == MAS3507D bool dbg_mas_info(void) { int button; @@ -1457,7 +1457,7 @@ bool dbg_save_roms(void) return false; } -#ifdef HAVE_FMRADIO +#ifdef CONFIG_TUNER extern int debug_fm_detection; bool dbg_fm_radio(void) @@ -1535,11 +1535,11 @@ bool debug_menu(void) #endif /* HAVE_LCD_BITMAP */ { "View OS stacks", dbg_os }, { "Catch mem accesses", dbg_set_memory_guard }, -#ifdef HAVE_MAS3507D +#if CONFIG_HWCODEC == MAS3507D { "View MAS info", dbg_mas_info }, #endif { "View MAS regs", dbg_mas }, -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F { "View MAS codec", dbg_mas_codec }, #endif #ifdef HAVE_LCD_BITMAP @@ -1560,7 +1560,7 @@ bool debug_menu(void) #endif /* PM_DEBUG */ #endif /* HAVE_LCD_BITMAP */ { "View runtime", view_runtime }, -#ifdef HAVE_FMRADIO +#ifdef CONFIG_TUNER { "FM Radio", dbg_fm_radio }, #endif }; diff --git a/apps/main_menu.c b/apps/main_menu.c index d642fc56fe..d47fc5148e 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c @@ -46,13 +46,13 @@ #include "screens.h" #include "playlist_menu.h" #include "talk.h" -#ifdef HAVE_FMRADIO +#ifdef CONFIG_TUNER #include "radio.h" #endif #include "misc.h" #include "lang.h" -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F #include "recording.h" #endif @@ -263,14 +263,14 @@ static bool plugin_browse(void) return rockbox_browse(PLUGIN_DIR, SHOW_PLUGINS); } -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F static bool recording_settings(void) { return recording_menu(false); } #endif -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F bool rec_menu(void) { @@ -335,14 +335,14 @@ bool main_menu(void) items[i].desc = ID2P(LANG_GENERAL_SETTINGS); items[i++].function = settings_menu; -#ifdef HAVE_FMRADIO +#ifdef CONFIG_TUNER if(radio_hardware_present()) { items[i].desc = ID2P(LANG_FM_RADIO); items[i++].function = radio_screen; } #endif -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F items[i].desc = ID2P(LANG_RECORDING); items[i++].function = rec_menu; #endif diff --git a/apps/menu.h b/apps/menu.h index 99ef3443ba..7ebfbf316c 100644 --- a/apps/menu.h +++ b/apps/menu.h @@ -23,7 +23,7 @@ #include /* button definitions */ -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD #define MENU_NEXT BUTTON_DOWN #define MENU_PREV BUTTON_UP #define MENU_EXIT (BUTTON_LEFT | BUTTON_REL) @@ -32,14 +32,14 @@ #define MENU_ENTER (BUTTON_RIGHT | BUTTON_REL) #define MENU_ENTER2 (BUTTON_PLAY | BUTTON_REL) -#elif defined HAVE_PLAYER_KEYPAD +#elif CONFIG_KEYPAD == PLAYER_PAD #define MENU_NEXT BUTTON_RIGHT #define MENU_PREV BUTTON_LEFT #define MENU_EXIT (BUTTON_STOP | BUTTON_REL) #define MENU_EXIT2 (BUTTON_MENU | BUTTON_REL) #define MENU_ENTER (BUTTON_PLAY | BUTTON_REL) -#elif defined HAVE_ONDIO_KEYPAD +#elif CONFIG_KEYPAD == ONDIO_PAD #define MENU_NEXT BUTTON_DOWN #define MENU_PREV BUTTON_UP #define MENU_EXIT (BUTTON_LEFT | BUTTON_REL) diff --git a/apps/playlist.c b/apps/playlist.c index ecdb45c104..e514530aea 100644 --- a/apps/playlist.c +++ b/apps/playlist.c @@ -1050,7 +1050,7 @@ static void display_playlist_count(int count, const char *fmt) #endif splash(0, true, fmt, count, -#ifdef HAVE_PLAYER_KEYPAD +#if CONFIG_KEYPAD == PLAYER_PAD str(LANG_STOP_ABORT) #else str(LANG_OFF_ABORT) diff --git a/apps/plugin.c b/apps/plugin.c index 9a7a397bea..51f7a610dd 100644 --- a/apps/plugin.c +++ b/apps/plugin.c @@ -211,7 +211,7 @@ static const struct plugin_api rockbox_api = { mas_writemem, mas_readreg, mas_writereg, -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F mas_codec_writereg, mas_codec_readreg, #endif @@ -244,7 +244,7 @@ static const struct plugin_api rockbox_api = { /* new stuff at the end, sort into place next time the API gets incompatible */ -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F mpeg_set_pitch, peak_meter_scale_value, diff --git a/apps/plugin.h b/apps/plugin.h index 078dc12217..445427ffd5 100644 --- a/apps/plugin.h +++ b/apps/plugin.h @@ -239,7 +239,7 @@ struct plugin_api { int (*mas_writemem)(int bank, int addr, const unsigned long* src, int len); int (*mas_readreg)(int reg); int (*mas_writereg)(int reg, unsigned int val); -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F int (*mas_codec_writereg)(int reg, unsigned int val); int (*mas_codec_readreg)(int reg); #endif @@ -277,7 +277,7 @@ struct plugin_api { /* new stuff at the end, sort into place next time the API gets incompatible */ -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F void (*mpeg_set_pitch)(int pitch); unsigned short (*peak_meter_scale_value)(unsigned short val, diff --git a/apps/plugins/battery_test.c b/apps/plugins/battery_test.c index c7dac01a47..04be9b0070 100644 --- a/apps/plugins/battery_test.c +++ b/apps/plugins/battery_test.c @@ -97,7 +97,7 @@ enum plugin_status loop(void) /* Check if we shall exit the plugin */ if (button==BUTTON_ON || -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD button==BUTTON_OFF #else button==BUTTON_STOP diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index b647a0fa76..4df169669a 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c @@ -227,7 +227,7 @@ static int run_timer(int nr) button = rb->button_get_w_tmo(10); switch (button) { /* OFF/MENU key to exit */ -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_OFF: #else case BUTTON_ON: @@ -299,7 +299,7 @@ static int run_timer(int nr) break; /* UP (RIGHT/+) = Scroll Lap timer up */ -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_UP: #else case BUTTON_RIGHT: @@ -309,7 +309,7 @@ static int run_timer(int nr) break; /* DOWN (LEFT/-) = Scroll Lap timer down */ -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_DOWN: #else case BUTTON_LEFT: @@ -364,7 +364,7 @@ static int chessclock_set_int(char* string, #endif button = rb->button_get_w_tmo(HZ/2); switch(button) { -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_UP: case BUTTON_UP | BUTTON_REPEAT: #else @@ -374,7 +374,7 @@ static int chessclock_set_int(char* string, *variable += step; break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_DOWN: case BUTTON_DOWN | BUTTON_REPEAT: #else @@ -384,7 +384,7 @@ static int chessclock_set_int(char* string, *variable -= step; break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_LEFT: case BUTTON_PLAY: #else @@ -393,7 +393,7 @@ static int chessclock_set_int(char* string, done = true; break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_OFF: #else case BUTTON_STOP: @@ -442,7 +442,7 @@ static int simple_menu(int nr, char **strarr) rb->lcd_puts_scroll(0, 0, strarr[show]); button = rb->button_get(false); switch(button) { -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_UP: case BUTTON_UP | BUTTON_REPEAT: #else @@ -452,7 +452,7 @@ static int simple_menu(int nr, char **strarr) show++; break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_DOWN: case BUTTON_DOWN | BUTTON_REPEAT: #else @@ -462,7 +462,7 @@ static int simple_menu(int nr, char **strarr) show--; break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_LEFT: case BUTTON_PLAY: #else @@ -471,7 +471,7 @@ static int simple_menu(int nr, char **strarr) return show; break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_OFF: #else case BUTTON_STOP: diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c index dbccd03697..74b7663f3f 100644 --- a/apps/plugins/metronome.c +++ b/apps/plugins/metronome.c @@ -200,7 +200,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter){ while (true){ switch (rb->button_get(true)) { -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_OFF: #else case BUTTON_STOP: @@ -220,7 +220,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter){ draw_display(); break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_UP: case BUTTON_UP | BUTTON_REPEAT: #else @@ -231,7 +231,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter){ calc_period(); break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_DOWN: case BUTTON_DOWN | BUTTON_REPEAT: #else diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c index db99c5bb77..b76a08cb80 100644 --- a/apps/plugins/splitedit.c +++ b/apps/plugins/splitedit.c @@ -230,7 +230,7 @@ static void update_icons(void) LCD_WIDTH/3 + LCD_WIDTH/3 / 2 - BMPWIDTH/2, LCD_HEIGHT - BMPHEIGHT, BMPWIDTH, BMPHEIGHT, true); -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F /* The scale icon */ rb->lcd_bitmap(SCALE_BMP[rb->peak_meter_get_use_dbfs()], 2 *LCD_WIDTH/3 + LCD_WIDTH/3 / 2 - BMPWIDTH/2, LCD_HEIGHT - BMPHEIGHT, @@ -849,7 +849,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split, { /* read volume info */ unsigned short volume; -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F volume = rb->mas_codec_readreg(0x0c); volume += rb->mas_codec_readreg(0x0d); volume = volume / 2; @@ -1003,7 +1003,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split, lastx = time_to_xpos(mp3->elapsed); break; -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F case BUTTON_ON | BUTTON_RIGHT: rb->mpeg_set_pitch(1500); splitedit_invalidate_osci(); @@ -1060,7 +1060,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split, break; case BUTTON_F3: -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F rb->peak_meter_set_use_dbfs(rb->peak_meter_get_use_dbfs() +1); #endif splitedit_invalidate_osci(); diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index f71c4fe454..370a1b51a6 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c @@ -103,7 +103,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { /* OFF/MENU key to exit */ -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_OFF: #else case BUTTON_MENU: @@ -127,7 +127,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) break; /* LEFT = Reset timer */ -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_LEFT: #else case BUTTON_STOP: @@ -148,7 +148,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) break; /* UP (RIGHT/+) = Scroll Lap timer up */ -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_UP: #else case BUTTON_RIGHT: @@ -161,7 +161,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) break; /* DOWN (LEFT/-) = Scroll Lap timer down */ -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_DOWN: #else case BUTTON_LEFT: diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index a593da28e7..eb15127704 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c @@ -746,7 +746,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) while (!exit) { switch (rb->button_get(true)) { -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_OFF: #else case BUTTON_STOP: @@ -755,7 +755,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) exit = true; break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_F1: #else case BUTTON_ON | BUTTON_LEFT: @@ -776,7 +776,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) viewer_draw(col); break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_F2: #else case BUTTON_ON | BUTTON_MENU | BUTTON_RIGHT: @@ -802,7 +802,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) viewer_draw(col); break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_F3: #else case BUTTON_ON | BUTTON_RIGHT: @@ -843,7 +843,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) viewer_draw(col); break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_UP: case BUTTON_UP | BUTTON_REPEAT: #else @@ -861,7 +861,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) viewer_draw(col); break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_DOWN: case BUTTON_DOWN | BUTTON_REPEAT: #else @@ -875,7 +875,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) viewer_draw(col); break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_LEFT: case BUTTON_LEFT | BUTTON_REPEAT: #else @@ -895,7 +895,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) viewer_draw(col); break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_RIGHT: case BUTTON_RIGHT | BUTTON_REPEAT: #else @@ -915,7 +915,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) viewer_draw(col); break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_ON: /*Go to On-btn combinations */ col = viewer_recorder_on_button(col); diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index c1bd25e0aa..b1a28c29b4 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c @@ -33,7 +33,7 @@ #define KEYBOARD_LINES 4 #define KEYBOARD_PAGES 3 -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD static void kbd_setupkeys(const char* line[KEYBOARD_LINES], int page) { switch (page) { @@ -77,7 +77,7 @@ void kbd_spellchar(char c) int kbd_input(char* text, int buflen) { -#ifndef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD != RECORDER_PAD (void)text; (void)buflen; splash(HZ*2, true, "Keyboard not implemented yet"); diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index c163cc4552..3d03dc30c9 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c @@ -48,7 +48,7 @@ #include "recording.h" #include "talk.h" -#ifdef HAVE_FMRADIO +#ifdef CONFIG_TUNER #define MAX_FREQ (108000000) #define MIN_FREQ (87500000) @@ -167,7 +167,7 @@ static void remember_frequency(void) bool radio_screen(void) { -#ifndef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD != RECORDER_PAD splash(HZ*2, true, "Radio not supported yet"); return false; #else @@ -668,7 +668,7 @@ static bool radio_add_preset(void) static int handle_radio_presets_menu_cb(int key, int m) { (void)m; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD switch(key) { case BUTTON_F3: @@ -732,7 +732,7 @@ bool handle_radio_presets_menu(void) int handle_radio_presets_cb(int key, int m) { -#ifdef HAVE_ONDIO_KEYPAD +#if CONFIG_KEYPAD == ONDIO_PAD (void)key; (void)m; return BUTTON_NONE; diff --git a/apps/recorder/radio.h b/apps/recorder/radio.h index 5ddbf13d6b..76a4af3b9f 100644 --- a/apps/recorder/radio.h +++ b/apps/recorder/radio.h @@ -19,7 +19,7 @@ #ifndef RADIO_H #define RADIO_H -#ifdef HAVE_FMRADIO +#ifdef CONFIG_TUNER bool radio_screen(void); void radio_stop(void); bool radio_hardware_present(void); diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 3a2505b6ae..98c2b27008 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c @@ -166,7 +166,7 @@ int rec_create_directory(void) bool recording_screen(void) { -#ifndef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD != RECORDER_PAD splash(HZ*2, true, "Recording not supported yet"); return false; #else @@ -625,7 +625,7 @@ bool recording_screen(void) #endif } -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD bool f2_rec_screen(void) { bool exit = false; diff --git a/apps/screens.c b/apps/screens.c index b0d95e0a7a..64382cc0ed 100644 --- a/apps/screens.c +++ b/apps/screens.c @@ -286,7 +286,7 @@ int charging_screen(void) #endif /* HAVE_BATTERIES */ -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD /* returns: 0 if no key was pressed 1 if a key was pressed (or if ON was held down long enough to repeat) @@ -1112,7 +1112,7 @@ bool set_time_screen(const char* string, struct tm *tm) } #endif -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD bool shutdown_screen(void) { int button; diff --git a/apps/screens.h b/apps/screens.h index 9f15ff3228..47b85af821 100644 --- a/apps/screens.h +++ b/apps/screens.h @@ -26,7 +26,7 @@ void usb_screen(void); int charging_screen(void); void charging_splash(void); -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD int pitch_screen(void); bool quick_screen(const int, const int); #endif diff --git a/apps/settings.c b/apps/settings.c index bd1abc240d..a13abecfc7 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -63,7 +63,7 @@ #include "keyboard.h" #include "version.h" #include "rtc.h" -#ifdef HAVE_MAS3507D +#if CONFIG_HWCODEC == MAS3507D void dac_line_in(bool enable); #endif struct user_settings global_settings; @@ -164,7 +164,7 @@ static const struct bit_entry rtc_bits[] = {8 | SIGNED, S_O(balance), 0, "balance", NULL }, /* -100...100 */ {5 | SIGNED, S_O(bass), 0, "bass", NULL }, /* -15..+15 / -12..+12 */ {5 | SIGNED, S_O(treble), 0, "treble", NULL }, /* -15..+15 / -12..+12 */ -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F {5, S_O(loudness), 0, "loudness", NULL }, /* 0...17 */ {3, S_O(avc), 0, "auto volume", "off,20ms,2,4,8" }, {1, S_O(superbass), false, "superbass", off_on }, @@ -221,7 +221,7 @@ static const struct bit_entry rtc_bits[] = /* new stuff to be added here */ /* If values are just added to the end, no need to bump the version. */ -#ifdef HAVE_FMRADIO +#ifdef CONFIG_TUNER {1, S_O(fm_force_mono), false, "force fm mono", off_on }, {8, S_O(last_frequency), 0, NULL, NULL }, /* Default: MIN_FREQ */ #endif @@ -295,7 +295,7 @@ static const struct bit_entry hd_bits[] = {7, S_O(peak_meter_min), 60, "peak meter min", NULL }, /* 0...100 */ {7, S_O(peak_meter_max), 0, "peak meter max", NULL }, /* 0...100 */ #endif -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F /* recording */ {1, S_O(rec_editable), false, "editable recordings", off_on }, {4, S_O(rec_timesplit), 0, "rec timesplit", /* 0...13 */ @@ -315,7 +315,7 @@ static const struct bit_entry hd_bits[] = {1, S_O(rec_directory), 0, /* rec_base_directory */ "rec directory", REC_BASE_DIR ",current" }, #endif -#ifdef HAVE_MAS3507D +#if CONFIG_HWCODEC == MAS3507D {1, S_O(line_in), false, "line in", off_on }, #endif /* voice */ @@ -710,7 +710,7 @@ void sound_settings_apply(void) mpeg_sound_set(SOUND_BALANCE, global_settings.balance); mpeg_sound_set(SOUND_VOLUME, global_settings.volume); mpeg_sound_set(SOUND_CHANNELS, global_settings.channel_config); -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F mpeg_sound_set(SOUND_LOUDNESS, global_settings.loudness); mpeg_sound_set(SOUND_AVC, global_settings.avc); mpeg_sound_set(SOUND_MDB_STRENGTH, global_settings.mdb_strength); @@ -735,7 +735,7 @@ void settings_apply(void) backlight_set_timeout(global_settings.backlight_timeout); backlight_set_on_when_charging(global_settings.backlight_on_when_charging); ata_spindown(global_settings.disk_spindown); -#ifdef HAVE_MAS3507D +#if CONFIG_HWCODEC == MAS3507D dac_line_in(global_settings.line_in); #endif #ifdef HAVE_ATA_POWER_OFF @@ -1513,7 +1513,7 @@ bool set_option(const char* string, void* variable, enum optiontype type, return false; } -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F /* This array holds the record timer interval lengths, in seconds */ static const unsigned long rec_timer_seconds[] = { diff --git a/apps/settings.h b/apps/settings.h index aa408ea2cc..b6d37a0aab 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -34,7 +34,7 @@ #define MAX_FILENAME 20 /* button definitions */ -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD #define SETTINGS_INC BUTTON_UP #define SETTINGS_DEC BUTTON_DOWN #define SETTINGS_OK (BUTTON_PLAY|BUTTON_REL) @@ -42,14 +42,14 @@ #define SETTINGS_CANCEL (BUTTON_OFF|BUTTON_REL) #define SETTINGS_CANCEL2 (BUTTON_F1|BUTTON_REL) -#elif defined HAVE_PLAYER_KEYPAD +#elif CONFIG_KEYPAD == PLAYER_PAD #define SETTINGS_INC BUTTON_RIGHT #define SETTINGS_DEC BUTTON_LEFT #define SETTINGS_OK (BUTTON_PLAY|BUTTON_REL) #define SETTINGS_CANCEL (BUTTON_STOP|BUTTON_REL) #define SETTINGS_CANCEL2 (BUTTON_MENU|BUTTON_REL) -#elif defined HAVE_ONDIO_KEYPAD +#elif CONFIG_KEYPAD == ONDIO_PAD #define SETTINGS_INC BUTTON_UP #define SETTINGS_DEC BUTTON_DOWN #define SETTINGS_OK (BUTTON_RIGHT|BUTTON_REL) @@ -239,7 +239,7 @@ struct user_settings bool fade_on_stop; /* fade on pause/unpause/stop */ bool caption_backlight; /* turn on backlight at end and start of track */ -#ifdef HAVE_FMRADIO +#ifdef CONFIG_TUNER int fm_freq_step; /* Frequency step for manual tuning, in kHz */ bool fm_force_mono; /* Forces Mono mode if true */ bool fm_full_range; /* Enables full 10MHz-160MHz range if true, else @@ -306,7 +306,7 @@ bool set_time_screen(const char* string, struct tm *tm); int read_line(int fd, char* buffer, int buffer_size); void set_file(char* filename, char* setting, int maxlen); -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F unsigned int rec_timesplit_seconds(void); #endif diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 9e95fe9d9a..624274520f 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c @@ -48,7 +48,7 @@ #include "peakmeter.h" #endif #include "lang.h" -#ifdef HAVE_MAS3507D +#if CONFIG_HWCODEC == MAS3507D void dac_line_in(bool enable); #endif #ifdef HAVE_ALARM_MOD @@ -775,7 +775,7 @@ static bool spindown(void) ata_spindown, 1, 3, 254 ); } -#ifdef HAVE_MAS3507D +#if CONFIG_HWCODEC == MAS3507D static bool line_in(void) { bool rc = set_bool(str(LANG_LINE_IN), &global_settings.line_in); @@ -1335,7 +1335,7 @@ static bool system_settings_menu(void) { ID2P(LANG_ALARM_MOD_ALARM_MENU), alarm_screen }, #endif { ID2P(LANG_LIMITS_MENU), limits_settings_menu }, -#ifdef HAVE_MAS3507D +#if CONFIG_HWCODEC == MAS3507D { ID2P(LANG_LINE_IN), line_in }, #endif { ID2P(LANG_CAR_ADAPTER_MODE), car_adapter_mode }, diff --git a/apps/sound_menu.c b/apps/sound_menu.c index fdb2043171..1cb10c6a81 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c @@ -137,7 +137,7 @@ bool set_sound(const char* string, } if (changed) { mpeg_sound_set(setting, *variable); -#ifdef HAVE_MAS3507D +#if CONFIG_HWCODEC == MAS3507D if(setting == SOUND_BALANCE) mpeg_sound_set(SOUND_VOLUME, global_settings.volume); #endif @@ -168,7 +168,7 @@ static bool treble(void) return set_sound(str(LANG_TREBLE), &global_settings.treble, SOUND_TREBLE); } -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F static bool loudness(void) { return set_sound(str(LANG_LOUDNESS), &global_settings.loudness, @@ -370,7 +370,7 @@ static bool recdirectory(void) names, 2, NULL ); } -#endif /* HAVE_MAS3587F */ +#endif /* MAS3587F */ static void set_chanconf(int val) { @@ -406,7 +406,7 @@ bool sound_menu(void) { ID2P(LANG_TREBLE), treble }, { ID2P(LANG_BALANCE), balance }, { ID2P(LANG_CHANNEL_MENU), chanconf }, -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F { ID2P(LANG_LOUDNESS), loudness }, { ID2P(LANG_AUTOVOL), avc }, { ID2P(LANG_SUPERBASS), superbass }, @@ -426,7 +426,7 @@ bool sound_menu(void) return result; } -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F bool recording_menu(bool no_source) { int m; diff --git a/apps/status.c b/apps/status.c index f144adebef..84a3f8d6c2 100644 --- a/apps/status.c +++ b/apps/status.c @@ -84,7 +84,7 @@ int current_playmode(void) else return STATUS_PLAY; } -#ifdef HAVE_MAS3587F +#if CONFIG_HWCODEC == MAS3587F else { if(mpeg_stat & MPEG_STATUS_RECORD) diff --git a/apps/tree.c b/apps/tree.c index 44ade04d29..1ffbaa47fe 100644 --- a/apps/tree.c +++ b/apps/tree.c @@ -1351,7 +1351,7 @@ static bool dirbrowse(const char *root, const int *dirfilter) break; #endif -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD case BUTTON_F2: if (*dirfilter < NUM_FILTER_MODES) { diff --git a/apps/tree.h b/apps/tree.h index eb4f0cd00c..398c676f05 100644 --- a/apps/tree.h +++ b/apps/tree.h @@ -21,7 +21,7 @@ #include -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD #define TREE_NEXT BUTTON_DOWN #define TREE_PREV BUTTON_UP #define TREE_EXIT BUTTON_LEFT @@ -37,7 +37,7 @@ #define TREE_RC_ENTER BUTTON_RC_PLAY #define TREE_RC_RUN BUTTON_RC_PLAY -#elif defined HAVE_PLAYER_KEYPAD +#elif CONFIG_KEYPAD == PLAYER_PAD #define TREE_NEXT BUTTON_RIGHT #define TREE_PREV BUTTON_LEFT #define TREE_EXIT BUTTON_STOP @@ -52,7 +52,7 @@ #define TREE_RC_ENTER BUTTON_RC_PLAY #define TREE_RC_RUN BUTTON_RC_PLAY -#elif defined HAVE_ONDIO_KEYPAD +#elif CONFIG_KEYPAD == ONDIO_PAD #define TREE_NEXT BUTTON_DOWN #define TREE_PREV BUTTON_UP #define TREE_EXIT BUTTON_LEFT diff --git a/apps/wps.c b/apps/wps.c index 8d49b5a478..d5c3d82eca 100644 --- a/apps/wps.c +++ b/apps/wps.c @@ -62,7 +62,7 @@ static struct mp3entry* nid3 = NULL; static char current_track_path[MAX_PATH+1]; /* button definitions */ -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) @@ -84,7 +84,7 @@ static char current_track_path[MAX_PATH+1]; #define WPS_RC_DECVOL BUTTON_RC_VOL_DOWN #define WPS_RC_EXIT BUTTON_RC_STOP -#elif defined HAVE_PLAYER_KEYPAD +#elif CONFIG_KEYPAD == PLAYER_PAD #define WPS_NEXT BUTTON_RIGHT #define WPS_PREV BUTTON_LEFT #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) @@ -106,7 +106,7 @@ static char current_track_path[MAX_PATH+1]; #define WPS_RC_DECVOL BUTTON_RC_VOL_DOWN #define WPS_RC_EXIT BUTTON_RC_STOP -#elif defined HAVE_ONDIO_KEYPAD +#elif CONFIG_KEYPAD == ONDIO_PAD #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) @@ -218,7 +218,7 @@ static bool ffwd_rew(int button) { if (!paused) mpeg_pause(); -#ifdef HAVE_PLAYER_KEYPAD +#if CONFIG_KEYPAD == PLAYER_PAD lcd_stop_scroll(); #endif if (direction > 0) @@ -629,7 +629,7 @@ int wps_show(void) case WPS_RC_NEXT: #endif case WPS_NEXT: -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD if (lastbutton & BUTTON_REPEAT) break; #endif @@ -664,7 +664,7 @@ int wps_show(void) waitfor_nokey(); break; -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD /* play settings */ case BUTTON_F2: if (quick_screen(CONTEXT_WPS, BUTTON_F2)) diff --git a/apps/wps.h b/apps/wps.h index c6cec3fdce..bc2e30e7c0 100644 --- a/apps/wps.h +++ b/apps/wps.h @@ -28,7 +28,7 @@ int wps_show(void); bool refresh_wps(bool refresh_scroll); void handle_usb(void); -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD bool f2_screen(void); bool f3_screen(void); #endif -- cgit v1.2.3