diff options
author | William Wilgus <wilgus.william@gmail.com> | 2020-09-17 14:53:29 -0400 |
---|---|---|
committer | William Wilgus <me.theuser@yahoo.com> | 2020-09-18 00:22:52 +0000 |
commit | 2df3a5b04c40d548391c69c18780fefd420fac02 (patch) | |
tree | 48f56c70a30c688e9360a03eff836de7fba9f73b /apps/root_menu.c | |
parent | 4fa945d810a574c96503834d1c9324d02f17fc4b (diff) | |
download | rockbox-2df3a5b04c40d548391c69c18780fefd420fac02.tar.gz rockbox-2df3a5b04c40d548391c69c18780fefd420fac02.zip |
Headphone / lineout pause/resume #FS13237
Allow Lineout to behave like headphone port in regards to
plug/unplug pause/resume
Change-Id: I9cb2c9c40e0bdf3bf7e1e272164acd343f6b3850
Diffstat (limited to 'apps/root_menu.c')
-rw-r--r-- | apps/root_menu.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/apps/root_menu.c b/apps/root_menu.c index 2a8662a170..77a092018a 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c | |||
@@ -767,11 +767,20 @@ void root_menu(void) | |||
767 | } | 767 | } |
768 | #endif /* HAVE_RTC_ALARM */ | 768 | #endif /* HAVE_RTC_ALARM */ |
769 | 769 | ||
770 | #if defined(HAVE_HEADPHONE_DETECTION) || defined(HAVE_LINEOUT_DETECTION) | ||
771 | if (next_screen == GO_TO_WPS && global_settings.unplug_autoresume) | ||
772 | { | ||
773 | next_screen = GO_TO_ROOT; | ||
770 | #ifdef HAVE_HEADPHONE_DETECTION | 774 | #ifdef HAVE_HEADPHONE_DETECTION |
771 | if (next_screen == GO_TO_WPS && | 775 | if (headphones_inserted()) |
772 | (global_settings.unplug_autoresume && !headphones_inserted() )) | 776 | next_screen = GO_TO_WPS; |
773 | next_screen = GO_TO_ROOT; | 777 | #endif |
778 | #ifdef HAVE_LINEOUT_DETECTION | ||
779 | if (lineout_inserted()) | ||
780 | next_screen = GO_TO_WPS; | ||
774 | #endif | 781 | #endif |
782 | } | ||
783 | #endif /*(HAVE_HEADPHONE_DETECTION) || (HAVE_LINEOUT_DETECTION)*/ | ||
775 | 784 | ||
776 | while (true) | 785 | while (true) |
777 | { | 786 | { |