diff options
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/apps/settings.c b/apps/settings.c index 8835b95b12..423e6ed173 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -69,7 +69,7 @@ | |||
69 | #if CONFIG_TUNER | 69 | #if CONFIG_TUNER |
70 | #include "radio.h" | 70 | #include "radio.h" |
71 | #endif | 71 | #endif |
72 | #include "skin_engine/skin_engine.h" | 72 | #include "wps.h" |
73 | 73 | ||
74 | #if CONFIG_CODEC == MAS3507D | 74 | #if CONFIG_CODEC == MAS3507D |
75 | void dac_line_in(bool enable); | 75 | void dac_line_in(bool enable); |
@@ -848,15 +848,12 @@ void settings_apply(bool read_disk) | |||
848 | global_settings.wps_file[0] != 0xff ) { | 848 | global_settings.wps_file[0] != 0xff ) { |
849 | snprintf(buf, sizeof buf, WPS_DIR "/%s.wps", | 849 | snprintf(buf, sizeof buf, WPS_DIR "/%s.wps", |
850 | global_settings.wps_file); | 850 | global_settings.wps_file); |
851 | skin_data_load(gui_wps[0].data, &screens[0], buf, true); | 851 | wps_data_load(SCREEN_MAIN, buf, true); |
852 | } | 852 | } |
853 | else | 853 | else |
854 | { | 854 | { |
855 | wps_data_init(gui_wps[0].data); | 855 | wps_data_init(SCREEN_MAIN); |
856 | skin_data_load(gui_wps[0].data, &screens[0], NULL, true); | 856 | wps_data_load(SCREEN_MAIN, NULL, true); |
857 | #ifdef HAVE_REMOTE_LCD | ||
858 | gui_wps[0].data->remote_wps = false; | ||
859 | #endif | ||
860 | } | 857 | } |
861 | 858 | ||
862 | #if LCD_DEPTH > 1 | 859 | #if LCD_DEPTH > 1 |
@@ -878,13 +875,12 @@ void settings_apply(bool read_disk) | |||
878 | if ( global_settings.rwps_file[0]) { | 875 | if ( global_settings.rwps_file[0]) { |
879 | snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps", | 876 | snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps", |
880 | global_settings.rwps_file); | 877 | global_settings.rwps_file); |
881 | skin_data_load(gui_wps[1].data, &screens[1], buf, true); | 878 | wps_data_load(SCREEN_REMOTE, buf, true); |
882 | } | 879 | } |
883 | else | 880 | else |
884 | { | 881 | { |
885 | wps_data_init(gui_wps[1].data); | 882 | wps_data_init(SCREEN_REMOTE); |
886 | skin_data_load(gui_wps[1].data, &screens[1], NULL, true); | 883 | wps_data_load(SCREEN_REMOTE, NULL, true); |
887 | gui_wps[1].data->remote_wps = true; | ||
888 | } | 884 | } |
889 | #endif | 885 | #endif |
890 | if ( global_settings.lang_file[0]) { | 886 | if ( global_settings.lang_file[0]) { |