From 7ae1f870faebb65e9ee3a064fc43ef2fc6955a84 Mon Sep 17 00:00:00 2001
From: Comment <tim@gray.(none)>
Date: Thu, 29 Nov 2012 19:13:19 +0000
Subject: work on asterisk plugin

---
 vfg/src/music.h | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'vfg/src/music.h')

diff --git a/vfg/src/music.h b/vfg/src/music.h
index a1eddc4..3a9f299 100755
--- a/vfg/src/music.h
+++ b/vfg/src/music.h
@@ -156,18 +156,18 @@ class musicscore: public score {
 	public:
 		musicscore();
 		void parseMidi(string filename);
-		void setTimeframe(int millis);
-		void setNowpoint(float pct);
+		void setTimeframe(int millis);
 		void drawNotes(levelscore *levels);
 		void drawFlakes(levelscore *levels,float scale);
-		void playerControl(int key,int threshold);
+		void playerControl(int key);
 		void makeFlakes(int threshStart,int threshEnd,levelscore *levels);
-
+		void printNotes();
 		int missedFlakes;
 		int missedNote;
 		int hitNote;
 		bool missedLast;
 		bool perfect;
+		int keyThresh;
 
 	private:
 		map<int,note*> notes;
@@ -175,7 +175,7 @@ class musicscore: public score {
 		map<int,flake*>::iterator missedFlake;
 		int timeframe;
 		float nowpoint;
-
+		
 		vector<Puppet> snowflakes;
 
 };
@@ -188,7 +188,7 @@ class song {
 		void preRoll(long preroll);
 		void setTimeframe(int millis);
 		void setFlakeThresh(int tS,int tE);
-		void setKeythresh(int millis);
+		void setKeyThresh(int millis);
 		void drawNotes();
 		void draw(float scale);
 		int missedNote();
@@ -197,16 +197,18 @@ class song {
 		void playerControl(int key);
 		int getLevel(long time);
 		int getCurrentTime();
+	
+	musicscore notes;
 	private:
 		ofSoundPlayer backing;
 		ofSoundPlayer melody;
 		lyricscore lyrics;
-		musicscore notes;
+		
 		levelscore levels;
 		long startTime;
 		bool isPreroll;
 
-		int fThreshStart,fThreshEnd,keyThresh;
+		int fThreshStart,fThreshEnd;
 };
 //---------------------------------------------------------------------------------------------------------------------------------------------
 /*
-- 
cgit v1.2.3