Only display Trim for tracks that have Trim. On the way:

[ardour.git] / libs / appleutility / CAAudioChannelLayout.h

diff --git a/libs/appleutility/CAAudioChannelLayout.h b/libs/appleutility/CAAudioChannelLayout.h
index 8f995b86144aa5fc3d8fd8ad8d6833c2f8c93fb6..388f087ef91d856e62dc7712bbcf5c9077b22e99 100644 (file)
--- a/libs/appleutility/CAAudioChannelLayout.h
+++ b/libs/appleutility/CAAudioChannelLayout.h
@@ -76,27 +76,27 @@ 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);
        static UInt32                           NumberChannels(const AudioChannelLayout& inLayout);
-       
+
 #if !HAL_Build
-// object methods      
+// object methods
 public:
                                                                CAAudioChannelLayout ();
 
                                                                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);
                                                                CAAudioChannelLayout (const AudioChannelLayout* inChannelLayout);
                                                                ~CAAudioChannelLayout();
-       
+
        CAAudioChannelLayout&           operator= (const AudioChannelLayout* inChannelLayout);
        CAAudioChannelLayout&           operator= (const CAAudioChannelLayout& c);
        bool                                            operator== (const CAAudioChannelLayout &c) const;
@@ -105,55 +105,55 @@ public:
 
        bool                                            IsValid() const { return NumberChannels() > 0; }
        UInt32                                          Size() const { return mLayoutHolder ? mLayoutHolder->Size() : 0; }
-       
+
        UInt32                                          NumberChannels() const { return NumberChannels(Layout()); }
-       
+
        AudioChannelLayoutTag           Tag() const { return Layout().mChannelLayoutTag; }
        const AudioChannelLayout&       Layout() const { return mLayoutHolder->Layout(); }
        operator const AudioChannelLayout *() const { return &Layout(); }
-       
+
        void                                            Print () const { Print (stdout); }
        void                                            Print (FILE* file) const;
 
        OSStatus                                        Save (CFPropertyListRef *outData) const;
        OSStatus                                        Restore (CFPropertyListRef &inData);
-       
+
 private:
        class ACLRefCounter : public CAReferenceCounted {
        public:
-                               ACLRefCounter (UInt32 inDataSize) 
-                               { 
+                               ACLRefCounter (UInt32 inDataSize)
+                               {
                                        if (inDataSize < offsetof(AudioChannelLayout, mChannelDescriptions))
                                                inDataSize = offsetof(AudioChannelLayout, mChannelDescriptions);
-                                               
+
                                        mLayout = static_cast<AudioChannelLayout*>(malloc (inDataSize));
                                        memset (mLayout, 0, inDataSize);
                                        mByteSize = inDataSize;
                                }
-       
+
                const AudioChannelLayout &      Layout() const { return *mLayout; }
-               
+
                UInt32                                          Size () const { return mByteSize; }
-               
+
        private:
                AudioChannelLayout      *mLayout;
                UInt32                          mByteSize;
-               
+
                        // only the constructors can change the actual state of the layout
                friend CAAudioChannelLayout::CAAudioChannelLayout (UInt32 inNumberChannels, bool inChooseSurround);
                friend OSStatus CAAudioChannelLayout::Restore (CFPropertyListRef &inData);
                friend CAAudioChannelLayout& CAAudioChannelLayout::operator= (const AudioChannelLayout* inChannelLayout);
                friend void CAAudioChannelLayout::SetWithTag(AudioChannelLayoutTag inTag);
-               
+
                AudioChannelLayout *    GetLayout() { return mLayout; }
                ~ACLRefCounter() { if (mLayout) { free(mLayout); mLayout = NULL; } }
-       
+
        private:
                ACLRefCounter () : mLayout(NULL) { }
-               ACLRefCounter(const ACLRefCounter& c) : mLayout(NULL) { }
-               ACLRefCounter& operator=(const ACLRefCounter& c) { return *this; }
+               ACLRefCounter(const ACLRefCounter& other) : CAReferenceCounted (other), mLayout(NULL) { }
+               ACLRefCounter& operator=(const ACLRefCounter&) { return *this; }
        };
-       
+
        ACLRefCounter                           *mLayoutHolder;
 #endif //      HAL_Build