From aa0f90feae3aefa637465cc26312bf68c5043b25 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Mon, 24 Oct 2005 10:37:56 +0000 Subject: [PATCH] __MACOSX__ --> MACOSX, keep __MACOSX__ for ogg. --- stepmania/src/RageDisplay_OGL.cpp | 4 ++-- stepmania/src/RageDisplay_OGL_Extensions.cpp | 4 ++-- stepmania/src/RageFileDriverDeflate.cpp | 2 +- stepmania/src/RageFileManager.cpp | 4 ++-- stepmania/src/RageMath.cpp | 6 +++--- stepmania/src/RageSurface_Load_PNG.cpp | 2 +- stepmania/src/RageThreads.cpp | 2 +- stepmania/src/SDL_utils.cpp | 2 +- stepmania/src/StepMania.cpp | 4 ++-- .../src/arch/ArchHooks/Selector_ArchHooks.h | 2 +- stepmania/src/arch/Dialog/Selector_Dialog.h | 2 +- .../arch/InputHandler/Selector_InputHandler.h | 2 +- .../LoadingWindow/Selector_LoadingWindow.h | 2 +- .../src/arch/Sound/RageSoundDriver_CA.cpp | 18 ++++++++++++++++-- .../src/arch/Sound/Selector_RageSoundDriver.h | 2 +- .../src/arch/Threads/Threads_Pthreads.cpp | 6 +++--- stepmania/src/arch/arch_default.h | 2 +- stepmania/src/archutils/Darwin/arch_setup.h | 3 +++ stepmania/src/archutils/Unix/Backtrace.h | 2 +- .../src/archutils/Unix/BacktraceNames.cpp | 2 +- stepmania/src/archutils/Unix/CrashHandler.cpp | 2 +- .../src/archutils/Unix/CrashHandlerChild.cpp | 8 ++++---- stepmania/src/archutils/Unix/SignalHandler.cpp | 2 +- stepmania/src/global.cpp | 2 +- 24 files changed, 52 insertions(+), 35 deletions(-) diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp index f7ce7660be..04936ef015 100644 --- a/stepmania/src/RageDisplay_OGL.cpp +++ b/stepmania/src/RageDisplay_OGL.cpp @@ -7,7 +7,7 @@ #include #endif -#if !defined(__MACOSX__) +#if !defined(MACOSX) # include # include #else @@ -30,7 +30,7 @@ #include #include -#if defined(__MACOSX__) +#if defined(MACOSX) #include "archutils/Darwin/Vsync.h" #endif diff --git a/stepmania/src/RageDisplay_OGL_Extensions.cpp b/stepmania/src/RageDisplay_OGL_Extensions.cpp index 892c8f50d3..ec37eb6228 100644 --- a/stepmania/src/RageDisplay_OGL_Extensions.cpp +++ b/stepmania/src/RageDisplay_OGL_Extensions.cpp @@ -8,7 +8,7 @@ #include -#if !defined(__MACOSX__) +#if !defined(MACOSX) # include # include #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 diff --git a/stepmania/src/RageFileDriverDeflate.cpp b/stepmania/src/RageFileDriverDeflate.cpp index 7338288bc7..617ef42321 100644 --- a/stepmania/src/RageFileDriverDeflate.cpp +++ b/stepmania/src/RageFileDriverDeflate.cpp @@ -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, 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. diff --git a/stepmania/src/RageFileManager.cpp b/stepmania/src/RageFileManager.cpp index e4032a0193..068fe2f776 100644 --- a/stepmania/src/RageFileManager.cpp +++ b/stepmania/src/RageFileManager.cpp @@ -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 ); diff --git a/stepmania/src/RageMath.cpp b/stepmania/src/RageMath.cpp index 474fd2583f..8f11b01f1f 100644 --- a/stepmania/src/RageMath.cpp +++ b/stepmania/src/RageMath.cpp @@ -13,7 +13,7 @@ #include "arch/Dialog/Dialog.h" #include -#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 diff --git a/stepmania/src/RageSurface_Load_PNG.cpp b/stepmania/src/RageSurface_Load_PNG.cpp index 8f411367f3..cbcdaa34d2 100644 --- a/stepmania/src/RageSurface_Load_PNG.cpp +++ b/stepmania/src/RageSurface_Load_PNG.cpp @@ -23,7 +23,7 @@ #if defined(_XBOX) # include // for alloca # include "archutils/Xbox/VirtualMemory.h" -#elif !defined(WIN32) && !defined(__MACOSX__) +#elif !defined(WIN32) && !defined(MACOSX) # include #endif diff --git a/stepmania/src/RageThreads.cpp b/stepmania/src/RageThreads.cpp index f05eac9417..97f835f332 100644 --- a/stepmania/src/RageThreads.cpp +++ b/stepmania/src/RageThreads.cpp @@ -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 diff --git a/stepmania/src/SDL_utils.cpp b/stepmania/src/SDL_utils.cpp index f2b681e86f..f0b8f5cbdb 100644 --- a/stepmania/src/SDL_utils.cpp +++ b/stepmania/src/SDL_utils.cpp @@ -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); diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 4e2dbe169f..36a5439b9c 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -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) && diff --git a/stepmania/src/arch/ArchHooks/Selector_ArchHooks.h b/stepmania/src/arch/ArchHooks/Selector_ArchHooks.h index de91661360..09f1f2c506 100644 --- a/stepmania/src/arch/ArchHooks/Selector_ArchHooks.h +++ b/stepmania/src/arch/ArchHooks/Selector_ArchHooks.h @@ -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) diff --git a/stepmania/src/arch/Dialog/Selector_Dialog.h b/stepmania/src/arch/Dialog/Selector_Dialog.h index aa08f72e8b..96e3126912 100644 --- a/stepmania/src/arch/Dialog/Selector_Dialog.h +++ b/stepmania/src/arch/Dialog/Selector_Dialog.h @@ -7,7 +7,7 @@ #if defined(WIN32) #include "DialogDriver_Win32.h" -#elif defined(__MACOSX__) +#elif defined(MACOSX) #include "DialogDriver_Cocoa.h" #endif diff --git a/stepmania/src/arch/InputHandler/Selector_InputHandler.h b/stepmania/src/arch/InputHandler/Selector_InputHandler.h index e6aeb1f3d1..a343c44a03 100644 --- a/stepmania/src/arch/InputHandler/Selector_InputHandler.h +++ b/stepmania/src/arch/InputHandler/Selector_InputHandler.h @@ -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" diff --git a/stepmania/src/arch/LoadingWindow/Selector_LoadingWindow.h b/stepmania/src/arch/LoadingWindow/Selector_LoadingWindow.h index 0e9ff74a31..07d7efc99a 100644 --- a/stepmania/src/arch/LoadingWindow/Selector_LoadingWindow.h +++ b/stepmania/src/arch/LoadingWindow/Selector_LoadingWindow.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) diff --git a/stepmania/src/arch/Sound/RageSoundDriver_CA.cpp b/stepmania/src/arch/Sound/RageSoundDriver_CA.cpp index a98eeb0567..106f0d4219 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_CA.cpp +++ b/stepmania/src/arch/Sound/RageSoundDriver_CA.cpp @@ -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(); diff --git a/stepmania/src/arch/Sound/Selector_RageSoundDriver.h b/stepmania/src/arch/Sound/Selector_RageSoundDriver.h index 5c61c0a439..211ebd6528 100644 --- a/stepmania/src/arch/Sound/Selector_RageSoundDriver.h +++ b/stepmania/src/arch/Sound/Selector_RageSoundDriver.h @@ -9,7 +9,7 @@ #include "RageSoundDriver_ALSA9_Software.h" #endif -#if defined(__MACOSX__) +#if defined(MACOSX) #include "RageSoundDriver_CA.h" #endif diff --git a/stepmania/src/arch/Threads/Threads_Pthreads.cpp b/stepmania/src/arch/Threads/Threads_Pthreads.cpp index 172be002ac..33c330871e 100644 --- a/stepmania/src/arch/Threads/Threads_Pthreads.cpp +++ b/stepmania/src/arch/Threads/Threads_Pthreads.cpp @@ -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; diff --git a/stepmania/src/arch/arch_default.h b/stepmania/src/arch/arch_default.h index c5d824a7bc..8dfbc32071 100644 --- a/stepmania/src/arch/arch_default.h +++ b/stepmania/src/arch/arch_default.h @@ -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" diff --git a/stepmania/src/archutils/Darwin/arch_setup.h b/stepmania/src/archutils/Darwin/arch_setup.h index 14fdb3b2da..81bdd5ca83 100644 --- a/stepmania/src/archutils/Darwin/arch_setup.h +++ b/stepmania/src/archutils/Darwin/arch_setup.h @@ -30,6 +30,9 @@ typedef unsigned long long UInt64; #endif #define ENDIAN_BIG +#ifndef MACOSX +# define MACOSX +#endif #ifndef __MACOSX__ # define __MACOSX__ #endif diff --git a/stepmania/src/archutils/Unix/Backtrace.h b/stepmania/src/archutils/Unix/Backtrace.h index 02a62353e8..126a5c609a 100644 --- a/stepmania/src/archutils/Unix/Backtrace.h +++ b/stepmania/src/archutils/Unix/Backtrace.h @@ -14,7 +14,7 @@ struct BacktraceContext pid_t pid; #endif -#if defined(__MACOSX__) +#if defined(MACOSX) void *FramePtr, *PC; #endif }; diff --git a/stepmania/src/archutils/Unix/BacktraceNames.cpp b/stepmania/src/archutils/Unix/BacktraceNames.cpp index 2a44282068..6bb49a5e00 100644 --- a/stepmania/src/archutils/Unix/BacktraceNames.cpp +++ b/stepmania/src/archutils/Unix/BacktraceNames.cpp @@ -12,7 +12,7 @@ #include "RageUtil.h" -#if defined(__MACOSX__) +#if defined(MACOSX) #include "archutils/Darwin/Crash.h" #endif diff --git a/stepmania/src/archutils/Unix/CrashHandler.cpp b/stepmania/src/archutils/Unix/CrashHandler.cpp index 3d5e4fb257..36f2cacef7 100644 --- a/stepmania/src/archutils/Unix/CrashHandler.cpp +++ b/stepmania/src/archutils/Unix/CrashHandler.cpp @@ -19,7 +19,7 @@ #include "CrashHandler.h" #include "CrashHandlerInternal.h" -#if defined(__MACOSX__) +#if defined(MACOSX) # include "../Darwin/DarwinThreadHelpers.h" #endif diff --git a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp index 13170f8303..565f587666 100644 --- a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp +++ b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp @@ -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 ); diff --git a/stepmania/src/archutils/Unix/SignalHandler.cpp b/stepmania/src/archutils/Unix/SignalHandler.cpp index d1cc68bd38..b84ef3ea71 100644 --- a/stepmania/src/archutils/Unix/SignalHandler.cpp +++ b/stepmania/src/archutils/Unix/SignalHandler.cpp @@ -14,7 +14,7 @@ #include #include -#if defined(__MACOSX__) +#if defined(MACOSX) extern "C" int sigaltstack( const struct sigaltstack *ss, struct sigaltstack *oss ); #define MAP_ANONYMOUS MAP_ANON #endif diff --git a/stepmania/src/global.cpp b/stepmania/src/global.cpp index eaa2ce20a5..ca1074da72 100644 --- a/stepmania/src/global.cpp +++ b/stepmania/src/global.cpp @@ -9,7 +9,7 @@ # include #endif -#if defined(CRASH_HANDLER) && (defined(LINUX) || defined(__MACOSX__)) +#if defined(CRASH_HANDLER) && (defined(LINUX) || defined(MACOSX)) #include "archutils/Unix/CrashHandler.h" #endif