diff --git a/src/controller/apc.cxx b/src/controller/apc.cxx index 14747cd..52a34c5 100644 --- a/src/controller/apc.cxx +++ b/src/controller/apc.cxx @@ -44,7 +44,7 @@ void AkaiAPC::trackSend(int t, int send, float v) { if ( t >= NTRACKS) { - // master track + // master track, no sidechains / sends return; } @@ -52,9 +52,10 @@ void AkaiAPC::trackSend(int t, int send, float v) if ( send == SEND_SIDE ) { - data[0] = 144 + t; + int tmp = v > 0.5 ? 144 : 128; + data[0] = tmp + t; data[1] = 49; - data[2] = v > 0.5 ? 127 : 0 ; + data[2] = 127 ; } else if ( send == SEND_POST ) { @@ -68,6 +69,10 @@ void AkaiAPC::trackSend(int t, int send, float v) data[1] = 17; data[2] = 127 * v; } + else + { + cout << "AkaiAPC::trackSend() unknown send!" << endl; + } jack->midiObserverWriteMIDI( _port, &data[0] ); } diff --git a/src/jack.cxx b/src/jack.cxx index 78e4dc9..b101458 100644 --- a/src/jack.cxx +++ b/src/jack.cxx @@ -143,18 +143,6 @@ void Jack::activate() Controller* g = new LupppGUI(); - /* - // move to "settings" class or so - Controller* c = new AkaiAPC(); - controllerUpdater->registerController( c ); - Controller* g = new LupppGUI(); - controllerUpdater->registerController( g ); - */ - - // move to time class, get instantiate order right - //jack->getTimeManager()->registerObserver( metronome ); - //jack->getTimeManager()->registerObserver( gridLogic ); - jack_activate( client ); jack_transport_start(client); } @@ -369,7 +357,7 @@ void Jack::midiObserverWriteMIDI( int portIndex, unsigned char* data ) if( buf != 0 ) { memcpy( buf, data, sizeof( unsigned char ) * 3); - //cout << "writeApcOutput " << int(buf[0]) << ", " << int(buf[1]) << ", " << int(buf[2]) << endl; + cout << "midiObserverWriteMIDI portID " << portIndex << " " << int(buf[0]) << ", " << int(buf[1]) << ", " << int(buf[2]) << endl; } else {