kbd_input(): move sc assignement under #ifdef HAVE_TOUCHSCREEN

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28112 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-09-19 08:17:02 +00:00
parent 37c1192753
commit c78d55a311

View file

@ -453,7 +453,6 @@ int kbd_input(char* text, int buflen)
const int button_screen = 0; const int button_screen = 0;
#endif #endif
struct keyboard_parameters *pm; struct keyboard_parameters *pm;
struct screen *sc;
state.len_utf8 = utf8length(state.text); state.len_utf8 = utf8length(state.text);
@ -492,10 +491,12 @@ int kbd_input(char* text, int buflen)
button_screen = (get_action_statuscode(NULL) & ACTION_REMOTE) ? 1 : 0; button_screen = (get_action_statuscode(NULL) & ACTION_REMOTE) ? 1 : 0;
#endif #endif
pm = &param[button_screen]; pm = &param[button_screen];
sc = &screens[button_screen];
#ifdef HAVE_TOUCHSCREEN #ifdef HAVE_TOUCHSCREEN
if (button == ACTION_TOUCHSCREEN) if (button == ACTION_TOUCHSCREEN)
{
struct screen *sc = &screens[button_screen];
button = keyboard_touchscreen(pm, sc, &state); button = keyboard_touchscreen(pm, sc, &state);
}
#endif #endif
/* Remap some buttons to allow to move /* Remap some buttons to allow to move