From 069e7a203561787c83c1b7a597aad17ad0f57e79 Mon Sep 17 00:00:00 2001 From: Christoph Hart Date: Mon, 1 Mar 2021 13:25:40 +0100 Subject: [PATCH] - fix compilation on macOS pt. II --- hi_components/eq_plot/EqComponent.h | 2 +- hi_dsp_library/dsp_nodes/CableNodes.h | 2 +- hi_modules/raw/raw_misc.h | 5 ++--- .../scripting/scriptnode/api/StaticNodeWrappers.h | 14 +++++++++----- .../dynamic_elements/DynamicParameterList.cpp | 4 ++-- .../dynamic_elements/DynamicParameterList.h | 2 +- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/hi_components/eq_plot/EqComponent.h b/hi_components/eq_plot/EqComponent.h index 3427a0749..8824d719c 100644 --- a/hi_components/eq_plot/EqComponent.h +++ b/hi_components/eq_plot/EqComponent.h @@ -67,7 +67,7 @@ struct AnalyserRingBuffer: public AsyncUpdater handleAsyncUpdate(); } - void pushSamples(AudioSampleBuffer& b, int startSample, int numSamples) + void pushSamples(const AudioSampleBuffer& b, int startSample, int numSamples) { if (internalBuffer.getNumSamples() == 0) return; diff --git a/hi_dsp_library/dsp_nodes/CableNodes.h b/hi_dsp_library/dsp_nodes/CableNodes.h index a2d912152..5de956dc0 100644 --- a/hi_dsp_library/dsp_nodes/CableNodes.h +++ b/hi_dsp_library/dsp_nodes/CableNodes.h @@ -207,7 +207,7 @@ namespace control template void callFadeValue(double v) { if (P < p.getNumParameters()) - p.call

(fader.getFadeValue

(p.getNumParameters(), v)); + p.template call

(fader.template getFadeValue

(p.getNumParameters(), v)); } ModValue lastValue; diff --git a/hi_modules/raw/raw_misc.h b/hi_modules/raw/raw_misc.h index d8408fdb9..86b12d805 100644 --- a/hi_modules/raw/raw_misc.h +++ b/hi_modules/raw/raw_misc.h @@ -399,7 +399,6 @@ template struct Data auto table = ltp->getTable(tableIndex); table->restoreData(newValue.toString()); - table->sendChangeMessage(); } } }; @@ -411,7 +410,7 @@ template struct Data { if (auto sp = dynamic_cast(p)) { - return DataType(sp->getSliderPackData(sliderPackIndex)->toBase64()); + return DataType(sp->getSliderPack(sliderPackIndex)->toBase64()); } return {}; @@ -421,7 +420,7 @@ template struct Data { if (auto sp = dynamic_cast(p)) { - if (auto spData = sp->getSliderPackData(sliderPackIndex)) + if (auto spData = sp->getSliderPack(sliderPackIndex)) { spData->fromBase64(String(newValue)); } diff --git a/hi_scripting/scripting/scriptnode/api/StaticNodeWrappers.h b/hi_scripting/scripting/scriptnode/api/StaticNodeWrappers.h index e8de9812c..89bfae9a4 100644 --- a/hi_scripting/scripting/scriptnode/api/StaticNodeWrappers.h +++ b/hi_scripting/scripting/scriptnode/api/StaticNodeWrappers.h @@ -72,7 +72,7 @@ template class InterpretedNodeBase template void init() { - obj.getWrappedObject().create(); + obj.getWrappedObject().template create(); if constexpr (AddDataOffsetToUIPtr && std::is_base_of()) { @@ -340,6 +340,10 @@ struct ParameterMultiplyAddNode : public ParameterNodeBase }; #endif +namespace parameter +{ + struct dynamic_list; +} struct NewHero : public ModulationSourceNode, public InterpretedNodeBase @@ -355,9 +359,9 @@ struct NewHero : public ModulationSourceNode, template static NodeBase* createNode(DspNetwork* n, ValueTree d) { - constexpr bool isBaseOfDynamicParameterHolder = std::is_base_of, T::WrappedObjectType>(); + constexpr bool isBaseOfDynamicParameterHolder = std::is_base_of, typename T::WrappedObjectType>(); - static_assert(std::is_base_of(), "not a base of no_processing"); + static_assert(std::is_base_of(), "not a base of no_processing"); auto mn = new NewHero(n, d); @@ -365,7 +369,7 @@ struct NewHero : public ModulationSourceNode, mn->getParameterFunction = NewHero::getParameterFunctionStatic; else { - constexpr bool isBaseOfDynamicList = std::is_base_of, T::WrappedObjectType>(); + constexpr bool isBaseOfDynamicList = std::is_base_of, typename T::WrappedObjectType>(); static_assert(isBaseOfDynamicList, "not a base of dynamic holder or list"); mn->getParameterFunction = nullptr; } @@ -435,7 +439,7 @@ struct NewHero : public ModulationSourceNode, { using BaseClass = control::pimpl::parameter_node_base; - static_assert(std::is_base_of()); + static_assert(std::is_base_of()); auto typed = static_cast(b); return &typed->getWrappedObject().getParameter(); diff --git a/hi_scripting/scripting/scriptnode/dynamic_elements/DynamicParameterList.cpp b/hi_scripting/scripting/scriptnode/dynamic_elements/DynamicParameterList.cpp index 38cb17d2f..a13613dc1 100644 --- a/hi_scripting/scripting/scriptnode/dynamic_elements/DynamicParameterList.cpp +++ b/hi_scripting/scripting/scriptnode/dynamic_elements/DynamicParameterList.cpp @@ -141,7 +141,7 @@ namespace parameter return targets.size(); } - void dynamic_list::updateConnections(ValueTree& v, bool wasAdded) + void dynamic_list::updateConnections(ValueTree v, bool wasAdded) { if (deferUpdate) return; @@ -523,4 +523,4 @@ namespace parameter } -} \ No newline at end of file +} diff --git a/hi_scripting/scripting/scriptnode/dynamic_elements/DynamicParameterList.h b/hi_scripting/scripting/scriptnode/dynamic_elements/DynamicParameterList.h index e2eaa5cda..de000e995 100644 --- a/hi_scripting/scripting/scriptnode/dynamic_elements/DynamicParameterList.h +++ b/hi_scripting/scripting/scriptnode/dynamic_elements/DynamicParameterList.h @@ -79,7 +79,7 @@ namespace parameter int getNumParameters() const; - void updateConnections(ValueTree& v, bool wasAdded); + void updateConnections(ValueTree v, bool wasAdded); void updateParameterAmount(Identifier id, var newValue);