build fixes

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@476 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Javier Serrano Polo
2007-04-21 03:13:00 +00:00
parent 4e319102a5
commit 40137f4453
5 changed files with 40 additions and 31 deletions

View File

@@ -58,7 +58,6 @@
static const int total = 1;
audioJACK::audioJACK( const sample_rate_t _sample_rate, bool & _success_ful,
mixer * _mixer ) :
@@ -69,7 +68,7 @@ audioJACK::audioJACK( const sample_rate_t _sample_rate, bool & _success_ful,
m_client( NULL ),
m_active( FALSE ),
// m_processCallbackMutex(),
m_stop_semaphore( total ),
m_stop_semaphore( 1 ),
m_outBuf( bufferAllocator::alloc<surroundSampleFrame>(
getMixer()->framesPerAudioBuffer() ) ),
m_framesDoneInCurBuf( 0 ),
@@ -169,9 +168,9 @@ audioJACK::audioJACK( const sample_rate_t _sample_rate, bool & _success_ful,
}
#ifndef QT3
m_stop_semaphore.acquire( total );
m_stop_semaphore.acquire();
#else
m_stop_semaphore += total;
m_stop_semaphore++;
#endif
@@ -184,9 +183,9 @@ audioJACK::audioJACK( const sample_rate_t _sample_rate, bool & _success_ful,
audioJACK::~audioJACK()
{
#ifndef QT3
m_stop_semaphore.release( total );
m_stop_semaphore.release();
#else
m_stop_semaphore -= total;
m_stop_semaphore--;
#endif
while( m_portMap.size() )

View File

@@ -50,7 +50,7 @@
#include "templates.h"
static const int total = 1;
audioSDL::audioSDL( const sample_rate_t _sample_rate, bool & _success_ful,
mixer * _mixer ) :
@@ -59,7 +59,7 @@ audioSDL::audioSDL( const sample_rate_t _sample_rate, bool & _success_ful,
getMixer()->framesPerAudioBuffer() ) ),
m_convertedBuf_pos( 0 ),
m_convertEndian( FALSE ),
m_stop_semaphore( total )
m_stop_semaphore( 1 )
{
_success_ful = FALSE;
@@ -109,9 +109,9 @@ audioSDL::audioSDL( const sample_rate_t _sample_rate, bool & _success_ful,
m_convertEndian = ( m_audioHandle.format != actual.format );
#ifndef QT3
m_stop_semaphore.acquire( total );
m_stop_semaphore.acquire();
#else
m_stop_semaphore += total;
m_stop_semaphore++;
#endif
_success_ful = TRUE;
@@ -124,9 +124,9 @@ audioSDL::~audioSDL()
{
stopProcessing();
#ifndef QT3
m_stop_semaphore.release( total );
m_stop_semaphore.release();
#else
m_stop_semaphore -= total;
m_stop_semaphore--;
#endif
SDL_CloseAudio();
SDL_Quit();