Mercurial > sdl-ios-xcode
view src/cdrom/macosx/AudioFilePlayer.cpp @ 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 |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 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.cpp // #include "AudioFilePlayer.h" void ThrowResult (OSStatus result, const char* str) { SDL_SetError ("Error: %s %d", str, result); throw result; } #if DEBUG void PrintStreamDesc (AudioStreamBasicDescription *inDesc) { if (!inDesc) { printf ("Can't print a NULL desc!\n"); return; } printf ("- - - - - - - - - - - - - - - - - - - -\n"); printf (" Sample Rate:%f\n", inDesc->mSampleRate); printf (" Format ID:%s\n", (char*)&inDesc->mFormatID); printf (" Format Flags:%lX\n", inDesc->mFormatFlags); printf (" Bytes per Packet:%ld\n", inDesc->mBytesPerPacket); printf (" Frames per Packet:%ld\n", inDesc->mFramesPerPacket); printf (" Bytes per Frame:%ld\n", inDesc->mBytesPerFrame); printf (" Channels per Frame:%ld\n", inDesc->mChannelsPerFrame); printf (" Bits per Channel:%ld\n", inDesc->mBitsPerChannel); printf ("- - - - - - - - - - - - - - - - - - - -\n"); } #endif OSStatus AudioFileManager::FileInputProc (void *inRefCon, AudioUnitRenderActionFlags inActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, AudioBuffer *ioData) { AudioFileManager* THIS = (AudioFileManager*)inRefCon; return THIS->Render(*ioData); } OSStatus AudioFileManager::Render (AudioBuffer &ioData) { OSStatus result = noErr; if (mBufferOffset >= mBufferSize) { result = GetFileData(&mTmpBuffer, &mBufferSize); if (result) { SDL_SetError ("AudioConverterFillBuffer:%ld\n", result); mParent.DoNotification (result); return result; } mBufferOffset = 0; } if (ioData.mDataByteSize > mBufferSize - mBufferOffset) ioData.mDataByteSize = mBufferSize - mBufferOffset; ioData.mData = (char *)mTmpBuffer + mBufferOffset; mBufferOffset += ioData.mDataByteSize; mByteCounter += ioData.mDataByteSize; AfterRender(); return result; } AudioFileManager::~AudioFileManager () { if (mFileBuffer) { free (mFileBuffer); mFileBuffer = 0; } } AudioFilePlayer::AudioFilePlayer (const FSRef *inFileRef) : mConnected (false), mAudioFileManager (0), mNotifier (0), mStartFrame (0) { SInt64 fileDataSize = 0; OpenFile (inFileRef, fileDataSize); // we want about 4 seconds worth of data for the buffer int bytesPerSecond = UInt32 (4 * mFileDescription.mSampleRate * mFileDescription.mBytesPerFrame); #if DEBUG printf("File format:\n"); PrintStreamDesc (&mFileDescription); #endif mAudioFileManager = new AudioFileManager (*this, mForkRefNum, fileDataSize, bytesPerSecond); } void AudioFilePlayer::SetDestination (AudioUnit &inDestUnit) { if (mConnected) throw static_cast<OSStatus>(-1); //can't set dest if already engaged mPlayUnit = inDestUnit; OSStatus result = noErr; //we can "down" cast a component instance to a component ComponentDescription desc; result = GetComponentInfo ((Component)inDestUnit, &desc, 0, 0, 0); THROW_RESULT("GetComponentInfo") // we're going to use this to know which convert routine to call // a v1 audio unit will have a type of 'aunt' // a v2 audio unit will have one of several different types. if (desc.componentType != kAudioUnitComponentType) { result = badComponentInstance; THROW_RESULT("BAD COMPONENT") } /* Set the input format of the audio unit. */ result = AudioUnitSetProperty (inDestUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, &mFileDescription, sizeof (mFileDescription)); THROW_RESULT("AudioUnitSetProperty") } void AudioFilePlayer::SetStartFrame (int frame) { SInt64 position = frame * 2352; mStartFrame = frame; mAudioFileManager->SetPosition (position); } int AudioFilePlayer::GetCurrentFrame () { return mStartFrame + (mAudioFileManager->GetByteCounter() / 2352); } void AudioFilePlayer::SetStopFrame (int frame) { SInt64 position = frame * 2352; mAudioFileManager->SetEndOfFile (position); } AudioFilePlayer::~AudioFilePlayer() { Disconnect(); if (mAudioFileManager) { delete mAudioFileManager; mAudioFileManager = 0; } if (mForkRefNum) { FSClose (mForkRefNum); mForkRefNum = 0; } } void AudioFilePlayer::Connect() { #if DEBUG printf ("Connect:%x, engaged=%d\n", (int)mPlayUnit, (mConnected ? 1 : 0)); #endif if (!mConnected) { mAudioFileManager->DoConnect(); // set the render callback for the file data to be supplied to the sound converter AU mInputCallback.inputProc = AudioFileManager::FileInputProc; mInputCallback.inputProcRefCon = mAudioFileManager; OSStatus result = AudioUnitSetProperty (mPlayUnit, kAudioUnitProperty_SetInputCallback, kAudioUnitScope_Input, 0, &mInputCallback, sizeof(mInputCallback)); THROW_RESULT("AudioUnitSetProperty") mConnected = true; } } // warning noted, now please go away ;-) // #warning This should redirect the calling of notification code to some other thread void AudioFilePlayer::DoNotification (OSStatus inStatus) const { AudioFilePlayer* THIS = const_cast<AudioFilePlayer*>(this); if (mNotifier) { (*mNotifier) (mRefCon, inStatus); } else { SDL_SetError ("Notification posted with no notifier in place"); if (inStatus == kAudioFilePlay_FileIsFinished) THIS->Disconnect(); else if (inStatus != kAudioFilePlayErr_FilePlayUnderrun) THIS->Disconnect(); } } void AudioFilePlayer::Disconnect () { #if DEBUG printf ("Disconnect:%x,%ld, engaged=%d\n", (int)mPlayUnit, 0, (mConnected ? 1 : 0)); #endif if (mConnected) { mConnected = false; mInputCallback.inputProc = 0; mInputCallback.inputProcRefCon = 0; OSStatus result = AudioUnitSetProperty (mPlayUnit, kAudioUnitProperty_SetInputCallback, kAudioUnitScope_Input, 0, &mInputCallback, sizeof(mInputCallback)); if (result) SDL_SetError ("AudioUnitSetProperty:RemoveInputCallback:%ld", result); mAudioFileManager->Disconnect(); } } struct SSNDData { UInt32 offset; UInt32 blockSize; }; void AudioFilePlayer::OpenFile (const FSRef *inRef, SInt64& outFileDataSize) { ContainerChunk chunkHeader; ChunkHeader chunk; SSNDData ssndData; OSErr result; HFSUniStr255 dfName; ByteCount actual; SInt64 offset; // Open the data fork of the input file result = FSGetDataForkName(&dfName); THROW_RESULT("AudioFilePlayer::OpenFile(): FSGetDataForkName") result = FSOpenFork(inRef, dfName.length, dfName.unicode, fsRdPerm, &mForkRefNum); THROW_RESULT("AudioFilePlayer::OpenFile(): FSOpenFork") // Read the file header, and check if it's indeed an AIFC file result = FSReadFork(mForkRefNum, fsAtMark, 0, sizeof(chunkHeader), &chunkHeader, &actual); THROW_RESULT("AudioFilePlayer::OpenFile(): FSReadFork") if (chunkHeader.ckID != 'FORM') { result = -1; THROW_RESULT("AudioFilePlayer::OpenFile(): chunk id is not 'FORM'"); } if (chunkHeader.formType != 'AIFC') { result = -1; THROW_RESULT("AudioFilePlayer::OpenFile(): file format is not 'AIFC'"); } // Search for the SSND chunk. We ignore all compression etc. information // in other chunks. Of course that is kind of evil, but for now we are lazy // and rely on the cdfs to always give us the same fixed format. // TODO: Parse the COMM chunk we currently skip to fill in mFileDescription. offset = 0; do { result = FSReadFork(mForkRefNum, fsFromMark, offset, sizeof(chunk), &chunk, &actual); THROW_RESULT("AudioFilePlayer::OpenFile(): FSReadFork") // Skip the chunk data offset = chunk.ckSize; } while (chunk.ckID != 'SSND'); // Read the header of the SSND chunk. After this, we are positioned right // at the start of the audio data. result = FSReadFork(mForkRefNum, fsAtMark, 0, sizeof(ssndData), &ssndData, &actual); THROW_RESULT("AudioFilePlayer::OpenFile(): FSReadFork") result = FSSetForkPosition(mForkRefNum, fsFromMark, ssndData.offset); THROW_RESULT("AudioFilePlayer::OpenFile(): FSSetForkPosition") // Data size outFileDataSize = chunk.ckSize - ssndData.offset - 8; // File format mFileDescription.mSampleRate = 44100; mFileDescription.mFormatID = kAudioFormatLinearPCM; mFileDescription.mFormatFlags = kLinearPCMFormatFlagIsPacked | kLinearPCMFormatFlagIsSignedInteger; mFileDescription.mBytesPerPacket = 4; mFileDescription.mFramesPerPacket = 1; mFileDescription.mBytesPerFrame = 4; mFileDescription.mChannelsPerFrame = 2; mFileDescription.mBitsPerChannel = 16; }