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

* ensure correct thread affinity when deleting play handles - fixes crash when previewing samples and LMMS was linked against Qt 4.3.x

Browse Source 
* renamed destroyed()-signals for not conflicting with QObject::destroyed() in Qt 4.3
* made effectChain creation in audioPort optional
* fixed various compiler warnings



git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1602 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-09-11 13:43:43 +00:00
parent ee91a2176e
commit b217bbdfd8
12 changed files with 123 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/audio/audio_port.cpp
View File

@@ -24,16 +24,13 @@
*
*/
#include "mixer.h"
#include "audio_device.h"
#include "config_mgr.h"
#include "audio_port.h"
#include "audio_device.h"
#include "effect_chain.h"
#include "engine.h"
audioPort::audioPort( const QString & _name ) :
audioPort::audioPort( const QString & _name, bool _has_effect_chain ) :
m_bufferUsage( NoUsage ),
m_firstBuffer( new sampleFrame[engine::getMixer()->framesPerPeriod()] ),
m_secondBuffer( new sampleFrame[
@@ -41,7 +38,7 @@ audioPort::audioPort( const QString & _name ) :
m_extOutputEnabled( FALSE ),
m_nextFxChannel( 0 ),
m_name( "unnamed port" ),
m_effects( NULL )
m_effects( _has_effect_chain ? new effectChain( NULL ) : NULL )
{
engine::getMixer()->clearAudioBuffer( m_firstBuffer,
engine::getMixer()->framesPerPeriod() );
@@ -60,6 +57,7 @@ audioPort::~audioPort()
engine::getMixer()->removeAudioPort( this );
delete[] m_firstBuffer;
delete[] m_secondBuffer;
delete m_effects;
}
@@ -113,11 +111,15 @@ void audioPort::setName( const QString & _name )
bool audioPort::processEffects( void )
{
lockFirstBuffer();
bool more = m_effects.processAudioBuffer( m_firstBuffer,
if( m_effects )
{
lockFirstBuffer();
bool more = m_effects->processAudioBuffer( m_firstBuffer,
engine::getMixer()->framesPerPeriod() );
unlockFirstBuffer();
return( more );
unlockFirstBuffer();
return( more );
}
return false;
}

2
src/core/effect_chain.cpp
View File

@@ -38,7 +38,7 @@
effectChain::effectChain( model * _parent ) :
model( _parent ),
m_enabledModel( FALSE, this, tr( "Effects enabled" ) )
m_enabledModel( FALSE, NULL, tr( "Effects enabled" ) )
{
}

25
src/core/mixer.cpp
View File

@@ -567,7 +567,7 @@ const surroundSampleFrame * mixer::renderNextBuffer( void )
m_playHandles.erase( it );
}
m_playHandlesToRemove.erase( it_rem );
it_rem = m_playHandlesToRemove.erase( it_rem );
}
unlockPlayHandlesToRemove();
unlockPlayHandles();
@@ -636,22 +636,27 @@ const surroundSampleFrame * mixer::renderNextBuffer( void )
}
}
}
idx = 0;
while( idx < m_playHandles.size() )
for( playHandleVector::iterator it = m_playHandles.begin();
it != m_playHandles.end(); )
{
playHandle * n = m_playHandles[idx];
if( n->done() )
if( ( *it )->affinityMatters() &&
( *it )->affinity() != QThread::currentThread() )
{
delete n;
m_playHandles.erase(
m_playHandles.begin() + idx );
++it;
continue;
}
if( ( *it )->done() )
{
delete *it;
it = m_playHandles.erase( it );
}
else
{
++idx;
++it;
}
}
unlockPlayHandles();
if( m_multiThreaded )
{
mixerWorkerThread::jobQueue jq;
@@ -951,7 +956,7 @@ void mixer::removePlayHandles( track * _track )
if( ( *it )->isFromTrack( _track ) )
{
delete *it;
m_playHandles.erase( it );
it = m_playHandles.erase( it );
}
else
{

22
src/core/sample_play_handle.cpp
View File

@@ -39,10 +39,10 @@
samplePlayHandle::samplePlayHandle( const QString & _sample_file ) :
playHandle( SamplePlayHandle ),
m_sampleBuffer( new sampleBuffer( _sample_file ) ),
m_doneMayReturnTrue( TRUE ),
m_doneMayReturnTrue( true ),
m_frame( 0 ),
m_audioPort( new audioPort( "samplePlayHandle" ) ),
m_ownAudioPort( TRUE ),
m_audioPort( new audioPort( "samplePlayHandle", false ) ),
m_ownAudioPort( true ),
m_defaultVolumeModel( DefaultVolume, MinVolume, MaxVolume, 1 ),
m_volumeModel( &m_defaultVolumeModel ),
m_track( NULL ),
@@ -56,10 +56,10 @@ samplePlayHandle::samplePlayHandle( const QString & _sample_file ) :
samplePlayHandle::samplePlayHandle( sampleBuffer * _sample_buffer ) :
playHandle( SamplePlayHandle ),
m_sampleBuffer( sharedObject::ref( _sample_buffer ) ),
m_doneMayReturnTrue( TRUE ),
m_doneMayReturnTrue( true ),
m_frame( 0 ),
m_audioPort( new audioPort( "samplePlayHandle" ) ),
m_ownAudioPort( TRUE ),
m_audioPort( new audioPort( "samplePlayHandle", false ) ),
m_ownAudioPort( true ),
m_defaultVolumeModel( DefaultVolume, MinVolume, MaxVolume, 1 ),
m_volumeModel( &m_defaultVolumeModel ),
m_track( NULL ),
@@ -73,10 +73,10 @@ samplePlayHandle::samplePlayHandle( sampleBuffer * _sample_buffer ) :
samplePlayHandle::samplePlayHandle( sampleTCO * _tco ) :
playHandle( SamplePlayHandle ),
m_sampleBuffer( sharedObject::ref( _tco->getSampleBuffer() ) ),
m_doneMayReturnTrue( TRUE ),
m_doneMayReturnTrue( true ),
m_frame( 0 ),
m_audioPort( ( (sampleTrack *)_tco->getTrack() )->getAudioPort() ),
m_ownAudioPort( FALSE ),
m_ownAudioPort( false ),
m_defaultVolumeModel( DefaultVolume, MinVolume, MaxVolume, 1 ),
m_volumeModel( &m_defaultVolumeModel ),
m_track( _tco->getTrack() ),
@@ -90,10 +90,10 @@ samplePlayHandle::samplePlayHandle( sampleTCO * _tco ) :
samplePlayHandle::samplePlayHandle( pattern * _pattern ) :
playHandle( SamplePlayHandle ),
m_sampleBuffer( sharedObject::ref( _pattern->getFrozenPattern() ) ),
m_doneMayReturnTrue( TRUE ),
m_doneMayReturnTrue( true ),
m_frame( 0 ),
m_audioPort( _pattern->getInstrumentTrack()->getAudioPort() ),
m_ownAudioPort( FALSE ),
m_ownAudioPort( false ),
m_defaultVolumeModel( DefaultVolume, MinVolume, MaxVolume, 1 ),
m_volumeModel( &m_defaultVolumeModel ),
m_track( _pattern->getInstrumentTrack() ),
@@ -146,7 +146,7 @@ void samplePlayHandle::play( bool /* _try_parallelizing */,
bool samplePlayHandle::done( void ) const
{
return( framesDone() >= totalFrames() && m_doneMayReturnTrue == TRUE );
return( framesDone() >= totalFrames() && m_doneMayReturnTrue == true );
}

14
src/core/track.cpp
View File

@@ -134,11 +134,7 @@ trackContentObject::trackContentObject( track * _track ) :
*/
trackContentObject::~trackContentObject()
{
/*! \brief Start a drag event on this track View.
*
* \param _dee the DragEnterEvent to start.
*/
emit destroyed();
emit destroyedTCO();
if( getTrack() )
{
@@ -323,7 +319,7 @@ trackContentObjectView::trackContentObjectView( trackContentObject * _tco,
this, SLOT( updateLength() ) );
connect( m_tco, SIGNAL( positionChanged() ),
this, SLOT( updatePosition() ) );
connect( m_tco, SIGNAL( destroyed() ), this, SLOT( close() ) );
connect( m_tco, SIGNAL( destroyedTCO() ), this, SLOT( close() ) );
setModel( m_tco );
m_trackView->getTrackContentWidget()->addTCOView( this );
@@ -1572,6 +1568,8 @@ track::track( TrackTypes _type, trackContainer * _tc ) :
*/
track::~track()
{
emit destroyedTrack();
while( !m_trackContentObjects.isEmpty() )
{
delete m_trackContentObjects.last();
@@ -2121,7 +2119,7 @@ trackView::trackView( track * _track, trackContainerView * _tcv ) :
setAttribute( Qt::WA_DeleteOnClose );
connect( m_track, SIGNAL( destroyed() ), this, SLOT( close() ) );
connect( m_track, SIGNAL( destroyedTrack() ), this, SLOT( close() ) );
connect( m_track,
SIGNAL( trackContentObjectAdded( trackContentObject * ) ),
this, SLOT( createTCOView( trackContentObject * ) ),
@@ -2206,7 +2204,7 @@ void trackView::modelChanged( void )
{
m_track = castModel<track>();
assert( m_track != NULL );
connect( m_track, SIGNAL( destroyed() ), this, SLOT( close() ) );
connect( m_track, SIGNAL( destroyedTrack() ), this, SLOT( close() ) );
m_trackOperationsWidget.m_muteBtn->setModel( &m_track->m_mutedModel );
m_trackOperationsWidget.m_soloBtn->setModel( &m_track->m_soloModel );
modelView::modelChanged();