Date: Mon, 8 May 2006 14:19:30 -0700
authorSam Lantinga <slouken@libsdl.org>
Tue, 09 May 2006 07:52:04 +0000
changeset 17934d66375c2012
parent 1792 409974dedf2e
child 1794 5605a9820134
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
src/cdrom/macosx/SDL_syscdrom.c
     1.1 --- a/src/cdrom/macosx/AudioFilePlayer.c	Tue May 09 07:50:28 2006 +0000
     1.2 +++ b/src/cdrom/macosx/AudioFilePlayer.c	Tue May 09 07:52:04 2006 +0000
     1.3 @@ -153,7 +153,7 @@
     1.4          }
     1.5      
     1.6          if (afp->mForkRefNum) {
     1.7 -            FSClose (afp->mForkRefNum);
     1.8 +            FSCloseFork (afp->mForkRefNum);
     1.9              afp->mForkRefNum = 0;
    1.10          }
    1.11          SDL_free(afp);
     2.1 --- a/src/cdrom/macosx/SDL_syscdrom.c	Tue May 09 07:50:28 2006 +0000
     2.2 +++ b/src/cdrom/macosx/SDL_syscdrom.c	Tue May 09 07:52:04 2006 +0000
     2.3 @@ -453,8 +453,8 @@
     2.4  static int SDL_SYS_CDEject(SDL_CD *cdrom)
     2.5  {
     2.6      OSStatus err;
     2.7 -	HParamBlockRec  pb;
     2.8 -    
     2.9 +    pid_t dissenter;
    2.10 +
    2.11      if (fakeCD) {
    2.12          SDL_SetError (kErrorFakeDevice);
    2.13          return -1;
    2.14 @@ -475,9 +475,7 @@
    2.15      status = CD_STOPPED;
    2.16      
    2.17  	/* Eject the volume */
    2.18 -	pb.ioParam.ioNamePtr = NULL;
    2.19 -	pb.ioParam.ioVRefNum = volumes[cdrom->id];
    2.20 -	err = PBUnmountVol((ParamBlockRec *) &pb);
    2.21 +	err = FSEjectVolumeSync(volumes[cdrom->id], kNilOptions, &dissenter);
    2.22  
    2.23  	if (err != noErr) {
    2.24          Unlock ();