diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-04 14:51:05 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-04 14:51:05 -0400 |
commit | 4dc63966f0872efe768dad61eb9b8785d06b92d1 (patch) | |
tree | e54104d57d6c2da7840979181368151fd0819c96 /libs/appleutility | |
parent | 297e80e020da94a56984b20782584bb1dd96ea34 (diff) |
globally remove all trailing whitespace from ardour code base.
Paul Davis was responsible for introducing almost all of this.
Diffstat (limited to 'libs/appleutility')
-rw-r--r-- | libs/appleutility/AUParamInfo.h | 20 | ||||
-rw-r--r-- | libs/appleutility/CAAUParameter.h | 46 | ||||
-rw-r--r-- | libs/appleutility/CAAudioChannelLayout.h | 8 | ||||
-rw-r--r-- | libs/appleutility/CAAudioUnit.h | 50 | ||||
-rw-r--r-- | libs/appleutility/CABufferList.h | 2 | ||||
-rw-r--r-- | libs/appleutility/CACFDictionary.h | 6 | ||||
-rw-r--r-- | libs/appleutility/CAComponent.h | 8 | ||||
-rw-r--r-- | libs/appleutility/CAReferenceCounted.h | 4 | ||||
-rw-r--r-- | libs/appleutility/CAStreamBasicDescription.h | 2 |
9 files changed, 73 insertions, 73 deletions
diff --git a/libs/appleutility/AUParamInfo.h b/libs/appleutility/AUParamInfo.h index 8e446394c4..b5f7c26345 100644 --- a/libs/appleutility/AUParamInfo.h +++ b/libs/appleutility/AUParamInfo.h @@ -45,11 +45,11 @@ #include "CAAUParameter.h" /* - The ParameterMap returned by the Map() method is a map where + The ParameterMap returned by the Map() method is a map where - the key is the clumpID - the value is a ParameterList (vector<CAAUParameter>) - If you have parameters on multiple scopes (or elements within a scope), then you should create one of these + If you have parameters on multiple scopes (or elements within a scope), then you should create one of these for each scope-element pair */ @@ -61,9 +61,9 @@ public: - AUParamInfo (AudioUnit inAU, - bool inIncludeExpert, - bool inIncludeReadOnly, + AUParamInfo (AudioUnit inAU, + bool inIncludeExpert, + bool inIncludeReadOnly, AudioUnitScope inScope = kAudioUnitScope_Global, AudioUnitElement inElement = 0); @@ -74,12 +74,12 @@ public: // some convenience methods UInt32 NumParams () const { return mNumParams; } - AudioUnitParameterID ParamID (UInt32 inIndex) const - { - if (inIndex < mNumParams) return mParamListID[inIndex]; - return 0xFFFFFFFF; + AudioUnitParameterID ParamID (UInt32 inIndex) const + { + if (inIndex < mNumParams) return mParamListID[inIndex]; + return 0xFFFFFFFF; } - + UInt32 NumClumps () const { return mParams.size(); } UInt32 NumParamsForClump (UInt32 inClump) const; diff --git a/libs/appleutility/CAAUParameter.h b/libs/appleutility/CAAUParameter.h index 4f35b26353..143a798006 100644 --- a/libs/appleutility/CAAUParameter.h +++ b/libs/appleutility/CAAUParameter.h @@ -63,15 +63,15 @@ public: ~CAAUParameter(); /*! @method operator <@ */ - bool operator < (const CAAUParameter &a) const - { - return memcmp(this, &a, sizeof(AudioUnitParameter)) < 0; + bool operator < (const CAAUParameter &a) const + { + return memcmp(this, &a, sizeof(AudioUnitParameter)) < 0; } /*! @method operator ==@ */ - bool operator == (const CAAUParameter &a) const - { - return !memcmp(this, &a, sizeof(AudioUnitParameter)); + bool operator == (const CAAUParameter &a) const + { + return !memcmp(this, &a, sizeof(AudioUnitParameter)); } /*! @method operator =@ */ @@ -80,12 +80,12 @@ public: /*! @method GetValue */ Float32 GetValue() const; /*! @method SetValue */ - void SetValue( AUParameterListenerRef inListener, + void SetValue( AUParameterListenerRef inListener, void * inObject, Float32 inValue) const; /*! @method GetName */ - CFStringRef GetName() const { return mParamName; } + CFStringRef GetName() const { return mParamName; } // borrowed reference! /*! @method GetStringFromValueCopy */ @@ -94,9 +94,9 @@ public: // or null if there is no name associated // caller must release /*! @method ValuesHaveStrings */ - bool ValuesHaveStrings () const - { - return (mParamInfo.flags & kAudioUnitParameterFlag_ValuesHaveStrings) != 0; + bool ValuesHaveStrings () const + { + return (mParamInfo.flags & kAudioUnitParameterFlag_ValuesHaveStrings) != 0; } /*! @method GetValueFromString */ @@ -109,16 +109,16 @@ public: /*! @method GetParamTag */ CFStringRef GetParamTag() const { return mParamTag; } - // this may return null! - + // this may return null! - // in which case there is no descriptive tag for the parameter /*! @method GetParamName */ CFStringRef GetParamName (int inIndex) const // this can return null if there is no name for the parameter - { - return (mNamedParams && inIndex < mNumIndexedParams) + { + return (mNamedParams && inIndex < mNumIndexedParams) ? (CFStringRef) CFArrayGetValueAtIndex(mNamedParams, inIndex) - : 0; + : 0; } /*! @method GetNumIndexedParams */ @@ -131,8 +131,8 @@ public: bool HasNamedParams () const { return IsIndexedParam() && mNamedParams; } /*! @method GetClumpID */ - bool GetClumpID (UInt32 &outClumpID) const - { + bool GetClumpID (UInt32 &outClumpID) const + { if (mParamInfo.flags & kAudioUnitParameterFlag_HasClump) { outClumpID = mParamInfo.clumpID; return true; @@ -141,15 +141,15 @@ public: } /*! @method HasDisplayTransformation */ - bool HasDisplayTransformation () const - { - return GetAudioUnitParameterDisplayType (mParamInfo.flags); + bool HasDisplayTransformation () const + { + return GetAudioUnitParameterDisplayType (mParamInfo.flags); } /*! @method IsExpert */ - bool IsExpert () const - { - return mParamInfo.flags & kAudioUnitParameterFlag_ExpertMode; + bool IsExpert () const + { + return mParamInfo.flags & kAudioUnitParameterFlag_ExpertMode; } #if DEBUG void Print () const; diff --git a/libs/appleutility/CAAudioChannelLayout.h b/libs/appleutility/CAAudioChannelLayout.h index 5c351c29b5..7db75ad7e0 100644 --- a/libs/appleutility/CAAudioChannelLayout.h +++ b/libs/appleutility/CAAudioChannelLayout.h @@ -76,7 +76,7 @@ class CAAudioChannelLayout public: static AudioChannelLayout* Create(UInt32 inNumberChannelDescriptions); static void Destroy(AudioChannelLayout* inChannelLayout); - static UInt32 CalculateByteSize(UInt32 inNumberChannelDescriptions) { + static UInt32 CalculateByteSize(UInt32 inNumberChannelDescriptions) { return offsetof(AudioChannelLayout, mChannelDescriptions) + inNumberChannelDescriptions * sizeof(AudioChannelDescription); } static void SetAllToUnknown(AudioChannelLayout& outChannelLayout, UInt32 inNumberChannelDescriptions); @@ -90,7 +90,7 @@ public: CAAudioChannelLayout (UInt32 inNumberChannels, bool inChooseSurround); // if inChooseSurround is false, then symmetrical speaker arrangements // are chosen in place of surround layouts if there is a choice - // This call chooses layouts based on the expected defaults in + // This call chooses layouts based on the expected defaults in // AudioUnit usage CAAudioChannelLayout (AudioChannelLayoutTag inTag); CAAudioChannelLayout (const CAAudioChannelLayout &c); @@ -121,8 +121,8 @@ public: private: class ACLRefCounter : public CAReferenceCounted { public: - ACLRefCounter (UInt32 inDataSize) - { + ACLRefCounter (UInt32 inDataSize) + { if (inDataSize < offsetof(AudioChannelLayout, mChannelDescriptions)) inDataSize = offsetof(AudioChannelLayout, mChannelDescriptions); diff --git a/libs/appleutility/CAAudioUnit.h b/libs/appleutility/CAAudioUnit.h index 810b81be2f..e5927af1fc 100644 --- a/libs/appleutility/CAAudioUnit.h +++ b/libs/appleutility/CAAudioUnit.h @@ -37,7 +37,7 @@ */ /*============================================================================= CAAudioUnit.h - + =============================================================================*/ #ifndef __CAAudioUnit_h__ @@ -68,7 +68,7 @@ class CAAUChanHelper; // The destructor will NOT automatically close the AU down // This state should be managed by the Caller // once closed, the unit represented by this object is no longer valid -// it is up to the user of this object to ensure its validity is in sync +// it is up to the user of this object to ensure its validity is in sync // if it is removed from a graph // methods that can significantly change the state of the AU (like its format) are @@ -80,7 +80,7 @@ public: typedef ChannelTagVector::iterator ChannelTagVectorIter; public: - CAAudioUnit () + CAAudioUnit () : mDataPtr(0) {} CAAudioUnit (const AudioUnit& inUnit); @@ -178,8 +178,8 @@ public: UInt32 inOffsetSampleFrame, const MusicDeviceNoteParams * inParams) { - return StartNote (kMusicNoteEvent_UseGroupInstrument, - inGroupID, outNoteInstanceID, + return StartNote (kMusicNoteEvent_UseGroupInstrument, + inGroupID, outNoteInstanceID, inOffsetSampleFrame, inParams); } @@ -204,7 +204,7 @@ public: return CanDo (inChannelsInOut, inChannelsInOut); } - bool CanDo ( int inChannelsIn, + bool CanDo ( int inChannelsIn, int inChannelsOut) const; // This version does a more thorough test for ANY AU with ANY ins/outs @@ -215,7 +215,7 @@ public: bool SupportsNumChannels () const; - bool HasChannelLayouts (AudioUnitScope inScope, + bool HasChannelLayouts (AudioUnitScope inScope, AudioUnitElement inEl) const; int GetChannelInfo (AUChannelInfo** chaninfo, UInt32& cnt); @@ -227,11 +227,11 @@ public: AudioUnitElement inEl, CAAudioChannelLayout &outLayout) const; - OSStatus SetChannelLayout (AudioUnitScope inScope, + OSStatus SetChannelLayout (AudioUnitScope inScope, AudioUnitElement inEl, CAAudioChannelLayout &inLayout); - OSStatus SetChannelLayout (AudioUnitScope inScope, + OSStatus SetChannelLayout (AudioUnitScope inScope, AudioUnitElement inEl, AudioChannelLayout &inLayout, UInt32 inSize); @@ -264,9 +264,9 @@ public: OSStatus GetNumberChannels (AudioUnitScope inScope, AudioUnitElement inEl, - UInt32 &outChans) const - { - return NumberChannels (inScope, inEl, outChans); + UInt32 &outChans) const + { + return NumberChannels (inScope, inEl, outChans); } OSStatus SetNumberChannels (AudioUnitScope inScope, @@ -280,7 +280,7 @@ public: OSStatus SetElementCount (AudioUnitScope inScope, UInt32 inCount); // value of -1 for outTotalNumChannels indicates no restriction on num channels - // for ex. the Matrix Mixer satisfies this (its in/out element count is writable, and can be set to + // for ex. the Matrix Mixer satisfies this (its in/out element count is writable, and can be set to // any number of channels. // outTotalNumChannels is only valid if method returns true... bool HasDynamicInputs (SInt32 &outTotalNumChannels) const @@ -339,30 +339,30 @@ private: CAAudioUnit (const CAComponent& inComp); bool HasDynamicScope (AudioUnitScope inScope, SInt32 &outTotalNumChannels) const; - OSStatus ConfigureDynamicScope (AudioUnitScope inScope, - UInt32 inNumElements, - UInt32 *inChannelsPerElement, + OSStatus ConfigureDynamicScope (AudioUnitScope inScope, + UInt32 inNumElements, + UInt32 *inChannelsPerElement, Float64 inSampleRate); - bool ValidateChannelPair (int inChannelsIn, + bool ValidateChannelPair (int inChannelsIn, int inChannelsOut, const AUChannelInfo * info, UInt32 numChanInfo) const; - bool ValidateDynamicScope (AudioUnitScope inScope, - SInt32 &outTotalNumChannels, - const AUChannelInfo * info, + bool ValidateDynamicScope (AudioUnitScope inScope, + SInt32 &outTotalNumChannels, + const AUChannelInfo * info, UInt32 numInfo) const; - bool CheckOneSide (const CAAUChanHelper &inHelper, - bool checkOutput, - const AUChannelInfo *info, + bool CheckOneSide (const CAAUChanHelper &inHelper, + bool checkOutput, + const AUChannelInfo *info, UInt32 numInfo) const; }; class CAAUChanHelper { public: - CAAUChanHelper() - : mChans(mStaticChans), mNumEls(0), mDidAllocate(false) + CAAUChanHelper() + : mChans(mStaticChans), mNumEls(0), mDidAllocate(false) { memset (mChans, 0, sizeof(UInt32) * 8); } diff --git a/libs/appleutility/CABufferList.h b/libs/appleutility/CABufferList.h index 3b0cef9a52..8f69de9413 100644 --- a/libs/appleutility/CABufferList.h +++ b/libs/appleutility/CABufferList.h @@ -248,7 +248,7 @@ public: void DeallocateBuffers(); void UseExternalBuffer(Byte *ptr, UInt32 nBytes); - + void AdvanceBufferPointers(UInt32 nBytes) // this is for bufferlists that function simply as // an array of pointers into another bufferlist, being advanced, diff --git a/libs/appleutility/CACFDictionary.h b/libs/appleutility/CACFDictionary.h index 362b1c8821..ac82ebb87c 100644 --- a/libs/appleutility/CACFDictionary.h +++ b/libs/appleutility/CACFDictionary.h @@ -37,7 +37,7 @@ */ /*============================================================================= CACFDictionary.h - + =============================================================================*/ #if !defined(__CACFDictionary_h__) #define __CACFDictionary_h__ @@ -57,7 +57,7 @@ // CACFDictionary //============================================================================= -class CACFDictionary +class CACFDictionary { // Construction/Destruction @@ -66,7 +66,7 @@ public: CACFDictionary(const CFDictionaryRef inCFDictionary, bool inRelease) : mCFDictionary(const_cast<CFMutableDictionaryRef>(inCFDictionary)), mRelease(inRelease), mMutable(true) {} CACFDictionary(const CFMutableDictionaryRef inCFDictionary, bool inRelease) : mCFDictionary(inCFDictionary), mRelease(inRelease), mMutable(true) {} CACFDictionary(const CACFDictionary& inDictionary) : mCFDictionary(inDictionary.mCFDictionary), mRelease(inDictionary.mRelease), mMutable(inDictionary.mMutable) { if(mRelease && (mCFDictionary != NULL)) { CFRetain(mCFDictionary); } } - CACFDictionary& operator=(const CACFDictionary& inDictionary) { mCFDictionary = inDictionary.mCFDictionary; mRelease = inDictionary.mRelease; mMutable = inDictionary.mMutable; if(mRelease && (mCFDictionary != NULL)) { CFRetain(mCFDictionary); } return *this; } + CACFDictionary& operator=(const CACFDictionary& inDictionary) { mCFDictionary = inDictionary.mCFDictionary; mRelease = inDictionary.mRelease; mMutable = inDictionary.mMutable; if(mRelease && (mCFDictionary != NULL)) { CFRetain(mCFDictionary); } return *this; } ~CACFDictionary() { if(mRelease && (mCFDictionary != NULL)) { CFRelease(mCFDictionary); } } // Attributes diff --git a/libs/appleutility/CAComponent.h b/libs/appleutility/CAComponent.h index 2ace42532d..2e721d8df9 100644 --- a/libs/appleutility/CAComponent.h +++ b/libs/appleutility/CAComponent.h @@ -37,7 +37,7 @@ */ /*============================================================================= CAComponent.h - + =============================================================================*/ #ifndef __CAComponent_h__ @@ -52,7 +52,7 @@ #include "CAComponentDescription.h" -class CAComponent +class CAComponent { public: CAComponent () @@ -61,7 +61,7 @@ public: // if next is specifed that is used to find the next component after that one CAComponent (const ComponentDescription& inDesc, CAComponent* next = 0); - CAComponent (const CAComponent& y) + CAComponent (const CAComponent& y) : mComp (0), mDesc(), mManuName(0), mAUName(0), mCompName(0), mCompInfo (0) { *this = y; } CAComponent (const Component& comp); @@ -91,7 +91,7 @@ public: const CAComponentDescription& Desc () const { return mDesc; } - OSStatus Open (ComponentInstance& outInst) const + OSStatus Open (ComponentInstance& outInst) const { return OpenAComponent (Comp(), &outInst); } diff --git a/libs/appleutility/CAReferenceCounted.h b/libs/appleutility/CAReferenceCounted.h index a9c8dccca3..5c9b1168bd 100644 --- a/libs/appleutility/CAReferenceCounted.h +++ b/libs/appleutility/CAReferenceCounted.h @@ -60,8 +60,8 @@ public: void retain() { IncrementAtomic(&mRefCount); } - void release() - { + void release() + { // this returns the ORIGINAL value, not the new one. SInt32 rc = DecrementAtomic(&mRefCount); if (rc == 1) { diff --git a/libs/appleutility/CAStreamBasicDescription.h b/libs/appleutility/CAStreamBasicDescription.h index aa41c40fe4..c9caed5aa0 100644 --- a/libs/appleutility/CAStreamBasicDescription.h +++ b/libs/appleutility/CAStreamBasicDescription.h @@ -71,7 +71,7 @@ // It adds a number of convenience routines, but otherwise adds nothing // to the footprint of the original struct. //============================================================================= -class CAStreamBasicDescription : +class CAStreamBasicDescription : public AudioStreamBasicDescription { |