diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/skin_engine/skin_engine.c | 12 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/apps/gui/skin_engine/skin_engine.c b/apps/gui/skin_engine/skin_engine.c index 960bbdb313..25baeb2c3c 100644 --- a/apps/gui/skin_engine/skin_engine.c +++ b/apps/gui/skin_engine/skin_engine.c | |||
@@ -40,18 +40,18 @@ | |||
40 | 40 | ||
41 | static bool skins_initialising = true; | 41 | static bool skins_initialising = true; |
42 | 42 | ||
43 | /* Hosted platforms use the host malloc to manage the buffer */ | 43 | /* App uses the host malloc to manage the buffer */ |
44 | #if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0) | 44 | #ifdef APPLICATION |
45 | static char *skin_buffer = NULL; | 45 | #define skin_buffer NULL |
46 | void theme_init_buffer(void) | 46 | void theme_init_buffer(void) |
47 | { | 47 | { |
48 | skin_buffer = buffer_alloc(SKIN_BUFFER_SIZE); | ||
49 | skins_initialising = false; | 48 | skins_initialising = false; |
50 | } | 49 | } |
51 | #else | 50 | #else |
52 | #define skin_buffer NULL | 51 | static char *skin_buffer = NULL; |
53 | void theme_init_buffer(void) | 52 | void theme_init_buffer(void) |
54 | { | 53 | { |
54 | skin_buffer = buffer_alloc(SKIN_BUFFER_SIZE); | ||
55 | skins_initialising = false; | 55 | skins_initialising = false; |
56 | } | 56 | } |
57 | #endif | 57 | #endif |
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index c0ea3e3ca9..ad3e7e48ce 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -1613,13 +1613,13 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data, | |||
1613 | wps_data->backdrop_id = -1; | 1613 | wps_data->backdrop_id = -1; |
1614 | #endif | 1614 | #endif |
1615 | /* parse the skin source */ | 1615 | /* parse the skin source */ |
1616 | #if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0) | 1616 | #ifndef APPLICATION |
1617 | skin_buffer_save_position(); | 1617 | skin_buffer_save_position(); |
1618 | #endif | 1618 | #endif |
1619 | wps_data->tree = skin_parse(wps_buffer, skin_element_callback, wps_data); | 1619 | wps_data->tree = skin_parse(wps_buffer, skin_element_callback, wps_data); |
1620 | if (!wps_data->tree) { | 1620 | if (!wps_data->tree) { |
1621 | skin_data_reset(wps_data); | 1621 | skin_data_reset(wps_data); |
1622 | #if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0) | 1622 | #ifndef APPLICATION |
1623 | skin_buffer_restore_position(); | 1623 | skin_buffer_restore_position(); |
1624 | #endif | 1624 | #endif |
1625 | return false; | 1625 | return false; |
@@ -1643,7 +1643,7 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data, | |||
1643 | !skin_load_fonts(wps_data)) | 1643 | !skin_load_fonts(wps_data)) |
1644 | { | 1644 | { |
1645 | skin_data_reset(wps_data); | 1645 | skin_data_reset(wps_data); |
1646 | #if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0) | 1646 | #ifndef APPLICATION |
1647 | skin_buffer_restore_position(); | 1647 | skin_buffer_restore_position(); |
1648 | #endif | 1648 | #endif |
1649 | return false; | 1649 | return false; |