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

Sf2Player: fixed crash and race conditions

Browse Source 
Do not crash if no fluid_voice could be determined in
sf2Instrument::playNote() (which for example happens if no soundfont
is loaded). Furthermore protect the FluidSynth API calls in the
envelope and panning code with global synth mutex.
This commit is contained in:
Tobias Doerffel
2009-08-05 18:00:04 +02:00
parent 4baf459da2
commit 144f0c6c80
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/sf2_player/sf2_player.cpp
View File

@@ -43,7 +43,6 @@
#include "patches_dialog.h"
#include "tooltip.h"
#include "lcd_spinbox.h"
#include "panning.h"
#include "embed.cpp"
@@ -616,10 +615,8 @@ void sf2Instrument::playNote( notePlayHandle * _n, sampleFrame * )
// get new voice and save it
fluid_synth_get_voicelist( m_synth, voices, poly, -1 );
int last = -1;
for( int i = 0; i < poly && voices[i]; ++i )
{
last = i;
const unsigned int newID = fluid_voice_get_id( voices[i] );
if( id[i] != newID || newID == 0 )
{
@@ -627,10 +624,6 @@ void sf2Instrument::playNote( notePlayHandle * _n, sampleFrame * )
break;
}
}
if( pluginData->fluidVoice == NULL )
{
pluginData->fluidVoice = voices[last];
}
m_synthMutex.unlock();
@@ -641,26 +634,33 @@ void sf2Instrument::playNote( notePlayHandle * _n, sampleFrame * )
SF2PluginData * pluginData = static_cast<SF2PluginData *>(
_n->m_pluginData );
if( pluginData->lastPanning != _n->getPanning() )
if( pluginData->fluidVoice &&
pluginData->lastPanning != _n->getPanning() )
{
const float pan = -500 +
( (float)( _n->getPanning() - PanningLeft ) ) /
( (float)( PanningRight - PanningLeft ) ) * 1000;
m_synthMutex.lock();
fluid_voice_gen_set( pluginData->fluidVoice, GEN_PAN, pan );
fluid_voice_update_param( pluginData->fluidVoice, GEN_PAN );
m_synthMutex.unlock();
pluginData->lastPanning = _n->getPanning();
}
const float currentVelocity = _n->volumeLevel( tfp ) * 127;
if( pluginData->lastVelocity != currentVelocity )
if( pluginData->fluidVoice &&
pluginData->lastVelocity != currentVelocity )
{
m_synthMutex.lock();
fluid_voice_gen_set( pluginData->fluidVoice, GEN_VELOCITY,
currentVelocity );
fluid_voice_update_param( pluginData->fluidVoice, GEN_VELOCITY );
// make sure, FluidSynth modulates our changed GEN_VELOCITY via internal
// attenuation modulator, so changes take effect (7=Volume CC)
fluid_synth_cc( m_synth, m_channel, 7, 127 );
m_synthMutex.unlock();
pluginData->lastVelocity = currentVelocity;
}

2
plugins/sf2_player/sf2_player.h
View File

@@ -62,7 +62,7 @@ public:
virtual void playNote( notePlayHandle * _n,
sampleFrame * _working_buffer );
virtual void deleteNotePluginData( notePlayHandle * _n );
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );