Mercurial > sdl-ios-xcode
diff src/cdrom/macosx/AudioFilePlayer.h @ 4190:386181851388 SDL-1.2
Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Sat, 12 Sep 2009 15:06:16 +0000 |
| parents | a1b03ba2fcd0 |
| children | 4c088d2b29eb |
line wrap: on
line diff
--- a/src/cdrom/macosx/AudioFilePlayer.h Sat Sep 12 15:04:32 2009 +0000 +++ b/src/cdrom/macosx/AudioFilePlayer.h Sat Sep 12 15:06:16 2009 +0000 @@ -33,7 +33,7 @@ #include <CoreServices/CoreServices.h> #include <AudioUnit/AudioUnit.h> -#ifdef AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER +#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1050 #include <AudioUnit/AUNTComponent.h> #endif @@ -82,7 +82,7 @@ AudioUnit mPlayUnit; SInt16 mForkRefNum; - AudioUnitInputCallback mInputCallback; + AURenderCallbackStruct mInputCallback; AudioStreamBasicDescription mFileDescription; @@ -114,7 +114,7 @@ as it is called by the parent's Disconnect() method */ void (*Disconnect)(struct S_AudioFileManager *afm); int (*DoConnect)(struct S_AudioFileManager *afm); - OSStatus (*Read)(struct S_AudioFileManager *afm, char *buffer, UInt32 *len); + OSStatus (*Read)(struct S_AudioFileManager *afm, char *buffer, ByteCount *len); const char* (*GetFileBuffer)(struct S_AudioFileManager *afm); const AudioFilePlayer *(*GetParent)(struct S_AudioFileManager *afm); void (*SetPosition)(struct S_AudioFileManager *afm, SInt64 pos); /* seek/rewind in the file */ @@ -148,17 +148,18 @@ int mFinishedReadingData; /*protected:*/ - OSStatus (*Render)(struct S_AudioFileManager *afm, AudioBuffer *ioData); + OSStatus (*Render)(struct S_AudioFileManager *afm, AudioBufferList *ioData); OSStatus (*GetFileData)(struct S_AudioFileManager *afm, void** inOutData, UInt32 *inOutDataSize); void (*AfterRender)(struct S_AudioFileManager *afm); /*public:*/ /*static*/ - OSStatus (*FileInputProc)(void *inRefCon, - AudioUnitRenderActionFlags inActionFlags, + OSStatus (*FileInputProc)(void *inRefCon, + AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, - AudioBuffer *ioData); + UInt32 inNumberFrames, + AudioBufferList *ioData); } AudioFileManager;