sdl-ios-xcode: src/cdrom/macosx/AudioFilePlayer.c annotate

annotate src/cdrom/macosx/AudioFilePlayer.c @ 4158:96ce26f24b01 SDL-1.2

Date: Sun, 7 Sep 2008 15:17:00 +0200 From: c2woody@gmx.net Subject: [SDL] SDL 1.2 doube free/pointer zeroing missing Hello, this is about a crash/debug breakage for the current SDL 1.2 source tree (today's svn checkout, same problem in 1.2.13 and before as far as relevant). In some places memory is free()d but the associated pointer is not zeroed, leading to for example double free()s. For me this happened because SDL_StopEventThread() was executed twice (during restart of the subsystems), once for the close down in SDL_VideoQuit() and once at the startup, right at the beginning of SDL_StartEventLoop(). Thus the code SDL_DestroyMutex(SDL_EventQ.lock); (see SDL_events.c) was called twice and executed the SDL_free(mutex); twice as well, leading to a crash (msvc 64bit for which it was noticed). I've tried to check all other occurrences of SDL_free and similar code in msvc, see the attached patch (udiff against revision 4082). Non-windows only codepaths have neither been checked nor touched. Comments/ideas welcome. Attached patch: NULLifies some pointers after they have been free()d.

author	Sam Lantinga <slouken@libsdl.org>
date	Wed, 12 Nov 2008 17:23:40 +0000
parents	4d66375c2012
children	782fd950bd46 c121d94672cb a1b03ba2fcd0

rev	line source
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	1 /*
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	3 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	4
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	6 modify it under the terms of the GNU Library General Public
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	8 version 2 of the License, or (at your option) any later version.
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	9
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	13 Library General Public License for more details.
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	14
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	15 You should have received a copy of the GNU Library General Public
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	16 License along with this library; if not, write to the Free
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	18
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	19 Sam Lantinga
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	20 slouken@libsdl.org
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	21
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	22 This file based on Apple sample code. We haven't changed the file name,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	23 so if you want to see the original search for it on apple.com/developer
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	24 */
1402 d910939febfa Use consistent identifiers for the various platforms we support. Sam Lantinga <slouken@libsdl.org> parents: 1336 diff changeset	25 #include "SDL_config.h"
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	26
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	27 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	28 AudioFilePlayer.cpp
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	29 */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	30 #include "AudioFilePlayer.h"
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	31
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	32 /*
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	33 void ThrowResult (OSStatus result, const char* str)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	34 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	35 SDL_SetError ("Error: %s %d", str, result);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	36 throw result;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	37 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	38 */
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	39
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	40 #if DEBUG
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	41 static void PrintStreamDesc (AudioStreamBasicDescription *inDesc)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	42 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	43 if (!inDesc) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	44 printf ("Can't print a NULL desc!\n");
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	45 return;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	46 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	47
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	48 printf ("- - - - - - - - - - - - - - - - - - - -\n");
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	49 printf (" Sample Rate:%f\n", inDesc->mSampleRate);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	50 printf (" Format ID:%s\n", (char*)&inDesc->mFormatID);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	51 printf (" Format Flags:%lX\n", inDesc->mFormatFlags);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	52 printf (" Bytes per Packet:%ld\n", inDesc->mBytesPerPacket);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	53 printf (" Frames per Packet:%ld\n", inDesc->mFramesPerPacket);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	54 printf (" Bytes per Frame:%ld\n", inDesc->mBytesPerFrame);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	55 printf (" Channels per Frame:%ld\n", inDesc->mChannelsPerFrame);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	56 printf (" Bits per Channel:%ld\n", inDesc->mBitsPerChannel);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	57 printf ("- - - - - - - - - - - - - - - - - - - -\n");
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	58 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	59 #endif
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	60
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	61
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	62 static int AudioFilePlayer_SetDestination (AudioFilePlayer afp, AudioUnit inDestUnit)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	63 {
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	64 /if (afp->mConnected) throw static_cast<OSStatus>(-1);/ /* can't set dest if already engaged */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	65 if (afp->mConnected)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	66 return 0 ;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	67
1336 3692456e7b0f Use SDL_ prefixed versions of C library functions. Sam Lantinga <slouken@libsdl.org> parents: 1143 diff changeset	68 SDL_memcpy(&afp->mPlayUnit, inDestUnit, sizeof (afp->mPlayUnit));
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	69
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	70 OSStatus result = noErr;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	71
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	72
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	73 /* we can "down" cast a component instance to a component */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	74 ComponentDescription desc;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	75 result = GetComponentInfo ((Component)*inDestUnit, &desc, 0, 0, 0);
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	76 if (result) return 0; /THROW_RESULT("GetComponentInfo")/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	77
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	78 /* we're going to use this to know which convert routine to call
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	79 a v1 audio unit will have a type of 'aunt'
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	80 a v2 audio unit will have one of several different types. */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	81 if (desc.componentType != kAudioUnitComponentType) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	82 result = badComponentInstance;
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	83 /THROW_RESULT("BAD COMPONENT")/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	84 if (result) return 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	85 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	86
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	87 /* Set the input format of the audio unit. */
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	88 result = AudioUnitSetProperty (*inDestUnit,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	89 kAudioUnitProperty_StreamFormat,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	90 kAudioUnitScope_Input,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	91 0,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	92 &afp->mFileDescription,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	93 sizeof (afp->mFileDescription));
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	94 /THROW_RESULT("AudioUnitSetProperty")/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	95 if (result) return 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	96 return 1;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	97 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	98
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	99 static void AudioFilePlayer_SetNotifier(AudioFilePlayer afp, AudioFilePlayNotifier inNotifier, void inRefCon)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	100 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	101 afp->mNotifier = inNotifier;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	102 afp->mRefCon = inRefCon;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	103 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	104
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	105 static int AudioFilePlayer_IsConnected(AudioFilePlayer *afp)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	106 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	107 return afp->mConnected;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	108 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	109
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	110 static AudioUnit AudioFilePlayer_GetDestUnit(AudioFilePlayer *afp)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	111 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	112 return afp->mPlayUnit;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	113 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	114
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	115 static void AudioFilePlayer_Print(AudioFilePlayer *afp)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	116 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	117 #if DEBUG
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	118 printf ("Is Connected:%s\n", (IsConnected() ? "true" : "false"));
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	119 printf ("- - - - - - - - - - - - - - \n");
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	120 #endif
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	121 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	122
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	123 static void AudioFilePlayer_SetStartFrame (AudioFilePlayer *afp, int frame)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	124 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	125 SInt64 position = frame * 2352;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	126
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	127 afp->mStartFrame = frame;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	128 afp->mAudioFileManager->SetPosition (afp->mAudioFileManager, position);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	129 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	130
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	131
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	132 static int AudioFilePlayer_GetCurrentFrame (AudioFilePlayer *afp)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	133 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	134 return afp->mStartFrame + (afp->mAudioFileManager->GetByteCounter(afp->mAudioFileManager) / 2352);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	135 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	136
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	137 static void AudioFilePlayer_SetStopFrame (AudioFilePlayer *afp, int frame)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	138 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	139 SInt64 position = frame * 2352;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	140
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	141 afp->mAudioFileManager->SetEndOfFile (afp->mAudioFileManager, position);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	142 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	143
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	144 void delete_AudioFilePlayer(AudioFilePlayer *afp)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	145 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	146 if (afp != NULL)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	147 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	148 afp->Disconnect(afp);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	149
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	150 if (afp->mAudioFileManager) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	151 delete_AudioFileManager(afp->mAudioFileManager);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	152 afp->mAudioFileManager = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	153 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	154
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	155 if (afp->mForkRefNum) {
1793 4d66375c2012 Date: Mon, 8 May 2006 14:19:30 -0700 Sam Lantinga <slouken@libsdl.org> parents: 1487 diff changeset	156 FSCloseFork (afp->mForkRefNum);
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	157 afp->mForkRefNum = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	158 }
1336 3692456e7b0f Use SDL_ prefixed versions of C library functions. Sam Lantinga <slouken@libsdl.org> parents: 1143 diff changeset	159 SDL_free(afp);
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	160 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	161 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	162
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	163 static int AudioFilePlayer_Connect(AudioFilePlayer *afp)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	164 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	165 #if DEBUG
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	166 printf ("Connect:%x, engaged=%d\n", (int)afp->mPlayUnit, (afp->mConnected ? 1 : 0));
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	167 #endif
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	168 if (!afp->mConnected)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	169 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	170 if (!afp->mAudioFileManager->DoConnect(afp->mAudioFileManager))
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	171 return 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	172
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	173 /* set the render callback for the file data to be supplied to the sound converter AU */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	174 afp->mInputCallback.inputProc = afp->mAudioFileManager->FileInputProc;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	175 afp->mInputCallback.inputProcRefCon = afp->mAudioFileManager;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	176
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	177 OSStatus result = AudioUnitSetProperty (afp->mPlayUnit,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	178 kAudioUnitProperty_SetInputCallback,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	179 kAudioUnitScope_Input,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	180 0,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	181 &afp->mInputCallback,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	182 sizeof(afp->mInputCallback));
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	183 if (result) return 0; /THROW_RESULT("AudioUnitSetProperty")/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	184 afp->mConnected = 1;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	185 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	186
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	187 return 1;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	188 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	189
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	190 /* warning noted, now please go away ;-) */
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	191 /* #warning This should redirect the calling of notification code to some other thread */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	192 static void AudioFilePlayer_DoNotification (AudioFilePlayer *afp, OSStatus inStatus)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	193 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	194 if (afp->mNotifier) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	195 (*afp->mNotifier) (afp->mRefCon, inStatus);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	196 } else {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	197 SDL_SetError ("Notification posted with no notifier in place");
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	198
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	199 if (inStatus == kAudioFilePlay_FileIsFinished)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	200 afp->Disconnect(afp);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	201 else if (inStatus != kAudioFilePlayErr_FilePlayUnderrun)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	202 afp->Disconnect(afp);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	203 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	204 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	205
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	206 static void AudioFilePlayer_Disconnect (AudioFilePlayer *afp)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	207 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	208 #if DEBUG
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	209 printf ("Disconnect:%x,%ld, engaged=%d\n", (int)afp->mPlayUnit, 0, (afp->mConnected ? 1 : 0));
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	210 #endif
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	211 if (afp->mConnected)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	212 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	213 afp->mConnected = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	214
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	215 afp->mInputCallback.inputProc = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	216 afp->mInputCallback.inputProcRefCon = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	217 OSStatus result = AudioUnitSetProperty (afp->mPlayUnit,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	218 kAudioUnitProperty_SetInputCallback,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	219 kAudioUnitScope_Input,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	220 0,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	221 &afp->mInputCallback,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	222 sizeof(afp->mInputCallback));
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	223 if (result)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	224 SDL_SetError ("AudioUnitSetProperty:RemoveInputCallback:%ld", result);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	225
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	226 afp->mAudioFileManager->Disconnect(afp->mAudioFileManager);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	227 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	228 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	229
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	230 typedef struct {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	231 UInt32 offset;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	232 UInt32 blockSize;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	233 } SSNDData;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	234
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	235 static int AudioFilePlayer_OpenFile (AudioFilePlayer afp, const FSRef inRef, SInt64 *outFileDataSize)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	236 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	237 ContainerChunk chunkHeader;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	238 ChunkHeader chunk;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	239 SSNDData ssndData;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	240
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	241 OSErr result;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	242 HFSUniStr255 dfName;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	243 ByteCount actual;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	244 SInt64 offset;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	245
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	246 /* Open the data fork of the input file */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	247 result = FSGetDataForkName(&dfName);
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	248 if (result) return 0; /THROW_RESULT("AudioFilePlayer::OpenFile(): FSGetDataForkName")/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	249
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	250 result = FSOpenFork(inRef, dfName.length, dfName.unicode, fsRdPerm, &afp->mForkRefNum);
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	251 if (result) return 0; /THROW_RESULT("AudioFilePlayer::OpenFile(): FSOpenFork")/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	252
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	253 /* Read the file header, and check if it's indeed an AIFC file */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	254 result = FSReadFork(afp->mForkRefNum, fsAtMark, 0, sizeof(chunkHeader), &chunkHeader, &actual);
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	255 if (result) return 0; /THROW_RESULT("AudioFilePlayer::OpenFile(): FSReadFork")/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	256
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	257 if (chunkHeader.ckID != 'FORM') {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	258 result = -1;
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	259 if (result) return 0; /THROW_RESULT("AudioFilePlayer::OpenFile(): chunk id is not 'FORM'");/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	260 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	261
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	262 if (chunkHeader.formType != 'AIFC') {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	263 result = -1;
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	264 if (result) return 0; /THROW_RESULT("AudioFilePlayer::OpenFile(): file format is not 'AIFC'");/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	265 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	266
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	267 /* Search for the SSND chunk. We ignore all compression etc. information
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	268 in other chunks. Of course that is kind of evil, but for now we are lazy
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	269 and rely on the cdfs to always give us the same fixed format.
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	270 TODO: Parse the COMM chunk we currently skip to fill in mFileDescription.
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	271 */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	272 offset = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	273 do {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	274 result = FSReadFork(afp->mForkRefNum, fsFromMark, offset, sizeof(chunk), &chunk, &actual);
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	275 if (result) return 0; /THROW_RESULT("AudioFilePlayer::OpenFile(): FSReadFork")/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	276
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	277 /* Skip the chunk data */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	278 offset = chunk.ckSize;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	279 } while (chunk.ckID != 'SSND');
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	280
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	281 /* Read the header of the SSND chunk. After this, we are positioned right
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	282 at the start of the audio data. */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	283 result = FSReadFork(afp->mForkRefNum, fsAtMark, 0, sizeof(ssndData), &ssndData, &actual);
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	284 if (result) return 0; /THROW_RESULT("AudioFilePlayer::OpenFile(): FSReadFork")/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	285
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	286 result = FSSetForkPosition(afp->mForkRefNum, fsFromMark, ssndData.offset);
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	287 if (result) return 0; /THROW_RESULT("AudioFilePlayer::OpenFile(): FSSetForkPosition")/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	288
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	289 /* Data size */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	290 *outFileDataSize = chunk.ckSize - ssndData.offset - 8;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	291
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	292 /* File format */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	293 afp->mFileDescription.mSampleRate = 44100;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	294 afp->mFileDescription.mFormatID = kAudioFormatLinearPCM;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	295 afp->mFileDescription.mFormatFlags = kLinearPCMFormatFlagIsPacked \| kLinearPCMFormatFlagIsSignedInteger;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	296 afp->mFileDescription.mBytesPerPacket = 4;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	297 afp->mFileDescription.mFramesPerPacket = 1;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	298 afp->mFileDescription.mBytesPerFrame = 4;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	299 afp->mFileDescription.mChannelsPerFrame = 2;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	300 afp->mFileDescription.mBitsPerChannel = 16;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	301
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	302 return 1;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	303 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	304
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	305 AudioFilePlayer new_AudioFilePlayer (const FSRef inFileRef)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	306 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	307 SInt64 fileDataSize = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	308
1336 3692456e7b0f Use SDL_ prefixed versions of C library functions. Sam Lantinga <slouken@libsdl.org> parents: 1143 diff changeset	309 AudioFilePlayer afp = (AudioFilePlayer ) SDL_malloc(sizeof (AudioFilePlayer));
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	310 if (afp == NULL)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	311 return NULL;
1336 3692456e7b0f Use SDL_ prefixed versions of C library functions. Sam Lantinga <slouken@libsdl.org> parents: 1143 diff changeset	312 SDL_memset(afp, '\0', sizeof (*afp));
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	313
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	314 #define SET_AUDIOFILEPLAYER_METHOD(m) afp->m = AudioFilePlayer_##m
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	315 SET_AUDIOFILEPLAYER_METHOD(SetDestination);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	316 SET_AUDIOFILEPLAYER_METHOD(SetNotifier);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	317 SET_AUDIOFILEPLAYER_METHOD(SetStartFrame);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	318 SET_AUDIOFILEPLAYER_METHOD(GetCurrentFrame);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	319 SET_AUDIOFILEPLAYER_METHOD(SetStopFrame);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	320 SET_AUDIOFILEPLAYER_METHOD(Connect);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	321 SET_AUDIOFILEPLAYER_METHOD(Disconnect);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	322 SET_AUDIOFILEPLAYER_METHOD(DoNotification);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	323 SET_AUDIOFILEPLAYER_METHOD(IsConnected);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	324 SET_AUDIOFILEPLAYER_METHOD(GetDestUnit);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	325 SET_AUDIOFILEPLAYER_METHOD(Print);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	326 SET_AUDIOFILEPLAYER_METHOD(OpenFile);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	327 #undef SET_AUDIOFILEPLAYER_METHOD
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	328
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	329 if (!afp->OpenFile (afp, inFileRef, &fileDataSize))
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	330 {
1336 3692456e7b0f Use SDL_ prefixed versions of C library functions. Sam Lantinga <slouken@libsdl.org> parents: 1143 diff changeset	331 SDL_free(afp);
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	332 return NULL;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	333 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	334
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	335 /* we want about 4 seconds worth of data for the buffer */
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	336 int bytesPerSecond = (UInt32) (4 * afp->mFileDescription.mSampleRate * afp->mFileDescription.mBytesPerFrame);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	337
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	338 #if DEBUG
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	339 printf("File format:\n");
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	340 PrintStreamDesc (&afp->mFileDescription);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	341 #endif
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	342
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	343 afp->mAudioFileManager = new_AudioFileManager(afp, afp->mForkRefNum,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	344 fileDataSize,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	345 bytesPerSecond);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	346 if (afp->mAudioFileManager == NULL)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	347 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	348 delete_AudioFilePlayer(afp);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	349 return NULL;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	350 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	351
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	352 return afp;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	353 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	354

Mercurial > sdl-ios-xcode

annotate src/cdrom/macosx/AudioFilePlayer.c @ 4158:96ce26f24b01 SDL-1.2