diff --git a/src/config.hxx b/src/config.hxx index 18d8110..3211cba 100644 --- a/src/config.hxx +++ b/src/config.hxx @@ -25,7 +25,7 @@ // State save / load //#define DEBUG_STATE 1 -// Jack print controller out MIDI +// Jack print controller out MIDI, loading etc //#define DEBUG_MIDI 1 diff --git a/src/controller/genericmidi.cxx b/src/controller/genericmidi.cxx index 77d8305..a20935c 100644 --- a/src/controller/genericmidi.cxx +++ b/src/controller/genericmidi.cxx @@ -826,10 +826,10 @@ Binding* GenericMIDI::setupBinding( cJSON* binding ) else if ( strcmp( actionJson->valuestring, "grid:launch_scene" ) == 0 ) { tmp->action = Event::GRID_LAUNCH_SCENE; } - else if ( strcmp( actionJson->valuestring, "grid:selectclipevent" ) == 0 ) { + else if ( strcmp( actionJson->valuestring, "grid:special_clip_event" ) == 0 ) { tmp->action = Event::GRID_SELECT_CLIP_EVENT; } - else if ( strcmp( actionJson->valuestring, "grid:selectclipenable" ) == 0 ) { + else if ( strcmp( actionJson->valuestring, "grid:select_clip_enable" ) == 0 ) { tmp->action = Event::GRID_SELECT_CLIP_ENABLE; } else if ( strcmp( actionJson->valuestring, "master:volume" ) == 0 ) { diff --git a/src/controller/guicontroller.cxx b/src/controller/guicontroller.cxx index ecbbcb1..cf7a5c2 100644 --- a/src/controller/guicontroller.cxx +++ b/src/controller/guicontroller.cxx @@ -68,7 +68,6 @@ void LupppGUI::trackSend(int t, int send, float r) void LupppGUI::specialScene(int t, int s) { - printf("special cene writing event\n"); EventGridSelectNewChosen e( t, s ); writeToGuiRingbuffer( &e ); } diff --git a/src/controllerupdater.cxx b/src/controllerupdater.cxx index dbffeca..dcb406c 100644 --- a/src/controllerupdater.cxx +++ b/src/controllerupdater.cxx @@ -104,10 +104,7 @@ void ControllerUpdater::setTrackSend(int t, int send, float v) void ControllerUpdater::specialScene(int t, int scene) { for(unsigned int i = 0; i < c.size(); i++) - { - printf("calling on c %i, %s\n", i, c.at(i)->getName().c_str() ); c.at(i)->specialScene(t, scene); - } } void ControllerUpdater::masterInputToActive(int to, bool v) diff --git a/src/event.cxx b/src/event.cxx index 5713fe5..520e8de 100644 --- a/src/event.cxx +++ b/src/event.cxx @@ -57,6 +57,8 @@ const char* Event::getPrettyName( int type ) case GRID_EVENT:{ return EventGridEvent::prettyName; } case GRID_LAUNCH_SCENE:{ return EventGridLaunchScene::prettyName; } + case METRONOME_ACTIVE:{ return EventMetronomeActive::prettyName; } + default: return 0; } } diff --git a/src/eventhandlergui.cxx b/src/eventhandlergui.cxx index a31a4b4..da45bbb 100644 --- a/src/eventhandlergui.cxx +++ b/src/eventhandlergui.cxx @@ -202,10 +202,7 @@ void handleGuiEvents() if ( availableRead >= sizeof(EventGridSelectNewChosen) ) { EventGridSelectNewChosen ev; jack_ringbuffer_read( rbToGui, (char*)&ev, sizeof(EventGridSelectNewChosen) ); - - LUPPP_NOTE("New special, %i, %i", ev.track, ev.scene); - - + //LUPPP_NOTE("New special, %i, %i", ev.track, ev.scene); for(int i = 0; i < NTRACKS; i++) { gui->getTrack(i)->getClipSelector()->setSpecial( i == ev.track ? ev.scene : -1 ); diff --git a/src/goptions.cxx b/src/goptions.cxx index d9f6b5e..bf5ac6c 100644 --- a/src/goptions.cxx +++ b/src/goptions.cxx @@ -146,9 +146,10 @@ static void selectLoadController(Fl_Widget* w, void* data) fnfc.directory( s.str().c_str() ); // default directory to use // Show native chooser switch ( fnfc.show() ) { - case -1: printf("ERROR: %s\n", fnfc.errmsg()); break; // ERROR - case 1: printf("CANCEL\n"); break; // CANCEL - default: printf("Loading controller at %s\n", fnfc.filename()); + case -1: /*printf("ERROR: %s\n", fnfc.errmsg());*/ break; // ERROR + case 1: /*printf("CANCEL\n"); */ break; // CANCEL + default: + //printf("Loading controller at %s\n", fnfc.filename()); path = fnfc.filename(); break; } @@ -299,7 +300,12 @@ void ControllerUI::addBinding( Binding* b ) // add individual bindings as they're made const char* tmp = Event::getPrettyName( b->action ); if ( !tmp ) + { +#ifdef DEBUG_MIDI LUPPP_NOTE("new binding, action string returned NULL, action number %i ", b->action ); +#endif + return; + } } else {