From 65cf7b27e9d2f9e59da322b4fbad1ed1df27eb8d Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Sun, 2 Sep 2012 12:18:44 +0100
Subject: v 0.1

---
 liveengine/src/playlist.cpp | 63 ++++++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 27 deletions(-)

(limited to 'liveengine/src/playlist.cpp')

diff --git a/liveengine/src/playlist.cpp b/liveengine/src/playlist.cpp
index 896c788..3063595 100644
--- a/liveengine/src/playlist.cpp
+++ b/liveengine/src/playlist.cpp
@@ -12,6 +12,7 @@ void playlist::load(string _name){
 		printf("unable to load %s check data/ folder\n",_name.c_str());
     }else {
         printf("starting loader thread\n");
+        loadimg(); //how to do this from the worker thread???
         startThread(false, false); //blocking, verbose
     }
 
@@ -20,37 +21,45 @@ void playlist::load(string _name){
 }
 
 void playlist::threadedFunction(){
-
         if( lock() ){
-
-            int numLayers=0;
-            layers.clear();
-            if(XML.pushTag("playlist")) {
-                numLayers=XML.getNumTags("svglayer");
-                if(numLayers) {
-                    for (int i=0;i<numLayers;i++) {
-                    string s=XML.getAttribute("svglayer", "file", "",i);
-                    printf("loading %s: ",s.c_str());
-                    layers[XML.getAttribute("svglayer", "note", 0,i)]=new svglayer(XML.getAttribute("svglayer", "file", "",i));
-                 }
-                  }
-              else printf("no SVG layers loaded!\n");
-              numLayers=XML.getNumTags("imglayer");
-                  if(numLayers) {
-                         for (int i=0;i<numLayers;i++) {
-                     string s=XML.getAttribute("imglayer", "file", "",i);
-                     printf("%s: ",s.c_str());
-                     //int i=XML.getAttribute("imglayer", "note", 0,i);
-                     //ofImage i =
-                    layers[XML.getAttribute("imglayer", "note", 0,i)]=new imglayer(XML.getAttribute("imglayer", "file", "",i));
-                 }
-                  }
-              else printf("no IMG layers loaded!\n");
-             }
+            loadsvg();
             unlock();
         }
-
 }
+
+void playlist::loadsvg(){
+    int numLayers=0;
+    layers.clear();
+    if(XML.pushTag("playlist")) {
+        numLayers=XML.getNumTags("svglayer");
+        if(numLayers) {
+            for (int i=0;i<numLayers;i++) {
+            string s=XML.getAttribute("svglayer", "file", "",i);
+            printf("loading %s: ",s.c_str());
+            layers[XML.getAttribute("svglayer", "note", 0,i)]=new svglayer(XML.getAttribute("svglayer", "file", "",i));
+         }
+          }
+      else printf("no SVG layers loaded!\n");
+     }
+     XML.popTag();
+}
+
+void playlist::loadimg(){
+    int numLayers=0;
+    layers.clear();
+    if(XML.pushTag("playlist")) {
+      numLayers=XML.getNumTags("imglayer");
+          if(numLayers) {
+                 for (int i=0;i<numLayers;i++) {
+             string s=XML.getAttribute("imglayer", "file", "",i);
+             printf("%s: ",s.c_str());
+            layers[XML.getAttribute("imglayer", "note", 0,i)]=new imglayer(XML.getAttribute("imglayer", "file", "",i));
+         }
+          }
+      else printf("no IMG layers loaded!\n");
+     }
+     XML.popTag();
+}
 
 playlist::~playlist()
 {
-- 
cgit v1.2.3