From abb625769369fb560476a98b2b4571c2a9d456dd Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Thu, 2 Oct 2008 20:46:38 +0000 Subject: [PATCH] fixed last commit git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1724 0778d3d1-df1d-0410-868b-ea421aaaa00d --- src/core/mixer.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/core/mixer.cpp b/src/core/mixer.cpp index 66f0120a8..eb1c13ca5 100644 --- a/src/core/mixer.cpp +++ b/src/core/mixer.cpp @@ -100,6 +100,8 @@ static void * aligned_malloc( int _bytes ) } +#undef QT_VERSION +#define QT_VERSION 0x040300 class mixerWorkerThread : public QThread { @@ -193,11 +195,11 @@ private: it->job != NULL ) { #else - m_jobQueue->lock.lock(); + s_jobQueue.lock.lock(); if( !it->done && it->job != NULL ) { it->done = true; - m_jobQueue->lock.unlock(); + s_jobQueue.lock.unlock(); #endif switch( it->type ) { @@ -226,7 +228,7 @@ private: #if QT_VERSION < 0x040400 else { - m_jobQueue->lock.unlock(); + s_jobQueue.lock.unlock(); } #endif } @@ -239,7 +241,6 @@ private: mixer * m_mixer; QSemaphore * m_queueReadySem; QSemaphore * m_workersDoneSem; - volatile jobQueue * m_jobQueue; } ; @@ -260,7 +261,7 @@ mixerWorkerThread::jobQueue mixerWorkerThread::s_jobQueue; } \ } -#define START_JOBS() \ +#define START_JOBS() \ m_queueReadySem.release( m_numWorkers ); \ #define WAIT_FOR_JOBS() \