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

-GOptions opens link when clicked

Browse source
This commit is contained in:
Harry van Haaren 2013-12-04 12:38:02 +00:00
parent 51a7b1c2af
commit 7f5e6dd0d5
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/controller/genericmidi.cxx
View file

@ -405,7 +405,7 @@ void GenericMIDI::midi(unsigned char* midi)
// create new MIDI binding? // create new MIDI binding?
if ( jack->bindingEventRecordEnable ) if ( jack->bindingEventRecordEnable )
{ {
LUPPP_NOTE("making binding from: %i %i %f", status, data, value ); //LUPPP_NOTE("making binding from: %i %i %f", status, data, value );
setupBinding( jack->bindingEventType, status, data, setupBinding( jack->bindingEventType, status, data,
jack->bindingTrack, jack->bindingTrack,
jack->bindingScene, jack->bindingScene,
@ -431,7 +431,7 @@ void GenericMIDI::midi(unsigned char* midi)
if ( b->status == status && b->data == data ) if ( b->status == status && b->data == data )
{ {
LUPPP_NOTE("Executing action %s, send %i value %f, b->active %i", Event::getPrettyName(b->action), b->send, value, int(b->active) ); //LUPPP_NOTE("Executing action %s, send %i value %f, b->active %i", Event::getPrettyName(b->action), b->send, value, int(b->active) );
switch( b->action ) switch( b->action )
{ {
@ -771,8 +771,7 @@ Binding* GenericMIDI::setupBinding( cJSON* binding )
tmp->data = dataJson->valueint; tmp->data = dataJson->valueint;
// gets the Action type from the JSON string // gets the Action type from the JSON string
tmp->action = Event::getTypeFromName(actionJson->valuestring); tmp->action = Event::getTypeFromName( actionJson->valuestring );
// check what our send value should be: // check what our send value should be:

28
src/goptions.cxx
View file

@ -55,11 +55,18 @@ static void updateAuthorCB(Fl_Widget* w, void* data)
static void updateLinkCB(Fl_Widget* w, void* data) static void updateLinkCB(Fl_Widget* w, void* data)
{ {
ControllerUI* c = (ControllerUI*)data; ControllerUI* c = (ControllerUI*)data;
const char* s = fl_input( "Link: ", "" );
if ( s ) stringstream str;
{ str << "xdg-open ";
c->setLink( s );
} // add http:// if its not in the string
std::string l = c->getLink();
if ( ( l.find("http") ) == std::string::npos )
str << " http://";
str << l;
system( str.str().c_str() );
} }
static void writeBindEnable(Fl_Widget* w, void* data) static void writeBindEnable(Fl_Widget* w, void* data)
@ -286,10 +293,14 @@ void ControllerUI::setBindEnable( bool b )
void ControllerUI::addBinding( Binding* b ) void ControllerUI::addBinding( Binding* b )
{ {
if ( b->action ) if ( b->action != EVENT_NULL )
{ {
// add individual bindings as they're made // add individual bindings as they're made
LUPPP_NOTE("new binding, action: %s, ", Event::getPrettyName( b->action ) ); const char* tmp = Event::getPrettyName( b->action );
if ( tmp )
LUPPP_NOTE("new binding, action: %s, ", tmp );
else
LUPPP_NOTE("new binding, action string returned NULL, action number %i ", b->action );
} }
else else
{ {
@ -357,11 +368,10 @@ void ControllerUI::addBinding( Binding* b )
bindingsPack->add( tmp ); bindingsPack->add( tmp );
bindingsPack->resize( bindingsPack->x(),bindingsPack->y(),bindingsPack->w(),bindingsPack->children() * 36 ); bindingsPack->resize( bindingsPack->x(),bindingsPack->y(),bindingsPack->w(),bindingsPack->children() * 36 );
bindingsPack->redraw(); bindingsPack->redraw();
scroll->redraw(); scroll->redraw();
LUPPP_NOTE("binding size %i %i", bindingsPack->w(), bindingsPack->h() );
} }
void ControllerUI::addBindings( GenericMIDI* c ) void ControllerUI::addBindings( GenericMIDI* c )