diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/features.txt | 4 | ||||
-rw-r--r-- | apps/lang/english.lang | 18 | ||||
-rw-r--r-- | apps/main.c | 3 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 6 | ||||
-rw-r--r-- | apps/settings.h | 3 | ||||
-rw-r--r-- | apps/settings_list.c | 4 |
6 files changed, 37 insertions, 1 deletions
diff --git a/apps/features.txt b/apps/features.txt index 242d2d4386..af0da5b355 100644 --- a/apps/features.txt +++ b/apps/features.txt | |||
@@ -225,6 +225,10 @@ usb_hid_mouse | |||
225 | wheel_acceleration | 225 | wheel_acceleration |
226 | #endif | 226 | #endif |
227 | 227 | ||
228 | #if defined(HAVE_LINEOUT_POWEROFF) | ||
229 | lineout_poweroff | ||
230 | #endif | ||
231 | |||
228 | #if defined(HAVE_TOUCHSCREEN) | 232 | #if defined(HAVE_TOUCHSCREEN) |
229 | touchscreen | 233 | touchscreen |
230 | #endif | 234 | #endif |
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index ab5b6b59cf..3c847cff81 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -13377,4 +13377,20 @@ | |||
13377 | recording_histogram: "Histogram interval" | 13377 | recording_histogram: "Histogram interval" |
13378 | </voice> | 13378 | </voice> |
13379 | </phrase> | 13379 | </phrase> |
13380 | 13380 | <phrase> | |
13381 | id: LANG_LINEOUT_ONOFF | ||
13382 | desc: in system settings menu | ||
13383 | user: core | ||
13384 | <source> | ||
13385 | *: none | ||
13386 | lineout_poweroff: "Line-out" | ||
13387 | </source> | ||
13388 | <dest> | ||
13389 | *: none | ||
13390 | lineout_poweroff: "Line-out" | ||
13391 | </dest> | ||
13392 | <voice> | ||
13393 | *: none | ||
13394 | lineout_poweroff: "Line-out" | ||
13395 | </voice> | ||
13396 | </phrase> | ||
diff --git a/apps/main.c b/apps/main.c index fa1500edd5..7c43c0c277 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -632,6 +632,9 @@ static void init(void) | |||
632 | #ifdef HAVE_ACCESSORY_SUPPLY | 632 | #ifdef HAVE_ACCESSORY_SUPPLY |
633 | accessory_supply_set(global_settings.accessory_supply); | 633 | accessory_supply_set(global_settings.accessory_supply); |
634 | #endif | 634 | #endif |
635 | #ifdef HAVE_LINEOUT_POWEROFF | ||
636 | lineout_set(global_settings.lineout_active); | ||
637 | #endif | ||
635 | #ifdef HAVE_HOTSWAP_STORAGE_AS_MAIN | 638 | #ifdef HAVE_HOTSWAP_STORAGE_AS_MAIN |
636 | check_bootfile(false); /* remember write time and filesize */ | 639 | check_bootfile(false); /* remember write time and filesize */ |
637 | #endif | 640 | #endif |
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 5c30e5982f..b695d9265b 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -251,6 +251,9 @@ MENUITEM_SETTING(serial_bitrate, &global_settings.serial_bitrate, NULL); | |||
251 | #ifdef HAVE_ACCESSORY_SUPPLY | 251 | #ifdef HAVE_ACCESSORY_SUPPLY |
252 | MENUITEM_SETTING(accessory_supply, &global_settings.accessory_supply, NULL); | 252 | MENUITEM_SETTING(accessory_supply, &global_settings.accessory_supply, NULL); |
253 | #endif | 253 | #endif |
254 | #ifdef HAVE_LINEOUT_POWEROFF | ||
255 | MENUITEM_SETTING(lineout_onoff, &global_settings.lineout_active, NULL); | ||
256 | #endif | ||
254 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); | 257 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); |
255 | #ifdef USB_ENABLE_HID | 258 | #ifdef USB_ENABLE_HID |
256 | MENUITEM_SETTING(usb_hid, &global_settings.usb_hid, NULL); | 259 | MENUITEM_SETTING(usb_hid, &global_settings.usb_hid, NULL); |
@@ -299,6 +302,9 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | |||
299 | #ifdef HAVE_ACCESSORY_SUPPLY | 302 | #ifdef HAVE_ACCESSORY_SUPPLY |
300 | &accessory_supply, | 303 | &accessory_supply, |
301 | #endif | 304 | #endif |
305 | #ifdef HAVE_LINEOUT_POWEROFF | ||
306 | &lineout_onoff, | ||
307 | #endif | ||
302 | #ifdef HAVE_BUTTON_LIGHT | 308 | #ifdef HAVE_BUTTON_LIGHT |
303 | &buttonlight_timeout, | 309 | &buttonlight_timeout, |
304 | #endif | 310 | #endif |
diff --git a/apps/settings.h b/apps/settings.h index 4cc2bd521e..62f85254aa 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -767,6 +767,9 @@ struct user_settings | |||
767 | #ifdef HAVE_ACCESSORY_SUPPLY | 767 | #ifdef HAVE_ACCESSORY_SUPPLY |
768 | bool accessory_supply; /* 0=off 1=on, accessory power supply for iPod */ | 768 | bool accessory_supply; /* 0=off 1=on, accessory power supply for iPod */ |
769 | #endif | 769 | #endif |
770 | #ifdef HAVE_LINEOUT_POWEROFF | ||
771 | bool lineout_active; | ||
772 | #endif | ||
770 | 773 | ||
771 | #ifdef HAVE_SPEAKER | 774 | #ifdef HAVE_SPEAKER |
772 | bool speaker_enabled; | 775 | bool speaker_enabled; |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 5759e24286..2638eac5a0 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -700,6 +700,10 @@ const struct settings_list settings[] = { | |||
700 | OFFON_SETTING(0, accessory_supply, LANG_ACCESSORY_SUPPLY, | 700 | OFFON_SETTING(0, accessory_supply, LANG_ACCESSORY_SUPPLY, |
701 | true, "accessory power supply", accessory_supply_set), | 701 | true, "accessory power supply", accessory_supply_set), |
702 | #endif | 702 | #endif |
703 | #ifdef HAVE_LINEOUT_POWEROFF | ||
704 | OFFON_SETTING(0, lineout_active, LANG_LINEOUT_ONOFF, | ||
705 | true, "lineout", lineout_set), | ||
706 | #endif | ||
703 | /* tuner */ | 707 | /* tuner */ |
704 | #if CONFIG_TUNER | 708 | #if CONFIG_TUNER |
705 | OFFON_SETTING(0,fm_force_mono, LANG_FM_MONO_MODE, | 709 | OFFON_SETTING(0,fm_force_mono, LANG_FM_MONO_MODE, |