diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-04 15:11:15 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-04 15:11:15 -0400 |
commit | 4178db5f632721eefb58c42d684fc10f8f4fb9da (patch) | |
tree | a549de293b1a4dd6b5c3f5070f44f95e5e829f46 /libs/appleutility | |
parent | 4dc63966f0872efe768dad61eb9b8785d06b92d1 (diff) |
globally remove all trailing whitespace from .cpp and .hpp files missed by previous commit
Diffstat (limited to 'libs/appleutility')
-rw-r--r-- | libs/appleutility/AUOutputBL.cpp | 12 | ||||
-rw-r--r-- | libs/appleutility/AUParamInfo.cpp | 14 | ||||
-rw-r--r-- | libs/appleutility/CAAUParameter.cpp | 40 | ||||
-rw-r--r-- | libs/appleutility/CAAudioChannelLayoutObject.cpp | 4 | ||||
-rw-r--r-- | libs/appleutility/CAAudioFile.cpp | 14 | ||||
-rw-r--r-- | libs/appleutility/CAAudioUnit.cpp | 138 | ||||
-rw-r--r-- | libs/appleutility/CABufferList.cpp | 4 | ||||
-rw-r--r-- | libs/appleutility/CAComponent.cpp | 38 | ||||
-rw-r--r-- | libs/appleutility/CAComponentDescription.cpp | 8 | ||||
-rw-r--r-- | libs/appleutility/CAStreamBasicDescription.cpp | 24 |
10 files changed, 148 insertions, 148 deletions
diff --git a/libs/appleutility/AUOutputBL.cpp b/libs/appleutility/AUOutputBL.cpp index 8509f46288..026989afc4 100644 --- a/libs/appleutility/AUOutputBL.cpp +++ b/libs/appleutility/AUOutputBL.cpp @@ -55,7 +55,7 @@ struct AudioBuffer }; */ -AUOutputBL::AUOutputBL (const CAStreamBasicDescription &inDesc, UInt32 inDefaultNumFrames) +AUOutputBL::AUOutputBL (const CAStreamBasicDescription &inDesc, UInt32 inDefaultNumFrames) : mFormat (inDesc), mBufferMemory(NULL), mBufferList (NULL), @@ -76,7 +76,7 @@ AUOutputBL::~AUOutputBL() delete [] mBufferList; } -void AUOutputBL::Prepare (UInt32 inNumFrames, bool inWantNullBufferIfAllocated) +void AUOutputBL::Prepare (UInt32 inNumFrames, bool inWantNullBufferIfAllocated) { UInt32 channelsPerBuffer = mFormat.IsInterleaved() ? mFormat.NumberChannels() : 1; @@ -111,11 +111,11 @@ void AUOutputBL::Prepare (UInt32 inNumFrames, bool inWantNullBufferIfAllocated) void AUOutputBL::Allocate (UInt32 inNumFrames) { - if (inNumFrames) + if (inNumFrames) { UInt32 nBytes = mFormat.FramesToBytes (inNumFrames); - if (nBytes <= AllocatedBytes()) + if (nBytes <= AllocatedBytes()) return; // align successive buffers for Altivec and to take alternating @@ -134,8 +134,8 @@ void AUOutputBL::Allocate (UInt32 inNumFrames) delete[] oldMemory; mFrames = inNumFrames; - } - else + } + else { if (mBufferMemory) { delete [] mBufferMemory; diff --git a/libs/appleutility/AUParamInfo.cpp b/libs/appleutility/AUParamInfo.cpp index 9b0046166f..15cee0fa34 100644 --- a/libs/appleutility/AUParamInfo.cpp +++ b/libs/appleutility/AUParamInfo.cpp @@ -42,8 +42,8 @@ #include "AUParamInfo.h" #include "CAXException.h" -AUParamInfo::AUParamInfo (AudioUnit inAU, - bool inIncludeExpert, +AUParamInfo::AUParamInfo (AudioUnit inAU, + bool inIncludeExpert, bool inIncludeReadOnly, AudioUnitScope inScope, AudioUnitElement inElement) @@ -73,13 +73,13 @@ AUParamInfo::AUParamInfo (AudioUnit inAU, } ParameterMap params; - for (int i = 0; i < nparams; ++i) + for (int i = 0; i < nparams; ++i) { CAAUParameter auvp (mAU, paramList[i], mScope, mElement); // took out only using global scope in CAAUParameter creation const AudioUnitParameterInfo ¶mInfo = auvp.ParamInfo(); // don't include if parameter can't be read or written - if (!(paramInfo.flags & kAudioUnitParameterFlag_IsWritable) + if (!(paramInfo.flags & kAudioUnitParameterFlag_IsWritable) && !(paramInfo.flags & kAudioUnitParameterFlag_IsReadable)) continue; @@ -88,7 +88,7 @@ AUParamInfo::AUParamInfo (AudioUnit inAU, continue; // only include if read only params are wanted - if (!(paramInfo.flags & kAudioUnitParameterFlag_IsWritable) + if (!(paramInfo.flags & kAudioUnitParameterFlag_IsWritable) && (paramInfo.flags & kAudioUnitParameterFlag_IsReadable)) { if (!inIncludeReadOnly) @@ -113,9 +113,9 @@ AUParamInfo::~AUParamInfo() } UInt32 AUParamInfo::NumParamsForClump (UInt32 inClump) const -{ +{ ParameterMap::const_iterator it = mParams.find(inClump); - if (it != mParams.end()) + if (it != mParams.end()) return (*it).second.size(); return 0; } diff --git a/libs/appleutility/CAAUParameter.cpp b/libs/appleutility/CAAUParameter.cpp index b99b6ab749..1050ecfe1b 100644 --- a/libs/appleutility/CAAUParameter.cpp +++ b/libs/appleutility/CAAUParameter.cpp @@ -42,7 +42,7 @@ #include "CAAUParameter.h" -CAAUParameter::CAAUParameter() +CAAUParameter::CAAUParameter() { memset(this, 0, sizeof(CAAUParameter)); } @@ -59,7 +59,7 @@ CAAUParameter::CAAUParameter (AudioUnitParameter &inParam) Init (inParam.mAudioUnit, inParam.mParameterID, inParam.mScope, inParam.mElement); } -CAAUParameter::CAAUParameter(const CAAUParameter &a) +CAAUParameter::CAAUParameter(const CAAUParameter &a) { memset(this, 0, sizeof(CAAUParameter)); *this = a; @@ -101,7 +101,7 @@ void CAAUParameter::Init (AudioUnit au, AudioUnitParameterID param, AudioUnitSc memset(&mParamInfo, 0, sizeof(mParamInfo)); if (mParamInfo.flags & kAudioUnitParameterFlag_HasCFNameString) { mParamName = mParamInfo.cfNameString; - if (!(mParamInfo.flags & kAudioUnitParameterFlag_CFNameRelease)) + if (!(mParamInfo.flags & kAudioUnitParameterFlag_CFNameRelease)) CFRetain (mParamName); } else mParamName = CFStringCreateWithCString(NULL, mParamInfo.name, kCFStringEncodingUTF8); @@ -173,11 +173,11 @@ void CAAUParameter::Init (AudioUnit au, AudioUnitParameterID param, AudioUnitSc case kAudioUnitParameterUnit_Indexed: { propertySize = sizeof(mNamedParams); - err = AudioUnitGetProperty (au, + err = AudioUnitGetProperty (au, kAudioUnitProperty_ParameterValueStrings, - scope, - param, - &mNamedParams, + scope, + param, + &mNamedParams, &propertySize); if (!err && mNamedParams) { mNumIndexedParams = CFArrayGetCount(mNamedParams); @@ -215,7 +215,7 @@ void CAAUParameter::Init (AudioUnit au, AudioUnitParameterID param, AudioUnitSc Float32 CAAUParameter::GetValue() const { Float32 value = 0.; - //OSStatus err = + //OSStatus err = AudioUnitGetParameter(mAudioUnit, mParameterID, mScope, mElement, &value); return value; } @@ -232,7 +232,7 @@ CFStringRef CAAUParameter::GetStringFromValueCopy(const Float32 *value) const return str; } } - else if (ValuesHaveStrings()) + else if (ValuesHaveStrings()) { AudioUnitParameterStringFromValue stringValue; stringValue.inParamID = mParameterID; @@ -240,11 +240,11 @@ CFStringRef CAAUParameter::GetStringFromValueCopy(const Float32 *value) const stringValue.outString = NULL; UInt32 propertySize = sizeof(stringValue); - OSStatus err = AudioUnitGetProperty (mAudioUnit, + OSStatus err = AudioUnitGetProperty (mAudioUnit, kAudioUnitProperty_ParameterStringFromValue, - mScope, - mParameterID, - &stringValue, + mScope, + mParameterID, + &stringValue, &propertySize); if (err == noErr && stringValue.outString != NULL) @@ -259,18 +259,18 @@ CFStringRef CAAUParameter::GetStringFromValueCopy(const Float32 *value) const Float32 CAAUParameter::GetValueFromString(CFStringRef str) const { - if (ValuesHaveStrings()) + if (ValuesHaveStrings()) { AudioUnitParameterValueFromString valueString; valueString.inParamID = mParameterID; valueString.inString = str; UInt32 propertySize = sizeof(valueString); - OSStatus err = AudioUnitGetProperty (mAudioUnit, + OSStatus err = AudioUnitGetProperty (mAudioUnit, kAudioUnitProperty_ParameterValueFromString, - mScope, - mParameterID, - &valueString, + mScope, + mParameterID, + &valueString, &propertySize); if (err == noErr) { @@ -285,7 +285,7 @@ Float32 CAAUParameter::GetValueFromString(CFStringRef str) const return paramValue; } -void CAAUParameter::SetValue( AUParameterListenerRef inListener, +void CAAUParameter::SetValue( AUParameterListenerRef inListener, void * inObject, Float32 inValue) const { @@ -295,7 +295,7 @@ void CAAUParameter::SetValue( AUParameterListenerRef inListener, valueToSet = mParamInfo.maxValue; if (valueToSet < mParamInfo.minValue) valueToSet = mParamInfo.minValue; - + AUParameterSet(inListener, inObject, this, valueToSet, 0); } diff --git a/libs/appleutility/CAAudioChannelLayoutObject.cpp b/libs/appleutility/CAAudioChannelLayoutObject.cpp index 8c4030048d..64a452d6b6 100644 --- a/libs/appleutility/CAAudioChannelLayoutObject.cpp +++ b/libs/appleutility/CAAudioChannelLayoutObject.cpp @@ -37,7 +37,7 @@ */ /*============================================================================= CAAudioChannelLayoutObject.cpp - + =============================================================================*/ #include "CAAudioChannelLayout.h" @@ -69,7 +69,7 @@ CAAudioChannelLayout::CAAudioChannelLayout (UInt32 inNumberChannels, bool inChoo layout->mNumberChannelDescriptions = inNumberChannels; - switch (inNumberChannels) + switch (inNumberChannels) { case 1: layout->mChannelLayoutTag = kAudioChannelLayoutTag_Mono; diff --git a/libs/appleutility/CAAudioFile.cpp b/libs/appleutility/CAAudioFile.cpp index e1e39b0ec9..1e97de6211 100644 --- a/libs/appleutility/CAAudioFile.cpp +++ b/libs/appleutility/CAAudioFile.cpp @@ -243,7 +243,7 @@ void CAAudioFile::CreateNew(const FSRef &parentDir, CFStringRef filename, AudioF // _______________________________________________________________________________________ // -// called to create the file -- or update its format/channel layout/properties based on an encoder +// called to create the file -- or update its format/channel layout/properties based on an encoder // setting change void CAAudioFile::FileFormatChanged(const FSRef *parentDir, CFStringRef filename, AudioFileTypeID filetype) { @@ -356,7 +356,7 @@ void CAAudioFile::FileFormatChanged(const FSRef *parentDir, CFStringRef filename #if VERBOSE_CHANNELMAP printf("writing file's channel layout: %s\n", CAChannelLayouts::ConstantToString(mFileChannelLayout.Tag())); #endif - err = AudioFileSetProperty(mAudioFile, kAudioFilePropertyChannelLayout, + err = AudioFileSetProperty(mAudioFile, kAudioFilePropertyChannelLayout, mFileChannelLayout.Size(), &mFileChannelLayout.Layout()); if (err) CAXException::Warning("could not set the file's channel layout", err); @@ -378,7 +378,7 @@ void CAAudioFile::InitFileMaxPacketSize() { LOG_FUNCTION("CAAudioFile::InitFileMaxPacketSize", "%p", this); UInt32 propertySize = sizeof(UInt32); - OSStatus err = AudioFileGetProperty(mAudioFile, kAudioFilePropertyMaximumPacketSize, + OSStatus err = AudioFileGetProperty(mAudioFile, kAudioFilePropertyMaximumPacketSize, &propertySize, &mFileMaxPacketSize); if (err) { // workaround for 3361377: not all file formats' maximum packet sizes are supported @@ -657,7 +657,7 @@ void CAAudioFile::UpdateClientMaxPacketSize() LOG_FUNCTION("CAAudioFile::UpdateClientMaxPacketSize", "%p", this); mFrame0Offset = 0; if (mConverter != NULL) { - AudioConverterPropertyID property = (mMode == kReading) ? + AudioConverterPropertyID property = (mMode == kReading) ? kAudioConverterPropertyMaximumOutputPacketSize : kAudioConverterPropertyMaximumInputPacketSize; @@ -1078,14 +1078,14 @@ void CAAudioFile::Write(UInt32 numPackets, const AudioBufferList *data) WritePacketsFromCallback(WriteInputProc, this); } else { StartTiming(this, write); - XThrowIfError(AudioFileWritePackets(mAudioFile, mUseCache, data->mBuffers[0].mDataByteSize, + XThrowIfError(AudioFileWritePackets(mAudioFile, mUseCache, data->mBuffers[0].mDataByteSize, NULL, mPacketMark, &numPackets, data->mBuffers[0].mData), "write audio file"); ElapsedTime(this, write, mTicksInIO); #if VERBOSE_IO printf("CAAudioFile::WritePackets: wrote %ld packets at %qd, %ld bytes\n", numPackets, mPacketMark, data->mBuffers[0].mDataByteSize); #endif - //mNumberPackets = + //mNumberPackets = mPacketMark += numPackets; if (mFileDataFormat.mFramesPerPacket > 0) mFrameMark += numPackets * mFileDataFormat.mFramesPerPacket; @@ -1201,7 +1201,7 @@ void CAAudioFile::WritePacketsFromCallback( mInConverter = true; #endif StartTiming(this, fill); - OSStatus err = AudioConverterFillComplexBuffer(mConverter, inInputDataProc, inInputDataProcUserData, + OSStatus err = AudioConverterFillComplexBuffer(mConverter, inInputDataProc, inInputDataProcUserData, &numEncodedPackets, &mIOBufferList, mPacketDescs); ElapsedTime(this, fill, mTicksInConverter); #if CAAUDIOFILE_PROFILE diff --git a/libs/appleutility/CAAudioUnit.cpp b/libs/appleutility/CAAudioUnit.cpp index 54c4ecef2f..853cfc124c 100644 --- a/libs/appleutility/CAAudioUnit.cpp +++ b/libs/appleutility/CAAudioUnit.cpp @@ -37,7 +37,7 @@ */ /*============================================================================= CAAudioUnit.cpp - + =============================================================================*/ #include "CAAudioUnit.h" @@ -65,15 +65,15 @@ class CAAudioUnit::AUState : public CAReferenceCounted { public: AUState (Component inComp) : mUnit(0), mNode (0) - { - OSStatus result = ::OpenAComponent (inComp, &mUnit); + { + OSStatus result = ::OpenAComponent (inComp, &mUnit); if (result) throw result; Init(); } AUState (const AUNode &inNode, const AudioUnit& inUnit) - : mUnit (inUnit), mNode (inNode) + : mUnit (inUnit), mNode (inNode) { Init(); } @@ -87,7 +87,7 @@ public: Float32 &outValue) const { if (mGetParamProc != NULL) { - return reinterpret_cast<AudioUnitGetParameterProc>(mGetParamProc) (mConnInstanceStorage, + return reinterpret_cast<AudioUnitGetParameterProc>(mGetParamProc) (mConnInstanceStorage, inID, scope, element, &outValue); } return AudioUnitGetParameter(mUnit, inID, scope, element, &outValue); @@ -97,7 +97,7 @@ public: Float32 value, UInt32 bufferOffsetFrames) { if (mSetParamProc != NULL) { - return reinterpret_cast<AudioUnitSetParameterProc>(mSetParamProc) (mConnInstanceStorage, + return reinterpret_cast<AudioUnitSetParameterProc>(mSetParamProc) (mConnInstanceStorage, inID, scope, element, value, bufferOffsetFrames); } return AudioUnitSetParameter(mUnit, inID, scope, element, value, bufferOffsetFrames); @@ -110,7 +110,7 @@ public: AudioBufferList * ioData) { if (mRenderProc != NULL) { - return reinterpret_cast<AudioUnitRenderProc>(mRenderProc) (mConnInstanceStorage, + return reinterpret_cast<AudioUnitRenderProc>(mRenderProc) (mConnInstanceStorage, ioActionFlags, inTimeStamp, inOutputBusNumber, inNumberFrames, ioData); } return AudioUnitRender(mUnit, ioActionFlags, inTimeStamp, inOutputBusNumber, inNumberFrames, ioData); @@ -123,7 +123,7 @@ public: { #if !TARGET_OS_WIN32 if (mMIDIEventProc != NULL) { - return reinterpret_cast<MusicDeviceMIDIEventProc>(mMIDIEventProc) (mConnInstanceStorage, + return reinterpret_cast<MusicDeviceMIDIEventProc>(mMIDIEventProc) (mConnInstanceStorage, inStatus, inData1, inData2, inOffsetSampleFrame); } return MusicDeviceMIDIEvent (mUnit, inStatus, inData1, inData2, inOffsetSampleFrame); @@ -157,7 +157,7 @@ public: private: // get the fast dispatch pointers - void Init() + void Init() { UInt32 size = sizeof(AudioUnitRenderProc); if (AudioUnitGetProperty(mUnit, kAudioUnitProperty_FastDispatch, @@ -192,7 +192,7 @@ private: // get the compiler to tell us when we do a bad thing!!! AUState () {} AUState (const AUState& other) : CAReferenceCounted (other) {} - AUState& operator= (const AUState&) { return *this; } + AUState& operator= (const AUState&) { return *this; } }; @@ -208,7 +208,7 @@ CAAudioUnit::AUState::~AUState () OSStatus CAAudioUnit::Open (const CAComponent& inComp, CAAudioUnit &outUnit) { try { - outUnit = inComp; + outUnit = inComp; return noErr; } catch (OSStatus res) { return res; @@ -229,7 +229,7 @@ CAAudioUnit::CAAudioUnit (const CAComponent& inComp) } CAAudioUnit::CAAudioUnit (const AUNode &inNode, const AudioUnit& inUnit) - : mComp (inUnit), mDataPtr(new AUState (inNode, inUnit)) + : mComp (inUnit), mDataPtr(new AUState (inNode, inUnit)) { } @@ -272,24 +272,24 @@ bool CAAudioUnit::operator== (const AudioUnit& y) const #pragma mark __State Management -bool CAAudioUnit::IsValid () const -{ - return mDataPtr ? mDataPtr->mUnit != 0 : false; +bool CAAudioUnit::IsValid () const +{ + return mDataPtr ? mDataPtr->mUnit != 0 : false; } -AudioUnit CAAudioUnit::AU() const -{ - return mDataPtr ? mDataPtr->mUnit : 0; +AudioUnit CAAudioUnit::AU() const +{ + return mDataPtr ? mDataPtr->mUnit : 0; } AUNode CAAudioUnit::GetAUNode () const { - return mDataPtr ? mDataPtr->mNode : 0; + return mDataPtr ? mDataPtr->mNode : 0; } #pragma mark __Format Handling -bool CAAudioUnit::CanDo ( int inChannelsIn, +bool CAAudioUnit::CanDo ( int inChannelsIn, int inChannelsOut) const { // this is the default assumption of an audio effect unit @@ -303,14 +303,14 @@ bool CAAudioUnit::CanDo ( int inChannelsIn, // if this property is NOT implemented an FX unit // is expected to deal with same channel valance in and out - if (result) + if (result) { if ((Comp().Desc().IsEffect() && (inChannelsIn == inChannelsOut)) || (Comp().Desc().IsOffline() && (inChannelsIn == inChannelsOut))) { return true; } - else + else { // the au should either really tell us about this // or we will assume the worst @@ -342,9 +342,9 @@ int CAAudioUnit::GetChannelInfo (AUChannelInfo** chaninfo, UInt32& cnt) // if this property is NOT implemented an FX unit // is expected to deal with same channel valance in and out - if (result) + if (result) { - if (Comp().Desc().IsEffect()) + if (Comp().Desc().IsEffect()) { return 1; } @@ -383,7 +383,7 @@ int CAAudioUnit::GetChannelInfo (AUChannelInfo** chaninfo, UInt32& cnt) } return 0; } - else + else { // the au should either really tell us about this // or we will assume the worst @@ -403,7 +403,7 @@ int CAAudioUnit::GetChannelInfo (AUChannelInfo** chaninfo, UInt32& cnt) } -bool CAAudioUnit::ValidateChannelPair (int inChannelsIn, +bool CAAudioUnit::ValidateChannelPair (int inChannelsIn, int inChannelsOut, const AUChannelInfo * info, UInt32 numChanInfo) const @@ -415,8 +415,8 @@ bool CAAudioUnit::ValidateChannelPair (int inChannelsIn, -1 wild card: -1,-1 any num channels as long as same channels on in and out -1,-2 any num channels channels on in and out - special meaning --2+ indicates total num channs AU can handle - - elements configurable to any num channels, +-2+ indicates total num channs AU can handle + - elements configurable to any num channels, - element count in scope must be writable */ @@ -433,7 +433,7 @@ bool CAAudioUnit::ValidateChannelPair (int inChannelsIn, } } else if ((info[i].inChannels == -1 && info[i].outChannels == -2) - || (info[i].inChannels == -2 && info[i].outChannels == -1)) + || (info[i].inChannels == -2 && info[i].outChannels == -1)) { return true; } @@ -445,7 +445,7 @@ bool CAAudioUnit::ValidateChannelPair (int inChannelsIn, IsElementCountWritable (kAudioUnitScope_Input, inWrite); if (inWrite && outWrite) { if ((inChannelsOut <= abs(info[i].outChannels)) - && (inChannelsIn <= abs(info[i].inChannels))) + && (inChannelsIn <= abs(info[i].inChannels))) { return true; } @@ -455,12 +455,12 @@ bool CAAudioUnit::ValidateChannelPair (int inChannelsIn, // special meaning on input, specific num on output else if (info[i].inChannels < 0) { - if (info[i].outChannels == inChannelsOut) + if (info[i].outChannels == inChannelsOut) { // can do any in channels if (info[i].inChannels == -1) { return true; - } + } // total chans on input else { bool inWrite = false; @@ -474,12 +474,12 @@ bool CAAudioUnit::ValidateChannelPair (int inChannelsIn, // special meaning on output, specific num on input else if (info[i].outChannels < 0) { - if (info[i].inChannels == inChannelsIn) + if (info[i].inChannels == inChannelsIn) { // can do any out channels if (info[i].outChannels == -1) { return true; - } + } // total chans on output else { bool outWrite = false; @@ -494,9 +494,9 @@ bool CAAudioUnit::ValidateChannelPair (int inChannelsIn, // both chans in struct >= 0 - thus has to explicitly match else if ((info[i].inChannels == inChannelsIn) && (info[i].outChannels == inChannelsOut)) { return true; - } + } - // now check to see if a wild card on the args (inChannelsIn or inChannelsOut chans is zero) is found + // now check to see if a wild card on the args (inChannelsIn or inChannelsOut chans is zero) is found // tells us to match just one side of the scopes else if (inChannelsIn == 0) { if (info[i].outChannels == inChannelsOut) { @@ -521,9 +521,9 @@ bool CheckDynCount (SInt32 inTotalChans, const CAAUChanHelper &inHelper) return (totalChans <= inTotalChans); } -bool CAAudioUnit::CheckOneSide (const CAAUChanHelper &inHelper, - bool checkOutput, - const AUChannelInfo *info, +bool CAAudioUnit::CheckOneSide (const CAAUChanHelper &inHelper, + bool checkOutput, + const AUChannelInfo *info, UInt32 numInfo) const { // now we can use the wildcard option (see above impl) to see if this matches @@ -546,7 +546,7 @@ bool CAAudioUnit::CheckOneSide (const CAAUChanHelper &inHelper, return true; } -bool CAAudioUnit::CanDo (const CAAUChanHelper &inputs, +bool CAAudioUnit::CanDo (const CAAUChanHelper &inputs, const CAAUChanHelper &outputs) const { @@ -564,7 +564,7 @@ bool CAAudioUnit::CanDo (const CAAUChanHelper &inputs, // (1) special cases (effects and sources (generators and instruments) only) UInt32 dataSize = 0; if (GetPropertyInfo (kAudioUnitProperty_SupportedNumChannels, - kAudioUnitScope_Global, 0, &dataSize, NULL) != noErr) + kAudioUnitScope_Global, 0, &dataSize, NULL) != noErr) { if (Comp().Desc().IsEffect() || Comp().Desc().IsOffline()) { UInt32 numChan = outputs.mNumEls > 0 ? outputs.mChans[0] : inputs.mChans[0]; @@ -599,8 +599,8 @@ bool CAAudioUnit::CanDo (const CAAUChanHelper &inputs, if (GetProperty (kAudioUnitProperty_SupportedNumChannels, kAudioUnitScope_Global, 0, info.mChanInfo, &dataSize) != noErr) - { - return false; + { + return false; } int numInfo = dataSize / sizeof(AUChannelInfo); @@ -628,7 +628,7 @@ bool CAAudioUnit::CanDo (const CAAUChanHelper &inputs, } // (4) - not a dynamic AU, has ins and outs, and has channel constraints so we test every possible pairing - for (unsigned int in = 0; in < inputs.mNumEls; ++in) + for (unsigned int in = 0; in < inputs.mNumEls; ++in) { bool testInAlready = false; for (unsigned int i = 0; i < in; ++i) { @@ -683,7 +683,7 @@ bool CAAudioUnit::GetChannelLayouts (AudioUnitScope inScope, AudioUnitElement inEl, ChannelTagVector &outChannelVector) const { - if (HasChannelLayouts (inScope, inEl) == false) return false; + if (HasChannelLayouts (inScope, inEl) == false) return false; UInt32 dataSize; OSStatus result = AudioUnitGetPropertyInfo (AU(), @@ -721,7 +721,7 @@ home: return canDo; } -bool CAAudioUnit::HasChannelLayouts (AudioUnitScope inScope, +bool CAAudioUnit::HasChannelLayouts (AudioUnitScope inScope, AudioUnitElement inEl) const { OSStatus result = AudioUnitGetPropertyInfo (AU(), @@ -763,7 +763,7 @@ OSStatus CAAudioUnit::SetChannelLayout (AudioUnitScope inScope, return result; } -OSStatus CAAudioUnit::SetChannelLayout (AudioUnitScope inScope, +OSStatus CAAudioUnit::SetChannelLayout (AudioUnitScope inScope, AudioUnitElement inEl, AudioChannelLayout &inLayout, UInt32 inSize) @@ -789,7 +789,7 @@ OSStatus CAAudioUnit::GetFormat (AudioUnitScope inScope, { UInt32 dataSize = sizeof (AudioStreamBasicDescription); return AudioUnitGetProperty (AU(), kAudioUnitProperty_StreamFormat, - inScope, inEl, + inScope, inEl, &outFormat, &dataSize); } @@ -799,7 +799,7 @@ OSStatus CAAudioUnit::SetFormat (AudioUnitScope inScope, { return AudioUnitSetProperty (AU(), kAudioUnitProperty_StreamFormat, inScope, inEl, - const_cast<AudioStreamBasicDescription*>(&inFormat), + const_cast<AudioStreamBasicDescription*>(&inFormat), sizeof (AudioStreamBasicDescription)); } @@ -809,7 +809,7 @@ OSStatus CAAudioUnit::GetSampleRate (AudioUnitScope inScope, { UInt32 dataSize = sizeof (Float64); return AudioUnitGetProperty (AU(), kAudioUnitProperty_SampleRate, - inScope, inEl, + inScope, inEl, &outRate, &dataSize); } @@ -924,9 +924,9 @@ bool CAAudioUnit::HasDynamicScope (AudioUnitScope inScope, SInt32 &outTotalNum -N (where N is less than -2), signifies the total channel count on the scope side (in or out) */ -bool CAAudioUnit::ValidateDynamicScope (AudioUnitScope inScope, - SInt32 &outTotalNumChannels, - const AUChannelInfo *info, +bool CAAudioUnit::ValidateDynamicScope (AudioUnitScope inScope, + SInt32 &outTotalNumChannels, + const AUChannelInfo *info, UInt32 numInfo) const { bool writable = false; @@ -956,7 +956,7 @@ bool CAAudioUnit::ValidateDynamicScope (AudioUnitScope inScope, outTotalNumChannels = abs (info[i].inChannels); return true; } - } + } else if (inScope == kAudioUnitScope_Output) { // isn't dynamic on this side at least @@ -967,7 +967,7 @@ bool CAAudioUnit::ValidateDynamicScope (AudioUnitScope inScope, outTotalNumChannels = abs (info[i].outChannels); return true; } - } + } else { break; // wrong scope was specified @@ -977,9 +977,9 @@ bool CAAudioUnit::ValidateDynamicScope (AudioUnitScope inScope, return false; } -OSStatus CAAudioUnit::ConfigureDynamicScope (AudioUnitScope inScope, - UInt32 inNumElements, - UInt32 *inChannelsPerElement, +OSStatus CAAudioUnit::ConfigureDynamicScope (AudioUnitScope inScope, + UInt32 inNumElements, + UInt32 *inChannelsPerElement, Float64 inSampleRate) { SInt32 numChannels = 0; @@ -1142,7 +1142,7 @@ OSStatus CAAudioUnit::StartNote (MusicDeviceInstrumentID inInstrument, UInt32 inOffsetSampleFrame, const MusicDeviceNoteParams * inParams) { - return mDataPtr ? (OSStatus) mDataPtr->StartNote (inInstrument, inGroupID, outNoteInstanceID, inOffsetSampleFrame, inParams) + return mDataPtr ? (OSStatus) mDataPtr->StartNote (inInstrument, inGroupID, outNoteInstanceID, inOffsetSampleFrame, inParams) : paramErr; } @@ -1165,11 +1165,11 @@ OSStatus CAAudioUnit::Render (AudioUnitRenderActionFlags * ioActionFlags, } static AURenderCallbackStruct sRenderCallback; -static OSStatus PrerollRenderProc ( void * /*inRefCon*/, +static OSStatus PrerollRenderProc ( void * /*inRefCon*/, AudioUnitRenderActionFlags * /*inActionFlags*/, - const AudioTimeStamp * /*inTimeStamp*/, + const AudioTimeStamp * /*inTimeStamp*/, UInt32 /*inBusNumber*/, - UInt32 /*inNumFrames*/, + UInt32 /*inNumFrames*/, AudioBufferList *ioData) { AudioBuffer *buf = ioData->mBuffers; @@ -1185,12 +1185,12 @@ OSStatus CAAudioUnit::Preroll (UInt32 inFrameSize) OSStatus result = GetFormat (kAudioUnitScope_Input, 0, desc); bool hasInput = false; //we have input - if (result == noErr) + if (result == noErr) { sRenderCallback.inputProc = PrerollRenderProc; sRenderCallback.inputProcRefCon = 0; - result = SetProperty (kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input, + result = SetProperty (kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input, 0, &sRenderCallback, sizeof(sRenderCallback)); if (result) return result; hasInput = true; @@ -1217,7 +1217,7 @@ home: sRenderCallback.inputProc = 0; sRenderCallback.inputProcRefCon = 0; - SetProperty (kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input, + SetProperty (kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input, 0, &sRenderCallback, sizeof(sRenderCallback)); } return result; @@ -1251,8 +1251,8 @@ CAAUChanHelper::~CAAUChanHelper() if (mDidAllocate) delete [] mChans; } -CAAUChanHelper& CAAUChanHelper::operator= (const CAAUChanHelper &c) -{ +CAAUChanHelper& CAAUChanHelper::operator= (const CAAUChanHelper &c) +{ if (mDidAllocate) delete [] mChans; if (c.mDidAllocate) { mChans = new UInt32[c.mNumEls]; @@ -1263,7 +1263,7 @@ CAAUChanHelper& CAAUChanHelper::operator= (const CAAUChanHelper &c) } memcpy (mChans, c.mChans, c.mNumEls * sizeof(int)); - return *this; + return *this; } #pragma mark __Print Utilities @@ -1271,7 +1271,7 @@ CAAUChanHelper& CAAUChanHelper::operator= (const CAAUChanHelper &c) void CAAudioUnit::Print (FILE* file) const { fprintf (file, "AudioUnit:%p\n", AU()); - if (IsValid()) { + if (IsValid()) { fprintf (file, "\tnode=%ld\t", (long)GetAUNode()); Comp().Print (file); } } diff --git a/libs/appleutility/CABufferList.cpp b/libs/appleutility/CABufferList.cpp index 81298f918a..47fe524f6f 100644 --- a/libs/appleutility/CABufferList.cpp +++ b/libs/appleutility/CABufferList.cpp @@ -123,7 +123,7 @@ void CABufferList::DeallocateBuffers() delete[] mBufferMemory; mBufferMemory = NULL; } - + } extern "C" void CAShowAudioBufferList(const AudioBufferList *abl, int framesToPrint, int wordSize) @@ -131,7 +131,7 @@ extern "C" void CAShowAudioBufferList(const AudioBufferList *abl, int framesToPr printf("AudioBufferList @ %p:\n", abl); const AudioBuffer *buf = abl->mBuffers; for (UInt32 i = 0; i < abl->mNumberBuffers; ++i, ++buf) { - printf(" [%2ld]: %2ldch, %5ld bytes @ %8p", + printf(" [%2ld]: %2ldch, %5ld bytes @ %8p", i, buf->mNumberChannels, buf->mDataByteSize, buf->mData); if (framesToPrint) { printf(":"); diff --git a/libs/appleutility/CAComponent.cpp b/libs/appleutility/CAComponent.cpp index 10c253c7f2..914e8f3c08 100644 --- a/libs/appleutility/CAComponent.cpp +++ b/libs/appleutility/CAComponent.cpp @@ -37,7 +37,7 @@ */ /*============================================================================= CAComponent.cpp - + =============================================================================*/ #include "CAComponent.h" @@ -55,23 +55,23 @@ CAComponent::CAComponent (const ComponentDescription& inDesc, CAComponent* next) memcpy (&mDesc, &inDesc, sizeof(ComponentDescription)); } -CAComponent::CAComponent (const Component& comp) +CAComponent::CAComponent (const Component& comp) : mComp (comp), - mManuName(0), - mAUName(0), - mCompName(0), - mCompInfo (0) + mManuName(0), + mAUName(0), + mCompName(0), + mCompInfo (0) { GetComponentInfo (Comp(), &mDesc, NULL, NULL, NULL); } -CAComponent::CAComponent (const ComponentInstance& compInst) - : mComp (Component(compInst)), - mManuName(0), - mAUName(0), - mCompName(0), - mCompInfo (0) -{ +CAComponent::CAComponent (const ComponentInstance& compInst) + : mComp (Component(compInst)), + mManuName(0), + mAUName(0), + mCompName(0), + mCompInfo (0) +{ GetComponentInfo (Comp(), &mDesc, NULL, NULL, NULL); } @@ -107,7 +107,7 @@ OSStatus CAComponent::GetResourceVersion (UInt32 &outVersion) const // only go on if we successfully found at least 1 thng resource require_noerr (thngResourceCount <= 0 ? -1 : 0, home); - // loop through all of the Component thng resources trying to + // loop through all of the Component thng resources trying to // find one that matches this Component description for (short i = 0; i < thngResourceCount && (!versionFound); i++) { @@ -121,8 +121,8 @@ OSStatus CAComponent::GetResourceVersion (UInt32 &outVersion) const // check to see if this is the thng resource for the particular Component that we are looking at // (there often is more than one Component described in the resource) - if ((componentThng->cd.componentType == mDesc.Type()) - && (componentThng->cd.componentSubType == mDesc.SubType()) + if ((componentThng->cd.componentType == mDesc.Type()) + && (componentThng->cd.componentSubType == mDesc.SubType()) && (componentThng->cd.componentManufacturer == mDesc.Manu())) { outVersion = componentThng->componentVersion; @@ -162,7 +162,7 @@ CAComponent& CAComponent::operator= (const CAComponent& y) if (y.mManuName) { mManuName = y.mManuName; CFRetain (mManuName); } if (y.mAUName) { mAUName = y.mAUName; CFRetain (mAUName); } - if (y.mCompName) { mCompName = y.mCompName; CFRetain (mCompName); } + if (y.mCompName) { mCompName = y.mCompName; CFRetain (mCompName); } if (y.mCompInfo) { mCompInfo = y.mCompInfo; CFRetain (mCompInfo); } return *this; @@ -208,7 +208,7 @@ void CAComponent::SetCompNames () const displayStr[j] = 0; const_cast<CAComponent*>(this)->mAUName = CFStringCreateWithCString(NULL, displayStr, kCFStringEncodingMacRoman); - } + } DisposeHandle (h1); } @@ -252,6 +252,6 @@ void CAComponent::Print(FILE* file) const fprintf (file, ", Manu:"); _ShowCF (file, mManuName); if (mAUName) fprintf (file, ", Name:"); _ShowCF (file, mAUName); } - fprintf (file, ", "); + fprintf (file, ", "); Desc ().Print(file); } diff --git a/libs/appleutility/CAComponentDescription.cpp b/libs/appleutility/CAComponentDescription.cpp index 261a2b881c..7c3a449955 100644 --- a/libs/appleutility/CAComponentDescription.cpp +++ b/libs/appleutility/CAComponentDescription.cpp @@ -37,7 +37,7 @@ */ /*============================================================================= CAComponentDescription.cpp - + =============================================================================*/ #include "CAComponentDescription.h" @@ -87,8 +87,8 @@ CAComponentDescription::CAComponentDescription (OSType inType, OSType inSubtype, componentFlagsMask = 0; } -bool CAComponentDescription::IsAU () const -{ +bool CAComponentDescription::IsAU () const +{ bool flag = IsEffect() || IsMusicDevice() || IsOffline(); if (flag) return true; @@ -103,7 +103,7 @@ bool CAComponentDescription::IsAU () const inline bool _MatchTest (const OSType &inTypeA, const OSType &inTypeB) { - return ((inTypeA == inTypeB) || (!inTypeA && !inTypeB) || (inTypeA && !inTypeB) || (!inTypeA && inTypeB)); + return ((inTypeA == inTypeB) || (!inTypeA && !inTypeB) || (inTypeA && !inTypeB) || (!inTypeA && inTypeB)); } bool CAComponentDescription::Matches (const ComponentDescription &desc) const diff --git a/libs/appleutility/CAStreamBasicDescription.cpp b/libs/appleutility/CAStreamBasicDescription.cpp index f65bdd99ac..e89b898666 100644 --- a/libs/appleutility/CAStreamBasicDescription.cpp +++ b/libs/appleutility/CAStreamBasicDescription.cpp @@ -37,7 +37,7 @@ */ /*============================================================================= CAStreamBasicDescription.cpp - + =============================================================================*/ #include "CAConditionalMacros.h" @@ -82,9 +82,9 @@ void CAStreamBasicDescription::PrintFormat(FILE *f, const char *indent, const ch if (mFormatID == kAudioFormatLinearPCM) { bool isInt = !(mFormatFlags & kLinearPCMFormatFlagIsFloat); int wordSize = SampleWordSize(); - const char *endian = (wordSize > 1) ? + const char *endian = (wordSize > 1) ? ((mFormatFlags & kLinearPCMFormatFlagIsBigEndian) ? " big-endian" : " little-endian" ) : ""; - const char *sign = isInt ? + const char *sign = isInt ? ((mFormatFlags & kLinearPCMFormatFlagIsSignedInteger) ? " signed" : " unsigned") : ""; const char *floatInt = isInt ? "integer" : "float"; char packed[32]; @@ -101,7 +101,7 @@ void CAStreamBasicDescription::PrintFormat(FILE *f, const char *indent, const ch const char *commaSpace = (packed[0]!='\0') || (align[0]!='\0') ? ", " : ""; fprintf(f, "%ld-bit%s%s %s%s%s%s%s\n", - mBitsPerChannel, endian, sign, floatInt, + mBitsPerChannel, endian, sign, floatInt, commaSpace, packed, align, deinter); } else if (mFormatID == 'alac') { // kAudioFormatAppleLossless int sourceBits = 0; @@ -128,7 +128,7 @@ void CAStreamBasicDescription::PrintFormat(FILE *f, const char *indent, const ch fprintf(f, "%ld frames/packet\n", mFramesPerPacket); } else - fprintf(f, "%ld bits/channel, %ld bytes/packet, %ld frames/packet, %ld bytes/frame\n", + fprintf(f, "%ld bits/channel, %ld bytes/packet, %ld frames/packet, %ld bytes/frame\n", mBitsPerChannel, mBytesPerPacket, mFramesPerPacket, mBytesPerFrame); } @@ -440,7 +440,7 @@ static bool MatchFormatFlags(const AudioStreamBasicDescription& x, const AudioSt UInt32 yFlags = y.mFormatFlags; // match wildcards - if (x.mFormatID == 0 || y.mFormatID == 0 || xFlags == 0 || yFlags == 0) + if (x.mFormatID == 0 || y.mFormatID == 0 || xFlags == 0 || yFlags == 0) return true; if (x.mFormatID == kAudioFormatLinearPCM) @@ -488,7 +488,7 @@ bool operator==(const AudioStreamBasicDescription& x, const AudioStreamBasicDesc #define MATCH(name) ((x.name) == 0 || (y.name) == 0 || (x.name) == (y.name)) - return + return // check the sample rate (fiszero(x.mSampleRate) || fiszero(y.mSampleRate) || fequal(x.mSampleRate, y.mSampleRate)) @@ -496,19 +496,19 @@ bool operator==(const AudioStreamBasicDescription& x, const AudioStreamBasicDesc && MATCH(mFormatID) // check the format flags - && MatchFormatFlags(x, y) + && MatchFormatFlags(x, y) // check the bytes per packet - && MATCH(mBytesPerPacket) + && MATCH(mBytesPerPacket) // check the frames per packet - && MATCH(mFramesPerPacket) + && MATCH(mFramesPerPacket) // check the bytes per frame - && MATCH(mBytesPerFrame) + && MATCH(mBytesPerFrame) // check the channels per frame - && MATCH(mChannelsPerFrame) + && MATCH(mChannelsPerFrame) // check the channels per frame && MATCH(mBitsPerChannel) ; |