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

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401752

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);

src/cdrom/macosx/SDL_syscdrom.c

@@ -453,7 +453,7 @@ 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);
@@ -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 ();