From 1635480b173128d4a29e57eea94399bf680e782a Mon Sep 17 00:00:00 2001 From: nodeful Date: Mon, 27 Apr 2020 13:47:19 +0100 Subject: [PATCH] fixed Driver compiling issues due to C++17 deprecation --- .../xcschemes/xcschememanagement.plist | 6 +- .../driver/Driver.xcodeproj/project.pbxproj | 63 ++++-------------- .../UserInterfaceState.xcuserstate | Bin 18183 -> 0 bytes .../xcschemes/PublicUtility.xcscheme | 21 ++---- .../xcschemes/xcschememanagement.plist | 39 ----------- .../driver/PublicUtility/CAPropertyAddress.h | 6 +- .../xcshareddata/WorkspaceSettings.xcsettings | 5 +- 7 files changed, 28 insertions(+), 112 deletions(-) delete mode 100644 native/driver/Driver.xcodeproj/project.xcworkspace/xcuserdata/romanskisils.xcuserdatad/UserInterfaceState.xcuserstate delete mode 100644 native/driver/Driver.xcodeproj/xcuserdata/romanskisils.xcuserdatad/xcschemes/xcschememanagement.plist 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 0ab3fcc233be071d279234d52d0c8bda6bb50b1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18183 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 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 + +