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

improved destruction

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1588 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-09-08 10:16:45 +00:00
parent 2ccbbae6ee
commit 98ddc0df71
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,5 +1,8 @@
2008-09-08 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* src/core/remote_plugin.cpp:
improved destruction
* src/core/mixer.cpp:
re-enabled WinMM MIDI

24
src/core/remote_plugin.cpp
View File

@@ -82,13 +82,18 @@ remotePlugin::~remotePlugin()
{
if( m_failed == false )
{
sendMessage( IdQuit );
m_process.waitForFinished( 1000 );
if( m_process.state() != QProcess::NotRunning )
if( m_process.state() == QProcess::Running )
{
m_process.terminate();
m_process.kill();
lock();
sendMessage( IdQuit );
m_process.waitForFinished( 1000 );
if( m_process.state() != QProcess::NotRunning )
{
m_process.terminate();
m_process.kill();
}
unlock();
}
#ifdef USE_NATIVE_SHMEM
@@ -105,6 +110,10 @@ remotePlugin::~remotePlugin()
bool remotePlugin::process( const sampleFrame * _in_buf,
sampleFrame * _out_buf, bool _wait )
{
if( m_failed )
{
return false;
}
const fpp_t frames = engine::getMixer()->framesPerPeriod();
if( m_shm == NULL )
@@ -179,7 +188,8 @@ bool remotePlugin::process( const sampleFrame * _in_buf,
bool remotePlugin::waitForProcessingFinished( sampleFrame * _out_buf )
{
if( !m_initialized || _out_buf == NULL || m_outputCount == 0 )
if( m_failed || !m_initialized || _out_buf == NULL ||
m_outputCount == 0 )
{
return( false );
}