Merge branch 'master' of github.com:HalfdanJ/PeopleCounter

HalfdanJ · Jun 12, 2011 · 3cc6434 · 3cc6434
2 parents 33f7195 + dae1901
commit 3cc6434
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 22 deletions.
diff --git a/PeopleCounterServer/src/gui.cpp b/PeopleCounterServer/src/gui.cpp
@@ -12,12 +12,18 @@ void Gui::setup(){
 	playAudio = 1;
 	addPerson = 1;
 
-	gui.addTitle("Analyzer");
+
+	gui.addTitle("Debug");
+	gui.addButton("Add person", addPerson);
+
+
+	gui.addTitle("Analyzer").setNewColumn(true);
 	gui.addSlider("Depth threshold", depthThreshold, 0, 255);
-	gui.addSlider("Blur", blur, 0, 30);//.setNewColumn(true);
-    gui.addSlider("Merge distance", analyzerMergeDist,0,100);
+	gui.addSlider("Blur", blur, 0, 30);
+	gui.addSlider("Merge distance", analyzerMergeDist,0,100);
     gui.addSlider("Blob min size", minBlobSize,0,640*480);
-    gui.addSlider("Blob max size", maxBlobSize,0,640*480);
+    gui.addSlider("Blob max size", maxBlobSize,0,640*480).setNewColumn(true);
+
 
 	gui.addTitle("Clients").setNewColumn(true);
     for(int i=0;i<NUM_CLIENTS;i++){
@@ -27,7 +33,11 @@ void Gui::setup(){
         gui.addSlider("Client"+ofToString(i)+"OffsetY", clientOffsetY[i], -100, 100);//.setNewColumn(true);
 
     }
-
+
+	gui.addPage("Speech synth");
+	gui.addToggle("Play audio", playAudio);
+
+
     gui.addPage("Cropping");
     topCrop = 0;
     gui.addSlider("ClientTopCrop", topCrop, 0, 640);//.setNewColumn(true);
@@ -41,11 +51,6 @@ void Gui::setup(){
         gui.addSlider("Client"+ofToString(i)+"RightCrop", rightCrop[i], 0, 640);//.setNewColumn(true);
     }
 
-	gui.addTitle("Speech synth").setNewColumn(true);
-	gui.addToggle("Play audio", playAudio);
-
-	gui.addButton("Add person", addPerson);
-
 	gui.loadFromXML();
 	gui.show();
 }

diff --git a/PeopleCounterServer/src/synth.cpp b/PeopleCounterServer/src/synth.cpp
@@ -1,5 +1,9 @@
 #include "synth.h"
 
+
+string welcomeMsg[4] = { " Hi jerk" , " I love you!", " Didn't think I would see you here", " Welcome to Roskilde Festival" };
+
+
 void Synth::setup(Analyzer * analyzeRef, Gui * guiRef){
 
 	analyzer = analyzeRef;
@@ -9,14 +13,10 @@ void Synth::setup(Analyzer * analyzeRef, Gui * guiRef){
 
 	synth.initSynthesizer();
 
-	string messages[] = {"Welcome to Roskilde Festival", 
-		"Hi jerk", "Hi you, remember me?", 
-		"I love you!", 
-		"Didn't think I would see you again."};
-
-
 	voices = synth.getListOfVoices();
 
+	lastMsgTime = -10;
+
 	if(voices.size() > 0)
     {
         std::map<std::string, int>::iterator iter;
@@ -26,21 +26,28 @@ void Synth::setup(Analyzer * analyzeRef, Gui * guiRef){
         }
     }
 
-	analyzer->count += 1;
-
 }
 
 void Synth::update(){
 
 	if (analyzer->count > count) {
 
 		diff = analyzer->count - count;
-		count = analyzer->count;
 
-		say("hi visitor number" + ofToString(count), "Whisper");
+		if (ofGetElapsedTimef() - lastMsgTime > 3) {
+			// wait for old msg to finish
+
+			count = analyzer->count;
+			// + welcomeMsg[2]
+
+			say("Hi visitor number" + ofToString(count), "Whisper");
+
+			lastMsgTime = ofGetElapsedTimef();
+		}
+
+
 
 	}
-
 }
 
 

diff --git a/PeopleCounterServer/src/synth.h b/PeopleCounterServer/src/synth.h
@@ -18,8 +18,12 @@ class Synth {
 
 	map< string, int > voices;
 
+	float lastMsgTime;
 
-	vector< string > messages;
+	int shortmsgtime;
+	int longmsgtime;
+
+	string message;
 
 	int count;
 	int diff;