Mercurial > sdl-ios-xcode

comparison src/audio/macrom/SDL_romaudio.c @ 1621:f12379c41042

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes bug #195: The proper name of Apple's operating system is "Mac OS X" not "MacOS X", as can bee seen in many places, for example http://www.apple.com/macosx/). This contrasts the naming of the old operating system, which was called "MacOS" and today is often refered to as "MacOS Classic". The attached patches fixes the misuse of the name "MacOS X" in both the SDL12 and sdlweb CVS modules.
author Sam Lantinga <slouken@libsdl.org>
date Thu, 13 Apr 2006 13:08:26 +0000
parents d910939febfa
children 782fd950bd46 c121d94672cb a1b03ba2fcd0
comparison
equal deleted inserted replaced
1620:2fe5319df0e1 1621:f12379c41042
91 this->CloseAudio = Mac_CloseAudio; 91 this->CloseAudio = Mac_CloseAudio;
92 this->LockAudio = Mac_LockAudio; 92 this->LockAudio = Mac_LockAudio;
93 this->UnlockAudio = Mac_UnlockAudio; 93 this->UnlockAudio = Mac_UnlockAudio;
94 this->free = Audio_DeleteDevice; 94 this->free = Audio_DeleteDevice;
95 95
96 #ifdef __MACOSX__ /* MacOS X uses threaded audio, so normal thread code is okay */ 96 #ifdef __MACOSX__ /* Mac OS X uses threaded audio, so normal thread code is okay */
97 this->LockAudio = NULL; 97 this->LockAudio = NULL;
98 this->UnlockAudio = NULL; 98 this->UnlockAudio = NULL;
99 #endif 99 #endif
100 return this; 100 return this;
101 } 101 }
104 "sndmgr", "MacOS SoundManager 3.0", 104 "sndmgr", "MacOS SoundManager 3.0",
105 Audio_Available, Audio_CreateDevice 105 Audio_Available, Audio_CreateDevice
106 }; 106 };
107 107
108 #if defined(TARGET_API_MAC_CARBON) || defined(USE_RYANS_SOUNDCODE) 108 #if defined(TARGET_API_MAC_CARBON) || defined(USE_RYANS_SOUNDCODE)
109 /* This works correctly on MacOS X */ 109 /* This works correctly on Mac OS X */
110 110
111 #pragma options align=power 111 #pragma options align=power
112 112
113 static volatile SInt32 audio_is_locked = 0; 113 static volatile SInt32 audio_is_locked = 0;
114 static volatile SInt32 need_to_mix = 0; 114 static volatile SInt32 need_to_mix = 0;