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

annotate src/cdrom/macosx/CDPlayer.c @ 4158:96ce26f24b01 SDL-1.2

Date: Sun, 7 Sep 2008 15:17:00 +0200 From: c2woody@gmx.net Subject: [SDL] SDL 1.2 doube free/pointer zeroing missing Hello, this is about a crash/debug breakage for the current SDL 1.2 source tree (today's svn checkout, same problem in 1.2.13 and before as far as relevant). In some places memory is free()d but the associated pointer is not zeroed, leading to for example double free()s. For me this happened because SDL_StopEventThread() was executed twice (during restart of the subsystems), once for the close down in SDL_VideoQuit() and once at the startup, right at the beginning of SDL_StartEventLoop(). Thus the code SDL_DestroyMutex(SDL_EventQ.lock); (see SDL_events.c) was called twice and executed the SDL_free(mutex); twice as well, leading to a crash (msvc 64bit for which it was noticed). I've tried to check all other occurrences of SDL_free and similar code in msvc, see the attached patch (udiff against revision 4082). Non-windows only codepaths have neither been checked nor touched. Comments/ideas welcome. Attached patch: NULLifies some pointers after they have been free()d.

author	Sam Lantinga <slouken@libsdl.org>
date	Wed, 12 Nov 2008 17:23:40 +0000
parents	dc6b59e925a2
children	782fd950bd46 c121d94672cb a1b03ba2fcd0

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
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	3 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 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	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;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	137 SInt16 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	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;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	143
71a2648acc75 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;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	146
71a2648acc75 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";
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	148
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	149 /* get stuff from .TOC.plist */
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	150 fsRefPB.ioCompletion = 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	151 fsRefPB.ioNamePtr = "\p.TOC.plist";
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	152 fsRefPB.ioVRefNum = 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	153 fsRefPB.ioDirID = 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	154 fsRefPB.newRef = &tocPlistFSRef;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	155
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	156 theErr = PBMakeFSRefSync (&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	157 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	158 error = "PBMakeFSRefSync";
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	159 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	160 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	161
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	162 /* 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	163
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	164 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	165 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	166 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	167 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	168 }
71a2648acc75 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 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	171 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	172 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	173 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	174 }
71a2648acc75 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
71a2648acc75 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 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	177 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	178 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	179 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	180 }
71a2648acc75 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
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	182 /* 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	183 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	184 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	185 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	186 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	187 }
71a2648acc75 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
71a2648acc75 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 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	190 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	191 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	192 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	193 }
71a2648acc75 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
71a2648acc75 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 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	196 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	197 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	198 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	199 }
71a2648acc75 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
71a2648acc75 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 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	202 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	203 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	204 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	205 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	206 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	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
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	210 /* 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	211
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	212 /* 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	213 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	214 {
71a2648acc75 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 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	216
71a2648acc75 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 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	218 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	219 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	220 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	221
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	222 /* 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	223 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	224
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	225 /* 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	226 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	227
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	228 /* 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	229 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	230
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	231 /* 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	232 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	233
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	234 /* 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	235 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	236 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	237 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	238 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	239 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	240 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	241 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	242 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	243
71a2648acc75 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 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	245 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	246
71a2648acc75 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 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	248
71a2648acc75 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 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	250
71a2648acc75 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 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	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 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	254 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	255 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	256 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	257 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	258 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	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 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	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 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	263 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	264 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	265 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	266
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	267 /* 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	268 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	269
71a2648acc75 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 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	271 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	272
71a2648acc75 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 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	274 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	275
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	276 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	277
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	278 /* 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	279 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	280 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	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 }
71a2648acc75 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
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	284 /* 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	285 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	286
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	287 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	288 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	289
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	290 /* 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	291 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	292 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	293
71a2648acc75 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 }
71a2648acc75 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 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	297 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	298 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	299 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	300 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	301 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	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 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	304 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	305 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	306 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	307 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	308 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	309
71a2648acc75 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 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	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 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	313 }
71a2648acc75 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
71a2648acc75 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 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	316 {
71a2648acc75 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 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	318 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	319 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	320 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	321 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	322 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	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 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	325 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	326 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	327 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	328 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	329 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	330 &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	331
71a2648acc75 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 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	333 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	334 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	335 }
71a2648acc75 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
71a2648acc75 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 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	338 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	339 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	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 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	342 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	343 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	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 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	346 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	347
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	348 /* 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	349 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	350 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	351
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	352 /* 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	353 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	354 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	355 ++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	356 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	357 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	358 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	359 ++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	360 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	361
71a2648acc75 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 #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	363 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	364 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	365 #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	366
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	367 /* 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	368 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	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 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	371
71a2648acc75 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 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	373 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	374 }
71a2648acc75 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 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	376 }
71a2648acc75 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 } 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	378 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	379 }
71a2648acc75 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 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	382 }
71a2648acc75 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 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	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 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	387
71a2648acc75 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 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	389 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	390
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	391 /* 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	392 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	393 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	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 #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	396 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	397 #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	398
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	399 /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	400
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	401 /* 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	402
71a2648acc75 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 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	404 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	405 SDL_SetError ("LoadFile: Could not create player");
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	406 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	407 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	408
71a2648acc75 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 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	410 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	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 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	413 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	414
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	415 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	416 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	417
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	418 /* we set the notifier later */
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	419 /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	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 (!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	422 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	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 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	425 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	426 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	427 #endif
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	428 /*}
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	429 catch (...)
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	430 {
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	431 goto bail;
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	432 }*/
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	433
71a2648acc75 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 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	435
71a2648acc75 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 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	437 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	438 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	439
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	440 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	441 {
71a2648acc75 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 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	443
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	444 /* (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	445 /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	446 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	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 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	449
71a2648acc75 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 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	451
71a2648acc75 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 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	453 }
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	454 /*}
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	455 catch (...)
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	456 {
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	457 goto bail;
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	458 }*/
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	459
71a2648acc75 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 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	461
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	462 /* 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	463 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	464 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	465
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	466 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	467 {
71a2648acc75 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 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	469
71a2648acc75 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 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	471 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	472
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	473 /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	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 // 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	476 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	477 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	478
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	479 /*}
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	480 catch (...)
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	481 {
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	482 goto bail;
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	483 }*/
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	484
71a2648acc75 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 = 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	486
71a2648acc75 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 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	488 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	489 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	490
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	491 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	492 {
71a2648acc75 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 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	494
71a2648acc75 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 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	496 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	497
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	498 /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	499
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	500 /* 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	501 result = AudioOutputUnitStop (theUnit);
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	502 if (result) goto bail; /THROW_RESULT("PauseFile: AudioOutputUnitStop")/
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	503 /*}
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	504 catch (...)
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	505 {
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	506 goto bail;
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	507 }*/
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
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	509 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	510 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	511 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	512 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	513
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	514 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	515 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	516 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	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 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	519 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	520 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	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 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	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 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	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 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	528 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	529 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	530 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	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 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	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
71a2648acc75 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 #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	537
71a2648acc75 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 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	539 {
71a2648acc75 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 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	541 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	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 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	544
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	545 /* 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	546 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	547
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	548 /* 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	549 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	550
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	551 { /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	552 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	553
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	554 desc.componentType = kAudioUnitComponentType;
71a2648acc75 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 desc.componentSubType = kAudioUnitSubType_Output;
71a2648acc75 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 desc.componentManufacturer = kAudioUnitID_DefaultOutput;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	557 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	558 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	559
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	560 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	561 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	562 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	563 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	564 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	565
71a2648acc75 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 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	567 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	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 // 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	570 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	571 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	572
71a2648acc75 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 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	575 }
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	576 /*catch (...)
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	577 {
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	578 return -1;
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	579 }*/
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	580
71a2648acc75 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 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	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
71a2648acc75 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 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	585 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	586 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	587
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	588 /* 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	589 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	590
71a2648acc75 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 } 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	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 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	594 } 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	595
71a2648acc75 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 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	597 } 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	598
71a2648acc75 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 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	600 }
71a2648acc75 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
71a2648acc75 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 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	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 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	606
71a2648acc75 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 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	608
71a2648acc75 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 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	610 #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	611 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	612 #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	613 (*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	614 } 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	615 #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	616 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	617 #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	618 }
71a2648acc75 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 }
71a2648acc75 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
71a2648acc75 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 #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	622 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	623 #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	624
71a2648acc75 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 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	626 }
71a2648acc75 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
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	628 /}; // extern "C" /

Mercurial > sdl-ios-xcode

annotate src/cdrom/macosx/CDPlayer.c @ 4158:96ce26f24b01 SDL-1.2