__MACOSX__ --> MACOSX, keep __MACOSX__ for ogg.

2005-10-24 10:37:56 +00:00
parent 283747e8c9
commit aa0f90feae
24 changed files with 52 additions and 35 deletions
@@ -7,7 +7,7 @@
 #include <windows.h>
 #endif

-#if !defined(__MACOSX__)
+#if !defined(MACOSX)
 # include <GL/gl.h>
 # include <GL/glu.h>
 #else
@@ -30,7 +30,7 @@
 #include <set>
 #include <sstream>

-#if defined(__MACOSX__)
+#if defined(MACOSX)
 #include "archutils/Darwin/Vsync.h"
 #endif

@@ -8,7 +8,7 @@

 #include <set>

-#if !defined(__MACOSX__)
+#if !defined(MACOSX)
 # include <GL/gl.h>
 # include <GL/glu.h>
 #else
@@ -88,7 +88,7 @@ void GLExt_t::Load( LowLevelWindow *pWind )
 #if defined(WIN32)
 	if( HasExtension("WGL_EXT_swap_control") )
 		wglSwapIntervalEXT = (PWSWAPINTERVALEXTPROC) pWind->GetProcAddress("wglSwapIntervalEXT");
-#elif defined(__MACOSX__)
+#elif defined(MACOSX)
 	wglSwapIntervalEXT = wglSwapIntervalEXT;
 #endif

@@ -10,7 +10,7 @@
 #if defined(_MSC_VER)
        #pragma comment(lib, "zlib/zdll.lib")
 #endif
-#elif defined(__MACOSX__)
+#elif defined(MACOSX)
    /* Since crypto++ was added to the repository, <zlib.h> includes the zlib.h
     * in there rather than the correct system one. I don't know why it would do
     * this since crypto51 is not being listed as one of the include directories.
@@ -220,7 +220,7 @@ static void ChangeToDirOfExecutable( CString argv0 )
 	 * written through RageFile.  See also RageFileManager::RageFileManager. */
 #if defined(_WINDOWS)
 	chdir( DirOfExecutable + "/.." );
-#elif defined(__MACOSX__)
+#elif defined(MACOSX)
 	chdir( DirOfExecutable + "/../../.." );
 #endif
 }
@@ -297,7 +297,7 @@ void RageFileManager::MountInitialFilesystems()
 	ASSERT_M( parts.size() > 1, ssprintf("Strange DirOfExecutable: %s", DirOfExecutable.c_str()) );
 	CString Dir = join( "/", parts.begin(), parts.end()-1 );
 	RageFileManager::Mount( "dir", Dir, "/" );
-#elif defined(__MACOSX__)
+#elif defined(MACOSX)
 	CHECKPOINT_M( ssprintf("DOE \"%s\"", DirOfExecutable.c_str()) );
 	CStringArray parts;
 	split( DirOfExecutable, "/", parts );
@@ -13,7 +13,7 @@
 #include "arch/Dialog/Dialog.h"
 #include <float.h>

-#if defined(__MACOSX__)
+#if defined(MACOSX)
 // Work around global namespace pollution.
 namespace vblas
 {
@@ -90,7 +90,7 @@ void RageVec3TransformNormal( RageVector3* pOut, const RageVector3* pV, const Ra

 void RageVec4TransformCoord( RageVector4* pOut, const RageVector4* pV, const RageMatrix* pM )
 {
-#if defined(__MACOSX__)
+#if defined(MACOSX)
 	// (M^t * v)^t = v^t * M 
 	cblas_sgemv(CblasRowMajor, CblasTrans, 4, 4, 1, &pM->m00, 4, &pV->x, 1,
 				0, &pOut->x, 1);
@@ -135,7 +135,7 @@ RageMatrix RageMatrix::GetTranspose() const

 void RageMatrixMultiply( RageMatrix* pOut, const RageMatrix* pA, const RageMatrix* pB )
 {
-#if defined(__MACOSX__)
+#if defined(MACOSX)
 	cblas_sgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans, 4, 4, 4, 1,
 				&pB->m00, 4, &pA->m00, 4, 0, &pOut->m00, 4);
 #else
@@ -23,7 +23,7 @@
 #if defined(_XBOX)
 #  include <malloc.h>	// for alloca
 #  include "archutils/Xbox/VirtualMemory.h"
-#elif !defined(WIN32) && !defined(__MACOSX__)
+#elif !defined(WIN32) && !defined(MACOSX)
 #  include <alloca.h>
 #endif

@@ -25,7 +25,7 @@
 #if defined(CRASH_HANDLER)
 #if defined(_WINDOWS)
 #include "archutils/Win32/crash.h"
-#elif defined(LINUX) || defined(__MACOSX__)
+#elif defined(LINUX) || defined(MACOSX)
 #include "archutils/Unix/CrashHandler.h"
 #endif
 #endif
@@ -92,7 +92,7 @@ CString mySDL_GetError()

 void mySDL_WM_SetIcon( CString sIconFile )
 {
-#if !defined(__MACOSX__)
+#if !defined(MACOSX)
 	if( sIconFile.empty() )
 	{
 		SDL_WM_SetIcon(NULL, NULL);
@@ -1330,7 +1330,7 @@ bool HandleGlobalInputs( const InputEventPlus &input )
 		return false;	// Attract need to know because they go to TitleMenu on > 1 credit
 	}

-#ifndef __MACOSX__
+#ifndef MACOSX
 	if( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_F4) )
 	{
 		if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RALT)) ||
@@ -1355,7 +1355,7 @@ bool HandleGlobalInputs( const InputEventPlus &input )
 #endif

 	bool bDoScreenshot = 
-#if defined(__MACOSX__)
+#if defined(MACOSX)
 	/* Pressing F13 on an Apple keyboard sends KEY_PRINT.
 	 * However, notebooks don't have F13. Use cmd-F12 then*/
 		input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_F12) && 
@@ -4,7 +4,7 @@
 #include "arch/arch_platform.h"

 /* ArchHooks driver selector. */
-#if defined(__MACOSX__)
+#if defined(MACOSX)
 #include "ArchHooks_darwin.h"

 #elif defined(UNIX)
@@ -7,7 +7,7 @@
 #if defined(WIN32)
 #include "DialogDriver_Win32.h"

-#elif defined(__MACOSX__)
+#elif defined(MACOSX)
 #include "DialogDriver_Cocoa.h"
 #endif

@@ -17,7 +17,7 @@
 // NOTE: If X11 is available, we don't use LLW_SDL, which IH_SDL depends on.
 #if defined(HAVE_X11)
 #include "InputHandler_X11.h"
-#elif defined(__MACOSX__)
+#elif defined(MACOSX)
 #include "InputHandler_Carbon.h"
 #elif defined(HAVE_SDL)
 #include "InputHandler_SDL.h"
@@ -6,7 +6,7 @@
 /* LoadingWindow driver selector. */
 #include "LoadingWindow_Null.h"

-#if defined(__MACOSX__)
+#if defined(MACOSX)
 #include "LoadingWindow_Cocoa.h"

 #elif defined(HAVE_GTK)
@@ -154,7 +154,10 @@ CString RageSound_CA::Init()
 RageSound_CA::~RageSound_CA()
 {
 	if( mOutputDevice != NULL )
+	{
 		mOutputDevice->StopIOProc( GetData );
+		mOutputDevice->RemoveIOProc( GetData );
+	}
 	delete mOutputDevice;

 	if( mConverter != NULL )
@@ -163,10 +166,21 @@ RageSound_CA::~RageSound_CA()

 int64_t RageSound_CA::GetPosition( const RageSoundBase *sound ) const
 {
-	AudioTimeStamp time;
+#if 0
+	AudioTimeStamp inTime;
+	AudioTimeStamp outTime;
    
+	inTime.mHostTime = AudioGetCurrentHostTime();
+	inTime.mFlags = kAudioTimeStampHostTimeValid;
+	outTime.mFlags = kAudioTimeStampSampleTimeValid;
+	mOutputDevice->TranslateTime(inTime, outTime);
+	return int64_t(outTime.mSampleTime);
+#else
+	AudioTimeStamp time;
+	
 	mOutputDevice->GetCurrentTime( time );
 	return int64_t( time.mSampleTime );
+#endif
 }

 OSStatus RageSound_CA::GetData( AudioDeviceID inDevice,
@@ -185,7 +199,7 @@ OSStatus RageSound_CA::GetData( AudioDeviceID inDevice,
 	int64_t now = int64_t( inNow->mSampleTime );
 	
 	RageTimer tm2;
-	int16_t buffer[ dataPackets * (kBytesPerPacket >> 1) ];
+	int16_t buffer[dataPackets * (kBytesPerPacket >> 1)];
 		
 	This->Mix( buffer, dataPackets, decodePos, now) ;
 	g_fLastMixTimes[g_iLastMixTimePos] = tm2.GetDeltaTime();
@@ -9,7 +9,7 @@
 #include "RageSoundDriver_ALSA9_Software.h"
 #endif

-#if defined(__MACOSX__)
+#if defined(MACOSX)
 #include "RageSoundDriver_CA.h"
 #endif

@@ -10,7 +10,7 @@
 #include "archutils/Unix/RunningUnderValgrind.h"
 #endif

-#if defined(__MACOSX__)
+#if defined(MACOSX)
 #include "archutils/Darwin/DarwinThreadHelpers.h"
 #endif

@@ -109,7 +109,7 @@ MutexImpl_Pthreads::~MutexImpl_Pthreads()
 }


-#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(__MACOSX__)
+#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(MACOSX)
 static bool UseTimedlock()
 {
 #if defined(LINUX)
@@ -336,7 +336,7 @@ void SemaImpl_Pthreads::Post()

 bool SemaImpl_Pthreads::Wait()
 {
-#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(__MACOSX__)
+#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(MACOSX)
 	if( UseTimedlock() )
 	{
 		timeval tv;
@@ -15,7 +15,7 @@
 #define DEFAULT_INPUT_DRIVER_LIST "DirectInput,Pump,Para"
 #elif defined(HAVE_X11) // Prefer X11 over SDL
 #define DEFAULT_INPUT_DRIVER_LIST "X11,Joystick"
-#elif defined(__MACOSX__)
+#elif defined(MACOSX)
 # define DEFAULT_INPUT_DRIVER_LIST "Carbon,SDL"
 #elif defined(HAVE_SDL)
 #define DEFAULT_INPUT_DRIVER_LIST "SDL"
@@ -30,6 +30,9 @@ typedef unsigned long long UInt64;
 #endif
 #define ENDIAN_BIG

+#ifndef MACOSX
+# define MACOSX
+#endif
 #ifndef __MACOSX__
 # define __MACOSX__
 #endif
@@ -14,7 +14,7 @@ struct BacktraceContext
 	pid_t pid;
 #endif

-#if defined(__MACOSX__)
+#if defined(MACOSX)
 	void *FramePtr, *PC;
 #endif
 };
@@ -12,7 +12,7 @@

 #include "RageUtil.h"

-#if defined(__MACOSX__)
+#if defined(MACOSX)
 #include "archutils/Darwin/Crash.h"
 #endif

@@ -19,7 +19,7 @@
 #include "CrashHandler.h"
 #include "CrashHandlerInternal.h"

-#if defined(__MACOSX__)
+#if defined(MACOSX)
 # include "../Darwin/DarwinThreadHelpers.h"
 #endif

@@ -16,7 +16,7 @@
 #include "RageLog.h" /* for RageLog::GetAdditionalLog, etc. only */
 #include "ProductInfo.h"

-#if defined(__MACOSX__)
+#if defined(MACOSX)
 #include "archutils/Darwin/Crash.h"
 #endif

@@ -58,7 +58,7 @@ static void output_stack_trace( FILE *out, const void **BacktracePointers )
    }
 }

-#if !defined(__MACOSX__)
+#if !defined(MACOSX)
 const char *SignalCodeName( int signo, int code )
 {
 	switch( code )
@@ -289,7 +289,7 @@ static void child_process()
    {
 	CString Signal = SignalName( crash.signal );

-#if !defined(__MACOSX__)
+#if !defined(MACOSX)
 	reason = ssprintf( "%s - %s", Signal.c_str(), SignalCodeName(crash.signal, crash.si.si_code) );
 #else
 	reason = Signal;
@@ -340,7 +340,7 @@ static void child_process()
    fprintf(CrashDump, "-- End of report\n");
    fclose(CrashDump);

-#if defined(__MACOSX__)
+#if defined(MACOSX)
    /* Forcibly kill our parent. */
    kill( getppid(), SIGKILL );
    InformUserOfCrash( sCrashInfoPath );
@@ -14,7 +14,7 @@
 #include <sys/mman.h>
 #include <cerrno>

-#if defined(__MACOSX__)
+#if defined(MACOSX)
 extern "C" int sigaltstack( const struct sigaltstack *ss, struct sigaltstack *oss );
 #define MAP_ANONYMOUS MAP_ANON
 #endif
@@ -9,7 +9,7 @@
 #  include <unistd.h>
 #endif

-#if defined(CRASH_HANDLER) && (defined(LINUX) || defined(__MACOSX__))
+#if defined(CRASH_HANDLER) && (defined(LINUX) || defined(MACOSX))
 #include "archutils/Unix/CrashHandler.h"
 #endif