From 6ae491eea38055ebe3ba1154f0e916d7bbf95040 Mon Sep 17 00:00:00 2001
From: tim <tim@eclectronics.org>
Date: Mon, 22 May 2017 21:31:33 +0100
Subject: directory reader in test case

---
 testDir/src/dirscanner.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 testDir/src/dirscanner.h

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

diff --git a/testDir/src/dirscanner.h b/testDir/src/dirscanner.h
new file mode 100644
index 0000000..f78c6d5
--- /dev/null
+++ b/testDir/src/dirscanner.h
@@ -0,0 +1,58 @@
+#pragma once
+
+#include "ofMain.h"
+
+class timeSlot {
+	public:
+		timeSlot(std::string _p,int _s,int _e){
+			path=_p;
+			start=_s;
+			end=_e;
+		}
+		string path;
+		int start;
+		int end;
+};
+
+class playItem {
+	public:
+		playItem(std::string _n){
+			filename=_n;
+		}
+		string filename;									
+		ofImage image;
+		ofVideoPlayer video;
+		void play();
+		void draw();
+		bool isFinished();
+		float startTime;
+};
+
+class dirScanner {
+	//todo: compare each item in vector for reload
+	public:
+		dirScanner(std::string _d=""){
+			rootdir=_d;
+		}
+		int getSlotForTime();
+		string rootdir;
+		void scan();
+		vector<timeSlot> slots;
+};
+
+class dirPlayer {
+	public:
+		dirPlayer(){
+			currentslot=-1;
+		}
+		dirPlayer(dirScanner *_s){
+			scanner=_s;
+			dirPlayer();
+		}
+		vector<playItem> items;
+		string playdir;
+		int currentslot;
+		dirScanner *scanner;
+		void load();
+		void draw();
+};
\ No newline at end of file
-- 
cgit v1.2.3


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.cpp | 28 ++++++++++++++++++++++++----
 testDir/src/dirscanner.h   |  8 +++++++-
 2 files changed, 31 insertions(+), 5 deletions(-)

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

diff --git a/testDir/src/dirscanner.cpp b/testDir/src/dirscanner.cpp
index feb29c1..fc233d5 100644
--- a/testDir/src/dirscanner.cpp
+++ b/testDir/src/dirscanner.cpp
@@ -2,6 +2,12 @@
 
 void playItem::play(){
 
+}
+bool playItem::load(string filename){
+	ofFile file(filename);
+	string ext=file.getExtension();
+	ofLogNotice() << "item "<<i<<": "<<start<<" - "<<end<<" "<<dir.getPath(i);
+
 }
 void playItem::draw(){
 
@@ -29,7 +35,7 @@ void dirScanner::scan(){
 
 		if (start&&end){
 			slots.push_back(timeSlot(dir.getPath(i),start,end));
-			ofLogNotice() << "item "<<i<<": "<<start<<" - "<<end<<" "<<dir.getPath(i);
+			ofLogNotice() << "directory "<<i<<": "<<start<<" - "<<end<<" "<<dir.getPath(i);
 
 		}
 	}
@@ -51,8 +57,21 @@ int dirScanner::getSlotForTime(){
 	return -1;
 }
 
-void dirPlayer::load(){
-
+void dirPlayer::load(std::string path){
+	items.clear();
+	ofDirectory dir(path);
+	dir.allowExt("mp4");
+	dir.allowExt("mov");
+	dir.allowExt("jpg");
+	//	dir.allowExt("png");
+	dir.listDir();
+	for(int i = 0; i < dir.size(); i++){
+		string d=dir.getName(i);
+		playItem item;
+		if (item.load(d)){
+			items.push_back(item);
+		}
+	}
 }
 
 void dirPlayer::draw(){
@@ -60,9 +79,10 @@ void dirPlayer::draw(){
 	if (slot!=currentslot){
 		if (slot>-1){
 			ofLogNotice() << "entering slot "<<slot<<": "<<scanner->slots[slot].path;
+			load(scanner->slots[slot].path);
 		}
 		else {
-			ofLogNotice() << "leaving slots";
+			ofLogNotice() << "leaving slot";
 		}
 		currentslot=slot;
 	}
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


From a0e8fefd1bf241b805c4542421bdbc6a4447fdc3 Mon Sep 17 00:00:00 2001
From: tim <tim@eclectronics.org>
Date: Tue, 30 May 2017 00:50:56 +0100
Subject: no alpha or movs

---
 testDir/src/dirscanner.cpp | 47 +++++++++++++++++++++++++++++++++++++---------
 testDir/src/dirscanner.h   |  4 +++-
 testDir/src/main.cpp       |  4 ++--
 testDir/src/ofApp.cpp      |  3 +--
 4 files changed, 44 insertions(+), 14 deletions(-)

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

diff --git a/testDir/src/dirscanner.cpp b/testDir/src/dirscanner.cpp
index 34dec9b..f3aa974 100644
--- a/testDir/src/dirscanner.cpp
+++ b/testDir/src/dirscanner.cpp
@@ -1,9 +1,17 @@
 #include "dirscanner.h"
 
 void playItem::play(){
-
+	if (video.isLoaded()){
+		video.play();
+		ofLogNotice() << "playing video: "<<filename;
+	}
+	if (image.isAllocated()){
+		ofLogNotice() << "playing still: "<<filename;
+	}
+	startTime=ofGetElapsedTimef();
 }
-bool playItem::load(string filename){
+bool playItem::load(string _filename){
+	filename=_filename;
 	ofFile file(filename);
 	string ext=ofToLower(file.getExtension());
 	loaded=0;
@@ -13,7 +21,7 @@ bool playItem::load(string filename){
 			loaded=1;
 		}
 	}
-	if (ext=="mkv"||ext=="mov"){
+	if (ext=="mp4"||ext=="mov"){
 		if (video.load(filename)){
 			ofLogNotice() << "loaded clip: "<<filename;
 			loaded=2;
@@ -22,10 +30,23 @@ bool playItem::load(string filename){
 	return loaded>0;
 }
 void playItem::draw(){
+	if (image.isAllocated()){
 
-}
-bool playItem::isFinished(){
+		//ofEnableAlphaBlending();  
+		//ofSetColor(255,255,255,1.0);
+		image.draw(0,0);
+		//ofDisableAlphaBlending();  
 
+		if (ofGetElapsedTimef()-startTime>5.0){
+			isFinished=true;
+		}
+	}
+	if (video.isLoaded()){
+		video.draw(0,0);
+		if (video.getIsMovieDone()){
+			isFinished=true;
+		}
+	}
 }
 
 void dirScanner::scan(){
@@ -45,7 +66,7 @@ void dirScanner::scan(){
 		int start = ofToInt(d.substr(0,4));
 		int end = ofToInt(d.substr(5,4));
 
-		if (start&&end){
+		if (end){
 			slots.push_back(timeSlot(dir.getPath(i),start,end));
 			ofLogNotice() << "directory "<<i<<": "<<start<<" - "<<end<<" "<<dir.getPath(i);
 
@@ -72,10 +93,10 @@ int dirScanner::getSlotForTime(){
 void dirPlayer::load(std::string path){
 	items.clear();
 	ofDirectory dir(path);
-	dir.allowExt("mkv");
+	dir.allowExt("mp4");
 	dir.allowExt("mov");
 	dir.allowExt("jpg");
-	//	dir.allowExt("png");
+	dir.allowExt("png");
 	dir.listDir();
 	for(int i = 0; i < dir.size(); i++){
 		string d=dir.getPath(i);
@@ -84,6 +105,9 @@ void dirPlayer::load(std::string path){
 			items.push_back(item);
 		}
 	}
+	currentItem=0;
+	ofLogNotice() << "found "<<items.size()<<" items";
+			
 }
 
 void dirPlayer::draw(){
@@ -98,6 +122,11 @@ void dirPlayer::draw(){
 		}
 		currentslot=slot;
 	}
-	
+	if (items[currentItem].isFinished){
+		items[currentItem].isFinished=false;
+		currentItem=(currentItem+1)%items.size();
+		items[currentItem].play();
+	}
+	items[currentItem].draw();
 
 }
\ No newline at end of file
diff --git a/testDir/src/dirscanner.h b/testDir/src/dirscanner.h
index dfc0847..cddd42f 100644
--- a/testDir/src/dirscanner.h
+++ b/testDir/src/dirscanner.h
@@ -18,6 +18,7 @@ class playItem {
 	public:
 		playItem(){
 			loaded=0;
+			isFinished=false;
 		}
 		playItem(std::string _n){
 			filename=_n;
@@ -30,7 +31,7 @@ class playItem {
 		bool load(string filename);
 		void play();
 		void draw();
-		bool isFinished();
+		bool isFinished;
 		float startTime;
 };
 
@@ -61,4 +62,5 @@ class dirPlayer {
 		dirScanner *scanner;
 		void load(std::string path);
 		void draw();
+		int currentItem;
 };
\ No newline at end of file
diff --git a/testDir/src/main.cpp b/testDir/src/main.cpp
index c8c5551..120f5a0 100644
--- a/testDir/src/main.cpp
+++ b/testDir/src/main.cpp
@@ -5,9 +5,9 @@
 int main( ){
 
 #ifdef FULLSCREEN
-	ofSetupOpenGL(256,256,OF_FULLSCREEN);
+	ofSetupOpenGL(1080,1920,OF_FULLSCREEN);
 #else
-	ofSetupOpenGL(256,256,OF_WINDOW);			// <-------- setup the GL context
+	ofSetupOpenGL(1080,1920,OF_WINDOW);			// <-------- setup the GL context
 #endif
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
diff --git a/testDir/src/ofApp.cpp b/testDir/src/ofApp.cpp
index d6fdd4b..9ac9e12 100644
--- a/testDir/src/ofApp.cpp
+++ b/testDir/src/ofApp.cpp
@@ -10,7 +10,7 @@ void ofApp::setup(){
 
 	player=dirPlayer(&scanner);
 
-	ofSetFrameRate(1);
+	ofSetFrameRate(5);
 }
 
 //--------------------------------------------------------------
@@ -22,7 +22,6 @@ void ofApp::update(){
 //--------------------------------------------------------------
 void ofApp::draw(){	
 	ofSetColor(255,255,255);
-
 	
 	player.draw();
 
-- 
cgit v1.2.3