diff options
Diffstat (limited to 'apps/gui/quickscreen.c')
-rw-r--r-- | apps/gui/quickscreen.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c index 863bd54be4..c10e688c3e 100644 --- a/apps/gui/quickscreen.c +++ b/apps/gui/quickscreen.c | |||
@@ -19,7 +19,6 @@ | |||
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | |||
23 | #include <stdio.h> | 22 | #include <stdio.h> |
24 | #include "config.h" | 23 | #include "config.h" |
25 | #include "system.h" | 24 | #include "system.h" |
@@ -64,7 +63,7 @@ static void quickscreen_fix_viewports(struct gui_quickscreen *qs, | |||
64 | /* nb_lines only returns the number of fully visible lines, small screens | 63 | /* nb_lines only returns the number of fully visible lines, small screens |
65 | or really large fonts could cause problems with the calculation below. | 64 | or really large fonts could cause problems with the calculation below. |
66 | */ | 65 | */ |
67 | if(nb_lines==0) | 66 | if (nb_lines == 0) |
68 | nb_lines++; | 67 | nb_lines++; |
69 | 68 | ||
70 | char_height = parent->height/nb_lines; | 69 | char_height = parent->height/nb_lines; |
@@ -193,7 +192,7 @@ static void gui_quickscreen_draw(const struct gui_quickscreen *qs, | |||
193 | int temp; | 192 | int temp; |
194 | display->set_viewport(parent); | 193 | display->set_viewport(parent); |
195 | display->clear_viewport(); | 194 | display->clear_viewport(); |
196 | for (i=0; i<QUICKSCREEN_ITEM_COUNT; i++) | 195 | for (i = 0; i < QUICKSCREEN_ITEM_COUNT; i++) |
197 | { | 196 | { |
198 | if (!qs->items[i]) | 197 | if (!qs->items[i]) |
199 | continue; | 198 | continue; |
@@ -242,7 +241,7 @@ static void gui_quickscreen_draw(const struct gui_quickscreen *qs, | |||
242 | static void talk_qs_option(struct settings_list *opt, bool enqueue) | 241 | static void talk_qs_option(struct settings_list *opt, bool enqueue) |
243 | { | 242 | { |
244 | if (global_settings.talk_menu) { | 243 | if (global_settings.talk_menu) { |
245 | if(!enqueue) | 244 | if (!enqueue) |
246 | talk_shutup(); | 245 | talk_shutup(); |
247 | talk_id(opt->lang_id, true); | 246 | talk_id(opt->lang_id, true); |
248 | option_talk_value(opt, option_value_as_int(opt), true); | 247 | option_talk_value(opt, option_value_as_int(opt), true); |
@@ -335,29 +334,30 @@ static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_ente | |||
335 | talk_qs_option((struct settings_list *)qs->items[QUICKSCREEN_BOTTOM], true); | 334 | talk_qs_option((struct settings_list *)qs->items[QUICKSCREEN_BOTTOM], true); |
336 | talk_qs_option((struct settings_list *)qs->items[QUICKSCREEN_RIGHT], true); | 335 | talk_qs_option((struct settings_list *)qs->items[QUICKSCREEN_RIGHT], true); |
337 | while (true) { | 336 | while (true) { |
338 | button = get_action(CONTEXT_QUICKSCREEN,HZ/5); | 337 | button = get_action(CONTEXT_QUICKSCREEN, HZ/5); |
339 | #ifdef HAVE_TOUCHSCREEN | 338 | #ifdef HAVE_TOUCHSCREEN |
340 | if (button == ACTION_TOUCHSCREEN) | 339 | if (button == ACTION_TOUCHSCREEN) |
341 | button = quickscreen_touchscreen_button(vps[SCREEN_MAIN]); | 340 | button = quickscreen_touchscreen_button(vps[SCREEN_MAIN]); |
342 | #endif | 341 | #endif |
343 | if(default_event_handler(button) == SYS_USB_CONNECTED) | 342 | if (default_event_handler(button) == SYS_USB_CONNECTED) |
344 | return(true); | 343 | return(true); |
345 | if(gui_quickscreen_do_button(qs, button)) | 344 | if (gui_quickscreen_do_button(qs, button)) |
346 | { | 345 | { |
347 | changed = true; | 346 | changed = true; |
348 | can_quit=true; | 347 | can_quit = true; |
349 | FOR_NB_SCREENS(i) | 348 | FOR_NB_SCREENS(i) |
350 | gui_quickscreen_draw(qs, &screens[i], &parent[i], vps[i],&vp_icons[i]); | 349 | gui_quickscreen_draw(qs, &screens[i], &parent[i], |
350 | vps[i], &vp_icons[i]); | ||
351 | if (qs->callback) | 351 | if (qs->callback) |
352 | qs->callback(qs); | 352 | qs->callback(qs); |
353 | } | 353 | } |
354 | else if(button==button_enter) | 354 | else if (button == button_enter) |
355 | can_quit=true; | 355 | can_quit = true; |
356 | 356 | ||
357 | if((button == button_enter) && can_quit) | 357 | if ((button == button_enter) && can_quit) |
358 | break; | 358 | break; |
359 | 359 | ||
360 | if(button==ACTION_STD_CANCEL) | 360 | if (button == ACTION_STD_CANCEL) |
361 | break; | 361 | break; |
362 | } | 362 | } |
363 | /* Notify that we're exiting this screen */ | 363 | /* Notify that we're exiting this screen */ |
@@ -371,7 +371,7 @@ static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_ente | |||
371 | return changed; | 371 | return changed; |
372 | } | 372 | } |
373 | 373 | ||
374 | static inline const struct settings_list *get_setting(int gs_value, | 374 | static const struct settings_list *get_setting(int gs_value, |
375 | const struct settings_list *defaultval) | 375 | const struct settings_list *defaultval) |
376 | { | 376 | { |
377 | if (gs_value != -1 && gs_value < nb_settings && | 377 | if (gs_value != -1 && gs_value < nb_settings && |
@@ -379,6 +379,7 @@ static inline const struct settings_list *get_setting(int gs_value, | |||
379 | return &settings[gs_value]; | 379 | return &settings[gs_value]; |
380 | return defaultval; | 380 | return defaultval; |
381 | } | 381 | } |
382 | |||
382 | bool quick_screen_quick(int button_enter) | 383 | bool quick_screen_quick(int button_enter) |
383 | { | 384 | { |
384 | struct gui_quickscreen qs; | 385 | struct gui_quickscreen qs; |
@@ -393,10 +394,10 @@ bool quick_screen_quick(int button_enter) | |||
393 | find_setting(&global_settings.playlist_shuffle, NULL)); | 394 | find_setting(&global_settings.playlist_shuffle, NULL)); |
394 | qs.items[QUICKSCREEN_RIGHT] = | 395 | qs.items[QUICKSCREEN_RIGHT] = |
395 | get_setting(global_settings.qs_item_right, | 396 | get_setting(global_settings.qs_item_right, |
396 | find_setting(&global_settings.repeat_mode, NULL)); | 397 | find_setting(&global_settings.repeat_mode, NULL)); |
397 | qs.items[QUICKSCREEN_BOTTOM] = | 398 | qs.items[QUICKSCREEN_BOTTOM] = |
398 | get_setting(global_settings.qs_item_bottom, | 399 | get_setting(global_settings.qs_item_bottom, |
399 | find_setting(&global_settings.dirfilter, NULL)); | 400 | find_setting(&global_settings.dirfilter, NULL)); |
400 | 401 | ||
401 | qs.callback = NULL; | 402 | qs.callback = NULL; |
402 | if (gui_syncquickscreen_run(&qs, button_enter)) | 403 | if (gui_syncquickscreen_run(&qs, button_enter)) |
@@ -466,7 +467,7 @@ void set_as_qs_item(const struct settings_list *setting, | |||
466 | enum quickscreen_item item) | 467 | enum quickscreen_item item) |
467 | { | 468 | { |
468 | int i; | 469 | int i; |
469 | for(i=0;i<nb_settings;i++) | 470 | for (i = 0; i < nb_settings; i++) |
470 | { | 471 | { |
471 | if (&settings[i] == setting) | 472 | if (&settings[i] == setting) |
472 | break; | 473 | break; |