build fixes

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@476 0778d3d1-df1d-0410-868b-ea421aaaa00d

ChangeLog

@@ -1,3 +1,13 @@
+2007-04-21	Javier Serrano Polo <jasp00/at/terra/dot/es>
+
+	* plugins/singerbot/singerbot.cpp:
+	* src/audio/audio_jack.cpp:
+	* src/audio/audio_sdl.cpp:
+	assume 1-case semaphores, fixes single source compilation
+
+	* configure.in:
+	fixed --enable options
+
 2007-04-20	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* plugins/ladspa_effect/ladspa_subplugin_features.cpp:

configure.in

@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
-AC_INIT(lmms, 0.2.1-svn20070420, lmms-devel/at/lists/dot/sf/dot/net)
-AM_INIT_AUTOMAKE(lmms, 0.2.1-svn20070420)
+AC_INIT(lmms, 0.2.1-svn20070421, lmms-devel/at/lists/dot/sf/dot/net)
+AM_INIT_AUTOMAKE(lmms, 0.2.1-svn20070421)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -412,8 +412,8 @@ AH_TEMPLATE(DISABLE_SURROUND, [Define if you want to disable surround-support in
 AC_ARG_ENABLE([surround],
 	AS_HELP_STRING([--disable-surround],
 			[compile LMMS without surround-support]),
-	DISABLE_SURROUND="yes")
-if test "x$DISABLE_SURROUND" = "xyes" ; then
+	[ENABLE_SURROUND=$enableval])
+if test "x$ENABLE_SURROUND" = "xno" ; then
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(DISABLE_SURROUND)
 else
@@ -426,7 +426,7 @@ AC_MSG_CHECKING([whether to enable high quality sinc-resampling])
 AH_TEMPLATE(HQ_SINC, [Define if you want to enable high quality sinc-resampling.])
 AC_ARG_ENABLE([hqsinc],
 	AS_HELP_STRING([--enable-hqsinc],
-		[enable high quality sinc-resampling]), HQ_SINC="yes")
+		[enable high quality sinc-resampling]), [HQ_SINC=$enableval])
 if test "x$HQ_SINC" = "xyes" ; then
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(HQ_SINC)
@@ -439,8 +439,8 @@ AC_MSG_CHECKING([whether to disable single-source-compile])
 # AH_TEMPLATE(SINGLE_SOURCE_COMPILE, [Define if you want to enable single-source-compile.])
 AC_ARG_ENABLE([ssc],
 	AS_HELP_STRING([--disable-ssc],
-		[disable single-source-compile]), NO_SSC="true")
-if test ! "x$NO_SSC" = "xtrue" ; then
+		[disable single-source-compile]), [ENABLE_SSC=$enableval])
+if test ! "x$ENABLE_SSC" = "xno" ; then
 	AC_MSG_RESULT(no)
 	# AC_DEFINE(SINGLE_SOURCE_COMPILE)
 	CXXFLAGS="$CXXFLAGS -DSINGLE_SOURCE_COMPILE"
@@ -502,7 +502,8 @@ AC_MSG_CHECKING([whether to enable debugging-code])
 AH_TEMPLATE(LMMS_DEBUG, [Define if you want to disable debbuging-code in LMMS.])
 AC_ARG_ENABLE([debug],
 	AS_HELP_STRING([--enable-debug],
-		[compile LMMS with additional debugging support]), DEBUG="yes")
+		[compile LMMS with additional debugging support]),
+	[DEBUG=$enableval])
 if test "x$DEBUG" = "xyes" ; then
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(LMMS_DEBUG)

plugins/singerbot/singerbot.cpp

@@ -357,18 +357,17 @@ sampleBuffer * singerBot::readWave( handle_data * _hdata )
 
 
 
-static const int total = 1;
 
 singerBot::synThread::synThread( void ) :
-	m_handle_semaphore( total ),
-	m_synth_semaphore( total )
+	m_handle_semaphore( 1 ),
+	m_synth_semaphore( 1 )
 {
 #ifndef QT3
-	m_handle_semaphore.acquire( total );
-	m_synth_semaphore.acquire( total );
+	m_handle_semaphore.acquire();
+	m_synth_semaphore.acquire();
 #else
-	m_handle_semaphore += total;
-	m_synth_semaphore += total;
+	m_handle_semaphore++;
+	m_synth_semaphore++;
 #endif
 }
 
@@ -378,11 +377,11 @@ singerBot::synThread::synThread( void ) :
 singerBot::synThread::~synThread()
 {
 #ifndef QT3
-	m_handle_semaphore.release( total );
-	m_synth_semaphore.release( total );
+	m_handle_semaphore.release();
+	m_synth_semaphore.release();
 #else
-	m_handle_semaphore -= total;
-	m_synth_semaphore -= total;
+	m_handle_semaphore--;
+	m_synth_semaphore--;
 #endif
 }
 

src/audio/audio_jack.cpp

@@ -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() )

src/audio/audio_sdl.cpp

@@ -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();