diff --git a/native/app/eqMac.xcodeproj/xcuserdata/romanskisils.xcuserdatad/xcschemes/xcschememanagement.plist b/native/app/eqMac.xcodeproj/xcuserdata/romanskisils.xcuserdatad/xcschemes/xcschememanagement.plist index 8782848..7054a74 100644 --- a/native/app/eqMac.xcodeproj/xcuserdata/romanskisils.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/native/app/eqMac.xcodeproj/xcuserdata/romanskisils.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,17 +7,17 @@ App - Debug.xcscheme_^#shared#^_ orderHint - 3 + 2 App - Package.xcscheme_^#shared#^_ orderHint - 1 + 0 App - Release.xcscheme_^#shared#^_ orderHint - 2 + 1 SuppressBuildableAutocreation diff --git a/native/driver/Driver.xcodeproj/project.pbxproj b/native/driver/Driver.xcodeproj/project.pbxproj index 1aa5759..be6c5a6 100644 --- a/native/driver/Driver.xcodeproj/project.pbxproj +++ b/native/driver/Driver.xcodeproj/project.pbxproj @@ -38,56 +38,13 @@ 2743C9E41D7EF8760089613B /* CAVolumeCurve.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CB8B38C1BBCF4A9000E2DD1 /* CAVolumeCurve.cpp */; }; 2743C9E61D7EF8E00089613B /* libPublicUtility.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2743C9C61D7EF84B0089613B /* libPublicUtility.a */; }; E00879C9237EC3D3006AACF8 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E00879C8237EC3D3006AACF8 /* Accelerate.framework */; }; - E0267F7B21FCDF660065C9B1 /* CAAtomic.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1C0CB6A71C4E06F70084C15A /* CAAtomic.h */; }; - E0267F7C21FCDF660065C9B1 /* CAPropertyAddress.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1C37B3681E9B8D3C000DF98F /* CAPropertyAddress.h */; }; - E0267F7D21FCDF660065C9B1 /* CAAtomicStack.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1C0CB6A61C4E06C00084C15A /* CAAtomicStack.h */; }; - E0267F7E21FCDF660065C9B1 /* CAAutoDisposer.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1C0CB6A91C50A3AF0084C15A /* CAAutoDisposer.h */; }; - E0267F7F21FCDF660065C9B1 /* CACFArray.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1CE3E6901BE2683900167F5D /* CACFArray.h */; }; - E0267F8021FCDF660065C9B1 /* CACFDictionary.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1CE3E68D1BE263CA00167F5D /* CACFDictionary.h */; }; - E0267F8121FCDF660065C9B1 /* CACFNumber.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1C305D9C1BE294B5004EBB91 /* CACFNumber.h */; }; - E0267F8221FCDF660065C9B1 /* CACFString.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1CB8B38B1BBCF4A9000E2DD1 /* CACFString.h */; }; - E0267F8321FCDF660065C9B1 /* CADebugger.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1CC1DF881BE558B000FB8FE4 /* CADebugger.h */; }; - E0267F8421FCDF660065C9B1 /* CADebugMacros.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1CB8B3711BBBD8A4000E2DD1 /* CADebugMacros.h */; }; - E0267F8521FCDF660065C9B1 /* CADebugPrintf.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1CB8B3791BBBDFA2000E2DD1 /* CADebugPrintf.h */; }; - E0267F8621FCDF660065C9B1 /* CADispatchQueue.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1CB8B3941BBD2418000E2DD1 /* CADispatchQueue.h */; }; - E0267F8721FCDF660065C9B1 /* CAException.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1CB8B3721BBBD8A4000E2DD1 /* CAException.h */; }; - E0267F8821FCDF660065C9B1 /* CAHostTimeBase.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1CB8B3881BBCF08A000E2DD1 /* CAHostTimeBase.h */; }; - E0267F8921FCDF660065C9B1 /* CAMutex.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1CB8B3851BBCEFE8000E2DD1 /* CAMutex.h */; }; - E0267F8A21FCDF660065C9B1 /* CAPThread.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1C3821101C4A18DE00A0C8C6 /* CAPThread.h */; }; - E0267F8B21FCDF660065C9B1 /* CAVolumeCurve.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1CB8B38D1BBCF4A9000E2DD1 /* CAVolumeCurve.h */; }; + E01A29F42456E4F800369F41 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E01A29F32456E4F800369F41 /* Foundation.framework */; }; + E01A29F62456E4FF00369F41 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E01A29F52456E4FF00369F41 /* CoreAudio.framework */; }; + E01A29F82456E50500369F41 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E01A29F72456E50500369F41 /* CoreFoundation.framework */; }; E07380E22284D9F200FF0F53 /* EQM_Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E07380E02284D9F200FF0F53 /* EQM_Utils.cpp */; }; E0DAAFBD21FE545F00DCCCEC /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = E0DAAFBC21FE545F00DCCCEC /* icon.icns */; }; /* End PBXBuildFile section */ -/* Begin PBXCopyFilesBuildPhase section */ - E0267F7A21FCDF2B0065C9B1 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - E0267F7B21FCDF660065C9B1 /* CAAtomic.h in CopyFiles */, - E0267F7C21FCDF660065C9B1 /* CAPropertyAddress.h in CopyFiles */, - E0267F7D21FCDF660065C9B1 /* CAAtomicStack.h in CopyFiles */, - E0267F7E21FCDF660065C9B1 /* CAAutoDisposer.h in CopyFiles */, - E0267F7F21FCDF660065C9B1 /* CACFArray.h in CopyFiles */, - E0267F8021FCDF660065C9B1 /* CACFDictionary.h in CopyFiles */, - E0267F8121FCDF660065C9B1 /* CACFNumber.h in CopyFiles */, - E0267F8221FCDF660065C9B1 /* CACFString.h in CopyFiles */, - E0267F8321FCDF660065C9B1 /* CADebugger.h in CopyFiles */, - E0267F8421FCDF660065C9B1 /* CADebugMacros.h in CopyFiles */, - E0267F8521FCDF660065C9B1 /* CADebugPrintf.h in CopyFiles */, - E0267F8621FCDF660065C9B1 /* CADispatchQueue.h in CopyFiles */, - E0267F8721FCDF660065C9B1 /* CAException.h in CopyFiles */, - E0267F8821FCDF660065C9B1 /* CAHostTimeBase.h in CopyFiles */, - E0267F8921FCDF660065C9B1 /* CAMutex.h in CopyFiles */, - E0267F8A21FCDF660065C9B1 /* CAPThread.h in CopyFiles */, - E0267F8B21FCDF660065C9B1 /* CAVolumeCurve.h in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 19FE7431C588F36F4F1E70BB /* EQM_MuteControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EQM_MuteControl.h; sourceTree = ""; }; 19FE7B8CE9148B3D8D7517C6 /* EQM_Control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EQM_Control.h; sourceTree = ""; }; @@ -156,6 +113,9 @@ 27381A151C8EF50F00DF167C /* EQM_XPCHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EQM_XPCHelper.h; sourceTree = ""; }; 2743C9C61D7EF84B0089613B /* libPublicUtility.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPublicUtility.a; sourceTree = BUILT_PRODUCTS_DIR; }; E00879C8237EC3D3006AACF8 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; + E01A29F32456E4F800369F41 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + E01A29F52456E4FF00369F41 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; + E01A29F72456E50500369F41 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; E07380DF2284D9CC00FF0F53 /* EQM_Types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EQM_Types.h; sourceTree = ""; }; E07380E02284D9F200FF0F53 /* EQM_Utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EQM_Utils.cpp; sourceTree = ""; }; E07380E12284D9F200FF0F53 /* EQM_Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EQM_Utils.h; sourceTree = ""; }; @@ -168,6 +128,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + E01A29F82456E50500369F41 /* CoreFoundation.framework in Frameworks */, + E01A29F62456E4FF00369F41 /* CoreAudio.framework in Frameworks */, + E01A29F42456E4F800369F41 /* Foundation.framework in Frameworks */, E00879C9237EC3D3006AACF8 /* Accelerate.framework in Frameworks */, 2743C9E61D7EF8E00089613B /* libPublicUtility.a in Frameworks */, ); @@ -304,6 +267,9 @@ E00879C7237EC3D3006AACF8 /* Frameworks */ = { isa = PBXGroup; children = ( + E01A29F72456E50500369F41 /* CoreFoundation.framework */, + E01A29F52456E4FF00369F41 /* CoreAudio.framework */, + E01A29F32456E4F800369F41 /* Foundation.framework */, E00879C8237EC3D3006AACF8 /* Accelerate.framework */, ); name = Frameworks; @@ -356,7 +322,6 @@ 2743C9C21D7EF84B0089613B /* Sources */, 2743C9C31D7EF84B0089613B /* Frameworks */, 2743C9C41D7EF84B0089613B /* Headers */, - E0267F7A21FCDF2B0065C9B1 /* CopyFiles */, ); buildRules = ( ); @@ -634,7 +599,7 @@ COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = JZA6C97KJA; - GCC_C_LANGUAGE_STANDARD = c11; + GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_CPP_RTTI = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -673,7 +638,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = JZA6C97KJA; ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = c11; + GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_ENABLE_CPP_RTTI = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; diff --git a/native/driver/Driver.xcodeproj/project.xcworkspace/xcuserdata/romanskisils.xcuserdatad/UserInterfaceState.xcuserstate b/native/driver/Driver.xcodeproj/project.xcworkspace/xcuserdata/romanskisils.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 0ab3fcc..0000000 Binary files a/native/driver/Driver.xcodeproj/project.xcworkspace/xcuserdata/romanskisils.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/native/driver/Driver.xcodeproj/xcshareddata/xcschemes/PublicUtility.xcscheme b/native/driver/Driver.xcodeproj/xcshareddata/xcschemes/PublicUtility.xcscheme index 1f97870..1a00192 100644 --- a/native/driver/Driver.xcodeproj/xcshareddata/xcschemes/PublicUtility.xcscheme +++ b/native/driver/Driver.xcodeproj/xcshareddata/xcschemes/PublicUtility.xcscheme @@ -1,6 +1,6 @@ + ReferencedContainer = "container:Driver.xcodeproj"> @@ -29,11 +29,9 @@ shouldUseLaunchSchemeArgsEnv = "YES"> - - - - - - - - + ReferencedContainer = "container:Driver.xcodeproj"> diff --git a/native/driver/Driver.xcodeproj/xcuserdata/romanskisils.xcuserdatad/xcschemes/xcschememanagement.plist b/native/driver/Driver.xcodeproj/xcuserdata/romanskisils.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index f3d666d..0000000 --- a/native/driver/Driver.xcodeproj/xcuserdata/romanskisils.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,39 +0,0 @@ - - - - - SchemeUserState - - Driver - Debug.xcscheme_^#shared#^_ - - orderHint - 5 - - Driver - Release.xcscheme_^#shared#^_ - - orderHint - 4 - - PublicUtility.xcscheme_^#shared#^_ - - isShown - - orderHint - 0 - - - SuppressBuildableAutocreation - - 1CB8B3631BBBB78D000E2DD1 - - primary - - - 2743C9C51D7EF84B0089613B - - primary - - - - - diff --git a/native/driver/PublicUtility/CAPropertyAddress.h b/native/driver/PublicUtility/CAPropertyAddress.h index 6df444b..2d70008 100644 --- a/native/driver/PublicUtility/CAPropertyAddress.h +++ b/native/driver/PublicUtility/CAPropertyAddress.h @@ -157,14 +157,14 @@ public: const AudioObjectPropertyAddress* GetItems() const { return &(*mAddressList.begin()); } AudioObjectPropertyAddress* GetItems() { return &(*mAddressList.begin()); } - bool HasItem(const AudioObjectPropertyAddress& inAddress) const { AddressList::const_iterator theIterator = std::find_if(mAddressList.begin(), mAddressList.end(), std::bind1st(CAPropertyAddress::CongruentEqualTo(), inAddress)); return theIterator != mAddressList.end(); } - bool HasExactItem(const AudioObjectPropertyAddress& inAddress) const { AddressList::const_iterator theIterator = std::find_if(mAddressList.begin(), mAddressList.end(), std::bind1st(CAPropertyAddress::EqualTo(), inAddress)); return theIterator != mAddressList.end(); } + bool HasItem(const AudioObjectPropertyAddress& inAddress) const { AddressList::const_iterator theIterator = std::find_if(mAddressList.begin(), mAddressList.end(), std::bind(CAPropertyAddress::CongruentEqualTo(), inAddress, std::placeholders::_1)); return theIterator != mAddressList.end(); } + bool HasExactItem(const AudioObjectPropertyAddress& inAddress) const { AddressList::const_iterator theIterator = std::find_if(mAddressList.begin(), mAddressList.end(), std::bind(CAPropertyAddress::EqualTo(), inAddress, std::placeholders::_1)); return theIterator != mAddressList.end(); } void AppendItem(const AudioObjectPropertyAddress& inAddress) { mAddressList.push_back(inAddress); } void AppendUniqueItem(const AudioObjectPropertyAddress& inAddress) { if(!HasItem(inAddress)) { mAddressList.push_back(inAddress); } } void AppendUniqueExactItem(const AudioObjectPropertyAddress& inAddress) { if(!HasExactItem(inAddress)) { mAddressList.push_back(inAddress); } } void InsertItemAtIndex(UInt32 inIndex, const AudioObjectPropertyAddress& inAddress) { if(inIndex < mAddressList.size()) { AddressList::iterator theIterator = mAddressList.begin(); std::advance(theIterator, static_cast(inIndex)); mAddressList.insert(theIterator, inAddress); } else { mAddressList.push_back(inAddress); } } - void EraseExactItem(const AudioObjectPropertyAddress& inAddress) { AddressList::iterator theIterator = std::find_if(mAddressList.begin(), mAddressList.end(), std::bind1st(CAPropertyAddress::EqualTo(), inAddress)); if(theIterator != mAddressList.end()) { mAddressList.erase(theIterator); } } + void EraseExactItem(const AudioObjectPropertyAddress& inAddress) { AddressList::iterator theIterator = std::find_if(mAddressList.begin(), mAddressList.end(), std::bind(CAPropertyAddress::EqualTo(), inAddress, std::placeholders::_1)); if(theIterator != mAddressList.end()) { mAddressList.erase(theIterator); } } void EraseItemAtIndex(UInt32 inIndex) { if(inIndex < mAddressList.size()) { AddressList::iterator theIterator = mAddressList.begin(); std::advance(theIterator, static_cast(inIndex)); mAddressList.erase(theIterator); } } void EraseAllItems() { mAddressList.clear(); } diff --git a/native/eqMac.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/native/eqMac.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings index 0c67376..f9b0d7c 100644 --- a/native/eqMac.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ b/native/eqMac.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -1,5 +1,8 @@ - + + PreviewsEnabled + +