mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-20 23:13:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

do not crash in patmanInstrument::playNote() when no file is set

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@749 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-03-01 23:44:33 +00:00
parent 1c5c20a8b2
commit 2ca4447e61
2 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -1,5 +1,16 @@
2008-03-01 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* plugins/patman/patman.cpp:
do not crash in patmanInstrument::playNote() when no file is set
* include/ladspa_control.h:
* src/core/ladspa_control.cpp:
fixed missing tempoSyncKnobModel for not crashing when instantiating
LADSPA-plugins with time-knobs inside
* src/lib/sample_buffer.cpp:
do not set global mixer lock in update() if no data has been set yet
* plugins/patman/patman.cpp:
do not crash when loading settings where no file is set

32
src/lib/sample_buffer.cpp
View File

@@ -122,9 +122,12 @@ sampleBuffer::sampleBuffer( const sampleFrame * _data, const f_cnt_t _frames ) :
m_sample_rate( SAMPLE_RATES[DEFAULT_QUALITY_LEVEL] ),
m_sample_fragment( NULL )
{
m_origData = new sampleFrame[_frames];
memcpy( m_origData, _data, _frames * BYTES_PER_FRAME );
m_origFrames = _frames;
if( _frames > 0 )
{
m_origData = new sampleFrame[_frames];
memcpy( m_origData, _data, _frames * BYTES_PER_FRAME );
m_origFrames = _frames;
}
#ifdef SDL_SDL_SOUND_H
// init sound-file-system of SDL
Sound_Init();
@@ -152,9 +155,12 @@ sampleBuffer::sampleBuffer( const f_cnt_t _frames ) :
m_sample_rate( SAMPLE_RATES[DEFAULT_QUALITY_LEVEL] ),
m_sample_fragment( NULL )
{
m_origData = new sampleFrame[_frames];
memset( m_origData, 0, _frames * BYTES_PER_FRAME );
m_origFrames = _frames;
if( _frames > 0 )
{
m_origData = new sampleFrame[_frames];
memset( m_origData, 0, _frames * BYTES_PER_FRAME );
m_origFrames = _frames;
}
#ifdef SDL_SDL_SOUND_H
// init sound-file-system of SDL
Sound_Init();
@@ -180,9 +186,12 @@ sampleBuffer::~sampleBuffer()
void sampleBuffer::update( bool _keep_settings )
{
engine::getMixer()->lock();
delete[] m_data;
const bool lock = ( m_data == NULL );
if( lock )
{
engine::getMixer()->lock();
delete[] m_data;
}
if( m_audioFile == "" && m_origData != NULL && m_origFrames > 0 )
{
@@ -301,7 +310,10 @@ m_data[frame][chnl] = buf[idx] * fac;
m_loop_endFrame = m_endFrame = 1;
}
engine::getMixer()->unlock();
if( lock )
{
engine::getMixer()->unlock();
}
emit sampleUpdated();
}