From e49c8555552c76b526a798f16ec5327fe443141a Mon Sep 17 00:00:00 2001
From: tim <tim@eclectronics.org>
Date: Thu, 25 May 2017 00:21:51 +0100
Subject: load logic

---
 testDir/src/dirscanner.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'testDir/src/dirscanner.h')

diff --git a/testDir/src/dirscanner.h b/testDir/src/dirscanner.h
index f78c6d5..dfc0847 100644
--- a/testDir/src/dirscanner.h
+++ b/testDir/src/dirscanner.h
@@ -16,12 +16,18 @@ class timeSlot {
 
 class playItem {
 	public:
+		playItem(){
+			loaded=0;
+		}
 		playItem(std::string _n){
 			filename=_n;
+			playItem();
 		}
 		string filename;									
 		ofImage image;
 		ofVideoPlayer video;
+		int loaded; //0- none, 1- image, 2- mov
+		bool load(string filename);
 		void play();
 		void draw();
 		bool isFinished();
@@ -53,6 +59,6 @@ class dirPlayer {
 		string playdir;
 		int currentslot;
 		dirScanner *scanner;
-		void load();
+		void load(std::string path);
 		void draw();
 };
\ No newline at end of file
-- 
cgit v1.2.3