diff options
author | Nils Wallménius <nils@rockbox.org> | 2009-12-04 22:43:33 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2009-12-04 22:43:33 +0000 |
commit | f443d026ec7dbf4609b740f697ffa9438a5d7f38 (patch) | |
tree | 417c95ebf2ad6c0498f102b5caf9748a2f2b3c4a | |
parent | 03246172b8855d661309a166db6909e065ea54cb (diff) | |
download | rockbox-f443d026ec7dbf4609b740f697ffa9438a5d7f38.tar.gz rockbox-f443d026ec7dbf4609b740f697ffa9438a5d7f38.zip |
FS#10711 by Martin Ritter fixes handling of the 'First Keypress Enables Backlight Only' setting in simulators
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23849 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/drivers/button.c | 2 | ||||
-rw-r--r-- | uisimulator/sdl/button.c | 17 |
2 files changed, 1 insertions, 18 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index 71cd4726cc..f7523d776c 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
@@ -519,6 +519,7 @@ void button_set_flip(bool flip) | |||
519 | } | 519 | } |
520 | } | 520 | } |
521 | #endif /* HAVE_LCD_FLIP */ | 521 | #endif /* HAVE_LCD_FLIP */ |
522 | #endif /* SIMULATOR */ | ||
522 | 523 | ||
523 | #ifdef HAVE_BACKLIGHT | 524 | #ifdef HAVE_BACKLIGHT |
524 | void set_backlight_filter_keypress(bool value) | 525 | void set_backlight_filter_keypress(bool value) |
@@ -533,7 +534,6 @@ void set_remote_backlight_filter_keypress(bool value) | |||
533 | #endif | 534 | #endif |
534 | #endif | 535 | #endif |
535 | 536 | ||
536 | #endif /* SIMULATOR */ | ||
537 | /* | 537 | /* |
538 | * Get button pressed from hardware | 538 | * Get button pressed from hardware |
539 | */ | 539 | */ |
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c index 45de7a469f..e2bae1cf7b 100644 --- a/uisimulator/sdl/button.c +++ b/uisimulator/sdl/button.c | |||
@@ -58,23 +58,6 @@ struct event_queue button_queue; | |||
58 | 58 | ||
59 | static int btn = 0; /* Hopefully keeps track of currently pressed keys... */ | 59 | static int btn = 0; /* Hopefully keeps track of currently pressed keys... */ |
60 | 60 | ||
61 | #ifdef HAVE_BACKLIGHT | ||
62 | static bool filter_first_keypress; | ||
63 | |||
64 | void set_backlight_filter_keypress(bool value) | ||
65 | { | ||
66 | filter_first_keypress = value; | ||
67 | } | ||
68 | #ifdef HAVE_REMOTE_LCD | ||
69 | static bool remote_filter_first_keypress; | ||
70 | |||
71 | void set_remote_backlight_filter_keypress(bool value) | ||
72 | { | ||
73 | remote_filter_first_keypress = value; | ||
74 | } | ||
75 | #endif | ||
76 | #endif | ||
77 | |||
78 | #ifdef HAS_BUTTON_HOLD | 61 | #ifdef HAS_BUTTON_HOLD |
79 | bool hold_button_state = false; | 62 | bool hold_button_state = false; |
80 | bool button_hold(void) { | 63 | bool button_hold(void) { |