diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/main.c | 2 | ||||
| -rw-r--r-- | apps/screens.c | 4 | ||||
| -rw-r--r-- | apps/settings.c | 4 | ||||
| -rw-r--r-- | apps/settings_menu.c | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/apps/main.c b/apps/main.c index 01202a9..536a181 100644 --- a/apps/main.c +++ b/apps/main.c @@ -151,7 +151,7 @@ void init(void) powermgmt_init(); -#ifdef HAVE_BATTERIES +#ifdef HAVE_CHARGING if (coldstart && charger_inserted() && !global_settings.car_adapter_mode) { rc = charging_screen(); /* display a "charging" screen */ diff --git a/apps/screens.c b/apps/screens.c index 64382cc..b31067a 100644 --- a/apps/screens.c +++ b/apps/screens.c @@ -231,7 +231,7 @@ void charging_display_info(bool animate) } #endif -#ifdef HAVE_BATTERIES +#ifdef HAVE_CHARGING /* blocks while charging, returns on event: 1 if charger cable was removed 2 if Off/Stop key was pressed @@ -283,7 +283,7 @@ int charging_screen(void) return rc; } -#endif /* HAVE_BATTERIES */ +#endif /* HAVE_CHARGING */ #if CONFIG_KEYPAD == RECORDER_PAD diff --git a/apps/settings.c b/apps/settings.c index 3b6a048..2765ae8 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -224,7 +224,9 @@ static const struct bit_entry rtc_bits[] = #elif CONFIG_BATTERY == BATT_3AAA_ALKALINE {12, S_O(battery_capacity), 1000, "battery capacity", NULL }, #endif +#ifdef HAVE_CHARGING {1, S_O(car_adapter_mode), false, "car adapter mode", off_on }, +#endif /* new stuff to be added here */ /* If values are just added to the end, no need to bump the version. */ @@ -281,7 +283,7 @@ static const struct bit_entry hd_bits[] = {1, S_O(browse_current), false, "follow playlist", off_on }, /* playlist */ {1, S_O(playlist_viewer_icons), true, "playlist viewer icons", off_on }, - {1, S_O(playlist_viewer_indices), true, + {1, S_O(playlist_viewer_indices), true, "playlist viewer indices", off_on }, {1, S_O(playlist_viewer_track_display), 0, "playlist viewer track display", "track name,full path" }, diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 61d2519..2579d7b 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c @@ -58,6 +58,7 @@ void dac_line_in(bool enable); /* This flag is set by dirbrowse() if a new language is loaded */ bool language_changed; +#ifdef HAVE_CHARGING static bool car_adapter_mode(void) { return set_bool_options( str(LANG_CAR_ADAPTER_MODE), @@ -66,6 +67,7 @@ static bool car_adapter_mode(void) STR(LANG_SET_BOOL_NO), set_car_adapter_mode); } +#endif static bool contrast(void) { @@ -1351,7 +1353,9 @@ static bool system_settings_menu(void) #if CONFIG_HWCODEC == MAS3507D { ID2P(LANG_LINE_IN), line_in }, #endif +#ifdef HAVE_CHARGING { ID2P(LANG_CAR_ADAPTER_MODE), car_adapter_mode }, +#endif { ID2P(LANG_MANAGE_MENU), manage_settings_menu }, }; |