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
libsdl-org · May 9, 2006 · 37e5bd4 · 37e5bd4
1 parent 796693d
commit 37e5bd4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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 ();