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

-Updated Goptions, removed prints

Browse source
This commit is contained in:
Harry van Haaren 2013-12-04 14:27:47 +00:00
parent a3f9eda1d4
commit 211df0fa0f
7 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/config.hxx
View file

@ -25,7 +25,7 @@
// State save / load // State save / load
//#define DEBUG_STATE 1 //#define DEBUG_STATE 1
// Jack print controller out MIDI // Jack print controller out MIDI, loading etc
//#define DEBUG_MIDI 1 //#define DEBUG_MIDI 1

4
src/controller/genericmidi.cxx
View file

@ -826,10 +826,10 @@ Binding* GenericMIDI::setupBinding( cJSON* binding )
else if ( strcmp( actionJson->valuestring, "grid:launch_scene" ) == 0 ) { else if ( strcmp( actionJson->valuestring, "grid:launch_scene" ) == 0 ) {
tmp->action = Event::GRID_LAUNCH_SCENE; 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; 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; tmp->action = Event::GRID_SELECT_CLIP_ENABLE;
} }
else if ( strcmp( actionJson->valuestring, "master:volume" ) == 0 ) { else if ( strcmp( actionJson->valuestring, "master:volume" ) == 0 ) {

1
src/controller/guicontroller.cxx
View file

@ -68,7 +68,6 @@ void LupppGUI::trackSend(int t, int send, float r)
void LupppGUI::specialScene(int t, int s) void LupppGUI::specialScene(int t, int s)
{ {
printf("special cene writing event\n");
EventGridSelectNewChosen e( t, s ); EventGridSelectNewChosen e( t, s );
writeToGuiRingbuffer( &e ); writeToGuiRingbuffer( &e );
} }

3
src/controllerupdater.cxx
View file

@ -104,10 +104,7 @@ void ControllerUpdater::setTrackSend(int t, int send, float v)
void ControllerUpdater::specialScene(int t, int scene) void ControllerUpdater::specialScene(int t, int scene)
{ {
for(unsigned int i = 0; i < c.size(); i++) 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); c.at(i)->specialScene(t, scene);
}
} }
void ControllerUpdater::masterInputToActive(int to, bool v) void ControllerUpdater::masterInputToActive(int to, bool v)

2
src/event.cxx
View file

@ -57,6 +57,8 @@ const char* Event::getPrettyName( int type )
case GRID_EVENT:{ return EventGridEvent::prettyName; } case GRID_EVENT:{ return EventGridEvent::prettyName; }
case GRID_LAUNCH_SCENE:{ return EventGridLaunchScene::prettyName; } case GRID_LAUNCH_SCENE:{ return EventGridLaunchScene::prettyName; }
case METRONOME_ACTIVE:{ return EventMetronomeActive::prettyName; }
default: return 0; default: return 0;
} }
} }

5
src/eventhandlergui.cxx
View file

@ -202,10 +202,7 @@ void handleGuiEvents()
if ( availableRead >= sizeof(EventGridSelectNewChosen) ) { if ( availableRead >= sizeof(EventGridSelectNewChosen) ) {
EventGridSelectNewChosen ev; EventGridSelectNewChosen ev;
jack_ringbuffer_read( rbToGui, (char*)&ev, sizeof(EventGridSelectNewChosen) ); 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++) for(int i = 0; i < NTRACKS; i++)
{ {
gui->getTrack(i)->getClipSelector()->setSpecial( i == ev.track ? ev.scene : -1 ); gui->getTrack(i)->getClipSelector()->setSpecial( i == ev.track ? ev.scene : -1 );

12
src/goptions.cxx
View file

@ -146,9 +146,10 @@ static void selectLoadController(Fl_Widget* w, void* data)
fnfc.directory( s.str().c_str() ); // default directory to use fnfc.directory( s.str().c_str() ); // default directory to use
// Show native chooser // Show native chooser
switch ( fnfc.show() ) { switch ( fnfc.show() ) {
case -1: printf("ERROR: %s\n", fnfc.errmsg()); break; // ERROR case -1: /*printf("ERROR: %s\n", fnfc.errmsg());*/ break; // ERROR
case 1: printf("CANCEL\n"); break; // CANCEL case 1: /*printf("CANCEL\n"); */ break; // CANCEL
default: printf("Loading controller at %s\n", fnfc.filename()); default:
//printf("Loading controller at %s\n", fnfc.filename());
path = fnfc.filename(); path = fnfc.filename();
break; break;
} }
@ -299,7 +300,12 @@ 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 )
{
#ifdef DEBUG_MIDI
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 );
#endif
return;
}
} }
else else
{ {