diff options
Diffstat (limited to 'apps/menus/settings_menu.c')
-rw-r--r-- | apps/menus/settings_menu.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 2957b0635c..e2b496a6f7 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -38,9 +38,7 @@ | |||
38 | #include "yesno.h" | 38 | #include "yesno.h" |
39 | #include "talk.h" | 39 | #include "talk.h" |
40 | #include "powermgmt.h" | 40 | #include "powermgmt.h" |
41 | #if CONFIG_CODEC == SWCODEC | ||
42 | #include "playback.h" | 41 | #include "playback.h" |
43 | #endif | ||
44 | #if CONFIG_RTC | 42 | #if CONFIG_RTC |
45 | #include "screens.h" | 43 | #include "screens.h" |
46 | #endif | 44 | #endif |
@@ -326,7 +324,6 @@ MAKE_MENU(limits_menu, ID2P(LANG_LIMITS_MENU), 0, Icon_NOICON, | |||
326 | 324 | ||
327 | 325 | ||
328 | /* Keyclick menu */ | 326 | /* Keyclick menu */ |
329 | #if CONFIG_CODEC == SWCODEC | ||
330 | MENUITEM_SETTING(keyclick, &global_settings.keyclick, NULL); | 327 | MENUITEM_SETTING(keyclick, &global_settings.keyclick, NULL); |
331 | MENUITEM_SETTING(keyclick_repeats, &global_settings.keyclick_repeats, NULL); | 328 | MENUITEM_SETTING(keyclick_repeats, &global_settings.keyclick_repeats, NULL); |
332 | #ifdef HAVE_HARDWARE_CLICK | 329 | #ifdef HAVE_HARDWARE_CLICK |
@@ -337,7 +334,6 @@ MAKE_MENU(keyclick_menu, ID2P(LANG_KEYCLICK), 0, Icon_NOICON, | |||
337 | MAKE_MENU(keyclick_menu, ID2P(LANG_KEYCLICK), 0, Icon_NOICON, | 334 | MAKE_MENU(keyclick_menu, ID2P(LANG_KEYCLICK), 0, Icon_NOICON, |
338 | &keyclick, &keyclick_repeats); | 335 | &keyclick, &keyclick_repeats); |
339 | #endif | 336 | #endif |
340 | #endif | ||
341 | 337 | ||
342 | #if CONFIG_CHARGING | 338 | #if CONFIG_CHARGING |
343 | MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL); | 339 | MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL); |
@@ -437,9 +433,7 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | |||
437 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS | 433 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS |
438 | &buttonlight_brightness, | 434 | &buttonlight_brightness, |
439 | #endif | 435 | #endif |
440 | #if CONFIG_CODEC == SWCODEC | ||
441 | &keyclick_menu, | 436 | &keyclick_menu, |
442 | #endif | ||
443 | #ifdef HAVE_TOUCHPAD_SENSITIVITY_SETTING | 437 | #ifdef HAVE_TOUCHPAD_SENSITIVITY_SETTING |
444 | &touchpad_sensitivity, | 438 | &touchpad_sensitivity, |
445 | #endif | 439 | #endif |
@@ -619,7 +613,6 @@ MAKE_MENU(bookmark_settings_menu, ID2P(LANG_BOOKMARK_SETTINGS), 0, | |||
619 | /***********************************/ | 613 | /***********************************/ |
620 | /* AUTORESUME MENU */ | 614 | /* AUTORESUME MENU */ |
621 | #ifdef HAVE_TAGCACHE | 615 | #ifdef HAVE_TAGCACHE |
622 | #if CONFIG_CODEC == SWCODEC | ||
623 | 616 | ||
624 | static int autoresume_callback(int action, | 617 | static int autoresume_callback(int action, |
625 | const struct menu_item_ex *this_item, | 618 | const struct menu_item_ex *this_item, |
@@ -674,7 +667,6 @@ MAKE_MENU(autoresume_menu, ID2P(LANG_AUTORESUME), | |||
674 | 0, Icon_NOICON, | 667 | 0, Icon_NOICON, |
675 | &autoresume_enable, &autoresume_automatic); | 668 | &autoresume_enable, &autoresume_automatic); |
676 | 669 | ||
677 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
678 | #endif /* HAVE_TAGCACHE */ | 670 | #endif /* HAVE_TAGCACHE */ |
679 | /* AUTORESUME MENU */ | 671 | /* AUTORESUME MENU */ |
680 | /***********************************/ | 672 | /***********************************/ |
@@ -758,10 +750,8 @@ MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, | |||
758 | &startup_shutdown_menu, | 750 | &startup_shutdown_menu, |
759 | &bookmark_settings_menu, | 751 | &bookmark_settings_menu, |
760 | #ifdef HAVE_TAGCACHE | 752 | #ifdef HAVE_TAGCACHE |
761 | #if CONFIG_CODEC == SWCODEC | ||
762 | &autoresume_menu, | 753 | &autoresume_menu, |
763 | #endif | 754 | #endif |
764 | #endif | ||
765 | &browse_langs, &voice_settings_menu, | 755 | &browse_langs, &voice_settings_menu, |
766 | #ifdef HAVE_HOTKEY | 756 | #ifdef HAVE_HOTKEY |
767 | &hotkey_menu, | 757 | &hotkey_menu, |