FS#11470 - new skin code, finally svn uses the new parser from the theme editor. This means that a skin that passes the editor WILL pass svn and checkwps (unless the target runs out of skin buffer or something.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27613 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 10 insertions, 2 deletions

diff --git a/apps/gui/theme_settings.c b/apps/gui/theme_settings.c
index f3628f6..e9862ed 100644
--- a/apps/gui/theme_settings.c
+++ b/apps/gui/theme_settings.c
@@ -30,14 +30,21 @@
 #include "settings.h"
 #include "wps.h"
 #include "file.h"
+#include "buffer.h"
 #if CONFIG_TUNER
 #include "radio.h"
 #endif
 #include "skin_engine/skin_engine.h"
-#include "skin_engine/skin_fonts.h"
+#include "skin_buffer.h"
 #include "statusbar-skinned.h"
 #include "bootchart.h"
 
+static char *skin_buffer = NULL;
+void theme_init_buffer(void)
+{
+    skin_buffer = buffer_alloc(SKIN_BUFFER_SIZE);
+}
+
 
 /* call this after loading a .wps/.rwps or other skin files, so that the
  * skin buffer is reset properly
@@ -71,9 +78,10 @@ void settings_apply_skins(void)
 {
     char buf[MAX_PATH];
     /* re-initialize the skin buffer before we start reloading skins */
-    skin_buffer_init();
     enum screen_type screen = SCREEN_MAIN;
     unsigned int i;
+    
+    skin_buffer_init(skin_buffer, SKIN_BUFFER_SIZE);
 #ifdef HAVE_LCD_BITMAP
     skin_backdrop_init();
     skin_font_init();