sdl-ios-xcode: src/cdrom/macosx/CDPlayer.c annotate

annotate src/cdrom/macosx/CDPlayer.c @ 4223:63fd67e17705 SDL-1.2

Fixed bug #727 Lorenzo Desole 2009-04-19 07:36:10 PDT I am one of the developers of a multimedia application (My Media System MMS), which uses SDL. MMS is normally running in fullscreen mode but it switches it off before launching external applications (mplayer, xine, etc.). The problem with fullscreen is that when the latter is switched off either via SDL_WM_ToggleFullScreen() or SDL_SetVideoMode(), SDL compares the current screen sizes with the ones saved when the video system was initted, and if they don't match, it calls XF86VidModeSwitchToMode() to switch to the old modeline. This makes it impossible for external programs and for MMS itself to use RandR to change the screen size, because next time fullscreen mode is turned off, it bombs out with the following error: X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 136 (XFree86-VidModeExtension) Minor opcode of failed request: 10 (XF86VidModeSwitchToMode) [...] Obviously this happens only if the new screen resolution is smaller than the original one and XF86VidModeSwitchToMode() can't succeed. I couldn't find any way to inform SDL that the screen resolution it uses as reference is no longer valid. This can be fixed by adding "save_mode(this)" to ./src/video/x11/SDL_x11modes.c, API X11_EnterFullScreen(_THIS), like this: int X11_EnterFullScreen(_THIS) { int okay; + save_mode(this); I can't rule out possible side effects, but I don't see any. While I admit this is a minor issue for the general users, it is a major showstopper for our program where the ability to change screen resolution and refresh rate according to the movie being played, is very important. Thanks in advance.

author	Sam Lantinga <slouken@libsdl.org>
date	Mon, 21 Sep 2009 11:14:36 +0000
parents	386181851388
children

rev	line source
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	1 /*
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
4159 a1b03ba2fcd0 Updated copyright date Sam Lantinga <slouken@libsdl.org> parents: 1487 diff changeset	3 Copyright (C) 1997-2009 Sam Lantinga
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	4
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	6 modify it under the terms of the GNU Library General Public
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	8 version 2 of the License, or (at your option) any later version.
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	9
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	13 Library General Public License for more details.
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	14
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	15 You should have received a copy of the GNU Library General Public
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	16 License along with this library; if not, write to the Free
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	18
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	19 Sam Lantinga
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	20 slouken@libsdl.org
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	21 */
1402 d910939febfa Use consistent identifiers for the various platforms we support. Sam Lantinga <slouken@libsdl.org> parents: 1143 diff changeset	22 #include "SDL_config.h"
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	23
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	24 #include "CDPlayer.h"
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	25 #include "AudioFilePlayer.h"
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	26 #include "SDLOSXCAGuard.h"
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	27
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	28 /* we're exporting these functions into C land for SDL_syscdrom.c */
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	29 /extern "C" {/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	30
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	31 /*///////////////////////////////////////////////////////////////////////////
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	32 Constants
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	33 //////////////////////////////////////////////////////////////////////////*/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	34
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	35 #define kAudioCDFilesystemID (UInt16)(('J' << 8) \| 'H') /* 'JH'; this avoids compiler warning */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	36
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	37 /* XML PList keys */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	38 #define kRawTOCDataString "Format 0x02 TOC Data"
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	39 #define kSessionsString "Sessions"
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	40 #define kSessionTypeString "Session Type"
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	41 #define kTrackArrayString "Track Array"
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	42 #define kFirstTrackInSessionString "First Track"
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	43 #define kLastTrackInSessionString "Last Track"
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	44 #define kLeadoutBlockString "Leadout Block"
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	45 #define kDataKeyString "Data"
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	46 #define kPointKeyString "Point"
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	47 #define kSessionNumberKeyString "Session Number"
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	48 #define kStartBlockKeyString "Start Block"
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	49
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	50 /*///////////////////////////////////////////////////////////////////////////
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	51 Globals
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	52 //////////////////////////////////////////////////////////////////////////*/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	53
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	54 #pragma mark -- Globals --
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	55
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	56 static int playBackWasInit = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	57 static AudioUnit theUnit;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	58 static AudioFilePlayer* thePlayer = NULL;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	59 static CDPlayerCompletionProc completionProc = NULL;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	60 static SDL_mutex *apiMutex = NULL;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	61 static SDL_sem *callbackSem;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	62 static SDL_CD* theCDROM;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	63
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	64 /*///////////////////////////////////////////////////////////////////////////
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	65 Prototypes
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	66 //////////////////////////////////////////////////////////////////////////*/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	67
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	68 #pragma mark -- Prototypes --
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	69
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	70 static OSStatus CheckInit ();
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	71
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	72 static void FilePlayNotificationHandler (void* inRefCon, OSStatus inStatus);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	73
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	74 static int RunCallBackThread (void* inRefCon);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	75
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	76
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	77 #pragma mark -- Public Functions --
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	78
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	79 void Lock ()
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	80 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	81 if (!apiMutex) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	82 apiMutex = SDL_CreateMutex();
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	83 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	84 SDL_mutexP(apiMutex);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	85 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	86
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	87 void Unlock ()
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	88 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	89 SDL_mutexV(apiMutex);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	90 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	91
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	92 int DetectAudioCDVolumes(FSVolumeRefNum *volumes, int numVolumes)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	93 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	94 int volumeIndex;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	95 int cdVolumeCount = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	96 OSStatus result = noErr;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	97
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	98 for (volumeIndex = 1; result == noErr \|\| result != nsvErr; volumeIndex++)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	99 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	100 FSVolumeRefNum actualVolume;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	101 FSVolumeInfo volumeInfo;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	102
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	103 memset (&volumeInfo, 0, sizeof(volumeInfo));
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	104
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	105 result = FSGetVolumeInfo (kFSInvalidVolumeRefNum,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	106 volumeIndex,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	107 &actualVolume,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	108 kFSVolInfoFSInfo,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	109 &volumeInfo,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	110 NULL,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	111 NULL);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	112
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	113 if (result == noErr)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	114 {
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	115 if (volumeInfo.filesystemID == kAudioCDFilesystemID) /* It's an audio CD */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	116 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	117 if (volumes != NULL && cdVolumeCount < numVolumes)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	118 volumes[cdVolumeCount] = actualVolume;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	119
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	120 cdVolumeCount++;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	121 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	122 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	123 else
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	124 {
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	125 /* I'm commenting this out because it seems to be harmless */
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	126 /SDL_SetError ("DetectAudioCDVolumes: FSGetVolumeInfo returned %d", result);/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	127 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	128 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	129
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	130 return cdVolumeCount;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	131 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	132
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	133 int ReadTOCData (FSVolumeRefNum theVolume, SDL_CD *theCD)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	134 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	135 HFSUniStr255 dataForkName;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	136 OSStatus theErr;
4190 386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	137 FSIORefNum forkRefNum;
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	138 SInt64 forkSize;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	139 Ptr forkData = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	140 ByteCount actualRead;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	141 CFDataRef dataRef = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	142 CFPropertyListRef propertyListRef = 0;
4190 386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	143 int i;
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	144 FSRefParam fsRefPB;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	145 FSRef tocPlistFSRef;
4190 386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	146 FSRef rootRef;
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	147 const char* error = "Unspecified Error";
4190 386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	148 const UniChar uniName[] = { '.','T','O','C','.','p','l','i','s','t' };
386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	149
386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	150 theErr = FSGetVolumeInfo(theVolume, 0, 0, kFSVolInfoNone, 0, 0, &rootRef);
386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	151 if(theErr != noErr) {
386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	152 error = "FSGetVolumeInfo";
386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	153 goto bail;
386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	154 }
386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	155
386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	156 SDL_memset(&fsRefPB, '\0', sizeof (fsRefPB));
386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	157
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	158 /* get stuff from .TOC.plist */
4190 386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	159 fsRefPB.ref = &rootRef;
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	160 fsRefPB.newRef = &tocPlistFSRef;
4190 386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	161 fsRefPB.nameLength = sizeof (uniName) / sizeof (uniName[0]);
386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	162 fsRefPB.name = uniName;
386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	163 fsRefPB.textEncodingHint = kTextEncodingUnknown;
386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	164
386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	165 theErr = PBMakeFSRefUnicodeSync (&fsRefPB);
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	166 if(theErr != noErr) {
4190 386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	167 error = "PBMakeFSRefUnicodeSync";
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	168 goto bail;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	169 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	170
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	171 /* Load and parse the TOC XML data */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	172
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	173 theErr = FSGetDataForkName (&dataForkName);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	174 if (theErr != noErr) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	175 error = "FSGetDataForkName";
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	176 goto bail;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	177 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	178
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	179 theErr = FSOpenFork (&tocPlistFSRef, dataForkName.length, dataForkName.unicode, fsRdPerm, &forkRefNum);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	180 if (theErr != noErr) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	181 error = "FSOpenFork";
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	182 goto bail;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	183 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	184
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	185 theErr = FSGetForkSize (forkRefNum, &forkSize);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	186 if (theErr != noErr) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	187 error = "FSGetForkSize";
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	188 goto bail;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	189 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	190
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	191 /* Allocate some memory for the XML data */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	192 forkData = NewPtr (forkSize);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	193 if(forkData == NULL) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	194 error = "NewPtr";
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	195 goto bail;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	196 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	197
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	198 theErr = FSReadFork (forkRefNum, fsFromStart, 0 /* offset location */, forkSize, forkData, &actualRead);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	199 if(theErr != noErr) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	200 error = "FSReadFork";
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	201 goto bail;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	202 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	203
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	204 dataRef = CFDataCreate (kCFAllocatorDefault, (UInt8 *)forkData, forkSize);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	205 if(dataRef == 0) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	206 error = "CFDataCreate";
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	207 goto bail;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	208 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	209
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	210 propertyListRef = CFPropertyListCreateFromXMLData (kCFAllocatorDefault,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	211 dataRef,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	212 kCFPropertyListImmutable,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	213 NULL);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	214 if (propertyListRef == NULL) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	215 error = "CFPropertyListCreateFromXMLData";
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	216 goto bail;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	217 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	218
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	219 /* Now we got the Property List in memory. Parse it. */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	220
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	221 /* First, make sure the root item is a CFDictionary. If not, release and bail. */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	222 if(CFGetTypeID(propertyListRef)== CFDictionaryGetTypeID())
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	223 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	224 CFDictionaryRef dictRef = (CFDictionaryRef)propertyListRef;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	225
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	226 CFDataRef theRawTOCDataRef;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	227 CFArrayRef theSessionArrayRef;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	228 CFIndex numSessions;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	229 CFIndex index;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	230
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	231 /* This is how we get the Raw TOC Data */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	232 theRawTOCDataRef = (CFDataRef)CFDictionaryGetValue (dictRef, CFSTR(kRawTOCDataString));
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	233
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	234 /* Get the session array info. */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	235 theSessionArrayRef = (CFArrayRef)CFDictionaryGetValue (dictRef, CFSTR(kSessionsString));
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	236
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	237 /* Find out how many sessions there are. */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	238 numSessions = CFArrayGetCount (theSessionArrayRef);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	239
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	240 /* Initialize the total number of tracks to 0 */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	241 theCD->numtracks = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	242
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	243 /* Iterate over all sessions, collecting the track data */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	244 for(index = 0; index < numSessions; index++)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	245 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	246 CFDictionaryRef theSessionDict;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	247 CFNumberRef leadoutBlock;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	248 CFArrayRef trackArray;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	249 CFIndex numTracks;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	250 CFIndex trackIndex;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	251 UInt32 value = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	252
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	253 theSessionDict = (CFDictionaryRef) CFArrayGetValueAtIndex (theSessionArrayRef, index);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	254 leadoutBlock = (CFNumberRef) CFDictionaryGetValue (theSessionDict, CFSTR(kLeadoutBlockString));
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	255
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	256 trackArray = (CFArrayRef)CFDictionaryGetValue (theSessionDict, CFSTR(kTrackArrayString));
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	257
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	258 numTracks = CFArrayGetCount (trackArray);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	259
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	260 for(trackIndex = 0; trackIndex < numTracks; trackIndex++) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	261
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	262 CFDictionaryRef theTrackDict;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	263 CFNumberRef trackNumber;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	264 CFNumberRef sessionNumber;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	265 CFNumberRef startBlock;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	266 CFBooleanRef isDataTrack;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	267 UInt32 value;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	268
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	269 theTrackDict = (CFDictionaryRef) CFArrayGetValueAtIndex (trackArray, trackIndex);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	270
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	271 trackNumber = (CFNumberRef) CFDictionaryGetValue (theTrackDict, CFSTR(kPointKeyString));
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	272 sessionNumber = (CFNumberRef) CFDictionaryGetValue (theTrackDict, CFSTR(kSessionNumberKeyString));
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	273 startBlock = (CFNumberRef) CFDictionaryGetValue (theTrackDict, CFSTR(kStartBlockKeyString));
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	274 isDataTrack = (CFBooleanRef) CFDictionaryGetValue (theTrackDict, CFSTR(kDataKeyString));
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	275
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	276 /* Fill in the SDL_CD struct */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	277 int idx = theCD->numtracks++;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	278
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	279 CFNumberGetValue (trackNumber, kCFNumberSInt32Type, &value);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	280 theCD->track[idx].id = value;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	281
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	282 CFNumberGetValue (startBlock, kCFNumberSInt32Type, &value);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	283 theCD->track[idx].offset = value;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	284
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	285 theCD->track[idx].type = (isDataTrack == kCFBooleanTrue) ? SDL_DATA_TRACK : SDL_AUDIO_TRACK;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	286
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	287 /* Since the track lengths are not stored in .TOC.plist we compute them. */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	288 if (trackIndex > 0) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	289 theCD->track[idx-1].length = theCD->track[idx].offset - theCD->track[idx-1].offset;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	290 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	291 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	292
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	293 /* Compute the length of the last track */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	294 CFNumberGetValue (leadoutBlock, kCFNumberSInt32Type, &value);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	295
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	296 theCD->track[theCD->numtracks-1].length =
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	297 value - theCD->track[theCD->numtracks-1].offset;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	298
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	299 /* Set offset to leadout track */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	300 theCD->track[theCD->numtracks].offset = value;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	301 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	302
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	303 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	304
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	305 theErr = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	306 goto cleanup;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	307 bail:
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	308 SDL_SetError ("ReadTOCData: %s returned %d", error, theErr);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	309 theErr = -1;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	310 cleanup:
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	311
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	312 if (propertyListRef != NULL)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	313 CFRelease(propertyListRef);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	314 if (dataRef != NULL)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	315 CFRelease(dataRef);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	316 if (forkData != NULL)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	317 DisposePtr(forkData);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	318
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	319 FSCloseFork (forkRefNum);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	320
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	321 return theErr;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	322 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	323
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	324 int ListTrackFiles (FSVolumeRefNum theVolume, FSRef *trackFiles, int numTracks)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	325 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	326 OSStatus result = -1;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	327 FSIterator iterator;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	328 ItemCount actualObjects;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	329 FSRef rootDirectory;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	330 FSRef ref;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	331 HFSUniStr255 nameStr;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	332
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	333 result = FSGetVolumeInfo (theVolume,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	334 0,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	335 NULL,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	336 kFSVolInfoFSInfo,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	337 NULL,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	338 NULL,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	339 &rootDirectory);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	340
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	341 if (result != noErr) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	342 SDL_SetError ("ListTrackFiles: FSGetVolumeInfo returned %d", result);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	343 return result;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	344 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	345
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	346 result = FSOpenIterator (&rootDirectory, kFSIterateFlat, &iterator);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	347 if (result == noErr) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	348 do
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	349 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	350 result = FSGetCatalogInfoBulk (iterator, 1, &actualObjects,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	351 NULL, kFSCatInfoNone, NULL, &ref, NULL, &nameStr);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	352 if (result == noErr) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	353
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	354 CFStringRef name;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	355 name = CFStringCreateWithCharacters (NULL, nameStr.unicode, nameStr.length);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	356
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	357 /* Look for .aiff extension */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	358 if (CFStringHasSuffix (name, CFSTR(".aiff")) \|\|
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	359 CFStringHasSuffix (name, CFSTR(".cdda"))) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	360
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	361 /* Extract the track id from the filename */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	362 int trackID = 0, i = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	363 while (i < nameStr.length && !isdigit(nameStr.unicode[i])) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	364 ++i;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	365 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	366 while (i < nameStr.length && isdigit(nameStr.unicode[i])) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	367 trackID = 10 * trackID +(nameStr.unicode[i] - '0');
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	368 ++i;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	369 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	370
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	371 #if DEBUG_CDROM
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	372 printf("Found AIFF for track %d: '%s'\n", trackID,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	373 CFStringGetCStringPtr (name, CFStringGetSystemEncoding()));
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	374 #endif
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	375
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	376 /* Track ID's start at 1, but we want to start at 0 */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	377 trackID--;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	378
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	379 assert(0 <= trackID && trackID <= SDL_MAX_TRACKS);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	380
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	381 if (trackID < numTracks)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	382 memcpy (&trackFiles[trackID], &ref, sizeof(FSRef));
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	383 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	384 CFRelease (name);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	385 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	386 } while(noErr == result);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	387 FSCloseIterator (iterator);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	388 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	389
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	390 return 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	391 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	392
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	393 int LoadFile (const FSRef *ref, int startFrame, int stopFrame)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	394 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	395 int error = -1;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	396
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	397 if (CheckInit () < 0)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	398 goto bail;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	399
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	400 /* release any currently playing file */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	401 if (ReleaseFile () < 0)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	402 goto bail;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	403
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	404 #if DEBUG_CDROM
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	405 printf ("LoadFile: %d %d\n", startFrame, stopFrame);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	406 #endif
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	407
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	408 /try {/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	409
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	410 /* create a new player, and attach to the audio unit */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	411
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	412 thePlayer = new_AudioFilePlayer(ref);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	413 if (thePlayer == NULL) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	414 SDL_SetError ("LoadFile: Could not create player");
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	415 return -3; /throw (-3);/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	416 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	417
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	418 if (!thePlayer->SetDestination(thePlayer, &theUnit))
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	419 goto bail;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	420
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	421 if (startFrame >= 0)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	422 thePlayer->SetStartFrame (thePlayer, startFrame);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	423
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	424 if (stopFrame >= 0 && stopFrame > startFrame)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	425 thePlayer->SetStopFrame (thePlayer, stopFrame);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	426
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	427 /* we set the notifier later */
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	428 /thePlayer->SetNotifier(thePlayer, FilePlayNotificationHandler, NULL);/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	429
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	430 if (!thePlayer->Connect(thePlayer))
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	431 goto bail;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	432
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	433 #if DEBUG_CDROM
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	434 thePlayer->Print(thePlayer);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	435 fflush (stdout);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	436 #endif
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	437 /*}
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	438 catch (...)
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	439 {
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	440 goto bail;
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	441 }*/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	442
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	443 error = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	444
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	445 bail:
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	446 return error;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	447 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	448
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	449 int ReleaseFile ()
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	450 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	451 int error = -1;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	452
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	453 /* (Don't see any way that the original C++ code could throw here.) --ryan. */
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	454 /try {/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	455 if (thePlayer != NULL) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	456
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	457 thePlayer->Disconnect(thePlayer);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	458
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	459 delete_AudioFilePlayer(thePlayer);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	460
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	461 thePlayer = NULL;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	462 }
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	463 /*}
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	464 catch (...)
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	465 {
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	466 goto bail;
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	467 }*/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	468
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	469 error = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	470
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	471 /* bail: */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	472 return error;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	473 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	474
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	475 int PlayFile ()
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	476 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	477 OSStatus result = -1;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	478
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	479 if (CheckInit () < 0)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	480 goto bail;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	481
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	482 /try {/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	483
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	484 // start processing of the audio unit
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	485 result = AudioOutputUnitStart (theUnit);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	486 if (result) goto bail; //THROW_RESULT("PlayFile: AudioOutputUnitStart")
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	487
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	488 /*}
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	489 catch (...)
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	490 {
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	491 goto bail;
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	492 }*/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	493
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	494 result = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	495
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	496 bail:
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	497 return result;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	498 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	499
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	500 int PauseFile ()
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	501 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	502 OSStatus result = -1;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	503
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	504 if (CheckInit () < 0)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	505 goto bail;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	506
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	507 /try {/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	508
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	509 /* stop processing the audio unit */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	510 result = AudioOutputUnitStop (theUnit);
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	511 if (result) goto bail; /THROW_RESULT("PauseFile: AudioOutputUnitStop")/
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	512 /*}
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	513 catch (...)
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	514 {
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	515 goto bail;
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	516 }*/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	517
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	518 result = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	519 bail:
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	520 return result;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	521 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	522
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	523 void SetCompletionProc (CDPlayerCompletionProc proc, SDL_CD *cdrom)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	524 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	525 assert(thePlayer != NULL);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	526
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	527 theCDROM = cdrom;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	528 completionProc = proc;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	529 thePlayer->SetNotifier (thePlayer, FilePlayNotificationHandler, cdrom);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	530 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	531
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	532 int GetCurrentFrame ()
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	533 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	534 int frame;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	535
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	536 if (thePlayer == NULL)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	537 frame = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	538 else
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	539 frame = thePlayer->GetCurrentFrame (thePlayer);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	540
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	541 return frame;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	542 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	543
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	544
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	545 #pragma mark -- Private Functions --
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	546
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	547 static OSStatus CheckInit ()
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	548 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	549 if (playBackWasInit)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	550 return 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	551
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	552 OSStatus result = noErr;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	553
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	554 /* Create the callback semaphore */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	555 callbackSem = SDL_CreateSemaphore(0);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	556
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	557 /* Start callback thread */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	558 SDL_CreateThread(RunCallBackThread, NULL);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	559
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	560 { /try {/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	561 ComponentDescription desc;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	562
4190 386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	563 desc.componentType = kAudioUnitType_Output;
386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	564 desc.componentSubType = kAudioUnitSubType_DefaultOutput;
386181851388 Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets. Ryan C. Gordon <icculus@icculus.org> parents: 4159 diff changeset	565 desc.componentManufacturer = kAudioUnitManufacturer_Apple;
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	566 desc.componentFlags = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	567 desc.componentFlagsMask = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	568
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	569 Component comp = FindNextComponent (NULL, &desc);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	570 if (comp == NULL) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	571 SDL_SetError ("CheckInit: FindNextComponent returned NULL");
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	572 if (result) return -1; //throw(internalComponentErr);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	573 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	574
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	575 result = OpenAComponent (comp, &theUnit);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	576 if (result) return -1; //THROW_RESULT("CheckInit: OpenAComponent")
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	577
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	578 // you need to initialize the output unit before you set it as a destination
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	579 result = AudioUnitInitialize (theUnit);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	580 if (result) return -1; //THROW_RESULT("CheckInit: AudioUnitInitialize")
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	581
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	582
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	583 playBackWasInit = true;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	584 }
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	585 /*catch (...)
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	586 {
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	587 return -1;
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	588 }*/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	589
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	590 return 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	591 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	592
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	593 static void FilePlayNotificationHandler(void * inRefCon, OSStatus inStatus)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	594 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	595 if (inStatus == kAudioFilePlay_FileIsFinished) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	596
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	597 /* notify non-CA thread to perform the callback */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	598 SDL_SemPost(callbackSem);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	599
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	600 } else if (inStatus == kAudioFilePlayErr_FilePlayUnderrun) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	601
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	602 SDL_SetError ("CDPlayer Notification: buffer underrun");
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	603 } else if (inStatus == kAudioFilePlay_PlayerIsUninitialized) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	604
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	605 SDL_SetError ("CDPlayer Notification: player is uninitialized");
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	606 } else {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	607
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	608 SDL_SetError ("CDPlayer Notification: unknown error %ld", inStatus);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	609 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	610 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	611
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	612 static int RunCallBackThread (void *param)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	613 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	614 for (;;) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	615
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	616 SDL_SemWait(callbackSem);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	617
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	618 if (completionProc && theCDROM) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	619 #if DEBUG_CDROM
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	620 printf ("callback!\n");
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	621 #endif
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	622 (*completionProc)(theCDROM);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	623 } else {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	624 #if DEBUG_CDROM
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	625 printf ("callback?\n");
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	626 #endif
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	627 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	628 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	629
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	630 #if DEBUG_CDROM
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	631 printf ("thread dying now...\n");
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	632 #endif
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	633
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	634 return 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	635 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	636
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	637 /}; // extern "C" /

Mercurial > sdl-ios-xcode

annotate src/cdrom/macosx/CDPlayer.c @ 4223:63fd67e17705 SDL-1.2