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

restyled code after stereo added

Browse source
This commit is contained in:
Harry van Haaren 2017-03-27 21:04:30 +01:00
parent ed72627245
commit 08bdc1ff09
6 changed files with 128 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/diskreader.cxx
View file

@ -632,10 +632,10 @@ int DiskReader::readTracks()
LUPPP_WARN("Track %i has no send data saved.", t);
} else {
EventTrackSendActive e1( t, SEND_POSTFADER, sendActive->valueint );
EventTrackSendActive e2( t, SEND_KEY , keyActive ->valueint );
EventTrackSendActive e2( t, SEND_KEY, keyActive ->valueint );
EventTrackSend e3( t, SEND_XSIDE , xside->valuedouble );
EventTrackSend e4( t, SEND_POSTFADER , send->valuedouble );
EventTrackSend e3( t, SEND_XSIDE, xside->valuedouble );
EventTrackSend e4( t, SEND_POSTFADER, send->valuedouble );
writeToDspRingbuffer( &e1 );

21
src/diskwriter.cxx
View file

@ -193,15 +193,15 @@ int DiskWriter::writeControllerFile( Controller* c )
cJSON_AddItemToObject( binding, "action", cJSON_CreateString( actionName ) );
cJSON_AddNumberToObject( binding, "status", b.at(i)->status );
cJSON_AddNumberToObject( binding, "data" , b.at(i)->data );
cJSON_AddNumberToObject( binding, "data", b.at(i)->data );
// only add JSON elements if they're not the "invalid" defaults
if ( b.at(i)->track != -2 )
cJSON_AddNumberToObject( binding, "track" , b.at(i)->track );
cJSON_AddNumberToObject( binding, "track", b.at(i)->track );
if ( b.at(i)->scene != -1 )
cJSON_AddNumberToObject( binding, "scene" , b.at(i)->scene );
cJSON_AddNumberToObject( binding, "scene", b.at(i)->scene );
if ( b.at(i)->send != -1 )
cJSON_AddNumberToObject( binding, "send" , b.at(i)->send );
cJSON_AddNumberToObject( binding, "send", b.at(i)->send );
if ( b.at(i)->active!= -1 )
cJSON_AddNumberToObject( binding, "active", b.at(i)->active );
@ -327,8 +327,7 @@ int DiskWriter::writeAudioBuffer(int track, int scene, AudioBuffer* ab,
frameBuf[1] = ab->getDataR()[i];
outfile.writef( frameBuf, 1);
}
}
else {
} else {
LUPPP_WARN("%s","Sample has zero samples");
}
@ -402,14 +401,14 @@ int DiskWriter::writeSession()
cJSON_AddNumberToObject( track, "fader", gui->getTrack(t)->getVolume()->value() );
cJSON_AddNumberToObject( track, "pan", gui->getTrack(t)->getPan());
cJSON_AddNumberToObject( track, "sendAmount" , gui->getTrack(t)->getSend() );
cJSON_AddNumberToObject( track, "sendActive" , gui->getTrack(t)->getSendActive() );
cJSON_AddNumberToObject( track, "sendAmount", gui->getTrack(t)->getSend() );
cJSON_AddNumberToObject( track, "sendActive", gui->getTrack(t)->getSendActive() );
cJSON_AddNumberToObject( track, "jacksendAmount" , gui->getTrack(t)->getJackSend() );
cJSON_AddNumberToObject( track, "jacksendActive" , gui->getTrack(t)->getJackSendActivate() );
cJSON_AddNumberToObject( track, "jacksendAmount", gui->getTrack(t)->getJackSend() );
cJSON_AddNumberToObject( track, "jacksendActive", gui->getTrack(t)->getJackSendActivate() );
cJSON_AddNumberToObject( track, "xsideAmount", gui->getTrack(t)->getXSide() );
cJSON_AddNumberToObject( track, "keyActive" , gui->getTrack(t)->getKeyActive() );
cJSON_AddNumberToObject( track, "keyActive", gui->getTrack(t)->getKeyActive() );
// write clipData vector into clip placeholder
cJSON* clips = cJSON_CreateArray();

20
src/gaudioeditor.cxx
View file

@ -84,11 +84,11 @@ AudioEditor::AudioEditor()
}
window->end();
beatButtons[0]->callback( oneCB , this);
beatButtons[1]->callback( twoCB , this);
beatButtons[2]->callback( fourCB , this);
beatButtons[3]->callback( eightCB , this);
beatButtons[4]->callback( sixteenCB , this);
beatButtons[0]->callback( oneCB, this);
beatButtons[1]->callback( twoCB, this);
beatButtons[2]->callback( fourCB, this);
beatButtons[3]->callback( eightCB, this);
beatButtons[4]->callback( sixteenCB, this);
beatButtons[5]->callback( thirtyTwoCB, this);
beatButtons[6]->callback( sixtyfourCB, this);
@ -101,8 +101,9 @@ void AudioEditor::show( AudioBuffer* buf, bool modal )
if ( !ab ) {
LUPPP_WARN("called with ab == 0");
} else {
// TODO right (stereo)
return;
}
std::vector<float>& tmp = ab->getDataL();
int size = tmp.size();
waveform->setData( &tmp[0], size );
@ -115,12 +116,9 @@ void AudioEditor::show( AudioBuffer* buf, bool modal )
// figure out BPM values from size
for( int i = 0; i < 7; i++ ) {
int beat = beats[i];
int fpb = size / beat;
int bpm = (gui->samplerate / fpb) * 60;
if ( bpm < 60 || bpm > 220 ) {
// disable option: not valid
beatButtons[i]->setGreyOut( true );
@ -167,8 +165,6 @@ void AudioEditor::show( AudioBuffer* buf, bool modal )
// no valid BPM range..?
}
}
window->set_modal();
window->show();
}

22
src/jack.cxx
View file

@ -75,7 +75,7 @@ void Jack::resetMidiBindingState()
}
Jack::Jack( std::string name ) :
client( jack_client_open ( name.c_str(), JackNullOption , 0 , 0 ) ),
client( jack_client_open ( name.c_str(), JackNullOption, 0, 0 ) ),
state( new State() ),
controllerUpdater( new ControllerUpdater() ),
clientActive(false)
@ -439,16 +439,16 @@ int Jack::process (jack_nframes_t nframes)
// clear the buffers
memset( buffers.audio[Buffers::JACK_MASTER_OUT_L] , 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::JACK_MASTER_OUT_R] , 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::MASTER_OUT_L] , 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::MASTER_OUT_R] , 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::HEADPHONES_OUT_L] , 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::HEADPHONES_OUT_R] , 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::SEND_L] , 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::SEND_R] , 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::SIDECHAIN_KEY_L] , 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::SIDECHAIN_KEY_R] , 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::JACK_MASTER_OUT_L], 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::JACK_MASTER_OUT_R], 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::MASTER_OUT_L], 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::MASTER_OUT_R], 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::HEADPHONES_OUT_L], 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::HEADPHONES_OUT_R], 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::SEND_L], 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::SEND_R], 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::SIDECHAIN_KEY_L], 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::SIDECHAIN_KEY_R], 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::SIDECHAIN_SIGNAL_L], 0, sizeof(float) * nframes );
memset( buffers.audio[Buffers::SIDECHAIN_SIGNAL_R], 0, sizeof(float) * nframes );
if(gui->enablePerTrackOutput) {