blocking loading playlists

1 files changed, 17 insertions, 3 deletions

diff --git a/liveengine/src/layers.h b/liveengine/src/layers.h
index e3b0fd8..55f9529 100644
--- a/liveengine/src/layers.h
+++ b/liveengine/src/layers.h
@@ -10,7 +10,7 @@ class layer
 		layer(string _f);

 		virtual ~layer();

 		virtual void load(string _f);

-		virtual void draw();

+		virtual void draw(float a);

 	protected:

 	private:

 };

@@ -22,10 +22,24 @@ class svglayer: public layer
 		svglayer(string _f);

 		virtual ~svglayer();

 		void load(string _f);

-		void draw();

+		void draw(float a);

 	protected:

 	private:

-		ofxSVGTiny svg;

+		ofxSVGTiny svg;
+		vector <ofColor> fills;
+		vector <ofColor> strokes;

 };

 

+class imglayer: public layer

+{

+	public:

+		imglayer();

+		imglayer(string _f);

+		virtual ~imglayer();

+		void load(string _f);

+		void draw(float a);

+	protected:

+	private:

+		ofImage img;

+};

 #endif // SVGLAYER_H