diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/quickscreen.c | 27 | ||||
-rw-r--r-- | apps/settings.h | 7 | ||||
-rw-r--r-- | apps/settings_list.c | 8 |
3 files changed, 12 insertions, 30 deletions
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c index 1abe2d5992..c7774baef4 100644 --- a/apps/gui/quickscreen.c +++ b/apps/gui/quickscreen.c | |||
@@ -367,16 +367,16 @@ bool quick_screen_quick(int button_enter) | |||
367 | int oldrepeat = global_settings.repeat_mode; | 367 | int oldrepeat = global_settings.repeat_mode; |
368 | 368 | ||
369 | qs.items[QUICKSCREEN_TOP] = | 369 | qs.items[QUICKSCREEN_TOP] = |
370 | get_setting(global_settings.qs_item_top, | 370 | get_setting(global_settings.qs_items[QUICKSCREEN_TOP], |
371 | find_setting(&global_settings.party_mode, NULL)); | 371 | find_setting(&global_settings.party_mode, NULL)); |
372 | qs.items[QUICKSCREEN_LEFT] = | 372 | qs.items[QUICKSCREEN_LEFT] = |
373 | get_setting(global_settings.qs_item_left, | 373 | get_setting(global_settings.qs_items[QUICKSCREEN_LEFT], |
374 | find_setting(&global_settings.playlist_shuffle, NULL)); | 374 | find_setting(&global_settings.playlist_shuffle, NULL)); |
375 | qs.items[QUICKSCREEN_RIGHT] = | 375 | qs.items[QUICKSCREEN_RIGHT] = |
376 | get_setting(global_settings.qs_item_right, | 376 | get_setting(global_settings.qs_items[QUICKSCREEN_RIGHT], |
377 | find_setting(&global_settings.repeat_mode, NULL)); | 377 | find_setting(&global_settings.repeat_mode, NULL)); |
378 | qs.items[QUICKSCREEN_BOTTOM] = | 378 | qs.items[QUICKSCREEN_BOTTOM] = |
379 | get_setting(global_settings.qs_item_bottom, | 379 | get_setting(global_settings.qs_items[QUICKSCREEN_BOTTOM], |
380 | find_setting(&global_settings.dirfilter, NULL)); | 380 | find_setting(&global_settings.dirfilter, NULL)); |
381 | 381 | ||
382 | qs.callback = NULL; | 382 | qs.callback = NULL; |
@@ -452,22 +452,7 @@ void set_as_qs_item(const struct settings_list *setting, | |||
452 | if (&settings[i] == setting) | 452 | if (&settings[i] == setting) |
453 | break; | 453 | break; |
454 | } | 454 | } |
455 | switch (item) | 455 | |
456 | { | 456 | global_settings.qs_items[item] = i; |
457 | case QUICKSCREEN_TOP: | ||
458 | global_settings.qs_item_top = i; | ||
459 | break; | ||
460 | case QUICKSCREEN_LEFT: | ||
461 | global_settings.qs_item_left = i; | ||
462 | break; | ||
463 | case QUICKSCREEN_RIGHT: | ||
464 | global_settings.qs_item_right = i; | ||
465 | break; | ||
466 | case QUICKSCREEN_BOTTOM: | ||
467 | global_settings.qs_item_bottom = i; | ||
468 | break; | ||
469 | default: /* shut the compiler up */ | ||
470 | break; | ||
471 | } | ||
472 | } | 457 | } |
473 | 458 | ||
diff --git a/apps/settings.h b/apps/settings.h index c9ff3f9dd3..07f6f22efb 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -27,6 +27,7 @@ | |||
27 | #include "inttypes.h" | 27 | #include "inttypes.h" |
28 | #include "config.h" | 28 | #include "config.h" |
29 | #include "statusbar.h" /* for the statusbar values */ | 29 | #include "statusbar.h" /* for the statusbar values */ |
30 | #include "quickscreen.h" | ||
30 | #include "button.h" | 31 | #include "button.h" |
31 | #if CONFIG_CODEC == SWCODEC | 32 | #if CONFIG_CODEC == SWCODEC |
32 | #include "audio.h" | 33 | #include "audio.h" |
@@ -507,11 +508,7 @@ struct user_settings | |||
507 | #endif | 508 | #endif |
508 | 509 | ||
509 | #ifdef HAVE_QUICKSCREEN | 510 | #ifdef HAVE_QUICKSCREEN |
510 | /* these are split because settings_list cant handle arrays */ | 511 | int qs_items[QUICKSCREEN_ITEM_COUNT]; |
511 | int qs_item_top; | ||
512 | int qs_item_left; | ||
513 | int qs_item_right; | ||
514 | int qs_item_bottom; | ||
515 | #endif | 512 | #endif |
516 | 513 | ||
517 | #if CONFIG_RTC | 514 | #if CONFIG_RTC |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 5a0e05d7d2..d9ca889458 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -1582,19 +1582,19 @@ const struct settings_list settings[] = { | |||
1582 | ID2P(LANG_NORMAL), ID2P(LANG_HIGH)), | 1582 | ID2P(LANG_NORMAL), ID2P(LANG_HIGH)), |
1583 | #endif | 1583 | #endif |
1584 | #ifdef HAVE_QUICKSCREEN | 1584 | #ifdef HAVE_QUICKSCREEN |
1585 | CUSTOM_SETTING(0, qs_item_top, LANG_TOP_QS_ITEM, | 1585 | CUSTOM_SETTING(0, qs_items[QUICKSCREEN_TOP], LANG_TOP_QS_ITEM, |
1586 | &global_settings.dirfilter, "qs top", | 1586 | &global_settings.dirfilter, "qs top", |
1587 | qs_load_from_cfg, qs_write_to_cfg, | 1587 | qs_load_from_cfg, qs_write_to_cfg, |
1588 | qs_is_changed, qs_set_default), | 1588 | qs_is_changed, qs_set_default), |
1589 | CUSTOM_SETTING(0, qs_item_left, LANG_LEFT_QS_ITEM, | 1589 | CUSTOM_SETTING(0, qs_items[QUICKSCREEN_LEFT], LANG_LEFT_QS_ITEM, |
1590 | &global_settings.playlist_shuffle, "qs left", | 1590 | &global_settings.playlist_shuffle, "qs left", |
1591 | qs_load_from_cfg, qs_write_to_cfg, | 1591 | qs_load_from_cfg, qs_write_to_cfg, |
1592 | qs_is_changed, qs_set_default), | 1592 | qs_is_changed, qs_set_default), |
1593 | CUSTOM_SETTING(0, qs_item_right, LANG_RIGHT_QS_ITEM, | 1593 | CUSTOM_SETTING(0, qs_items[QUICKSCREEN_RIGHT], LANG_RIGHT_QS_ITEM, |
1594 | &global_settings.repeat_mode, "qs right", | 1594 | &global_settings.repeat_mode, "qs right", |
1595 | qs_load_from_cfg, qs_write_to_cfg, | 1595 | qs_load_from_cfg, qs_write_to_cfg, |
1596 | qs_is_changed, qs_set_default), | 1596 | qs_is_changed, qs_set_default), |
1597 | CUSTOM_SETTING(0, qs_item_bottom, LANG_BOTTOM_QS_ITEM, | 1597 | CUSTOM_SETTING(0, qs_items[QUICKSCREEN_BOTTOM], LANG_BOTTOM_QS_ITEM, |
1598 | &global_settings.dirfilter, "qs bottom", | 1598 | &global_settings.dirfilter, "qs bottom", |
1599 | qs_load_from_cfg, qs_write_to_cfg, | 1599 | qs_load_from_cfg, qs_write_to_cfg, |
1600 | qs_is_changed, qs_set_default), | 1600 | qs_is_changed, qs_set_default), |