diff --git a/src/gmastertrack.cxx b/src/gmastertrack.cxx index 823bd97..469d064 100644 --- a/src/gmastertrack.cxx +++ b/src/gmastertrack.cxx @@ -31,7 +31,7 @@ static void gmastertrack_sidchainKeyButton_callback(Fl_Widget *w, void *data) b->value( !b->value() ); EventMasterInputToActive e( INPUT_TO_SIDE_KEY, b->value() ); writeToDspRingbuffer( &e ); - printf("Key button\n"); + //printf("Key button\n"); } static void gmastertrack_mixButton_callback(Fl_Widget *w, void *data) @@ -40,7 +40,7 @@ static void gmastertrack_mixButton_callback(Fl_Widget *w, void *data) b->value( !b->value() ); EventMasterInputToActive e( INPUT_TO_MIX, b->value() ); writeToDspRingbuffer( &e ); - printf("Mix button\n"); + //printf("Mix button\n"); } static void gmastertrack_sendButton_callback(Fl_Widget *w, void *data) @@ -49,7 +49,7 @@ static void gmastertrack_sendButton_callback(Fl_Widget *w, void *data) b->value( !b->value() ); EventMasterInputToActive e( INPUT_TO_SEND, b->value() ); writeToDspRingbuffer( &e ); - printf("Send button\n"); + //printf("Send button\n"); } @@ -59,7 +59,7 @@ static void gmastertrack_sendVol_callback(Fl_Widget *w, void *data) float v = b->value(); EventMasterInputTo e = EventMasterInputTo( INPUT_TO_SEND, v ); writeToDspRingbuffer( &e ); - printf("Send dial\n"); + ///printf("Send dial\n"); } static void gmastertrack_xSideVol_callback(Fl_Widget *w, void *data) @@ -68,7 +68,7 @@ static void gmastertrack_xSideVol_callback(Fl_Widget *w, void *data) float v = b->value(); EventMasterInputTo e = EventMasterInputTo( INPUT_TO_XSIDE, v ); writeToDspRingbuffer( &e ); - printf("XSide dial\n"); + //printf("XSide dial\n"); } /// return volume @@ -78,7 +78,7 @@ static void gmastertrack_returnVol_callback(Fl_Widget *w, void *data) float v = b->value(); EventMasterReturn e( RETURN_MAIN, v ); writeToDspRingbuffer( &e ); - printf("Return dial\n"); + //printf("Return dial\n"); } static void gmastertrack_mixVol_callback(Fl_Widget *w, void *data) @@ -87,7 +87,7 @@ static void gmastertrack_mixVol_callback(Fl_Widget *w, void *data) float v = b->value(); EventMasterInputTo e = EventMasterInputTo( INPUT_TO_MIX, v ); writeToDspRingbuffer( &e ); - printf("MIX dial\n"); + //printf("MIX dial\n"); } static void gmastertrack_button_callback(Fl_Widget *w, void *data) @@ -197,13 +197,13 @@ void GMasterTrack::setBpm( int b ) void GMasterTrack::setInputVol(float f) { - LUPPP_NOTE(" gmtrck, inputVol %f", f ); + //LUPPP_NOTE(" gmtrck, inputVol %f", f ); inputVolume.value( f ); } void GMasterTrack::setInputTo(int to, float f) { - LUPPP_NOTE(" gmtrck, inputTO %i, %f", to, f ); + //LUPPP_NOTE(" gmtrck, inputTO %i, %f", to, f ); if ( to == Event::INPUT_TO_MIX ) inputToMixVol.value( f ); else if ( to == Event::INPUT_TO_SEND ) @@ -214,7 +214,7 @@ void GMasterTrack::setInputTo(int to, float f) void GMasterTrack::setInputToActive(int to, bool f) { - LUPPP_NOTE(" gmtrck, inputToActive %i, %i", to, int(f) ); + //LUPPP_NOTE(" gmtrck, inputToActive %i, %i", to, int(f) ); if ( to == Event::INPUT_TO_MIX ) inputToMix.value( f ); diff --git a/src/goptions.cxx b/src/goptions.cxx index 30354f7..c3114fa 100644 --- a/src/goptions.cxx +++ b/src/goptions.cxx @@ -158,9 +158,9 @@ ControllerUI::ControllerUI(int x, int y, int w, int h, std::string n, int ID) targetLabel = new Fl_Box(x + 140,y + 5, 200, 25,""); bindEnable = new Avtk::LightButton(x + 5, y + 5, 100, 25, "Bind Enable"); - writeControllerBtn = new Avtk::Button( x + 5, y + 275, 100, 25, "Save" ); + writeControllerBtn = new Avtk::Button( x + 5, y + h - 27, 100, 25, "Save" ); //ctlrButton = new Avtk::Button(x + 110, y + 275, 100, 25, "Load"); - removeController = new Avtk::Button(x + 110, y + 275, 100, 25, "Remove"); + removeController = new Avtk::Button(x + 110, y + h - 27, 100, 25, "Remove"); Fl_Scroll* s = new Fl_Scroll( x + 5, y + 35, 400, 180 ); bindings = new Avtk::Bindings( x + 5, y + 35, 398, 10 );