Added rawwaves to project

diff --git a/src/iosynthApp.cpp b/src/iosynthApp.cpp
index a7067b5c9d303097ab59babf4a36475b570f182e..8184e775fa69672a32e804ac8d852c8538e81c2a 100644 (file)
--- a/src/iosynthApp.cpp
+++ b/src/iosynthApp.cpp
@@ -4,10 +4,12 @@
 
 void iosynthApp::setup()
 {
-}
-
-void iosynthApp::mouseDown( MouseEvent event )
-{
+    for (int i = 0; i < NUM_VOICES; i++) {
+        voices.push_back(new Voice());
+        voices.at(i)->init();
+        voices.at(i)->setGain(1);
+        voices.at(i)->keyOff(0);
+    }
 }
 
 void iosynthApp::update()
@@ -16,20 +18,54 @@ void iosynthApp::update()
 
 void iosynthApp::draw()
 {
-       gl::clear( Color( 0, 1.0f, 0 ) );
+    gl::clear( Color( 0.2f, 0.2f, 0.4f ) );
+    gl::color(1.0f, 1.0f, 1.0f);
+    
+    float wavHeight  = (float) BUFFER_SIZE / 2.0;
+    for(int i = 0; i < BUFFER_SIZE; i++ ){
+        gl::drawLine(Vec2f(i, wavHeight / 2 ),
+                     Vec2f(i, wavHeight / 2 + mAudioSamples[0][i] * wavHeight));
+        gl::drawLine(Vec2f(i, wavHeight / 2 + wavHeight),
+                     Vec2f(i, wavHeight / 2 + wavHeight + (mAudioSamples[1][i] * wavHeight)));
+    }
+    
+    gl::color(1.0f, 1.0f, 1.0f);
+    for(auto touch : getActiveTouches()) {
+        for (int i = 0; i < touch.getId(); i++) {
+            gl::drawSolidCircle(
+                                touch.getPos() + Vec2f(0, 200 + (i * 50)),
+                                touch.getX() / getWindowWidth() * 50);
+        }
+    }
 }
 
+void iosynthApp::mouseDown( MouseEvent event )
+{
+}
 
 void iosynthApp::touchesBegan( TouchEvent t )
 {
+    for(auto touch : getActiveTouches()) {
+        voices.at(touch.getId()-1)->setFrequency(
+                                                 2000 * ( touch.getY() / getWindowHeight()) + 100 );
+        voices.at(touch.getId()-1)->keyOn(touch.getX() / getWindowWidth());
+    }
 }
 
 void iosynthApp::touchesMoved( TouchEvent t )
 {
+    for(auto touch : getActiveTouches()) {
+        voices.at(touch.getId()-1)->setFrequency(
+                                                 2000 * ( touch.getY() / getWindowHeight()) + 100 );
+        voices.at(touch.getId()-1)->setGain(touch.getX() / getWindowWidth());
+    }
 }
 
 void iosynthApp::touchesEnded( TouchEvent t )
 {
+    for (auto touch : t.getTouches()) {
+        voices.at(touch.getId()-1)->keyOff(0);
+    }
 }
 
 

diff --git a/xcode_ios/iosynth.xcodeproj/project.pbxproj b/xcode_ios/iosynth.xcodeproj/project.pbxproj
index 9bd003100ee478967c0735bef4e272388624f662..4bf2e74b56f79e3ef5f63e6bd3066da698ffef0e 100644 (file)
--- a/xcode_ios/iosynth.xcodeproj/project.pbxproj
+++ b/xcode_ios/iosynth.xcodeproj/project.pbxproj
@@ -101,6 +101,51 @@
                68CAB07F185456F100DB5318 /* VoicForm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68CAAFF7185456F100DB5318 /* VoicForm.cpp */; };
                68CAB080185456F100DB5318 /* Whistle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68CAAFF8185456F100DB5318 /* Whistle.cpp */; };
                68CAB081185456F100DB5318 /* Wurley.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68CAAFF9185456F100DB5318 /* Wurley.cpp */; };
+               68CAB0B218568BBF00DB5318 /* ahh.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB08518568BBE00DB5318 /* ahh.raw */; };
+               68CAB0B318568BBF00DB5318 /* bassdrum.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB08618568BBE00DB5318 /* bassdrum.raw */; };
+               68CAB0B418568BBF00DB5318 /* britestk.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB08718568BBE00DB5318 /* britestk.raw */; };
+               68CAB0B518568BBF00DB5318 /* cowbell1.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB08818568BBE00DB5318 /* cowbell1.raw */; };
+               68CAB0B618568BBF00DB5318 /* crashcym.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB08918568BBE00DB5318 /* crashcym.raw */; };
+               68CAB0B718568BBF00DB5318 /* dope.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB08A18568BBE00DB5318 /* dope.raw */; };
+               68CAB0B818568BBF00DB5318 /* eee.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB08B18568BBE00DB5318 /* eee.raw */; };
+               68CAB0B918568BBF00DB5318 /* fwavblnk.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB08C18568BBE00DB5318 /* fwavblnk.raw */; };
+               68CAB0BA18568BBF00DB5318 /* halfwave.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB08D18568BBF00DB5318 /* halfwave.raw */; };
+               68CAB0BB18568BBF00DB5318 /* hihatcym.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB08E18568BBF00DB5318 /* hihatcym.raw */; };
+               68CAB0BC18568BBF00DB5318 /* impuls10.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB08F18568BBF00DB5318 /* impuls10.raw */; };
+               68CAB0BD18568BBF00DB5318 /* impuls20.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB09018568BBF00DB5318 /* impuls20.raw */; };
+               68CAB0BE18568BBF00DB5318 /* impuls40.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB09118568BBF00DB5318 /* impuls40.raw */; };
+               68CAB0BF18568BBF00DB5318 /* makefunc.c in Sources */ = {isa = PBXBuildFile; fileRef = 68CAB09218568BBF00DB5318 /* makefunc.c */; };
+               68CAB0C018568BBF00DB5318 /* makemidi.c in Sources */ = {isa = PBXBuildFile; fileRef = 68CAB09318568BBF00DB5318 /* makemidi.c */; };
+               68CAB0C118568BBF00DB5318 /* makewavs.c in Sources */ = {isa = PBXBuildFile; fileRef = 68CAB09418568BBF00DB5318 /* makewavs.c */; };
+               68CAB0C218568BBF00DB5318 /* mand1.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB09518568BBF00DB5318 /* mand1.raw */; };
+               68CAB0C318568BBF00DB5318 /* mand10.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB09618568BBF00DB5318 /* mand10.raw */; };
+               68CAB0C418568BBF00DB5318 /* mand11.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB09718568BBF00DB5318 /* mand11.raw */; };
+               68CAB0C518568BBF00DB5318 /* mand12.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB09818568BBF00DB5318 /* mand12.raw */; };
+               68CAB0C618568BBF00DB5318 /* mand2.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB09918568BBF00DB5318 /* mand2.raw */; };
+               68CAB0C718568BBF00DB5318 /* mand3.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB09A18568BBF00DB5318 /* mand3.raw */; };
+               68CAB0C818568BBF00DB5318 /* mand4.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB09B18568BBF00DB5318 /* mand4.raw */; };
+               68CAB0C918568BBF00DB5318 /* mand5.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB09C18568BBF00DB5318 /* mand5.raw */; };
+               68CAB0CA18568BBF00DB5318 /* mand6.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB09D18568BBF00DB5318 /* mand6.raw */; };
+               68CAB0CB18568BBF00DB5318 /* mand7.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB09E18568BBF00DB5318 /* mand7.raw */; };
+               68CAB0CC18568BBF00DB5318 /* mand8.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB09F18568BBF00DB5318 /* mand8.raw */; };
+               68CAB0CD18568BBF00DB5318 /* mand9.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB0A018568BBF00DB5318 /* mand9.raw */; };
+               68CAB0CE18568BBF00DB5318 /* mandpluk.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB0A118568BBF00DB5318 /* mandpluk.raw */; };
+               68CAB0CF18568BBF00DB5318 /* marmstk1.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB0A218568BBF00DB5318 /* marmstk1.raw */; };
+               68CAB0D018568BBF00DB5318 /* ooo.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB0A318568BBF00DB5318 /* ooo.raw */; };
+               68CAB0D118568BBF00DB5318 /* peksblnk.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB0A418568BBF00DB5318 /* peksblnk.raw */; };
+               68CAB0D218568BBF00DB5318 /* ppksblnk.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB0A518568BBF00DB5318 /* ppksblnk.raw */; };
+               68CAB0D318568BBF00DB5318 /* ridecymb.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB0A618568BBF00DB5318 /* ridecymb.raw */; };
+               68CAB0D418568BBF00DB5318 /* silence.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB0A718568BBF00DB5318 /* silence.raw */; };
+               68CAB0D518568BBF00DB5318 /* sine.c in Sources */ = {isa = PBXBuildFile; fileRef = 68CAB0A818568BBF00DB5318 /* sine.c */; };
+               68CAB0D618568BBF00DB5318 /* sineblnk.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB0A918568BBF00DB5318 /* sineblnk.raw */; };
+               68CAB0D718568BBF00DB5318 /* sinewave.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB0AA18568BBF00DB5318 /* sinewave.raw */; };
+               68CAB0D818568BBF00DB5318 /* snardrum.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB0AB18568BBF00DB5318 /* snardrum.raw */; };
+               68CAB0D918568BBF00DB5318 /* snglpeak.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB0AC18568BBF00DB5318 /* snglpeak.raw */; };
+               68CAB0DA18568BBF00DB5318 /* tambourn.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB0AD18568BBF00DB5318 /* tambourn.raw */; };
+               68CAB0DB18568BBF00DB5318 /* tomhidrm.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB0AE18568BBF00DB5318 /* tomhidrm.raw */; };
+               68CAB0DC18568BBF00DB5318 /* tomlowdr.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB0AF18568BBF00DB5318 /* tomlowdr.raw */; };
+               68CAB0DD18568BBF00DB5318 /* tommiddr.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB0B018568BBF00DB5318 /* tommiddr.raw */; };
+               68CAB0DE18568BBF00DB5318 /* twopeaks.raw in Resources */ = {isa = PBXBuildFile; fileRef = 68CAB0B118568BBF00DB5318 /* twopeaks.raw */; };
                C725DFFE121DAC7F00FA186B /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C727C02B121B400300192073 /* CoreMedia.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                C725E001121DAC8F00FA186B /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C725E000121DAC8F00FA186B /* AVFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                C725E001121DAC8FFFFA18FF /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00CFDF6A1138442D0091FFFF /* ImageIO.framework */; };
@@ -309,6 +354,51 @@
                68CAAFF7185456F100DB5318 /* VoicForm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VoicForm.cpp; sourceTree = "<group>"; };
                68CAAFF8185456F100DB5318 /* Whistle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Whistle.cpp; sourceTree = "<group>"; };
                68CAAFF9185456F100DB5318 /* Wurley.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Wurley.cpp; sourceTree = "<group>"; };
+               68CAB08518568BBE00DB5318 /* ahh.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = ahh.raw; sourceTree = "<group>"; };
+               68CAB08618568BBE00DB5318 /* bassdrum.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = bassdrum.raw; sourceTree = "<group>"; };
+               68CAB08718568BBE00DB5318 /* britestk.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = britestk.raw; sourceTree = "<group>"; };
+               68CAB08818568BBE00DB5318 /* cowbell1.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = cowbell1.raw; sourceTree = "<group>"; };
+               68CAB08918568BBE00DB5318 /* crashcym.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = crashcym.raw; sourceTree = "<group>"; };
+               68CAB08A18568BBE00DB5318 /* dope.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = dope.raw; sourceTree = "<group>"; };
+               68CAB08B18568BBE00DB5318 /* eee.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = eee.raw; sourceTree = "<group>"; };
+               68CAB08C18568BBE00DB5318 /* fwavblnk.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = fwavblnk.raw; sourceTree = "<group>"; };
+               68CAB08D18568BBF00DB5318 /* halfwave.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = halfwave.raw; sourceTree = "<group>"; };
+               68CAB08E18568BBF00DB5318 /* hihatcym.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = hihatcym.raw; sourceTree = "<group>"; };
+               68CAB08F18568BBF00DB5318 /* impuls10.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = impuls10.raw; sourceTree = "<group>"; };
+               68CAB09018568BBF00DB5318 /* impuls20.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = impuls20.raw; sourceTree = "<group>"; };
+               68CAB09118568BBF00DB5318 /* impuls40.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = impuls40.raw; sourceTree = "<group>"; };
+               68CAB09218568BBF00DB5318 /* makefunc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = makefunc.c; sourceTree = "<group>"; };
+               68CAB09318568BBF00DB5318 /* makemidi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = makemidi.c; sourceTree = "<group>"; };
+               68CAB09418568BBF00DB5318 /* makewavs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = makewavs.c; sourceTree = "<group>"; };
+               68CAB09518568BBF00DB5318 /* mand1.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = mand1.raw; sourceTree = "<group>"; };
+               68CAB09618568BBF00DB5318 /* mand10.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = mand10.raw; sourceTree = "<group>"; };
+               68CAB09718568BBF00DB5318 /* mand11.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = mand11.raw; sourceTree = "<group>"; };
+               68CAB09818568BBF00DB5318 /* mand12.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = mand12.raw; sourceTree = "<group>"; };
+               68CAB09918568BBF00DB5318 /* mand2.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = mand2.raw; sourceTree = "<group>"; };
+               68CAB09A18568BBF00DB5318 /* mand3.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = mand3.raw; sourceTree = "<group>"; };
+               68CAB09B18568BBF00DB5318 /* mand4.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = mand4.raw; sourceTree = "<group>"; };
+               68CAB09C18568BBF00DB5318 /* mand5.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = mand5.raw; sourceTree = "<group>"; };
+               68CAB09D18568BBF00DB5318 /* mand6.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = mand6.raw; sourceTree = "<group>"; };
+               68CAB09E18568BBF00DB5318 /* mand7.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = mand7.raw; sourceTree = "<group>"; };
+               68CAB09F18568BBF00DB5318 /* mand8.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = mand8.raw; sourceTree = "<group>"; };
+               68CAB0A018568BBF00DB5318 /* mand9.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = mand9.raw; sourceTree = "<group>"; };
+               68CAB0A118568BBF00DB5318 /* mandpluk.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = mandpluk.raw; sourceTree = "<group>"; };
+               68CAB0A218568BBF00DB5318 /* marmstk1.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = marmstk1.raw; sourceTree = "<group>"; };
+               68CAB0A318568BBF00DB5318 /* ooo.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = ooo.raw; sourceTree = "<group>"; };
+               68CAB0A418568BBF00DB5318 /* peksblnk.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = peksblnk.raw; sourceTree = "<group>"; };
+               68CAB0A518568BBF00DB5318 /* ppksblnk.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = ppksblnk.raw; sourceTree = "<group>"; };
+               68CAB0A618568BBF00DB5318 /* ridecymb.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = ridecymb.raw; sourceTree = "<group>"; };
+               68CAB0A718568BBF00DB5318 /* silence.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = silence.raw; sourceTree = "<group>"; };
+               68CAB0A818568BBF00DB5318 /* sine.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sine.c; sourceTree = "<group>"; };
+               68CAB0A918568BBF00DB5318 /* sineblnk.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = sineblnk.raw; sourceTree = "<group>"; };
+               68CAB0AA18568BBF00DB5318 /* sinewave.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = sinewave.raw; sourceTree = "<group>"; };
+               68CAB0AB18568BBF00DB5318 /* snardrum.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = snardrum.raw; sourceTree = "<group>"; };
+               68CAB0AC18568BBF00DB5318 /* snglpeak.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = snglpeak.raw; sourceTree = "<group>"; };
+               68CAB0AD18568BBF00DB5318 /* tambourn.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = tambourn.raw; sourceTree = "<group>"; };
+               68CAB0AE18568BBF00DB5318 /* tomhidrm.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = tomhidrm.raw; sourceTree = "<group>"; };
+               68CAB0AF18568BBF00DB5318 /* tomlowdr.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = tomlowdr.raw; sourceTree = "<group>"; };
+               68CAB0B018568BBF00DB5318 /* tommiddr.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = tommiddr.raw; sourceTree = "<group>"; };
+               68CAB0B118568BBF00DB5318 /* twopeaks.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = twopeaks.raw; sourceTree = "<group>"; };
                C725E000121DAC8F00FA186B /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
                C727C02B121B400300192073 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
                C727C02D121B400300192073 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
@@ -423,6 +513,7 @@
                68CAAF11185456F000DB5318 /* MoMu-STK-1.0.0 */ = {
                        isa = PBXGroup;
                        children = (
+                               68CAB08418568BBE00DB5318 /* rawwaves */,
                                68CAAF15185456F000DB5318 /* include */,
                                68CAAFA6185456F100DB5318 /* src */,
                        );
@@ -623,6 +714,58 @@
                        path = src;
                        sourceTree = "<group>";
                };
+               68CAB08418568BBE00DB5318 /* rawwaves */ = {
+                       isa = PBXGroup;
+                       children = (
+                               68CAB08518568BBE00DB5318 /* ahh.raw */,
+                               68CAB08618568BBE00DB5318 /* bassdrum.raw */,
+                               68CAB08718568BBE00DB5318 /* britestk.raw */,
+                               68CAB08818568BBE00DB5318 /* cowbell1.raw */,
+                               68CAB08918568BBE00DB5318 /* crashcym.raw */,
+                               68CAB08A18568BBE00DB5318 /* dope.raw */,
+                               68CAB08B18568BBE00DB5318 /* eee.raw */,
+                               68CAB08C18568BBE00DB5318 /* fwavblnk.raw */,
+                               68CAB08D18568BBF00DB5318 /* halfwave.raw */,
+                               68CAB08E18568BBF00DB5318 /* hihatcym.raw */,
+                               68CAB08F18568BBF00DB5318 /* impuls10.raw */,
+                               68CAB09018568BBF00DB5318 /* impuls20.raw */,
+                               68CAB09118568BBF00DB5318 /* impuls40.raw */,
+                               68CAB09218568BBF00DB5318 /* makefunc.c */,
+                               68CAB09318568BBF00DB5318 /* makemidi.c */,
+                               68CAB09418568BBF00DB5318 /* makewavs.c */,
+                               68CAB09518568BBF00DB5318 /* mand1.raw */,
+                               68CAB09618568BBF00DB5318 /* mand10.raw */,
+                               68CAB09718568BBF00DB5318 /* mand11.raw */,
+                               68CAB09818568BBF00DB5318 /* mand12.raw */,
+                               68CAB09918568BBF00DB5318 /* mand2.raw */,
+                               68CAB09A18568BBF00DB5318 /* mand3.raw */,
+                               68CAB09B18568BBF00DB5318 /* mand4.raw */,
+                               68CAB09C18568BBF00DB5318 /* mand5.raw */,
+                               68CAB09D18568BBF00DB5318 /* mand6.raw */,
+                               68CAB09E18568BBF00DB5318 /* mand7.raw */,
+                               68CAB09F18568BBF00DB5318 /* mand8.raw */,
+                               68CAB0A018568BBF00DB5318 /* mand9.raw */,
+                               68CAB0A118568BBF00DB5318 /* mandpluk.raw */,
+                               68CAB0A218568BBF00DB5318 /* marmstk1.raw */,
+                               68CAB0A318568BBF00DB5318 /* ooo.raw */,
+                               68CAB0A418568BBF00DB5318 /* peksblnk.raw */,
+                               68CAB0A518568BBF00DB5318 /* ppksblnk.raw */,
+                               68CAB0A618568BBF00DB5318 /* ridecymb.raw */,
+                               68CAB0A718568BBF00DB5318 /* silence.raw */,
+                               68CAB0A818568BBF00DB5318 /* sine.c */,
+                               68CAB0A918568BBF00DB5318 /* sineblnk.raw */,
+                               68CAB0AA18568BBF00DB5318 /* sinewave.raw */,
+                               68CAB0AB18568BBF00DB5318 /* snardrum.raw */,
+                               68CAB0AC18568BBF00DB5318 /* snglpeak.raw */,
+                               68CAB0AD18568BBF00DB5318 /* tambourn.raw */,
+                               68CAB0AE18568BBF00DB5318 /* tomhidrm.raw */,
+                               68CAB0AF18568BBF00DB5318 /* tomlowdr.raw */,
+                               68CAB0B018568BBF00DB5318 /* tommiddr.raw */,
+                               68CAB0B118568BBF00DB5318 /* twopeaks.raw */,
+                       );
+                       path = rawwaves;
+                       sourceTree = "<group>";
+               };
                99692BD914FF149000D0A05F /* Headers */ = {
                        isa = PBXGroup;
                        children = (
@@ -681,9 +824,50 @@
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               68CAB0D918568BBF00DB5318 /* snglpeak.raw in Resources */,
+                               68CAB0CC18568BBF00DB5318 /* mand8.raw in Resources */,
+                               68CAB0CA18568BBF00DB5318 /* mand6.raw in Resources */,
+                               68CAB0C618568BBF00DB5318 /* mand2.raw in Resources */,
+                               68CAB0D718568BBF00DB5318 /* sinewave.raw in Resources */,
+                               68CAB0B218568BBF00DB5318 /* ahh.raw in Resources */,
+                               68CAB0C518568BBF00DB5318 /* mand12.raw in Resources */,
                                00748058165D41390024B57A /* assets in Resources */,
+                               68CAB0D218568BBF00DB5318 /* ppksblnk.raw in Resources */,
+                               68CAB0BE18568BBF00DB5318 /* impuls40.raw in Resources */,
+                               68CAB0DC18568BBF00DB5318 /* tomlowdr.raw in Resources */,
+                               68CAB0BA18568BBF00DB5318 /* halfwave.raw in Resources */,
+                               68CAB0C918568BBF00DB5318 /* mand5.raw in Resources */,
+                               68CAB0DA18568BBF00DB5318 /* tambourn.raw in Resources */,
+                               68CAB0CB18568BBF00DB5318 /* mand7.raw in Resources */,
+                               68CAB0CF18568BBF00DB5318 /* marmstk1.raw in Resources */,
+                               68CAB0B418568BBF00DB5318 /* britestk.raw in Resources */,
+                               68CAB0B318568BBF00DB5318 /* bassdrum.raw in Resources */,
+                               68CAB0DE18568BBF00DB5318 /* twopeaks.raw in Resources */,
+                               68CAB0BD18568BBF00DB5318 /* impuls20.raw in Resources */,
+                               68CAB0C418568BBF00DB5318 /* mand11.raw in Resources */,
+                               68CAB0CD18568BBF00DB5318 /* mand9.raw in Resources */,
+                               68CAB0CE18568BBF00DB5318 /* mandpluk.raw in Resources */,
+                               68CAB0C718568BBF00DB5318 /* mand3.raw in Resources */,
+                               68CAB0DB18568BBF00DB5318 /* tomhidrm.raw in Resources */,
                                31EF3990B82C404DB705930E /* CinderApp_ios.png in Resources */,
+                               68CAB0B918568BBF00DB5318 /* fwavblnk.raw in Resources */,
+                               68CAB0C218568BBF00DB5318 /* mand1.raw in Resources */,
+                               68CAB0BC18568BBF00DB5318 /* impuls10.raw in Resources */,
+                               68CAB0DD18568BBF00DB5318 /* tommiddr.raw in Resources */,
+                               68CAB0D318568BBF00DB5318 /* ridecymb.raw in Resources */,
+                               68CAB0BB18568BBF00DB5318 /* hihatcym.raw in Resources */,
+                               68CAB0B518568BBF00DB5318 /* cowbell1.raw in Resources */,
+                               68CAB0D618568BBF00DB5318 /* sineblnk.raw in Resources */,
+                               68CAB0C818568BBF00DB5318 /* mand4.raw in Resources */,
+                               68CAB0B818568BBF00DB5318 /* eee.raw in Resources */,
+                               68CAB0B618568BBF00DB5318 /* crashcym.raw in Resources */,
+                               68CAB0C318568BBF00DB5318 /* mand10.raw in Resources */,
+                               68CAB0D818568BBF00DB5318 /* snardrum.raw in Resources */,
+                               68CAB0B718568BBF00DB5318 /* dope.raw in Resources */,
                                FDB524FC93AD48DE9DEE5102 /* Default-568h@2x.png in Resources */,
+                               68CAB0D418568BBF00DB5318 /* silence.raw in Resources */,
+                               68CAB0D118568BBF00DB5318 /* peksblnk.raw in Resources */,
+                               68CAB0D018568BBF00DB5318 /* ooo.raw in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -711,8 +895,10 @@
                                68CAB073185456F100DB5318 /* Sphere.cpp in Sources */,
                                68CAB033185456F100DB5318 /* BiQuad.cpp in Sources */,
                                68CAB05C185456F100DB5318 /* Mutex.cpp in Sources */,
+                               68CAB0BF18568BBF00DB5318 /* makefunc.c in Sources */,
                                68CAB067185456F100DB5318 /* PRCRev.cpp in Sources */,
                                68CAB03C185456F100DB5318 /* Clarinet.cpp in Sources */,
+                               68CAB0D518568BBF00DB5318 /* sine.c in Sources */,
                                68CAB03F185456F100DB5318 /* DelayL.cpp in Sources */,
                                68CAB072185456F100DB5318 /* Socket.cpp in Sources */,
                                68CAB070185456F100DB5318 /* Sitar.cpp in Sources */,
@@ -721,6 +907,7 @@
                                68CAB068185456F100DB5318 /* Resonate.cpp in Sources */,
                                68CAB04C185456F100DB5318 /* FormSwep.cpp in Sources */,
                                68CAB07F185456F100DB5318 /* VoicForm.cpp in Sources */,
+                               68CAB0C118568BBF00DB5318 /* makewavs.c in Sources */,
                                68CAB05B185456F100DB5318 /* Moog.cpp in Sources */,
                                68CAB036185456F100DB5318 /* BlitSquare.cpp in Sources */,
                                68CAB055185456F100DB5318 /* Mesh2D.cpp in Sources */,
@@ -777,6 +964,7 @@
                                68CAB07C185456F100DB5318 /* TwoPole.cpp in Sources */,
                                68CAB074185456F100DB5318 /* StifKarp.cpp in Sources */,
                                68CAB034185456F100DB5318 /* Blit.cpp in Sources */,
+                               68CAB0C018568BBF00DB5318 /* makemidi.c in Sources */,
                                68CAB06A185456F100DB5318 /* Sampler.cpp in Sources */,
                                68CAB060185456F100DB5318 /* OneZero.cpp in Sources */,
                                68CAB043185456F100DB5318 /* FileLoop.cpp in Sources */,