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 session loading: clears the state first using EventStateReset, then loads new session

Browse source
This commit is contained in:
Harry van Haaren 2013-11-14 14:03:47 +00:00
parent e86b964d5b
commit 5db3b44030
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/eventhandlergui.cxx
View file

@ -50,7 +50,7 @@ void handleGuiEvents()
EventSamplerate ev; EventSamplerate ev;
jack_ringbuffer_read( rbToGui, (char*)&ev, sizeof(EventSamplerate) ); jack_ringbuffer_read( rbToGui, (char*)&ev, sizeof(EventSamplerate) );
gui->samplerate = ev.samplerate; gui->samplerate = ev.samplerate;
LUPPP_NOTE("Gui Samplerate: %i", gui->samplerate); //LUPPP_NOTE("Gui Samplerate: %i", gui->samplerate);
} break; } } break; }
/// master /// master
@ -276,7 +276,7 @@ void handleGuiEvents()
if ( ab ) if ( ab )
{ {
cout << "Save buffer sent with t s ab* " << ev.track << " " << ev.scene << " " << ab << endl; //LUPPP_NOTE("Save buffer sent with t %i, s %i, ab* %i", ev.track, ev.scene, ab );
EventRequestSaveBuffer returnEvent( ev.track, ev.scene, ab); EventRequestSaveBuffer returnEvent( ev.track, ev.scene, ab);
writeToDspRingbuffer( &returnEvent ); writeToDspRingbuffer( &returnEvent );
} }

5
src/gui.cxx
View file

@ -127,6 +127,11 @@ static void gui_header_callback(Fl_Widget *w, void *data)
break; // CANCEL break; // CANCEL
default: default:
LUPPP_NOTE( "Loading session from dir %s", fnfc.filename() ); LUPPP_NOTE( "Loading session from dir %s", fnfc.filename() );
// clear the current session: just do a state reset
EventStateReset e;
writeToDspRingbuffer( &e );
int sess = gui->getDiskReader()->readSession( fnfc.filename() ); int sess = gui->getDiskReader()->readSession( fnfc.filename() );
if ( sess != LUPPP_RETURN_OK ) if ( sess != LUPPP_RETURN_OK )
LUPPP_ERROR( "Error loading session" ); LUPPP_ERROR( "Error loading session" );