From d68b8424c8e63cb84147d021608fe5a69b30b288 Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@getdrop.com>
Date: Thu, 7 Sep 2017 14:33:28 +0100
Subject: threaded image loader (not working)

---
 gui/src/chainImage.h | 6 ++++++
 gui/src/ofApp.cpp    | 2 +-
 gui/src/ofApp.h      | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'gui/src')

diff --git a/gui/src/chainImage.h b/gui/src/chainImage.h
index aa7301d..66b2dbf 100644
--- a/gui/src/chainImage.h
+++ b/gui/src/chainImage.h
@@ -2,6 +2,7 @@
 
 #include "ofMain.h"
 #include "ofxJSON.h"
+#include "ofxThreadedImageLoader.h"
 
 #define THUMB_BORDER_RATIO 0.8
 #define THUMB_SIZE 160
@@ -84,6 +85,9 @@ class chainImageSet{
 			dragRotate=0.0f;
 			dragPoint=ofPoint(0,0);
 		}
+		chainImageSet(const chainImageSet& mom){
+			chainImageSet();
+		}
 		void drawGui(int x,int y,bool is_selected);
 		void drawOutput();
 		void update();
@@ -117,4 +121,6 @@ class chainImageSet{
 
 		bool additive;
 		float intensity;
+
+		ofxThreadedImageLoader loader;
 };
\ No newline at end of file
diff --git a/gui/src/ofApp.cpp b/gui/src/ofApp.cpp
index 4f73e90..a264f83 100644
--- a/gui/src/ofApp.cpp
+++ b/gui/src/ofApp.cpp
@@ -84,7 +84,7 @@ for (int i=0;i<sets.size();i++){
 		}
 		//artnet.sendDmx("10.7.175.170", dmx_data, 512);
 
-		next_update=ofGetElapsedTimef()+0.2f;
+		next_update=ofGetElapsedTimef()+0.1f;
 	}	
 	
 
diff --git a/gui/src/ofApp.h b/gui/src/ofApp.h
index 1df35e0..8216a9c 100644
--- a/gui/src/ofApp.h
+++ b/gui/src/ofApp.h
@@ -46,7 +46,7 @@ class USBdmxMap{
 			dmx->setLevel(chan_shutter,255); //,0);
 			dmx->update();
 
-			printf("Dmx: %i,%i,%i @ %i \n",color[0],color[1],color[2],intensity);
+			//printf("Dmx: %i,%i,%i @ %i \n",color[0],color[1],color[2],intensity);
 		}
 		int chan_R, chan_G, chan_B, chan_intensity, chan_shutter, chan_white;
 		float x,y;
-- 
cgit v1.2.3