pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Date: Mon, 8 May 2006 14:19:30 -0700

Browse source 
From: Bob Ippolito
Subject: SDL trunk (r2346) and Mac OS X

As for all the Carbon warnings.. the two File Manager ones should be
easy to get rid of, the QuickDraw ones won't be so easy since that
requires actual refactoring.

PBUnmountVol -> FSEjectVolumeSync
FSClose -> FSCloseFork

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401752
This commit is contained in:
Sam Lantinga 2006-05-09 07:52:04 +00:00
parent 5843b19d25
commit 782736f3f9
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cdrom/macosx/AudioFilePlayer.c
View file

@ -153,7 +153,7 @@ void delete_AudioFilePlayer(AudioFilePlayer *afp)
} }
if (afp->mForkRefNum) { if (afp->mForkRefNum) {
FSClose (afp->mForkRefNum); FSCloseFork (afp->mForkRefNum);
afp->mForkRefNum = 0; afp->mForkRefNum = 0;
} }
SDL_free(afp); SDL_free(afp);

6
src/cdrom/macosx/SDL_syscdrom.c
View file

@ -453,7 +453,7 @@ static int SDL_SYS_CDStop(SDL_CD *cdrom)
static int SDL_SYS_CDEject(SDL_CD *cdrom) static int SDL_SYS_CDEject(SDL_CD *cdrom)
{ {
OSStatus err; OSStatus err;
HParamBlockRec pb; pid_t dissenter;
if (fakeCD) { if (fakeCD) {
SDL_SetError (kErrorFakeDevice); SDL_SetError (kErrorFakeDevice);
@ -475,9 +475,7 @@ static int SDL_SYS_CDEject(SDL_CD *cdrom)
status = CD_STOPPED; status = CD_STOPPED;
/* Eject the volume */ /* Eject the volume */
pb.ioParam.ioNamePtr = NULL; err = FSEjectVolumeSync(volumes[cdrom->id], kNilOptions, &dissenter);
pb.ioParam.ioVRefNum = volumes[cdrom->id];
err = PBUnmountVol((ParamBlockRec *) &pb);
if (err != noErr) { if (err != noErr) {
Unlock (); Unlock ();