From 7424b75e51d5780c3a8e45c2208dda01675e4131 Mon Sep 17 00:00:00 2001 From: Christoph Hart <> Date: Tue, 9 Jan 2024 11:49:33 +0100 Subject: [PATCH] - fix warnings when compiling DLL on macOS --- hi_backend/snex_workbench/WorkbenchProcessor.cpp | 9 +++++++++ hi_dsp_library/node_api/helpers/ParameterData.cpp | 2 ++ hi_dsp_library/node_api/nodes/processors.h | 4 ++++ hi_tools/hi_dispatch/02_events/RootObject.cpp | 4 ++-- hi_tools/hi_dispatch/02_events/SourceManager.h | 3 +++ hi_tools/hi_dispatch/03_library/Processor.cpp | 6 +++++- .../RTNeural/modules/xsimd/arch/xsimd_sse2.hpp | 7 +++++++ hi_tools/hi_tools/MiscToolClasses.cpp | 13 +------------ 8 files changed, 33 insertions(+), 15 deletions(-) diff --git a/hi_backend/snex_workbench/WorkbenchProcessor.cpp b/hi_backend/snex_workbench/WorkbenchProcessor.cpp index c333b07f17..4fc008317b 100644 --- a/hi_backend/snex_workbench/WorkbenchProcessor.cpp +++ b/hi_backend/snex_workbench/WorkbenchProcessor.cpp @@ -1633,6 +1633,11 @@ void DspNetworkCompileExporter::createMainCppFile(bool isDllMainFile) b.addComment("Now we can add the rest of the codebase", snex::cppgen::Base::CommentType::FillTo80); Include(b, "JuceHeader.h"); + b.addEmptyLine(); + + b << "#pragma clang diagnostic push"; + b << "#pragma clang diagnostic ignored \"-Wreturn-type-c-linkage\""; + b.addEmptyLine(); { @@ -1835,6 +1840,10 @@ void DspNetworkCompileExporter::createMainCppFile(bool isDllMainFile) } } + b.addEmptyLine(); + b << "#pragma clang diagnostic pop"; + b.addEmptyLine(); + f.replaceWithText(b.toString()); auto rnboSibling = f.getSiblingFile("RNBO.cpp"); diff --git a/hi_dsp_library/node_api/helpers/ParameterData.cpp b/hi_dsp_library/node_api/helpers/ParameterData.cpp index c1d3eea108..1756d17069 100644 --- a/hi_dsp_library/node_api/helpers/ParameterData.cpp +++ b/hi_dsp_library/node_api/helpers/ParameterData.cpp @@ -115,6 +115,8 @@ juce::Array RangeHelpers::getRangeIds(bool includeValue, IdSet case IdSet::ScriptComponents: rangeIds = { Identifier("min"), Identifier("max"), Identifier("stepSize"), Identifier("middlePosition") }; break; case IdSet::MidiAutomation: rangeIds = { Identifier("Start"), Identifier("End"), Identifier("Interval"), Identifier("Skew") }; break; case IdSet::MidiAutomationFull: rangeIds = { Identifier("FullStart"), Identifier("FullEnd"), Identifier("Interval"), Identifier("Skew") }; break; + case IdSet::numIdSets: + default: break; } if (includeValue) diff --git a/hi_dsp_library/node_api/nodes/processors.h b/hi_dsp_library/node_api/nodes/processors.h index f32df91c0c..87fa5da954 100644 --- a/hi_dsp_library/node_api/nodes/processors.h +++ b/hi_dsp_library/node_api/nodes/processors.h @@ -65,6 +65,8 @@ struct dynamic case Types::Cubic: c.process(ratio, inp, out, numOut, numIn, false); break; case Types::Linear: l.process(ratio, inp, out, numOut, numIn, false); break; case Types::None: n.process(ratio, inp, out, numOut, numIn, false); break; + case Types::numTypes: + default: break; } } @@ -81,6 +83,8 @@ struct dynamic case Types::Cubic: c.reset(); break; case Types::Linear: l.reset(); break; case Types::None: n.reset(); break; + case Types::numTypes: + default: break; } } diff --git a/hi_tools/hi_dispatch/02_events/RootObject.cpp b/hi_tools/hi_dispatch/02_events/RootObject.cpp index 3b2c943126..1c1855615f 100644 --- a/hi_tools/hi_dispatch/02_events/RootObject.cpp +++ b/hi_tools/hi_dispatch/02_events/RootObject.cpp @@ -227,9 +227,9 @@ RootObject::Child(r) Queueable::~Queueable() { - int index = 0; - #if ENABLE_QUEUE_AND_LOGGER + int index = 0; + if(auto l = getRootObject().getLogger()) l->log(l, EventType::Remove, (uint8*)&index, sizeof(int)); #endif diff --git a/hi_tools/hi_dispatch/02_events/SourceManager.h b/hi_tools/hi_dispatch/02_events/SourceManager.h index 5c875714a7..ce546d1256 100644 --- a/hi_tools/hi_dispatch/02_events/SourceManager.h +++ b/hi_tools/hi_dispatch/02_events/SourceManager.h @@ -88,6 +88,9 @@ class SourceManager : public Suspendable, { auto& v = used ? messageCounter : skippedCounter; auto b = used ? messageCounterId.get() : skippedCounterId.get(); + + ignoreUnused(v, b); + TRACE_COUNTER("dispatch", perfetto::CounterTrack(b), ++v); } diff --git a/hi_tools/hi_dispatch/03_library/Processor.cpp b/hi_tools/hi_dispatch/03_library/Processor.cpp index 80164f51f4..fa82d02629 100644 --- a/hi_tools/hi_dispatch/03_library/Processor.cpp +++ b/hi_tools/hi_dispatch/03_library/Processor.cpp @@ -50,6 +50,7 @@ void ProcessorHandler::BypassListener::slotChanged(const ListenerData& d) jassert(f); auto slotType = (SlotTypes)d.slotIndex; + ignoreUnused(slotType); jassert(slotType == SlotTypes::Bypassed); TRACE_DISPATCH("onBypass"); @@ -62,7 +63,9 @@ ProcessorHandler::AttributeListener::AttributeListener(RootObject& r, ListenerOw f(f_) {} +#ifndef TRACE_DISPATCH_CALLBACK #define TRACE_DISPATCH_CALLBACK(obj, callbackName, arg) StringBuilder n; n << (obj).getDispatchId() << "." << callbackName << "(" << (int)arg << ")"; TRACE_DISPATCH(DYNAMIC_STRING_BUILDER(n)); +#endif void ProcessorHandler::AttributeListener::slotChanged(const ListenerData& d) { @@ -102,6 +105,7 @@ void ProcessorHandler::NameAndColourListener::slotChanged(const ListenerData& d) { jassert(d.s != nullptr); auto slotType = (SlotTypes)d.slotIndex; + ignoreUnused(slotType); jassert(slotType == SlotTypes::NameAndColour); jassert(f); @@ -347,4 +351,4 @@ Modulator::~Modulator() } } // library } // dispatch -} // hise \ No newline at end of file +} // hise diff --git a/hi_tools/hi_neural/RTNeural/modules/xsimd/arch/xsimd_sse2.hpp b/hi_tools/hi_neural/RTNeural/modules/xsimd/arch/xsimd_sse2.hpp index 02281c23cb..b828a82087 100644 --- a/hi_tools/hi_neural/RTNeural/modules/xsimd/arch/xsimd_sse2.hpp +++ b/hi_tools/hi_neural/RTNeural/modules/xsimd/arch/xsimd_sse2.hpp @@ -1020,6 +1020,10 @@ namespace xsimd } } + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wshorten-64-to-32" + // mask template ::value, void>::type> inline uint64_t mask(batch_bool const& self, requires_arch) noexcept @@ -1047,6 +1051,9 @@ namespace xsimd return {}; } } + +#pragma clang diagnostic pop + template inline uint64_t mask(batch_bool const& self, requires_arch) noexcept { diff --git a/hi_tools/hi_tools/MiscToolClasses.cpp b/hi_tools/hi_tools/MiscToolClasses.cpp index 79597823fc..7f67dc29a6 100644 --- a/hi_tools/hi_tools/MiscToolClasses.cpp +++ b/hi_tools/hi_tools/MiscToolClasses.cpp @@ -2381,12 +2381,6 @@ void Spectrum2D::draw(Graphics& g, const Image& img, Rectangle area, Graphi g.saveState(); g.setImageResamplingQuality(quality); - float offsetX = JUCE_LIVE_CONSTANT_OFF(0.0); - float offsetY = JUCE_LIVE_CONSTANT_OFF(0.0); - - float scaleX = JUCE_LIVE_CONSTANT_OFF(0.0); - float scaleY = JUCE_LIVE_CONSTANT_OFF(0.0); - auto t = AffineTransform::translation(-img.getWidth() / 2, -img.getHeight() / 2); t = t.followedBy(AffineTransform::rotation(float_Pi * 1.5f)); @@ -2493,14 +2487,11 @@ Image Spectrum2D::createSpectrumImage(AudioSampleBuffer& lastBuffer) auto newImage = Image(Image::RGB, lastBuffer.getNumSamples(), lastBuffer.getNumChannels(), true); - auto s2dHalf = parameters->Spectrum2DSize / 2; - Image::BitmapData bd(newImage, Image::BitmapData::writeOnly); for(int y = 0; y < lastBuffer.getNumChannels(); y++) { auto src = lastBuffer.getReadPointer(y); - auto dst = bd.getLinePointer(y); for(int x = 0; x < lastBuffer.getNumSamples(); x++) { @@ -2548,8 +2539,6 @@ AudioSampleBuffer Spectrum2D::createSpectrumBuffer() if (numSamplesToFill == 0) return {}; - auto paddingSize = JUCE_LIVE_CONSTANT_OFF(0); - AudioSampleBuffer b(numSamplesToFill, parameters->Spectrum2DSize / 2); b.clear(); @@ -2572,7 +2561,7 @@ AudioSampleBuffer Spectrum2D::createSpectrumBuffer() for(int i = 0; i < size; i++) { auto normIndex = (float)i / (float)size; - auto skewedProportionY = holder->getYPosition((float)i / (float)size); + auto skewedProportionY = holder->getYPosition(normIndex); positions[i] = skewedProportionY; }