hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Simpler SF2 Player file dialog. Copied from GIG Player. Opens correct SF2 plugin directory when running LMMS from build directory without install. (#3502)

Browse Source
This commit is contained in:
Karmo Rosental
2017-04-15 04:05:34 +03:00
committed by Tres Finocchiaro
parent e67779f817
commit fc70ae3fba
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/sf2_player/sf2_player.cpp
View File

@@ -546,7 +546,7 @@ void sf2Instrument::playNote( NotePlayHandle * _n, sampleFrame * )
{
return;
}
const f_cnt_t tfp = _n->totalFramesPlayed();
if( tfp == 0 )
@@ -561,7 +561,7 @@ void sf2Instrument::playNote( NotePlayHandle * _n, sampleFrame * )
return;
}
const int baseVelocity = instrumentTrack()->midiPort()->baseVelocity();
SF2PluginData * pluginData = new SF2PluginData;
pluginData->midiNote = midiNote;
pluginData->lastPanning = 0;
@@ -572,7 +572,7 @@ void sf2Instrument::playNote( NotePlayHandle * _n, sampleFrame * )
pluginData->noteOffSent = false;
_n->m_pluginData = pluginData;
// insert the nph to the playing notes vector
m_playingNotesMutex.lock();
m_playingNotes.append( _n );
@@ -594,7 +594,7 @@ void sf2Instrument::playNote( NotePlayHandle * _n, sampleFrame * )
void sf2Instrument::noteOn( SF2PluginData * n )
{
m_synthMutex.lock();
// get list of current voice IDs so we can easily spot the new
// voice after the fluid_synth_noteon() call
const int poly = fluid_synth_get_polyphony( m_synth );
@@ -645,7 +645,7 @@ void sf2Instrument::noteOff( SF2PluginData * n )
fluid_synth_noteoff( m_synth, m_channel, n->midiNote );
m_synthMutex.unlock();
}
}
@@ -697,7 +697,7 @@ void sf2Instrument::play( sampleFrame * _working_buffer )
currentNote = m_playingNotes[i];
}
}
// process the current note:
// first see if we're synced in frame count
SF2PluginData * currentData = static_cast<SF2PluginData *>( currentNote->m_pluginData );
@@ -737,7 +737,7 @@ void sf2Instrument::play( sampleFrame * _working_buffer )
instrumentTrack()->processAudioBuffer( _working_buffer, frames, NULL );
}
void sf2Instrument::renderFrames( f_cnt_t frames, sampleFrame * buf )
{
m_synthMutex.lock();
@@ -1084,15 +1084,7 @@ void sf2InstrumentView::showFileDialog()
QString dir;
if( k->m_filename != "" )
{
QString f = k->m_filename;
if( QFileInfo( f ).isRelative() )
{
f = ConfigManager::inst()->sf2Dir() + f;
if( QFileInfo( f ).exists() == false )
{
f = ConfigManager::inst()->factorySamplesDir() + k->m_filename;
}
}
QString f = SampleBuffer::tryToMakeAbsolute( k->m_filename );
ofd.setDirectory( QFileInfo( f ).absolutePath() );
ofd.selectFile( QFileInfo( f ).fileName() );
}