fixing maxiGrains

22 files changed, 11 insertions, 39 deletions

diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/Makefile b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/Makefile
index 8d8e4c0..8d8e4c0 100644
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/Makefile
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/Makefile
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/Project.xcconfig b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/Project.xcconfig
index e570b15..e570b15 100644
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/Project.xcconfig
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/Project.xcconfig
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/addons.make b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/addons.make
index 328952e..328952e 100644
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/addons.make
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/addons.make
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/bin/data/.gitkeep b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/bin/data/.gitkeep
index e69de29..e69de29 100644
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/bin/data/.gitkeep
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/bin/data/.gitkeep
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/bin/data/24620__anamorphosis__GMB_Kantilan_1.wav b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/bin/data/24620__anamorphosis__GMB_Kantilan_1.wav
index 81666d1..81666d1 100755
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/bin/data/24620__anamorphosis__GMB_Kantilan_1.wav
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/bin/data/24620__anamorphosis__GMB_Kantilan_1.wav
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/bin/data/2630__Jovica__133_bpm_ATTACK_LOOP_04_electrified_analog_kit_variation_16_mono.wav b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/bin/data/2630__Jovica__133_bpm_ATTACK_LOOP_04_electrified_analog_kit_variation_16_mono.wav
index 490d9ea..490d9ea 100755
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/bin/data/2630__Jovica__133_bpm_ATTACK_LOOP_04_electrified_analog_kit_variation_16_mono.wav
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/bin/data/2630__Jovica__133_bpm_ATTACK_LOOP_04_electrified_analog_kit_variation_16_mono.wav
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/bin/data/26393__brfindla__Calango1berimbau.wav b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/bin/data/26393__brfindla__Calango1berimbau.wav
index a9c93a4..a9c93a4 100755
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/bin/data/26393__brfindla__Calango1berimbau.wav
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/bin/data/26393__brfindla__Calango1berimbau.wav
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/bin/data/59210__suonho__abstract_electrofunkbreakbeats_124bpm_mono.wav b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/bin/data/59210__suonho__abstract_electrofunkbreakbeats_124bpm_mono.wav
index b23c5f0..b23c5f0 100755
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/bin/data/59210__suonho__abstract_electrofunkbreakbeats_124bpm_mono.wav
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/bin/data/59210__suonho__abstract_electrofunkbreakbeats_124bpm_mono.wav
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/bin/data/68373__juskiddink__Cello_open_string_bowed.wav b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/bin/data/68373__juskiddink__Cello_open_string_bowed.wav
index 19064f2..19064f2 100755
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/bin/data/68373__juskiddink__Cello_open_string_bowed.wav
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/bin/data/68373__juskiddink__Cello_open_string_bowed.wav
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/bin/data/71515__Microscopia__Wilhelm_Bruder_Sohne_Organ.wav b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/bin/data/71515__Microscopia__Wilhelm_Bruder_Sohne_Organ.wav
index 98860be..98860be 100755
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/bin/data/71515__Microscopia__Wilhelm_Bruder_Sohne_Organ.wav
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/bin/data/71515__Microscopia__Wilhelm_Bruder_Sohne_Organ.wav
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/bin/data/beat2.wav b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/bin/data/beat2.wav
index c71cee6..c71cee6 100755
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/bin/data/beat2.wav
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/bin/data/beat2.wav
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/config.make b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/config.make
index df10f64..df10f64 100644
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/config.make
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/config.make
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/granular0_92.xcodeproj/project.pbxproj b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/granular0_92.xcodeproj/project.pbxproj
index 755dcd2..755dcd2 100644
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/granular0_92.xcodeproj/project.pbxproj
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/granular0_92.xcodeproj/project.pbxproj
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/granular0_92.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/granular0_92.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 919434a..919434a 100644
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/granular0_92.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/granular0_92.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/granular0_92.xcodeproj/xcshareddata/xcschemes/granular0_92 Debug.xcscheme b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/granular0_92.xcodeproj/xcshareddata/xcschemes/granular0_92 Debug.xcscheme
index 6f7c747..6f7c747 100644
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/granular0_92.xcodeproj/xcshareddata/xcschemes/granular0_92 Debug.xcscheme
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/granular0_92.xcodeproj/xcshareddata/xcschemes/granular0_92 Debug.xcscheme
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/granular0_92.xcodeproj/xcshareddata/xcschemes/granular0_92 Release.xcscheme b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/granular0_92.xcodeproj/xcshareddata/xcschemes/granular0_92 Release.xcscheme
index 19fd904..19fd904 100644
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/granular0_92.xcodeproj/xcshareddata/xcschemes/granular0_92 Release.xcscheme
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/granular0_92.xcodeproj/xcshareddata/xcschemes/granular0_92 Release.xcscheme
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/openFrameworks-Info.plist b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/openFrameworks-Info.plist
index 8d64d2b..8d64d2b 100644
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/openFrameworks-Info.plist
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/openFrameworks-Info.plist
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/src/main.cpp b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/src/main.cpp
index e57370b..e57370b 100644
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/src/main.cpp
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/src/main.cpp
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/src/ofApp.cpp b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/src/ofApp.cpp
index 7e9bfdf..52ae7b0 100644
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/src/ofApp.cpp
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/src/ofApp.cpp
@@ -39,11 +39,11 @@ void ofApp::setup(){
     
     
     
-    ts = new maxiTimestretch<grainPlayerWin>(&samp);
-    ts2 = new maxiTimestretch<grainPlayerWin>(&samp2);
-    ts3 = new maxiTimestretch<grainPlayerWin>(&samp3);
-    ts4 = new maxiTimestretch<grainPlayerWin>(&samp4);
-    ts5 = new maxiTimestretch<grainPlayerWin>(&samp5);
+    ts = new maxiTimePitchStretch<grainPlayerWin, maxiSample>(&samp);
+    ts2 = new maxiTimePitchStretch<grainPlayerWin, maxiSample>(&samp2);
+    ts3 = new maxiTimePitchStretch<grainPlayerWin, maxiSample>(&samp3);
+    ts4 = new maxiTimePitchStretch<grainPlayerWin, maxiSample>(&samp4);
+    ts5 = new maxiTimePitchStretch<grainPlayerWin, maxiSample>(&samp5);
     stretches.push_back(ts);
     stretches.push_back(ts2);
     stretches.push_back(ts3);
@@ -134,11 +134,9 @@ void ofApp::draw(){
                    100 + ((int)(ofGetFrameNum() * 1.4) % 255),
                    ofGetFrameNum() % 255,
                    oct.averages[i] / 20.0 * 255.0);
-        //		ofCircle(ofGetWidth() / 2, ofGetHeight()/2, i * 5);
         glPushMatrix();
         glTranslatef(ofGetWidth()/2,ofGetHeight()/2, 0);
         glRotatef(0.01 * ofGetFrameNum() * speed * i, 0.01 * ofGetFrameNum() * speed * i,0.01 * ofGetFrameNum() * speed * i, 0);
-        //		glutWireSphere(i * 5, 2 + (10 - (fabs(speed) * 10)), 2 + (fabs(speed) * 10));
         ofDrawSphere(0, 0, i * 5);
         glPopMatrix();
     }
@@ -165,9 +163,8 @@ void ofApp::audioOut(float * output, int bufferSize, int nChannels) {
          */
         
         
-        //		wave = stretches[current]->play(speed, grainLength, 5, 0);
-        wave = stretches[current]->play(speed, 0.1, 4, 0);
-        //		wave = stretches[current]->play2(pos, 0.1, 4);
+        wave = stretches[current]->play(1.,speed, grainLength, 4, 0);
+        
         if (fft.process(wave)) {
             oct.calculate(fft.magnitudes);
         }
@@ -222,6 +219,8 @@ void ofApp::mouseMoved(int x, int y){
         
         speed = ((double ) x1 / ofGetWidth() * 4.0) - 2.0;
         grainLength = ((double) y1 / ofGetHeight() * 0.1) + 0.001;
+        if (grainLength < 0.01 ) grainLength = 0.01;
+        if (grainLength > 0.4 ) grainLength = 0.4;
         pos = ((double) x1 / ofGetWidth() * 2.0);
         //	cout << pos << endl;
         
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/src/ofApp.h b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/src/ofApp.h
index 3f8e034..a1d4d64 100644
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/src/ofApp.h
+++ b/openFrameworks/openFrameworksExamples/OSX/OF0.9.2_OSX_Granular0_92/src/ofApp.h
@@ -56,9 +56,9 @@ public:
     
     double wave,sample,outputs[2];
     maxiSample samp, samp2, samp3, samp4, samp5;
-    vector<maxiTimestretch<grainPlayerWin>*> stretches;
+    vector<maxiTimePitchStretch<grainPlayerWin, maxiSample>*> stretches;
     maxiMix mymix;
-    maxiTimestretch<grainPlayerWin> *ts, *ts2, *ts3, *ts4, *ts5;
+    maxiTimePitchStretch<grainPlayerWin, maxiSample> *ts, *ts2, *ts3, *ts4, *ts5;
     double speed, grainLength;
     
     ofxMaxiFFT fft;
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/granular0_92.xcodeproj/project.xcworkspace/xcuserdata/michaelgrierson.xcuserdatad/UserInterfaceState.xcuserstate b/openFrameworks/openFrameworksExamples/OSX/granular0_92/granular0_92.xcodeproj/project.xcworkspace/xcuserdata/michaelgrierson.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index 023c379..0000000
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/granular0_92.xcodeproj/project.xcworkspace/xcuserdata/michaelgrierson.xcuserdatad/UserInterfaceState.xcuserstate
+++ /dev/null
diff --git a/openFrameworks/openFrameworksExamples/OSX/granular0_92/granular0_92.xcodeproj/xcuserdata/michaelgrierson.xcuserdatad/xcschemes/xcschememanagement.plist b/openFrameworks/openFrameworksExamples/OSX/granular0_92/granular0_92.xcodeproj/xcuserdata/michaelgrierson.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index f1ba9be..0000000
--- a/openFrameworks/openFrameworksExamples/OSX/granular0_92/granular0_92.xcodeproj/xcuserdata/michaelgrierson.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>granular0_92 Debug.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-		<key>granular0_92 Release.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>1</integer>
-		</dict>
-	</dict>
-	<key>SuppressBuildableAutocreation</key>
-	<dict>
-		<key>E4B69B5A0A3A1756003C02F2</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-	</dict>
-</dict>
-</plist>