From d7aa9b58c757d7da91adb907f9b0262ac2815eaf Mon Sep 17 00:00:00 2001 From: Mick Grierson Date: Fri, 11 Nov 2011 17:28:53 +0000 Subject: tiny changes --- main.cpp | 4 +- .../project.xcworkspace/contents.xcworkspacedata | 7 ++ .../UserInterfaceState.xcuserstate | Bin 0 -> 30481 bytes .../xcschemes/maximilianTest.xcscheme | 84 +++++++++++++++++++++ .../xcschemes/xcschememanagement.plist | 22 ++++++ 5 files changed, 115 insertions(+), 2 deletions(-) create mode 100644 maximilianTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/maximilianTest.xcscheme create mode 100644 maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/main.cpp b/main.cpp index ad24cf4..e358344 100755 --- a/main.cpp +++ b/main.cpp @@ -47,10 +47,10 @@ void play(double *output) {//this is where the magic happens. Very slow magic. lastCount=0;//set lastCount to 0 } - bassout=filter2.lores(envelope.adsr(bass.saw(currentPitch*0.5)+sound.pulse(currentPitch*0.5,mod.phasor(1)),1,0.9995, 0.25, 0.9995, 1, trigger),9250,2);//new, simple ADSR. +// bassout=filter2.lores(envelope.adsr(bass.saw(currentPitch*0.5)+sound.pulse(currentPitch*0.5,mod.phasor(1)),1,0.9995, 0.25, 0.9995, 1, trigger),9250,2);//new, simple ADSR. leadout=filter.lores(leadenvelope.ar(lead2.saw(leadPitch*4)+lead.pulse(leadPitch+(leadmod.sinebuf(1.9)*1.5), 0.6), 0.00005, 0.999975, 50000, trigger2),5900,10);//leadline - delayout=(leadout+(delay.dl(leadout, 14000, 0.8)*0.5))/2;//add some delay + delayout=(leadout+(delay.dl(leadout, 14000, 0.8)*0.5))/4;//add some delay if(trigger!=0)trigger=0;//set the trigger to off if you want it to trigger immediately next time. diff --git a/maximilianTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/maximilianTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..9c20359 --- /dev/null +++ b/maximilianTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate b/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..1581f28 Binary files /dev/null and b/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/maximilianTest.xcscheme b/maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/maximilianTest.xcscheme new file mode 100644 index 0000000..63557c2 --- /dev/null +++ b/maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/maximilianTest.xcscheme @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/xcschememanagement.plist b/maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..f2cc5e9 --- /dev/null +++ b/maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,22 @@ + + + + + SchemeUserState + + maximilianTest.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 8DD76F620486A84900D96B5E + + primary + + + + + -- cgit v1.3