Merge branch 'dirscanner'

2 files changed, 8 insertions, 0 deletions

diff --git a/menuApp/src/ofApp.cpp b/menuApp/src/ofApp.cpp
index 81350ac..25990a1 100644
--- a/menuApp/src/ofApp.cpp
+++ b/menuApp/src/ofApp.cpp
@@ -131,6 +131,10 @@ bool ofApp::loadInstagramFeed(){
 //--------------------------------------------------------------
 void ofApp::setup(){
 
+	Dirscanner=dirScanner("/home/tim/Dropbox/menugrab");
+
+	Dirscanner.scan();
+
 /*
 	std::string str ("€");
 
diff --git a/menuApp/src/ofApp.h b/menuApp/src/ofApp.h
index 17a3d93..a85258e 100644
--- a/menuApp/src/ofApp.h
+++ b/menuApp/src/ofApp.h
@@ -5,6 +5,8 @@
 #include "ofxThreadedImageLoader.h"
 #include "ofxTextSuite.h"
 
+#include "dirscanner.h"
+
 #define IMAGE_SLOTS 5
 //#define FACTOR 1.0 //now in config.make
 #define FONTSIZE 13
@@ -66,6 +68,8 @@ class ofApp : public ofBaseApp{
 
 		ofImage background;
 		ofImage overlay;
+
+		dirScanner Dirscanner;
 };