Mercurial > sdl-ios-xcode
view src/cdrom/macosx/AudioFilePlayer.h @ 773:da0a2ad35bf4
Date: Sun, 4 Jan 2004 23:48:19 +0100
From: Max Horn
Subject: Re: Again Audio CD patch
Am 04.01.2004 um 22:38 schrieb Sam Lantinga:
>
> Okay, I fixed the buffering problems by simply using a 4 second buffer
> instead of a 1 second buffer. However, using your code I can't play an
> entire CD - the playback stops after the first song.
>
Found the problem: FSReadFork returns eofErr when the file is finished.
However, we check its return value for errors, and if anything but
noErr occurs, the reader thread aborts its current iteration. That is
bad, because it aborts before it can ever set the flag which tells that
the file is over (also, any remaining data which FSRead did return is
lost - so you'd not hear about to 4 seconds from the end of the file.
Furthermore, the computed data size was 8 bytes to high (I forgot to
account for the fact that the size of an (A)IFF chunk always contains
the chunk header & size fields, too). This is enough to make it work.
However, the end condition is rather fragile, so I tuned some other
things to be pessimistic (check for <= 0 instead of == 0, when eofErr
is encountered enforce mReadFilePosition == mFileLength). You never
know...
The attached patch fixes the issue for me.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Mon, 05 Jan 2004 00:57:51 +0000 |
parents | b8d311d90021 |
children | f8d5ddc7aef1 |
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 <AudioToolbox/AudioConverter.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, int inBusNumber); 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; } UInt32 GetBusNumber () const { return mBusNumber; } AudioUnit GetDestUnit () const { return mPlayUnit; } AudioConverterRef GetAudioConverter() const { return mConverter; } #if DEBUG void Print() const { printf ("Destination Bus:%ld\n", GetBusNumber()); printf ("Is Connected:%s\n", (IsConnected() ? "true" : "false")); printf ("- - - - - - - - - - - - - - \n"); } #endif const AudioStreamBasicDescription& GetFileFormat() const { return mFileDescription; } private: AudioUnit mPlayUnit; UInt32 mBusNumber; SInt16 mForkRefNum; AudioUnitInputCallback mInputCallback; AudioStreamBasicDescription mFileDescription; bool mConnected; AudioFileManager* mAudioFileManager; AudioConverterRef mConverter; 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(); void Connect (AudioConverterRef inConverter) { mParentConverter = inConverter; DoConnect(); } // this method should NOT be called by an object of this class // as it is called by the parent's Disconnect() method void Disconnect (); 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; AudioConverterRef mParentConverter; SInt16 mForkRefNum; SInt64 mAudioDataOffset; char* mFileBuffer; int mByteCounter; bool mReadFromFirstBuffer; bool mLockUnsuccessful; bool mIsEngaged; int mNumTimesAskedSinceFinished; public: const UInt32 mChunkSize; SInt64 mFileLength; SInt64 mReadFilePosition; bool mWriteToFirstBuffer; bool mFinishedReadingData; protected: OSStatus Render (AudioBuffer &ioData); OSStatus GetFileData (void** inOutData, UInt32 *inOutDataSize); void DoConnect (); void AfterRender (); public: static OSStatus FileInputProc (void *inRefCon, AudioUnitRenderActionFlags inActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, AudioBuffer *ioData); static OSStatus ACInputProc (AudioConverterRef inAudioConverter, UInt32* outDataSize, void** outData, void* inUserData); }; #endif