summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-09-19 08:17:02 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-09-19 08:17:02 +0000
commitc78d55a31147fcd0775b076c182cdcb265426013 (patch)
tree770be89c2a0cdc996ee4083f44dbeff3e6bf536d
parent37c1192753038816e77dc59b04e5c068d4bf78e8 (diff)
downloadrockbox-c78d55a31147fcd0775b076c182cdcb265426013.tar.gz
rockbox-c78d55a31147fcd0775b076c182cdcb265426013.zip
kbd_input(): move sc assignement under #ifdef HAVE_TOUCHSCREEN
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28112 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/recorder/keyboard.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index c48eced263..f31d63546a 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -453,7 +453,6 @@ int kbd_input(char* text, int buflen)
453 const int button_screen = 0; 453 const int button_screen = 0;
454#endif 454#endif
455 struct keyboard_parameters *pm; 455 struct keyboard_parameters *pm;
456 struct screen *sc;
457 456
458 state.len_utf8 = utf8length(state.text); 457 state.len_utf8 = utf8length(state.text);
459 458
@@ -492,10 +491,12 @@ int kbd_input(char* text, int buflen)
492 button_screen = (get_action_statuscode(NULL) & ACTION_REMOTE) ? 1 : 0; 491 button_screen = (get_action_statuscode(NULL) & ACTION_REMOTE) ? 1 : 0;
493#endif 492#endif
494 pm = &param[button_screen]; 493 pm = &param[button_screen];
495 sc = &screens[button_screen];
496#ifdef HAVE_TOUCHSCREEN 494#ifdef HAVE_TOUCHSCREEN
497 if (button == ACTION_TOUCHSCREEN) 495 if (button == ACTION_TOUCHSCREEN)
496 {
497 struct screen *sc = &screens[button_screen];
498 button = keyboard_touchscreen(pm, sc, &state); 498 button = keyboard_touchscreen(pm, sc, &state);
499 }
499#endif 500#endif
500 501
501 /* Remap some buttons to allow to move 502 /* Remap some buttons to allow to move