From 568cc8efd9c4ec2ddc7fdbdb1cac831d3988a154 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Sun, 8 Apr 2018 10:56:43 +0200 Subject: [PATCH 01/14] removed GenericMIDI::ccChange --- src/controller/genericmidi.cxx | 60 ---------------------------------- 1 file changed, 60 deletions(-) diff --git a/src/controller/genericmidi.cxx b/src/controller/genericmidi.cxx index 9613b9f..c8e8fea 100644 --- a/src/controller/genericmidi.cxx +++ b/src/controller/genericmidi.cxx @@ -367,68 +367,8 @@ void GenericMIDI::noteOff( int track, int note, int vel ) break; } } } - -void GenericMIDI::ccChange( int track, int cc, float value ) -{ - if ( track >= 0 && track < NTRACKS ) - { - switch( cc ) - { - /// Track faders - case 7: { - jack->getLogic()->trackVolume( track, value ); - break; } - case 14: { // master - jack->getLogic()->trackVolume( -1, value ); - break; } - - /// X-Fader - case 15: { - jack->getTimeManager()->setBpm( 60 + value * 180 ); - break; } - - /// Device Control - case 16: { - //jack->getLogic()->trackSend( track, SEND_KEY, value ); - break; } - case 17: { - jack->getLogic()->trackSend( track, SEND_XSIDE, value ); - break; } - case 18: { - jack->getLogic()->trackSend( track, SEND_POSTFADER, value ); - break; } - - - case 64: { // FootSwitch 1 - if ( value > 0.5 ) - { - printf("footpedal press %i, %i\n", footpedalTrack, footpedalScene ); - jack->getGridLogic()->pressed( footpedalTrack, footpedalScene ); - } - else - { - printf("footpedal release %i, %i\n", footpedalTrack, footpedalScene ); - jack->getGridLogic()->released( footpedalTrack, footpedalScene ); - } break; } - case 67: { // FootSwitch 2 - - break; } - } - } - else - // tracks outside normal track range - // handle master track buttons etc here - { - if ( cc == 16 ) // master device control select - { - - } - } -} - */ - void GenericMIDI::midi(unsigned char* midi) { int status = midi[0]; From 73ad9dac35e4556d08e8597897a376340719ce03 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Sun, 8 Apr 2018 10:57:18 +0200 Subject: [PATCH 02/14] removed GenericMIDI::ccChange --- src/controller/genericmidi.cxx | 37 ---------------------------------- 1 file changed, 37 deletions(-) diff --git a/src/controller/genericmidi.cxx b/src/controller/genericmidi.cxx index c8e8fea..4278392 100644 --- a/src/controller/genericmidi.cxx +++ b/src/controller/genericmidi.cxx @@ -330,43 +330,6 @@ void GenericMIDI::noteOn( int track, int note, int vel ) } - -void GenericMIDI::noteOff( int track, int note, int vel ) -{ - printf("apc noteOff: t = %i, n = %i, vel = %i\n", track, note, vel); - if ( note >= 53 && note <= 57 ) - { - jack->getGridLogic()->released( track, note - 53 ); - } - - switch( note ) - { - case 48: { // record - jack->getLogic()->trackRecordArm(track, false); - } break; - case 49: { // solo / cue - jack->getLogic()->trackSend(track, SEND_KEY, 0); - } - - case 99: { // tap tempo - EventTimeTempoTap e(false); - writeToGuiRingbuffer( &e ); - } break; - - case 82: // scene launch - case 83: - case 84: - case 85: - case 86: { - int s = jack->getGridLogic()->getLaunchedScene(); - launchScene( s ); - } break ; - - case 98: { // Shift - shiftPressed = false; - break; } - } -} */ void GenericMIDI::midi(unsigned char* midi) From 4e9def136ef90b0d8da66269a4d3c63c509326b2 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Sun, 8 Apr 2018 10:57:54 +0200 Subject: [PATCH 03/14] removed GenericMIDI::noteOn --- src/controller/genericmidi.cxx | 55 ---------------------------------- 1 file changed, 55 deletions(-) diff --git a/src/controller/genericmidi.cxx b/src/controller/genericmidi.cxx index 4278392..2b4214f 100644 --- a/src/controller/genericmidi.cxx +++ b/src/controller/genericmidi.cxx @@ -274,61 +274,6 @@ void GenericMIDI::mute(int t, bool b) void GenericMIDI::volume(int t, float f) { -} - -void GenericMIDI::noteOn( int track, int note, int vel ) -{ - printf("apc noteOn: t = %i, n = %i, vel = %i\n", track, note, vel); - if ( note >= 53 && note <= 57 ) - { - if ( shiftPressed ) - { - footpedalTrack = track; - footpedalScene = note - 53; - } - else - jack->getGridLogic()->pressed( track, note - 53 ); - return; - } - - - switch( note ) - { - case 48: { // record - jack->getLogic()->trackRecordArm(track, true); - } break; - case 49: { // solo / cue - jack->getLogic()->trackSend(track, SEND_KEY, 1); - } break; - - case 82: // Master Scene Clips - case 83: - case 84: - case 85: - case 86: { - jack->getGridLogic()->launchScene(note - 82); - } break; - - case 98: { // Shift - shiftPressed = true; - break; } - - case 99: { // tap tempo - jack->getLogic()->tapTempo(); - jack->getControllerUpdater()->tapTempo( true ); - } break; - case 100: { // nudge + - - } break; - case 101: { // nudge - - - } break; - - default: - break; - } - - } */ From 74f11675583569049477fb1338e88413771549a8 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Sun, 8 Apr 2018 10:58:12 +0200 Subject: [PATCH 04/14] removed GenericMIDI::volume --- src/controller/genericmidi.cxx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/controller/genericmidi.cxx b/src/controller/genericmidi.cxx index 2b4214f..cfd82ca 100644 --- a/src/controller/genericmidi.cxx +++ b/src/controller/genericmidi.cxx @@ -268,12 +268,6 @@ void GenericMIDI::launchScene( int s ) void GenericMIDI::mute(int t, bool b) { -} - - -void GenericMIDI::volume(int t, float f) -{ - } */ From 2572edb570a81e23bbbe09ca41af62606dc9cc6d Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Sun, 8 Apr 2018 10:59:45 +0200 Subject: [PATCH 05/14] removed GenericMIDI::progress --- src/controller/genericmidi.cxx | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/controller/genericmidi.cxx b/src/controller/genericmidi.cxx index cfd82ca..c9453fb 100644 --- a/src/controller/genericmidi.cxx +++ b/src/controller/genericmidi.cxx @@ -204,17 +204,6 @@ void GenericMIDI::trackJackSendActivate(int t, bool a) } /* -void GenericMIDI::progress(int t, int s, float f) -{ - - unsigned char data[3]; - data[0] = 176; - data[1] = 48; // record enable LED - data[2] = 127 * f; - jack->midiObserverWriteMIDI( _port, &data[0] ); - -} - void GenericMIDI::trackSend(int t, int send, float v) { if ( t >= NTRACKS) From ca4478c721375197af25bd72fe61ab6947e937ea Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Sun, 8 Apr 2018 11:00:03 +0200 Subject: [PATCH 06/14] removed GenericMIDI::trackSend --- src/controller/genericmidi.cxx | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/src/controller/genericmidi.cxx b/src/controller/genericmidi.cxx index c9453fb..a640530 100644 --- a/src/controller/genericmidi.cxx +++ b/src/controller/genericmidi.cxx @@ -204,38 +204,6 @@ void GenericMIDI::trackJackSendActivate(int t, bool a) } /* -void GenericMIDI::trackSend(int t, int send, float v) -{ - if ( t >= NTRACKS) - { - // master track - return; - } - - unsigned char data[3]; - - if ( send == SEND_KEY ) - { - data[0] = 144 + t; - data[1] = 49; - data[2] = v > 0.5 ? 127 : 0 ; - } - else if ( send == SEND_XSIDE ) - { - data[0] = 176 + t; - data[1] = 16; - data[2] = 127 * v; - } - else if ( send == SEND_POSTFADER ) - { - data[0] = 176 + t; - data[1] = 17; - data[2] = 127 * v; - } - - jack->midiObserverWriteMIDI( _port, &data[0] ); -} - void GenericMIDI::launchScene( int s ) { unsigned char data[3]; From c909d8b15fc883350ec70c014cc75aa487900797 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Sun, 8 Apr 2018 11:00:26 +0200 Subject: [PATCH 07/14] removed GenericMIDI::launchScene && ::mute --- src/controller/genericmidi.cxx | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/src/controller/genericmidi.cxx b/src/controller/genericmidi.cxx index a640530..6c2409f 100644 --- a/src/controller/genericmidi.cxx +++ b/src/controller/genericmidi.cxx @@ -203,31 +203,6 @@ void GenericMIDI::trackJackSendActivate(int t, bool a) } -/* -void GenericMIDI::launchScene( int s ) -{ - unsigned char data[3]; - - for(int i = 0; i < 5; i++ ) - { - data[0] = 128; - data[1] = 82 + i; // scene play - data[2] = 0; - jack->midiObserverWriteMIDI( _port, &data[0] ); - } - - data[0] = 144; - data[1] = 82 + s; - data[2] = 127; - jack->midiObserverWriteMIDI( _port, &data[0] ); -} - -void GenericMIDI::mute(int t, bool b) -{ - -} -*/ - void GenericMIDI::midi(unsigned char* midi) { int status = midi[0]; From 10b2cad7ed4e3951c8c32617937f1132d7c9ba7f Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Sun, 8 Apr 2018 11:04:11 +0200 Subject: [PATCH 08/14] removed declarations of removed functions --- src/controller/genericmidi.hxx | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/controller/genericmidi.hxx b/src/controller/genericmidi.hxx index 9b7f0a7..8656403 100644 --- a/src/controller/genericmidi.hxx +++ b/src/controller/genericmidi.hxx @@ -52,9 +52,6 @@ public: std::string getAuthor(); std::string getEmail(); - /// track actions - //void mute(int t, bool b); - void metronomeEnable(bool b); void launchScene( int scene ); @@ -65,14 +62,6 @@ public: void recordArm(int t, bool b); void setSceneState(int track, int clip, GridLogic::State s); - /* - void progress(int t, int s, float f); - void launchScene( int scene ); - - /// track FX - void trackSend(int t, int send, float v); - */ - void trackSend(int t, int send, float v); void trackSendActive(int t, int send, bool a); From efc531206d4b9b8b43cb6fc0df36e8094fd3212f Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Sun, 8 Apr 2018 11:07:13 +0200 Subject: [PATCH 09/14] removed AudioBuffer::operator<< --- src/audiobuffer.cxx | 12 +----------- src/audiobuffer.hxx | 2 -- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/audiobuffer.cxx b/src/audiobuffer.cxx index 13cb689..94876de 100644 --- a/src/audiobuffer.cxx +++ b/src/audiobuffer.cxx @@ -122,14 +122,4 @@ void AudioBuffer::nonRtResize(unsigned long size) { bufferL.resize(size); bufferR.resize(size); -} - -/* -ostream& AudioBuffer::operator<<(ostream& o, const AudioBuffer& a) -{ - o << "AudioBuffer " << a.name << - " beats: " << a.numBeats << - " audioFrames: " << a.audioFrames << endl; - return o; -} -*/ +} \ No newline at end of file diff --git a/src/audiobuffer.hxx b/src/audiobuffer.hxx index 08511ba..a91203c 100644 --- a/src/audiobuffer.hxx +++ b/src/audiobuffer.hxx @@ -61,8 +61,6 @@ public: void nonRtResize(unsigned long size); - //friend ostream& operator<<(ostream& o, const AudioBuffer& a); - protected: static int privateID; int ID; From 371bbf7f04720c453610c55db30b42bd41a430c6 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Sun, 8 Apr 2018 11:14:02 +0200 Subject: [PATCH 10/14] removed some unused code in Diskwriter::writeControllerFile --- src/diskwriter.cxx | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/src/diskwriter.cxx b/src/diskwriter.cxx index aa93358..30ef46e 100644 --- a/src/diskwriter.cxx +++ b/src/diskwriter.cxx @@ -218,33 +218,6 @@ int DiskWriter::writeControllerFile( Controller* c ) } } - - //std::vector b = g->getMidiToAction(); - /* - cJSON* outputBindings = cJSON_CreateArray(); - cJSON_AddItemToObject(controllerJson, "outputBindings", outputBindings ); - - for(unsigned int i = 0; i < b.size(); i++ ) - { - // create binding - cJSON* binding = cJSON_CreateObject(); - cJSON_AddItemToArray( outputBindings, binding ); - - // add metadata to binding - // FIXME: get action string from Event class: need to move function from GenericMIDI to there - cJSON_AddItemToObject( binding, "action", cJSON_CreateString( "gridlogic:launchscene" ) ); - - cJSON_AddNumberToObject( binding, "status", b.at(i)->status ); - cJSON_AddNumberToObject( binding, "data" , b.at(i)->data ); - - cJSON_AddNumberToObject( binding, "track" , b.at(i)->track ); - cJSON_AddNumberToObject( binding, "scene" , b.at(i)->scene ); - cJSON_AddNumberToObject( binding, "send" , b.at(i)->send ); - cJSON_AddNumberToObject( binding, "active", b.at(i)->active ); - } - */ - - // write the sample JSON node to /sample.cfg stringstream controllerCfgPath; controllerCfgPath << getenv("HOME") << "/.config/openAV/luppp/controllers/" << g->getName() << ".ctlr"; From a19a4a3e99b5b8351d60b41219c33d3a08b8afd5 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Sun, 8 Apr 2018 11:16:37 +0200 Subject: [PATCH 11/14] remove some unused Code in handleDspEvents --- src/eventhandlerdsp.cxx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/eventhandlerdsp.cxx b/src/eventhandlerdsp.cxx index bbfd06b..3643ace 100644 --- a/src/eventhandlerdsp.cxx +++ b/src/eventhandlerdsp.cxx @@ -300,14 +300,6 @@ void handleDspEvents() case Event::FX_REVERB: break; - /*{ - if ( availableRead >= sizeof(EventFxReverb) ) { - EventFxReverb ev; - jack_ringbuffer_read( rbToDsp, (char*)&ev, sizeof(EventFxReverb) ); - // TODO implement reverb - break; } - } - */ case Event::TRACK_VOLUME: { if ( availableRead >= sizeof(EventTrackVol) ) { EventTrackVol ev; From 659fd713a79134c8e48b78b89e82b1889751af3a Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Sun, 8 Apr 2018 11:19:30 +0200 Subject: [PATCH 12/14] removed some unused Code in Gui:Gui --- src/gui.cxx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/gui.cxx b/src/gui.cxx index f1e692e..c926afb 100644 --- a/src/gui.cxx +++ b/src/gui.cxx @@ -397,14 +397,6 @@ Gui::Gui(const char* argZero) : window.color( fl_rgb_color (7,7,7) ); - /* - tooltipLabel = new Fl_2(130, 25, 500, 20, ""); - tooltipLabel->labelcolor( FL_LIGHT2 ); - tooltipLabel->color( FL_DARK2 ); - tooltipLabel->hide(); - //tooltipLabel->align( FL_ALIGN_TOP_LEFT ); - */ - // horizontal no-resize-images group Fl_Group* headerImages = new Fl_Group( 0, 0, 1110, 650, "header"); { From e24b4a661fc2ebe2c36fa733367df72300d3041b Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Sun, 8 Apr 2018 11:20:23 +0200 Subject: [PATCH 13/14] removed some unused Code in Jack::Jack --- src/jack.cxx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/jack.cxx b/src/jack.cxx index ccb71df..bbf3413 100644 --- a/src/jack.cxx +++ b/src/jack.cxx @@ -96,10 +96,6 @@ Jack::Jack( std::string name ) : resetMidiBindingState(); - //GenericMIDI* tmp = new GenericMIDI("akai_apc.ctlr"); - //tmp->registerComponents(); - //controllerUpdater->registerController( static_cast(tmp) ); - buffers.nframes = jack_get_buffer_size( client ); buffers.samplerate = jack_get_sample_rate( client ); From 6a1e2c7782a4d0e9387940ab3b3cde5c93d3655d Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Sun, 8 Apr 2018 11:23:49 +0200 Subject: [PATCH 14/14] removed some unused Code in TimeManager::setBpm --- src/timemanager.cxx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/timemanager.cxx b/src/timemanager.cxx index 396e579..f052cfe 100644 --- a/src/timemanager.cxx +++ b/src/timemanager.cxx @@ -74,10 +74,6 @@ void TimeManager::setBpm(float bpm) barCounter = 0; beatCounter = 0; beatFrameCountdown = -1; - /* - for(int i=0;iresetTimeState(); - */ } void TimeManager::setBpmZeroOne(float b)