Mercurial > sdl-ios-xcode
view src/cdrom/SDL_cdrom.c @ 1135:cf6133247d34
Mac Classic and CodeWarrior patches.
--ryan.
From: =?ISO-8859-1?Q?Anders_F_Bj=F6rklund?= <afb@algonet.se>
Subject: Re: [SDL] Updated Mac patch
Date: Tue, 6 Sep 2005 15:21:27 +0200
To: A list for developers using the SDL library <sdl@libsdl.org>
Earlier, I wrote:
> Updated the previous Mac patch to disable Carbon by default.
> Also "fixed" the SDL.spec again, so that it builds on Darwin.
>
> http://www.algonet.se/~afb/SDL-1.2.9-mac.patch
> Also applied fine to SDL12 CVS, when I tried it.
>
> Haven't completed any new packaging or projects for Xcode/PB,
> but it seems to build and install fine here (in development).
Tested the new patch to build with old CodeWarrior and MPW,
and it seems it needed some hacks with those old headers...
Just in case you want to support the archeological versions -
here is a small add-on to the above patch, to fix those...
http://www.algonet.se/~afb/SDL-1.2.9-classic.patch
I couldn't get the old CW5 projects to build without a few
modifications - such as deleting the stray old header in:
"CWprojects/Support/Carbon/Include/ConditionalMacros.h" ?
But I updated both projects to CW6 too and built for Carbon,
and it ran all of the Mac test projects without any problems.
The MPW file seems to have compiled, with a small order change.
As long as you're still shipping the CWProjects and MPWmake
with the download, they should probably be updated/fixed ?
(another "solution" would of course be to just delete them)
I'll post my new projects along with the new Xcode projects
later on, along with XML exports of the various .mcp files.
(CW5 builds for Classic / "PPC", and CW6 builds for Carbon)
It'll be packaged as a part of the next SpriteWorld X release...
http://spriteworldx.sourceforge.net/ [Classic/Carbon/Win/X11]
--anders
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Thu, 08 Sep 2005 06:34:28 +0000 |
parents | b8d311d90021 |
children | c9b51268668f |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2004 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id$"; #endif /* This is the CD-audio control API for Simple DirectMedia Layer */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include "SDL_error.h" #include "SDL_cdrom.h" #include "SDL_syscdrom.h" #if !defined(macintosh) #define CLIP_FRAMES 10 /* Some CD-ROMs won't go all the way */ #endif static int SDL_cdinitted = 0; static SDL_CD *default_cdrom; /* The system level CD-ROM control functions */ struct CDcaps SDL_CDcaps = { NULL, /* Name */ NULL, /* Open */ NULL, /* GetTOC */ NULL, /* Status */ NULL, /* Play */ NULL, /* Pause */ NULL, /* Resume */ NULL, /* Stop */ NULL, /* Eject */ NULL, /* Close */ }; int SDL_numcds; int SDL_CDROMInit(void) { int retval; SDL_numcds = 0; retval = SDL_SYS_CDInit(); if ( retval == 0 ) { SDL_cdinitted = 1; } default_cdrom = NULL; return(retval); } /* Check to see if the CD-ROM subsystem has been initialized */ static int CheckInit(int check_cdrom, SDL_CD **cdrom) { int okay; okay = SDL_cdinitted; if ( check_cdrom && (*cdrom == NULL) ) { *cdrom = default_cdrom; if ( *cdrom == NULL ) { SDL_SetError("CD-ROM not opened"); okay = 0; } } if ( ! SDL_cdinitted ) { SDL_SetError("CD-ROM subsystem not initialized"); } return(okay); } int SDL_CDNumDrives(void) { if ( ! CheckInit(0, NULL) ) { return(-1); } return(SDL_numcds); } const char *SDL_CDName(int drive) { if ( ! CheckInit(0, NULL) ) { return(NULL); } if ( drive >= SDL_numcds ) { SDL_SetError("Invalid CD-ROM drive index"); return(NULL); } if ( SDL_CDcaps.Name ) { return(SDL_CDcaps.Name(drive)); } else { return(""); } } SDL_CD *SDL_CDOpen(int drive) { struct SDL_CD *cdrom; if ( ! CheckInit(0, NULL) ) { return(NULL); } if ( drive >= SDL_numcds ) { SDL_SetError("Invalid CD-ROM drive index"); return(NULL); } cdrom = (SDL_CD *)malloc(sizeof(*cdrom)); if ( cdrom == NULL ) { SDL_OutOfMemory(); return(NULL); } memset(cdrom, 0, sizeof(*cdrom)); cdrom->id = SDL_CDcaps.Open(drive); if ( cdrom->id < 0 ) { free(cdrom); return(NULL); } default_cdrom = cdrom; return(cdrom); } CDstatus SDL_CDStatus(SDL_CD *cdrom) { CDstatus status; int i; Uint32 position; /* Check if the CD-ROM subsystem has been initialized */ if ( ! CheckInit(1, &cdrom) ) { return(CD_ERROR); } /* Get the current status of the drive */ cdrom->numtracks = 0; cdrom->cur_track = 0; cdrom->cur_frame = 0; status = SDL_CDcaps.Status(cdrom, &i); position = (Uint32)i; cdrom->status = status; /* Get the table of contents, if there's a CD available */ if ( CD_INDRIVE(status) ) { if ( SDL_CDcaps.GetTOC(cdrom) < 0 ) { status = CD_ERROR; } /* If the drive is playing, get current play position */ if ( (status == CD_PLAYING) || (status == CD_PAUSED) ) { for ( i=1; cdrom->track[i].offset <= position; ++i ) { /* Keep looking */; } #ifdef DEBUG_CDROM fprintf(stderr, "Current position: %d, track = %d (offset is %d)\n", position, i-1, cdrom->track[i-1].offset); #endif cdrom->cur_track = i-1; position -= cdrom->track[cdrom->cur_track].offset; cdrom->cur_frame = position; } } return(status); } int SDL_CDPlayTracks(SDL_CD *cdrom, int strack, int sframe, int ntracks, int nframes) { int etrack, eframe; int start, length; /* Check if the CD-ROM subsystem has been initialized */ if ( ! CheckInit(1, &cdrom) ) { return(CD_ERROR); } /* Determine the starting and ending tracks */ if ( (strack < 0) || (strack >= cdrom->numtracks) ) { SDL_SetError("Invalid starting track"); return(CD_ERROR); } if ( ! ntracks && ! nframes ) { etrack = cdrom->numtracks; eframe = 0; } else { etrack = strack+ntracks; if ( etrack == strack ) { eframe = sframe + nframes; } else { eframe = nframes; } } if ( etrack > cdrom->numtracks ) { SDL_SetError("Invalid play length"); return(CD_ERROR); } /* Skip data tracks and verify frame offsets */ while ( (strack <= etrack) && (cdrom->track[strack].type == SDL_DATA_TRACK) ) { ++strack; } if ( sframe >= (int)cdrom->track[strack].length ) { SDL_SetError("Invalid starting frame for track %d", strack); return(CD_ERROR); } while ( (etrack > strack) && (cdrom->track[etrack-1].type == SDL_DATA_TRACK) ) { --etrack; } if ( eframe > (int)cdrom->track[etrack].length ) { SDL_SetError("Invalid ending frame for track %d", etrack); return(CD_ERROR); } /* Determine start frame and play length */ start = (cdrom->track[strack].offset+sframe); length = (cdrom->track[etrack].offset+eframe)-start; #ifdef CLIP_FRAMES /* I've never seen this necessary, but xmcd does it.. */ length -= CLIP_FRAMES; /* CLIP_FRAMES == 10 */ #endif if ( length < 0 ) { return(0); } /* Play! */ #ifdef DEBUG_CDROM fprintf(stderr, "Playing %d frames at offset %d\n", length, start); #endif return(SDL_CDcaps.Play(cdrom, start, length)); } int SDL_CDPlay(SDL_CD *cdrom, int sframe, int length) { /* Check if the CD-ROM subsystem has been initialized */ if ( ! CheckInit(1, &cdrom) ) { return(CD_ERROR); } return(SDL_CDcaps.Play(cdrom, sframe, length)); } int SDL_CDPause(SDL_CD *cdrom) { CDstatus status; int retval; /* Check if the CD-ROM subsystem has been initialized */ if ( ! CheckInit(1, &cdrom) ) { return(CD_ERROR); } status = SDL_CDcaps.Status(cdrom, NULL); switch (status) { case CD_PLAYING: retval = SDL_CDcaps.Pause(cdrom); break; default: retval = 0; break; } return(retval); } int SDL_CDResume(SDL_CD *cdrom) { CDstatus status; int retval; /* Check if the CD-ROM subsystem has been initialized */ if ( ! CheckInit(1, &cdrom) ) { return(CD_ERROR); } status = SDL_CDcaps.Status(cdrom, NULL); switch (status) { case CD_PAUSED: retval = SDL_CDcaps.Resume(cdrom); default: retval = 0; break; } return(retval); } int SDL_CDStop(SDL_CD *cdrom) { CDstatus status; int retval; /* Check if the CD-ROM subsystem has been initialized */ if ( ! CheckInit(1, &cdrom) ) { return(CD_ERROR); } status = SDL_CDcaps.Status(cdrom, NULL); switch (status) { case CD_PLAYING: case CD_PAUSED: retval = SDL_CDcaps.Stop(cdrom); default: retval = 0; break; } return(retval); } int SDL_CDEject(SDL_CD *cdrom) { /* Check if the CD-ROM subsystem has been initialized */ if ( ! CheckInit(1, &cdrom) ) { return(CD_ERROR); } return(SDL_CDcaps.Eject(cdrom)); } void SDL_CDClose(SDL_CD *cdrom) { /* Check if the CD-ROM subsystem has been initialized */ if ( ! CheckInit(1, &cdrom) ) { return; } SDL_CDcaps.Close(cdrom); free(cdrom); default_cdrom = NULL; } void SDL_CDROMQuit(void) { SDL_SYS_CDQuit(); SDL_cdinitted = 0; }