summaryrefslogtreecommitdiff
path: root/synth/jack.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@thinkpad.(none)>2011-01-06 23:31:51 +0100
committerFlorian Jung <flo@thinkpad.(none)>2011-01-06 23:31:51 +0100
commit892c323f7851c76bf678369987c5c7a361626ea2 (patch)
tree4393d75c4e9755defa41519488f335dcff9b2c59 /synth/jack.cpp
parente78131ccbbcb81da94e5992f788c6ea291a2050d (diff)
Added a rudimentary CLI to the note compiler + bugfix
Diffstat (limited to 'synth/jack.cpp')
-rw-r--r--synth/jack.cpp44
1 files changed, 40 insertions, 4 deletions
diff --git a/synth/jack.cpp b/synth/jack.cpp
index 8d599de..3949722 100644
--- a/synth/jack.cpp
+++ b/synth/jack.cpp
@@ -317,7 +317,7 @@ int process_callback(jack_nframes_t nframes, void *notused)
}
else if (tmp2==0)
{
- if (lastframe>tmp+44100*2)
+ if (lastframe>tmp+44100*1)
{
tmp2=1;
cout << "BÄÄM" << endl;
@@ -326,17 +326,53 @@ int process_callback(jack_nframes_t nframes, void *notused)
}
else if (tmp2==1)
{
- if (lastframe>tmp+44100*4)
+ if (lastframe>tmp+44100*2)
{
tmp2=2;
- //channel[0]->event(0x90,87,5);
+ channel[0]->event(0x90,87,5);
channel[0]->set_controller(58, 0);
cout << "BÄÄM2" << endl;
}
}
+ else if (tmp2==2)
+ {
+ if (lastframe>tmp+44100*3)
+ {
+ tmp2=3;
+ channel[0]->event(0x90,90,127);
+ cout << "BÄÄM2" << endl;
+ }
+ }
+ else if (tmp2==3)
+ {
+ if (lastframe>tmp+44100*4)
+ {
+ tmp2=4;
+ channel[0]->event(0x90,60,96);
+ cout << "BÄÄM2" << endl;
+ }
+ }
+ else if (tmp2==4)
+ {
+ if (lastframe>tmp+44100*5)
+ {
+ tmp2=5;
+ channel[0]->event(0x90,63,32);
+ cout << "BÄÄM2" << endl;
+ }
+ }
+ else if (tmp2==5)
+ {
+ if (lastframe>tmp+44100*6)
+ {
+ tmp2=6;
+ channel[0]->event(0x90,66,60);
+ cout << "BÄÄM2" << endl;
+ }
+ }
else
{
- if (lastframe>tmp+44100*10)
+ if (lastframe>tmp+44100*8)
{
cout << "finished" << endl;
exit(0);