Files
@ r5154:05517a0f26d2
Branch filter:
Location: cpp/openttd-patchpack/source/sound/cocoa_s.c - annotation
r5154:05517a0f26d2
4.6 KiB
text/x-c
(svn r7249) -Fix (r7248): Missed a free()...
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 | r2743:0c442dfd1461 r2743:0c442dfd1461 r2953:a59e10678800 r2953:a59e10678800 r2953:a59e10678800 r2953:a59e10678800 r2953:a59e10678800 r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2953:a59e10678800 r2953:a59e10678800 r2953:a59e10678800 r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2953:a59e10678800 r2736:03cd6438b59f r2977:6a8a4298e856 r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2837:f20515f8bc38 r2837:f20515f8bc38 r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r4077:259c4c4aacad r2736:03cd6438b59f r4077:259c4c4aacad r2736:03cd6438b59f r2736:03cd6438b59f r4077:259c4c4aacad r2736:03cd6438b59f r4077:259c4c4aacad r2736:03cd6438b59f r4077:259c4c4aacad r2736:03cd6438b59f r4077:259c4c4aacad r2736:03cd6438b59f r2736:03cd6438b59f r4077:259c4c4aacad r2953:a59e10678800 r4077:259c4c4aacad r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r4077:259c4c4aacad r2736:03cd6438b59f r4077:259c4c4aacad r2736:03cd6438b59f r2736:03cd6438b59f r4077:259c4c4aacad r2736:03cd6438b59f r4077:259c4c4aacad r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r4077:259c4c4aacad r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2953:a59e10678800 r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f | /* $Id$ */
/*****************************************************************************
* Cocoa sound driver *
* Known things left to do: *
* - Might need to do endian checking for it to work on both ppc and x86 *
*****************************************************************************/
#ifdef WITH_COCOA
#include <AudioUnit/AudioUnit.h>
/* Name conflict */
#define Rect OTTDRect
#define Point OTTDPoint
#define WindowClass OTTDWindowClass
/* Defined in stdbool.h */
#ifndef __cplusplus
# ifndef __BEOS__
# undef bool
# undef false
# undef true
# endif
#endif
#include "../stdafx.h"
#include "../openttd.h"
#include "../debug.h"
#include "../driver.h"
#include "../mixer.h"
#include "../sdl.h"
#include "cocoa_s.h"
#undef WindowClass
#undef Point
#undef Rect
static AudioUnit _outputAudioUnit;
/* The CoreAudio callback */
static OSStatus audioCallback(void *inRefCon, AudioUnitRenderActionFlags inActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, AudioBuffer *ioData)
{
MxMixSamples(ioData->mData, ioData->mDataByteSize / 4);
return noErr;
}
static const char *CocoaSoundStart(const char * const *parm)
{
Component comp;
ComponentDescription desc;
struct AudioUnitInputCallback callback;
AudioStreamBasicDescription requestedDesc;
DEBUG(driver, 1)("cocoa_s: CocoaSoundStart");
/* Setup a AudioStreamBasicDescription with the requested format */
requestedDesc.mFormatID = kAudioFormatLinearPCM;
requestedDesc.mFormatFlags = kLinearPCMFormatFlagIsPacked;
requestedDesc.mChannelsPerFrame = 2;
requestedDesc.mSampleRate = GetDriverParamInt(parm, "hz", 11025);
requestedDesc.mBitsPerChannel = 16;
requestedDesc.mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger;
#ifdef TTD_BIG_ENDIAN
requestedDesc.mFormatFlags |= kLinearPCMFormatFlagIsBigEndian;
#endif
requestedDesc.mFramesPerPacket = 1;
requestedDesc.mBytesPerFrame = requestedDesc.mBitsPerChannel * requestedDesc.mChannelsPerFrame / 8;
requestedDesc.mBytesPerPacket = requestedDesc.mBytesPerFrame * requestedDesc.mFramesPerPacket;
/* Locate the default output audio unit */
desc.componentType = kAudioUnitComponentType;
desc.componentSubType = kAudioUnitSubType_Output;
desc.componentManufacturer = kAudioUnitID_DefaultOutput;
desc.componentFlags = 0;
desc.componentFlagsMask = 0;
comp = FindNextComponent (NULL, &desc);
if (comp == NULL) {
return "cocoa_s: Failed to start CoreAudio: FindNextComponent returned NULL";
}
/* Open & initialize the default output audio unit */
if (OpenAComponent(comp, &_outputAudioUnit) != noErr) {
return "cocoa_s: Failed to start CoreAudio: OpenAComponent";
}
if (AudioUnitInitialize(_outputAudioUnit) != noErr) {
return "cocoa_s: Failed to start CoreAudio: AudioUnitInitialize";
}
/* Set the input format of the audio unit. */
if (AudioUnitSetProperty(_outputAudioUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, &requestedDesc, sizeof(requestedDesc)) != noErr) {
return "cocoa_s: Failed to start CoreAudio: AudioUnitSetProperty (kAudioUnitProperty_StreamFormat)";
}
/* Set the audio callback */
callback.inputProc = audioCallback;
callback.inputProcRefCon = NULL;
if (AudioUnitSetProperty(_outputAudioUnit, kAudioUnitProperty_SetInputCallback, kAudioUnitScope_Input, 0, &callback, sizeof(callback)) != noErr) {
return "cocoa_s: Failed to start CoreAudio: AudioUnitSetProperty (kAudioUnitProperty_SetInputCallback)";
}
/* Finally, start processing of the audio unit */
if (AudioOutputUnitStart(_outputAudioUnit) != noErr) {
return "cocoa_s: Failed to start CoreAudio: AudioOutputUnitStart";
}
/* We're running! */
return NULL;
}
static void CocoaSoundStop(void)
{
struct AudioUnitInputCallback callback;
DEBUG(driver, 1)("cocoa_s: CocoaSoundStop");
/* stop processing the audio unit */
if (AudioOutputUnitStop(_outputAudioUnit) != noErr) {
DEBUG(driver, 1)("cocoa_s: Core_CloseAudio: AudioOutputUnitStop failed");
return;
}
/* Remove the input callback */
callback.inputProc = 0;
callback.inputProcRefCon = 0;
if (AudioUnitSetProperty(_outputAudioUnit, kAudioUnitProperty_SetInputCallback, kAudioUnitScope_Input, 0, &callback, sizeof(callback)) != noErr) {
DEBUG(driver, 1)("cocoa_s: Core_CloseAudio: AudioUnitSetProperty (kAudioUnitProperty_SetInputCallback) failed");
return;
}
if (CloseComponent(_outputAudioUnit) != noErr) {
DEBUG(driver, 1)("cocoa_s: Core_CloseAudio: CloseComponent failed");
return;
}
}
const HalSoundDriver _cocoa_sound_driver = {
CocoaSoundStart,
CocoaSoundStop,
};
#endif /* WITH_COCOA */
|