diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/quickscreen.c | 47 | ||||
-rw-r--r-- | apps/gui/quickscreen.h | 3 |
2 files changed, 14 insertions, 36 deletions
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c index 4eebe09fd3..356f74b283 100644 --- a/apps/gui/quickscreen.c +++ b/apps/gui/quickscreen.c | |||
@@ -417,15 +417,6 @@ static int gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter | |||
417 | return ret; | 417 | return ret; |
418 | } | 418 | } |
419 | 419 | ||
420 | static const struct settings_list *get_setting(int gs_value, | ||
421 | const struct settings_list *defaultval) | ||
422 | { | ||
423 | if (gs_value != -1 && gs_value < nb_settings && | ||
424 | is_setting_quickscreenable(&settings[gs_value])) | ||
425 | return &settings[gs_value]; | ||
426 | return defaultval; | ||
427 | } | ||
428 | |||
429 | int quick_screen_quick(int button_enter) | 420 | int quick_screen_quick(int button_enter) |
430 | { | 421 | { |
431 | struct gui_quickscreen qs; | 422 | struct gui_quickscreen qs; |
@@ -436,16 +427,13 @@ int quick_screen_quick(int button_enter) | |||
436 | #endif | 427 | #endif |
437 | bool usb = false; | 428 | bool usb = false; |
438 | 429 | ||
439 | qs.items[QUICKSCREEN_TOP] = | 430 | for (int i = 0; i < 4; ++i) |
440 | get_setting(global_settings.qs_items[QUICKSCREEN_TOP], NULL); | 431 | { |
441 | qs.items[QUICKSCREEN_LEFT] = | 432 | qs.items[i] = global_settings.qs_items[i]; |
442 | get_setting(global_settings.qs_items[QUICKSCREEN_LEFT], | 433 | |
443 | find_setting(&global_settings.playlist_shuffle, NULL)); | 434 | if (!is_setting_quickscreenable(qs.items[i])) |
444 | qs.items[QUICKSCREEN_RIGHT] = | 435 | qs.items[i] = NULL; |
445 | get_setting(global_settings.qs_items[QUICKSCREEN_RIGHT], | 436 | } |
446 | find_setting(&global_settings.repeat_mode, NULL)); | ||
447 | qs.items[QUICKSCREEN_BOTTOM] = | ||
448 | get_setting(global_settings.qs_items[QUICKSCREEN_BOTTOM], NULL); | ||
449 | 437 | ||
450 | qs.callback = NULL; | 438 | qs.callback = NULL; |
451 | int ret = gui_syncquickscreen_run(&qs, button_enter, &usb); | 439 | int ret = gui_syncquickscreen_run(&qs, button_enter, &usb); |
@@ -481,10 +469,14 @@ int quick_screen_quick(int button_enter) | |||
481 | /* stuff to make the quickscreen configurable */ | 469 | /* stuff to make the quickscreen configurable */ |
482 | bool is_setting_quickscreenable(const struct settings_list *setting) | 470 | bool is_setting_quickscreenable(const struct settings_list *setting) |
483 | { | 471 | { |
472 | if (!setting) | ||
473 | return true; | ||
474 | |||
484 | /* to keep things simple, only settings which have a lang_id set are ok */ | 475 | /* to keep things simple, only settings which have a lang_id set are ok */ |
485 | if (setting->lang_id < 0 || (setting->flags&F_BANFROMQS)) | 476 | if (setting->lang_id < 0 || (setting->flags & F_BANFROMQS)) |
486 | return false; | 477 | return false; |
487 | switch (setting->flags&F_T_MASK) | 478 | |
479 | switch (setting->flags & F_T_MASK) | ||
488 | { | 480 | { |
489 | case F_T_BOOL: | 481 | case F_T_BOOL: |
490 | return true; | 482 | return true; |
@@ -495,16 +487,3 @@ bool is_setting_quickscreenable(const struct settings_list *setting) | |||
495 | return false; | 487 | return false; |
496 | } | 488 | } |
497 | } | 489 | } |
498 | |||
499 | void set_as_qs_item(const struct settings_list *setting, | ||
500 | enum quickscreen_item item) | ||
501 | { | ||
502 | int i; | ||
503 | for (i = 0; i < nb_settings; i++) | ||
504 | { | ||
505 | if (&settings[i] == setting) | ||
506 | break; | ||
507 | } | ||
508 | |||
509 | global_settings.qs_items[item] = i; | ||
510 | } | ||
diff --git a/apps/gui/quickscreen.h b/apps/gui/quickscreen.h index 6082b5a883..bd8008bd34 100644 --- a/apps/gui/quickscreen.h +++ b/apps/gui/quickscreen.h | |||
@@ -53,7 +53,6 @@ struct gui_quickscreen | |||
53 | extern int quick_screen_quick(int button_enter); | 53 | extern int quick_screen_quick(int button_enter); |
54 | int quickscreen_set_option(void *data); | 54 | int quickscreen_set_option(void *data); |
55 | bool is_setting_quickscreenable(const struct settings_list *setting); | 55 | bool is_setting_quickscreenable(const struct settings_list *setting); |
56 | void set_as_qs_item(const struct settings_list *setting, | 56 | |
57 | enum quickscreen_item item); | ||
58 | #endif /*_GUI_QUICK_SCREEN_H_*/ | 57 | #endif /*_GUI_QUICK_SCREEN_H_*/ |
59 | #endif /* HAVE_QUICKSCREEN */ | 58 | #endif /* HAVE_QUICKSCREEN */ |