Mercurial > sdl-ios-xcode
view src/cdrom/macosx/AudioFilePlayer.h @ 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 | f8d5ddc7aef1 |
children | 71a2648acc75 |
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 This file based on Apple sample code. We haven't changed the file name, so if you want to see the original search for it on apple.com/developer */ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // AudioFilePlayer.h // #ifndef __AudioFilePlayer_H__ #define __AudioFilePlayer_H__ #include <CoreServices/CoreServices.h> #include <AudioUnit/AudioUnit.h> #include "SDL_error.h" const char* AudioFilePlayerErrorStr (OSStatus error); void ThrowResult (OSStatus result, const char *str); #define THROW_RESULT(str) \ if (result) { \ ThrowResult (result, str); \ } typedef void (*AudioFilePlayNotifier)(void *inRefCon, OSStatus inStatus); enum { kAudioFilePlayErr_FilePlayUnderrun = -10000, kAudioFilePlay_FileIsFinished = -10001, kAudioFilePlay_PlayerIsUninitialized = -10002 }; class AudioFileManager; #pragma mark __________ AudioFilePlayer class AudioFilePlayer { public: AudioFilePlayer (const FSRef *inFileRef); ~AudioFilePlayer(); void SetDestination (AudioUnit &inDestUnit); void SetNotifier (AudioFilePlayNotifier inNotifier, void *inRefCon) { mNotifier = inNotifier; mRefCon = inRefCon; } void SetStartFrame (int frame); // seek in the file int GetCurrentFrame (); // get the current frame position void SetStopFrame (int frame); // set limit in the file void Connect(); void Disconnect(); void DoNotification (OSStatus inError) const; bool IsConnected () const { return mConnected; } AudioUnit GetDestUnit () const { return mPlayUnit; } #if DEBUG void Print() const { printf ("Is Connected:%s\n", (IsConnected() ? "true" : "false")); printf ("- - - - - - - - - - - - - - \n"); } #endif private: AudioUnit mPlayUnit; SInt16 mForkRefNum; AudioUnitInputCallback mInputCallback; AudioStreamBasicDescription mFileDescription; bool mConnected; AudioFileManager* mAudioFileManager; AudioFilePlayNotifier mNotifier; void* mRefCon; int mStartFrame; #pragma mark __________ Private_Methods void OpenFile (const FSRef *inRef, SInt64& outFileSize); }; #pragma mark __________ AudioFileManager class AudioFileManager { public: AudioFileManager (AudioFilePlayer &inParent, SInt16 inForkRefNum, SInt64 inFileLength, UInt32 inChunkSize); ~AudioFileManager(); // this method should NOT be called by an object of this class // as it is called by the parent's Disconnect() method void Disconnect (); void DoConnect (); OSStatus Read(char *buffer, UInt32 *len); const char* GetFileBuffer () { return mFileBuffer; } const AudioFilePlayer& GetParent () const { return mParent; } void SetPosition (SInt64 pos); // seek/rewind in the file int GetByteCounter () { return mByteCounter; } // return actual bytes streamed to audio hardware void SetEndOfFile (SInt64 pos); // set the "EOF" (will behave just like it reached eof) protected: AudioFilePlayer& mParent; SInt16 mForkRefNum; SInt64 mAudioDataOffset; char* mFileBuffer; int mByteCounter; bool mReadFromFirstBuffer; bool mLockUnsuccessful; bool mIsEngaged; int mNumTimesAskedSinceFinished; void* mTmpBuffer; UInt32 mBufferSize; UInt32 mBufferOffset; public: const UInt32 mChunkSize; SInt64 mFileLength; SInt64 mReadFilePosition; bool mWriteToFirstBuffer; bool mFinishedReadingData; protected: OSStatus Render (AudioBuffer &ioData); OSStatus GetFileData (void** inOutData, UInt32 *inOutDataSize); void AfterRender (); public: static OSStatus FileInputProc (void *inRefCon, AudioUnitRenderActionFlags inActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, AudioBuffer *ioData); }; #endif