From 37e5bd46e63ebb18942d51f5f7151b12fe5a3b49 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 9 May 2006 07:52:04 +0000 Subject: [PATCH] Date: Mon, 8 May 2006 14:19:30 -0700 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 --- src/cdrom/macosx/AudioFilePlayer.c | 2 +- src/cdrom/macosx/SDL_syscdrom.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/cdrom/macosx/AudioFilePlayer.c b/src/cdrom/macosx/AudioFilePlayer.c index 37a443524..333eb0c1c 100644 --- a/src/cdrom/macosx/AudioFilePlayer.c +++ b/src/cdrom/macosx/AudioFilePlayer.c @@ -153,7 +153,7 @@ void delete_AudioFilePlayer(AudioFilePlayer *afp) } if (afp->mForkRefNum) { - FSClose (afp->mForkRefNum); + FSCloseFork (afp->mForkRefNum); afp->mForkRefNum = 0; } SDL_free(afp); diff --git a/src/cdrom/macosx/SDL_syscdrom.c b/src/cdrom/macosx/SDL_syscdrom.c index b63ebf63b..ea43d8bde 100644 --- a/src/cdrom/macosx/SDL_syscdrom.c +++ b/src/cdrom/macosx/SDL_syscdrom.c @@ -453,8 +453,8 @@ static int SDL_SYS_CDStop(SDL_CD *cdrom) static int SDL_SYS_CDEject(SDL_CD *cdrom) { OSStatus err; - HParamBlockRec pb; - + pid_t dissenter; + if (fakeCD) { SDL_SetError (kErrorFakeDevice); return -1; @@ -475,9 +475,7 @@ static int SDL_SYS_CDEject(SDL_CD *cdrom) status = CD_STOPPED; /* Eject the volume */ - pb.ioParam.ioNamePtr = NULL; - pb.ioParam.ioVRefNum = volumes[cdrom->id]; - err = PBUnmountVol((ParamBlockRec *) &pb); + err = FSEjectVolumeSync(volumes[cdrom->id], kNilOptions, &dissenter); if (err != noErr) { Unlock ();