Soundship
/
Loopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

-Master Input section saved / restored properly

main
Harry van Haaren 2013-12-10 14:15:08 +00:00
parent 5cd23266a0
commit eb2bbe653b
4 changed files with 90 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/diskreader.cxx
View File

@ -409,6 +409,50 @@ int DiskReader::readMaster()
EventTrackVol e( -1, fader->valuedouble );
writeToDspRingbuffer( &e );
}
// input volume
{
cJSON* cjson = cJSON_GetObjectItem( master, "inputVolume");
EventMasterInputVol e( cjson->valuedouble );
writeToDspRingbuffer( &e );
}
// input to send
{
cJSON* cjson = cJSON_GetObjectItem( master, "inputToSndVol");
EventMasterInputTo e( INPUT_TO_SEND, cjson->valuedouble );
writeToDspRingbuffer( &e );
}
// input to key
{
cJSON* cjson = cJSON_GetObjectItem( master, "inputToXSide");
EventMasterInputTo e( INPUT_TO_XSIDE, cjson->valuedouble );
writeToDspRingbuffer( &e );
}
// input to mix
{
cJSON* cjson = cJSON_GetObjectItem( master, "inputToMixVol");
EventMasterInputTo e( INPUT_TO_MIX, cjson->valuedouble );
writeToDspRingbuffer( &e );
}
// input to send active
{
cJSON* cjson = cJSON_GetObjectItem( master, "inputToSndActive");
EventMasterInputTo e( INPUT_TO_SEND, cjson->valuedouble );
writeToDspRingbuffer( &e );
}
// input to key active
{
cJSON* cjson = cJSON_GetObjectItem( master, "inputToKeyActive");
EventMasterInputTo e( INPUT_TO_SIDE_KEY, cjson->valuedouble );
writeToDspRingbuffer( &e );
}
// input to mix active
{
cJSON* cjson = cJSON_GetObjectItem( master, "inputToMixActive");
EventMasterInputTo e( INPUT_TO_MIX, cjson->valuedouble );
writeToDspRingbuffer( &e );
}
// reverb
{
cJSON* reverb = cJSON_GetObjectItem( master, "reverb");

10
src/diskwriter.cxx
View File

@ -363,6 +363,16 @@ void DiskWriter::writeMaster()
// TODO add samplerate to session JSON
//cJSON_AddNumberToObject( masterTrack, "samplerate", gui->getMasterTrack()->getBpm() );
cJSON_AddNumberToObject( masterTrack, "inputVolume", gui->getMasterTrack()->getInputVolume()->value() );
cJSON_AddNumberToObject( masterTrack, "inputToSndActive", gui->getMasterTrack()->getInputToSend()->value() );
cJSON_AddNumberToObject( masterTrack, "inputToKeyActive", gui->getMasterTrack()->getInputToSidechainKey()->value() );
cJSON_AddNumberToObject( masterTrack, "inputToMixActive", gui->getMasterTrack()->getInputToMix()->value() );
cJSON_AddNumberToObject( masterTrack, "inputToSndVol", gui->getMasterTrack()->getInputToSendVol()->value() );
cJSON_AddNumberToObject( masterTrack, "inputToXSide", gui->getMasterTrack()->getInputToXSide()->value() );
cJSON_AddNumberToObject( masterTrack, "inputToMixVol", gui->getMasterTrack()->getInputToMixVol()->value() );
// scene names
Avtk::ClipSelector* clipSelector = master->getClipSelector();
cJSON* sceneNames = cJSON_CreateArray();

28
src/gmastertrack.cxx
View File

@ -288,6 +288,34 @@ Avtk::Volume* GMasterTrack::getVolume()
{
return &volume;
}
Avtk::LightButton* GMasterTrack::getInputToSend()
{
return &inputToSend;
}
Avtk::LightButton* GMasterTrack::getInputToSidechainKey()
{
return &inputToSidechainKey;
}
Avtk::LightButton* GMasterTrack::getInputToMix()
{
return &inputToMix;
}
Avtk::Dial* GMasterTrack::getInputToSendVol()
{
return &inputToSendVol;
}
Avtk::Dial* GMasterTrack::getInputToXSide()
{
return &inputToSidechainSignalVol;
}
Avtk::Dial* GMasterTrack::getInputToMixVol()
{
return &inputToMixVol;
}
Avtk::ClipSelector* GMasterTrack::getClipSelector()
{
return &clipSel;

8
src/gmastertrack.hxx
View File

@ -64,6 +64,14 @@ class GMasterTrack : public Fl_Group
Avtk::Volume* getVolume();
Avtk::ClipSelector* getClipSelector();
Avtk::LightButton* getInputToSend();
Avtk::LightButton* getInputToSidechainKey();
Avtk::LightButton* getInputToMix();
Avtk::Dial* getInputToSendVol();
Avtk::Dial* getInputToXSide();
Avtk::Dial* getInputToMixVol();
~GMasterTrack();
private: