Test updating to Juce 8

christofmuc · Sep 29, 2024 · 6c2ff3b · 6c2ff3b
1 parent 50c448f
commit 6c2ff3b
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -150,7 +150,6 @@ target_compile_definitions(juce-static
 		JUCE_PLUGINHOST_VST=0
 		JUCE_PLUGINHOST_AU=0
 		DONT_SET_USING_JUCE_NAMESPACE=1
-		JUCE_DISPLAY_SPLASH_SCREEN=0
 		JUCE_REPORT_APP_USAGE=0
 		JUCE_CHECK_MEMORY_LEAKS=0
 		JUCE_QUICKTIME=0

diff --git a/Client/Source/AudioCallback.cpp b/Client/Source/AudioCallback.cpp
@@ -160,8 +160,10 @@ void AudioCallback::calcLocalMonitoring(std::shared_ptr<AudioBuffer<float>> inpu
 	}
 }
 
-void AudioCallback::audioDeviceIOCallback(const float** inputChannelData, int numInputChannels, float** outputChannelData, int numOutputChannels, int numSamples)
+void AudioCallback::audioDeviceIOCallbackWithContext(const float* const* inputChannelData, int numInputChannels, float* const* outputChannelData,
+    int numOutputChannels, int numSamples, const AudioIODeviceCallbackContext& context)
 {
+	ignoreUnused(context);
 	float* const* constnessCorrection = const_cast<float* const*>(inputChannelData);
 	PlayoutQualityInfo qualityInfo = lastPlayoutQualityInfo_;
 

diff --git a/Client/Source/AudioCallback.h b/Client/Source/AudioCallback.h
@@ -48,7 +48,8 @@ class AudioCallback : public AudioIODeviceCallback {
 
 	void shutdown();
 
-	virtual void audioDeviceIOCallback(const float** inputChannelData, int numInputChannels, float** outputChannelData, int numOutputChannels, int numSamples) override;
+	virtual void audioDeviceIOCallbackWithContext(const float* const* inputChannelData, int numInputChannels, float* const* outputChannelData, int numOutputChannels,
+	    int numSamples, const AudioIODeviceCallbackContext& context);
 	virtual void audioDeviceAboutToStart(AudioIODevice* device) override;
 	virtual void audioDeviceStopped() override;
 

diff --git a/modules/juce-utils b/modules/juce-utils
diff --git a/modules/juce-widgets b/modules/juce-widgets
diff --git a/test/test_asio.cpp b/test/test_asio.cpp
@@ -19,7 +19,8 @@ class ASIOAudioIODeviceCallback : public AudioIODeviceCallback
 	{
 	}
 
-	void audioDeviceIOCallback(const float** inputChannelData, int numInputChannels, float** outputChannelData, int numOutputChannels, int numSamples) override
+	virtual void audioDeviceIOCallbackWithContext(const float* const* inputChannelData, int numInputChannels, float* const* outputChannelData, int numOutputChannels,
+	    int numSamples, const AudioIODeviceCallbackContext& context) override
 	{
 	}
 

diff --git a/third_party/JUCE b/third_party/JUCE
-Original file line number
+Diff line change
@@ Expand Up @@
     	{
     	}
-    	void audioDeviceIOCallback(const float** inputChannelData, int numInputChannels, float** outputChannelData, int numOutputChannels, int numSamples) override
+    	virtual void audioDeviceIOCallbackWithContext(const float* const* inputChannelData, int numInputChannels, float* const* outputChannelData, int numOutputChannels,
+    	    int numSamples, const AudioIODeviceCallbackContext& context) override
     	{
     	}
@@ Expand Down @@