Menu
▾
▴
[Iaxclient-cvs] SF.net SVN: iaxclient: [1283] trunk/lib
|
From: <jpg...@us...> - 2007-11-25 12:32:24
|
Revision: 1283
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1283&view=rev
Author: jpgrayson
Date: 2007-11-25 04:32:28 -0800 (Sun, 25 Nov 2007)
Log Message:
-----------
Build fixes for VC6 courtesy of Teri Schoech. Thank you again.
Modified Paths:
--------------
trunk/lib/iaxclient_lib.h
trunk/lib/portmixer/px_win_wmme/px_win_wmme.c
trunk/lib/ringbuffer.c
Modified: trunk/lib/iaxclient_lib.h
===================================================================
--- trunk/lib/iaxclient_lib.h 2007-11-25 12:31:48 UTC (rev 1282)
+++ trunk/lib/iaxclient_lib.h 2007-11-25 12:32:28 UTC (rev 1283)
@@ -71,6 +71,9 @@
#define THREADJOIN(t)
/* causes deadlock with wx GUI on MSW */
/* #define THREADJOIN(t) WaitForSingleObject(t, INFINITE) */
+#ifndef _WIN32_WINNT
+extern WINBASEAPI BOOL WINAPI TryEnterCriticalSection( LPCRITICAL_SECTION lpCriticalSection );
+#endif
#define MUTEX CRITICAL_SECTION
#define MUTEXINIT(m) InitializeCriticalSection(m)
#define MUTEXLOCK(m) EnterCriticalSection(m)
Modified: trunk/lib/portmixer/px_win_wmme/px_win_wmme.c
===================================================================
--- trunk/lib/portmixer/px_win_wmme/px_win_wmme.c 2007-11-25 12:31:48 UTC (rev 1282)
+++ trunk/lib/portmixer/px_win_wmme/px_win_wmme.c 2007-11-25 12:32:28 UTC (rev 1283)
@@ -626,7 +626,14 @@
int Px_SetMicrophoneBoost( PxMixer* mixer, int enable )
{
+ MIXERLINE mixerLine ;
+ LPMIXERCONTROL mixerControl ;
+ MIXERLINECONTROLS mixerLineControls ;
+ MIXERCONTROLDETAILS mixerControlDetails ;
+ MIXERCONTROLDETAILS_BOOLEAN value ;
MMRESULT mmr = MMSYSERR_ERROR ;
+ DWORD boost_id = -1 ;
+ DWORD x ;
// cast void pointer
PxInfo* info = ( PxInfo* )( mixer ) ;
@@ -638,7 +645,6 @@
// get line info
//
- MIXERLINE mixerLine ;
mixerLine.cbStruct = sizeof( MIXERLINE ) ;
mixerLine.dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE ;
@@ -655,9 +661,8 @@
// get all controls
//
- LPMIXERCONTROL mixerControl = (MIXERCONTROL *)malloc( sizeof( MIXERCONTROL ) * mixerLine.cControls ) ;
+ mixerControl = (MIXERCONTROL *)malloc( sizeof( MIXERCONTROL ) * mixerLine.cControls ) ;
- MIXERLINECONTROLS mixerLineControls ;
mixerLineControls.cbStruct = sizeof( MIXERLINECONTROLS ) ;
mixerLineControls.dwLineID = mixerLine.dwLineID ;
mixerLineControls.cControls = mixerLine.cControls ;
@@ -681,10 +686,7 @@
// find boost control
//
- DWORD boost_id = -1 ;
- DWORD x = 0 ;
-
- for ( ; x < mixerLineControls.cControls ; ++x )
+ for ( x = 0 ; x < mixerLineControls.cControls ; ++x )
{
// check control type
if ( mixerControl[x].dwControlType & MIXERCONTROL_CONTROLTYPE_BOOLEAN )
@@ -715,9 +717,6 @@
// get control details
//
- MIXERCONTROLDETAILS_BOOLEAN value ;
-
- MIXERCONTROLDETAILS mixerControlDetails ;
mixerControlDetails.cbStruct = sizeof( MIXERCONTROLDETAILS ) ;
mixerControlDetails.dwControlID = boost_id ;
mixerControlDetails.cChannels = 1 ;
@@ -764,7 +763,14 @@
int Px_GetMicrophoneBoost( PxMixer* mixer )
{
+ MIXERLINE mixerLine ;
+ LPMIXERCONTROL mixerControl ;
+ MIXERLINECONTROLS mixerLineControls ;
+ MIXERCONTROLDETAILS mixerControlDetails ;
+ MIXERCONTROLDETAILS_BOOLEAN value ;
MMRESULT mmr = MMSYSERR_ERROR ;
+ DWORD boost_id = -1 ;
+ DWORD x ;
// cast void pointer
PxInfo* info = ( PxInfo* )( mixer ) ;
@@ -776,7 +782,6 @@
// get line info
//
- MIXERLINE mixerLine ;
mixerLine.cbStruct = sizeof( MIXERLINE ) ;
mixerLine.dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE ;
@@ -793,9 +798,8 @@
// get all controls
//
- LPMIXERCONTROL mixerControl = (MIXERCONTROL *)malloc( sizeof( MIXERCONTROL ) * mixerLine.cControls ) ;
+ mixerControl = (MIXERCONTROL *)malloc( sizeof( MIXERCONTROL ) * mixerLine.cControls ) ;
- MIXERLINECONTROLS mixerLineControls ;
mixerLineControls.cbStruct = sizeof( MIXERLINECONTROLS ) ;
mixerLineControls.dwLineID = mixerLine.dwLineID ;
mixerLineControls.cControls = mixerLine.cControls ;
@@ -819,10 +823,7 @@
// find boost control
//
- DWORD boost_id = -1 ;
- DWORD x = 0 ;
-
- for ( ; x < mixerLineControls.cControls ; ++x )
+ for ( x = 0 ; x < mixerLineControls.cControls ; ++x )
{
// check control type
if ( mixerControl[x].dwControlType & MIXERCONTROL_CONTROLTYPE_BOOLEAN )
@@ -853,9 +854,6 @@
// get control details
//
- MIXERCONTROLDETAILS_BOOLEAN value ;
-
- MIXERCONTROLDETAILS mixerControlDetails ;
mixerControlDetails.cbStruct = sizeof( MIXERCONTROLDETAILS ) ;
mixerControlDetails.dwControlID = boost_id ;
mixerControlDetails.cChannels = 1 ;
@@ -879,6 +877,8 @@
int Px_SetCurrentInputSourceByName( PxMixer* mixer, const char* name )
{
+ int x ;
+
// cast void pointer
PxInfo* info = ( PxInfo* )( mixer ) ;
@@ -894,8 +894,7 @@
// set input source
//
- int x = 0 ;
- for ( ; x < info->numInputs ; ++x )
+ for ( x = 0 ; x < info->numInputs ; ++x )
{
// compare passed name with control name
if ( strncasecmp( info->src[x].name, name, strlen( name ) ) == 0 )
Modified: trunk/lib/ringbuffer.c
===================================================================
--- trunk/lib/ringbuffer.c 2007-11-25 12:31:48 UTC (rev 1282)
+++ trunk/lib/ringbuffer.c 2007-11-25 12:32:28 UTC (rev 1283)
@@ -125,22 +125,29 @@
# endif
# endif
#elif defined(_MSC_VER)
-# include <intrin.h>
-# pragma intrinsic(_ReadWriteBarrier)
-# pragma intrinsic(_ReadBarrier)
-# pragma intrinsic(_WriteBarrier)
-# define rb_FullMemoryBarrier() _ReadWriteBarrier()
-# define rb_ReadMemoryBarrier() _ReadBarrier()
-# define rb_WriteMemoryBarrier() _WriteBarrier()
-#else
-# ifdef ALLOW_SMP_DANGERS
-# ifdef _MSC_VER
+# if ( _MSC_VER > 1200 )
+# include <intrin.h>
+# pragma intrinsic(_ReadWriteBarrier)
+# pragma intrinsic(_ReadBarrier)
+# pragma intrinsic(_WriteBarrier)
+# define rb_FullMemoryBarrier() _ReadWriteBarrier()
+# define rb_ReadMemoryBarrier() _ReadBarrier()
+# define rb_WriteMemoryBarrier() _WriteBarrier()
+# else
+# ifdef ALLOW_SMP_DANGERS
# pragma message("Memory barriers not defined on this system or system unknown")
# pragma message("For SMP safety, you should fix this.")
+# define rb_FullMemoryBarrier()
+# define rb_ReadMemoryBarrier()
+# define rb_WriteMemoryBarrier()
# else
-# warning Memory barriers not defined on this system or system unknown
-# warning For SMP safety, you should fix this.
+# error Memory barriers are not defined on this system. You can still compile by defining ALLOW_SMP_DANGERS, but SMP safety will not be guaranteed.
# endif
+# endif
+#else
+# ifdef ALLOW_SMP_DANGERS
+# warning Memory barriers not defined on this system or system unknown
+# warning For SMP safety, you should fix this.
# define rb_FullMemoryBarrier()
# define rb_ReadMemoryBarrier()
# define rb_WriteMemoryBarrier()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
