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

-Updated DiskReader / Writer to new naming in session.luppp files

Browse source
This commit is contained in:
Harry van Haaren 2013-10-03 02:10:35 +01:00
parent c4e70c533f
commit 0cffa1f6f1
3 changed files with 35 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/controller/genericmidi.cxx
View file

@ -343,6 +343,13 @@ void GenericMIDI::midi(unsigned char* midi)
case Event::TRACK_SEND_ACTIVE: jack->getLogic()->trackSendActive( b.track, b.send, b.active ); break;
case Event::TRACK_RECORD_ARM: jack->getLogic()->trackRecordArm( b.track, b.active ); break;
case Event::GRID_EVENT:
if ( b.active )
jack->getGridLogic()->pressed( b.track, b.scene );
else
jack->getGridLogic()->pressed( b.track, b.scene );
break;
case Event::MASTER_VOL: jack->getLogic()->trackVolume( -1 , value ); break;
}
@ -445,7 +452,8 @@ int GenericMIDI::loadController( std::string file )
cJSON* actionJson = cJSON_GetObjectItem( binding, "action" );
// collect event metadata
cJSON* track = cJSON_GetObjectItem( binding, "track" );
cJSON* track = cJSON_GetObjectItem( binding, "track" );
cJSON* scene = cJSON_GetObjectItem( binding, "scene" );
int active = -1;
cJSON* activeJson = cJSON_GetObjectItem( binding, "active" );
@ -476,6 +484,15 @@ int GenericMIDI::loadController( std::string file )
action = Event::TRACK_RECORD_ARM;
}
else if ( strcmp( actionJson->valuestring, "track:clippressed" ) == 0 ) {
action = Event::GRID_EVENT;
active = 1; // press event
}
else if ( strcmp( actionJson->valuestring, "track:clipreleased" ) == 0 ) {
action = Event::GRID_EVENT;
active = 0; // release event
}
else if ( strcmp( actionJson->valuestring, "master:volume" ) == 0 ) {
action = Event::MASTER_VOL;
}
@ -501,6 +518,8 @@ int GenericMIDI::loadController( std::string file )
if ( track )
midiToAction.back().track = track->valueint;
if ( scene )
midiToAction.back().scene = scene->valueint;
if ( send != -1 )
midiToAction.back().send = send;
if ( active != -1 )

19
src/diskreader.cxx
View file

@ -303,12 +303,19 @@ int DiskReader::readTracks()
}
// sends
{
cJSON* side = cJSON_GetObjectItem( track, "side");
cJSON* post = cJSON_GetObjectItem( track, "post");
cJSON* rev = cJSON_GetObjectItem( track, "reverb");
EventTrackSend e1( t, SEND_KEY , side->valuedouble );
EventTrackSend e2( t, SEND_XSIDE, post->valuedouble );
EventTrackSend e3( t, SEND_POSTFADER , rev->valuedouble );
cJSON* send = cJSON_GetObjectItem( track, "sendAmount");
cJSON* sendActive = cJSON_GetObjectItem( track, "sendActive");
cJSON* xside = cJSON_GetObjectItem( track, "xsideAmount");
cJSON* keyActive = cJSON_GetObjectItem( track, "keyActive");
EventTrackSendActive e1( t, SEND_POSTFADER, sendActive->valueint );
EventTrackSendActive e2( t, SEND_KEY , keyActive ->valueint );
EventTrackSend e3( t, SEND_XSIDE , xside->valuedouble );
EventTrackSend e4( t, SEND_POSTFADER , send->valuedouble );
writeToDspRingbuffer( &e1 );
writeToDspRingbuffer( &e2 );
writeToDspRingbuffer( &e3 );

20
src/eventhandlergui.cxx
View file

@ -48,7 +48,7 @@ void handleGuiEvents()
EventSamplerate ev;
jack_ringbuffer_read( rbToGui, (char*)&ev, sizeof(EventSamplerate) );
gui->samplerate = ev.samplerate;
LUPPP_NOTE("%s %i","Gui Samplerate: ", gui->samplerate);
//LUPPP_NOTE("%s %i","Gui Samplerate: ", gui->samplerate);
} break; }
case Event::MASTER_VOL: {
@ -61,7 +61,7 @@ void handleGuiEvents()
if ( availableRead >= sizeof(EventMetronomeActive) ) {
EventMetronomeActive ev(false);
jack_ringbuffer_read( rbToGui, (char*)&ev, sizeof(EventMetronomeActive) );
//jack->getMetronome()->setActive(ev.active);
//gui->getMetronome()->setActive(ev.active);
} break; }
case Event::LOOPER_STATE: {
if ( availableRead >= sizeof(EventLooperState) ) {
@ -184,15 +184,6 @@ void handleGuiEvents()
{
gui->getTrack(ev.track)->setXSide( ev.value );
}
/* SEND_KEY is a boolean: on or off: so no value needed
if ( ev.send == SEND_KEY )
{
if ( ev.track < NTRACKS )
{
gui->getTrack(ev.track)->side.value( ev.value );
}
}
*/
} break; }
case Event::TRACK_SEND_ACTIVE: {
@ -204,13 +195,6 @@ void handleGuiEvents()
{
gui->getTrack(ev.track)->setSendActive(ev.active );
}
/* XSIDE is always active
if ( ev.send == SEND_XSIDE )
if ( ev.track < NTRACKS )
{
//gui->getTrack(ev.track)->( ev.active );
}
*/
if ( ev.send == SEND_KEY )
{
if ( ev.track < NTRACKS )