- fix compilation on macOS pt. II

christophhart · Mar 1, 2021 · 069e7a2 · 069e7a2
1 parent 8838d76
commit 069e7a2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git 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
@@ -207,7 +207,7 @@ namespace control
 		template <int P> void callFadeValue(double v)
 		{
 			if (P < p.getNumParameters())
-				p.call<P>(fader.getFadeValue<P>(p.getNumParameters(), v));
+				p.template call<P>(fader.template getFadeValue<P>(p.getNumParameters(), v));
 		}
 
 		ModValue lastValue;

diff --git a/hi_modules/raw/raw_misc.h b/hi_modules/raw/raw_misc.h
@@ -399,7 +399,6 @@ template <typename DataType> struct Data
 				auto table = ltp->getTable(tableIndex);
 
 				table->restoreData(newValue.toString());
-				table->sendChangeMessage();
 			}
 		}
 	};
@@ -411,7 +410,7 @@ template <typename DataType> struct Data
 		{
 			if (auto sp = dynamic_cast<hise::SliderPackProcessor*>(p))
 			{
-				return DataType(sp->getSliderPackData(sliderPackIndex)->toBase64());
+				return DataType(sp->getSliderPack(sliderPackIndex)->toBase64());
 			}
 
 			return {};
@@ -421,7 +420,7 @@ template <typename DataType> struct Data
 		{
 			if (auto sp = dynamic_cast<hise::SliderPackProcessor*>(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
@@ -72,7 +72,7 @@ template <class WType> class InterpretedNodeBase
 
 	template <typename T, bool AddDataOffsetToUIPtr> void init()
 	{
-		obj.getWrappedObject().create<T>();
+		obj.getWrappedObject().template create<T>();
 
 		if constexpr (AddDataOffsetToUIPtr && std::is_base_of<data::pimpl::provider_base, T>())
 		{
@@ -340,6 +340,10 @@ struct ParameterMultiplyAddNode : public ParameterNodeBase
 };
 #endif
 
+namespace parameter
+{
+    struct dynamic_list;
+}
 
 struct NewHero : public ModulationSourceNode,
 				 public InterpretedNodeBase<OpaqueNode>
@@ -355,17 +359,17 @@ struct NewHero : public ModulationSourceNode,
 
 	template <typename T, typename ComponentType, bool AddDataOffsetToUIPtr> static NodeBase* createNode(DspNetwork* n, ValueTree d)
 	{
-		constexpr bool isBaseOfDynamicParameterHolder = std::is_base_of<control::pimpl::parameter_node_base<parameter::dynamic_base_holder>, T::WrappedObjectType>();
+		constexpr bool isBaseOfDynamicParameterHolder = std::is_base_of<control::pimpl::parameter_node_base<parameter::dynamic_base_holder>, typename T::WrappedObjectType>();
 
-		static_assert(std::is_base_of<control::pimpl::no_processing, T::WrappedObjectType>(), "not a base of no_processing");
+		static_assert(std::is_base_of<control::pimpl::no_processing, typename T::WrappedObjectType>(), "not a base of no_processing");
 
 		auto mn = new NewHero(n, d);
 
 		if constexpr (isBaseOfDynamicParameterHolder)
 			mn->getParameterFunction = NewHero::getParameterFunctionStatic<T>;
 		else
 		{
-			constexpr bool isBaseOfDynamicList = std::is_base_of<control::pimpl::parameter_node_base<parameter::dynamic_list>, T::WrappedObjectType>();
+			constexpr bool isBaseOfDynamicList = std::is_base_of<control::pimpl::parameter_node_base<parameter::dynamic_list>, 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<parameter::dynamic_base_holder>;
 
-		static_assert(std::is_base_of<BaseClass, Derived::WrappedObjectType>());
+		static_assert(std::is_base_of<BaseClass, typename Derived::WrappedObjectType>());
 
 		auto typed = static_cast<Derived*>(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
@@ -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
 
 }
 
-}
+}
diff --git 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);