hiro/openAV-Luppp
1
0
Fork 0
mirror of https://github.com/vale981/openAV-Luppp synced 2025-03-05 09:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

-Fixed GOptions binding list, now shows all bindings

Browse source
This commit is contained in:
Harry van Haaren 2013-12-04 14:12:54 +00:00
parent 04fc086a5d
commit d8411389a9
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/goptions.cxx
View file

@ -298,9 +298,7 @@ void ControllerUI::addBinding( Binding* b )
{ {
// add individual bindings as they're made // add individual bindings as they're made
const char* tmp = Event::getPrettyName( b->action ); const char* tmp = Event::getPrettyName( b->action );
if ( tmp ) if ( !tmp )
LUPPP_NOTE("new binding, action: %s, ", tmp );
else
LUPPP_NOTE("new binding, action string returned NULL, action number %i ", b->action ); LUPPP_NOTE("new binding, action string returned NULL, action number %i ", b->action );
} }
else else
@ -357,7 +355,6 @@ void ControllerUI::addBinding( Binding* b )
but->callback( deleteBindingFromController, this ); but->callback( deleteBindingFromController, this );
but->redraw(); but->redraw();
Fl_Box* b = new Fl_Box(35, 35, 400, 25, strdup(s.str().c_str()) ); Fl_Box* b = new Fl_Box(35, 35, 400, 25, strdup(s.str().c_str()) );
b->align( FL_ALIGN_LEFT | FL_ALIGN_INSIDE ); b->align( FL_ALIGN_LEFT | FL_ALIGN_INSIDE );
b->redraw(); b->redraw();
@ -372,7 +369,7 @@ void ControllerUI::addBinding( Binding* b )
bindingsPack->redraw(); bindingsPack->redraw();
scroll->redraw(); scroll->redraw();
LUPPP_NOTE("binding size %i %i", bindingsPack->w(), bindingsPack->h() ); //LUPPP_NOTE("binding size %i %i", bindingsPack->w(), bindingsPack->h() );
} }
void ControllerUI::addBindings( GenericMIDI* c ) void ControllerUI::addBindings( GenericMIDI* c )
@ -380,8 +377,8 @@ void ControllerUI::addBindings( GenericMIDI* c )
// FIXME: add binding to Avtk::Binding here // FIXME: add binding to Avtk::Binding here
std::vector<Binding*> bindingVector= c->getMidiToAction(); std::vector<Binding*> bindingVector= c->getMidiToAction();
for(unsigned int i = 0; i < bindingVector.size() && i < 5; i++ ) for(unsigned int i = 0; i < bindingVector.size(); i++ )
{ {
addBinding( bindingVector.at(i) ); addBinding( bindingVector.at(i) );
} }
} }