Skip to content

Commit 0c69644

Browse files
jrlangloisjrlanglois
committed
Updated to latest JUCE.
1 parent 5702a07 commit 0c69644

File tree

6 files changed

+68
-6
lines changed

6 files changed

+68
-6
lines changed

‎demo/JuceLibraryCode/AppConfig.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
#define JUCE_MODULE_AVAILABLE_juce_graphics 1
4141
#define JUCE_MODULE_AVAILABLE_juce_gui_basics 1
4242
#define JUCE_MODULE_AVAILABLE_juce_gui_extra 1
43+
#define JUCE_MODULE_AVAILABLE_juce_javascript 1
44+
#define JUCE_MODULE_AVAILABLE_juce_midi_ci 1
4345
#define JUCE_MODULE_AVAILABLE_juce_opengl 1
4446
#define JUCE_MODULE_AVAILABLE_juce_osc 1
4547
#define JUCE_MODULE_AVAILABLE_juce_product_unlocking 1
@@ -123,7 +125,7 @@
123125
#endif
124126

125127
//==============================================================================
126-
// juce_audio_processors flags:
128+
// juce_audio_processors_headless flags:
127129

128130
#ifndef JUCE_PLUGINHOST_VST
129131
//#define JUCE_PLUGINHOST_VST 0

‎demo/SquarePineDemo.jucer‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@
166166
<MODULEPATH id="squarepine_animation" path="../modules"/>
167167
<MODULEPATH id="squarepine_cryptography" path="../modules"/>
168168
<MODULEPATH id="juce_audio_processors_headless" path="../../JUCE/modules"/>
169+
<MODULEPATH id="juce_javascript" path="../../JUCE/modules"/>
170+
<MODULEPATH id="juce_midi_ci" path="../../JUCE/modules"/>
169171
</MODULEPATHS>
170172
</ANDROIDSTUDIO>
171173
<LINUX_MAKE targetFolder="builds/linux" smallIcon="Shhj0E" bigIcon="qamACY">
@@ -200,6 +202,8 @@
200202
<MODULEPATH id="squarepine_cryptography" path="../modules"/>
201203
<MODULEPATH id="squarepine_graphics" path="../modules/"/>
202204
<MODULEPATH id="juce_audio_processors_headless" path="../../JUCE/modules"/>
205+
<MODULEPATH id="juce_javascript" path="../../JUCE/modules"/>
206+
<MODULEPATH id="juce_midi_ci" path="../../JUCE/modules"/>
203207
</MODULEPATHS>
204208
</LINUX_MAKE>
205209
<VS2022 targetFolder="builds/vs2022" smallIcon="Shhj0E" bigIcon="qamACY"
@@ -243,6 +247,8 @@
243247
<MODULEPATH id="squarepine_animation" path="../modules"/>
244248
<MODULEPATH id="squarepine_cryptography" path="../modules"/>
245249
<MODULEPATH id="juce_audio_processors_headless" path="../../JUCE/modules"/>
250+
<MODULEPATH id="juce_javascript" path="../../JUCE/modules"/>
251+
<MODULEPATH id="juce_midi_ci" path="../../JUCE/modules"/>
246252
</MODULEPATHS>
247253
</VS2022>
248254
<VS2022 targetFolder="builds/vs2022_clangcl" toolset="ClangCL" smallIcon="Shhj0E"
@@ -282,6 +288,8 @@
282288
<MODULEPATH id="squarepine_animation" path="../modules"/>
283289
<MODULEPATH id="squarepine_cryptography" path="../modules"/>
284290
<MODULEPATH id="juce_audio_processors_headless" path="../../JUCE/modules"/>
291+
<MODULEPATH id="juce_javascript" path="../../JUCE/modules"/>
292+
<MODULEPATH id="juce_midi_ci" path="../../JUCE/modules"/>
285293
</MODULEPATHS>
286294
</VS2022>
287295
<VS2022 targetFolder="builds/vs2022_icuesdk" extraDefs="_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING=1&#10;SQUAREPINE_USE_ICUESDK=1"
@@ -319,8 +327,50 @@
319327
<MODULEPATH id="squarepine_cryptography" path="../modules"/>
320328
<MODULEPATH id="squarepine_graphics" path="../modules/"/>
321329
<MODULEPATH id="juce_audio_processors_headless" path="../../JUCE/modules"/>
330+
<MODULEPATH id="juce_javascript" path="../../JUCE/modules"/>
331+
<MODULEPATH id="juce_midi_ci" path="../../JUCE/modules"/>
322332
</MODULEPATHS>
323333
</VS2022>
334+
<VS2026 targetFolder="builds/vs2026" smallIcon="Shhj0E" bigIcon="qamACY">
335+
<CONFIGURATIONS>
336+
<CONFIGURATION isDebug="1" name="Debug" winArchitecture="ARM64"/>
337+
<CONFIGURATION isDebug="0" name="Release" winArchitecture="ARM64"/>
338+
<CONFIGURATION isDebug="1" name="Debug"/>
339+
<CONFIGURATION isDebug="0" name="Release"/>
340+
<CONFIGURATION isDebug="1" name="Debug" winArchitecture="Win32"/>
341+
<CONFIGURATION isDebug="0" name="Release" winArchitecture="Win32"/>
342+
</CONFIGURATIONS>
343+
<MODULEPATHS>
344+
<MODULEPATH id="juce_analytics" path="../../JUCE/modules"/>
345+
<MODULEPATH id="juce_animation" path="../../JUCE/modules"/>
346+
<MODULEPATH id="juce_audio_basics" path="../../JUCE/modules"/>
347+
<MODULEPATH id="juce_audio_devices" path="../../JUCE/modules"/>
348+
<MODULEPATH id="juce_audio_formats" path="../../JUCE/modules"/>
349+
<MODULEPATH id="juce_audio_processors" path="../../JUCE/modules"/>
350+
<MODULEPATH id="juce_audio_processors_headless" path="../../JUCE/modules"/>
351+
<MODULEPATH id="juce_audio_utils" path="../../JUCE/modules"/>
352+
<MODULEPATH id="juce_box2d" path="../../JUCE/modules"/>
353+
<MODULEPATH id="juce_core" path="../../JUCE/modules"/>
354+
<MODULEPATH id="juce_cryptography" path="../../JUCE/modules"/>
355+
<MODULEPATH id="juce_data_structures" path="../../JUCE/modules"/>
356+
<MODULEPATH id="juce_dsp" path="../../JUCE/modules"/>
357+
<MODULEPATH id="juce_events" path="../../JUCE/modules"/>
358+
<MODULEPATH id="juce_graphics" path="../../JUCE/modules"/>
359+
<MODULEPATH id="juce_gui_basics" path="../../JUCE/modules"/>
360+
<MODULEPATH id="juce_gui_extra" path="../../JUCE/modules"/>
361+
<MODULEPATH id="juce_javascript" path="../../JUCE/modules"/>
362+
<MODULEPATH id="juce_midi_ci" path="../../JUCE/modules"/>
363+
<MODULEPATH id="juce_opengl" path="../../JUCE/modules"/>
364+
<MODULEPATH id="juce_osc" path="../../JUCE/modules"/>
365+
<MODULEPATH id="juce_product_unlocking" path="../../JUCE/modules"/>
366+
<MODULEPATH id="juce_video" path="../../JUCE/modules"/>
367+
<MODULEPATH id="squarepine_animation" path="../modules"/>
368+
<MODULEPATH id="squarepine_audio" path="../modules/"/>
369+
<MODULEPATH id="squarepine_core" path="../modules/"/>
370+
<MODULEPATH id="squarepine_cryptography" path="../modules"/>
371+
<MODULEPATH id="squarepine_graphics" path="../modules/"/>
372+
</MODULEPATHS>
373+
</VS2026>
324374
<XCODE_IPHONE targetFolder="builds/ios" iosScreenOrientation="UIInterfaceOrientationLandscapeLeft,UIInterfaceOrientationLandscapeRight,UIInterfaceOrientationPortrait,UIInterfaceOrientationPortraitUpsideDown"
325375
iPadScreenOrientation="UIInterfaceOrientationLandscapeLeft,UIInterfaceOrientationLandscapeRight,UIInterfaceOrientationPortrait,UIInterfaceOrientationPortraitUpsideDown"
326376
UIFileSharingEnabled="1" UISupportsDocumentBrowser="1" smallIcon="Shhj0E"
@@ -357,6 +407,8 @@
357407
<MODULEPATH id="squarepine_animation" path="../modules"/>
358408
<MODULEPATH id="squarepine_cryptography" path="../modules"/>
359409
<MODULEPATH id="juce_audio_processors_headless" path="../../JUCE/modules"/>
410+
<MODULEPATH id="juce_javascript" path="../../JUCE/modules"/>
411+
<MODULEPATH id="juce_midi_ci" path="../../JUCE/modules"/>
360412
</MODULEPATHS>
361413
</XCODE_IPHONE>
362414
<XCODE_MAC targetFolder="builds/macos" xcodeValidArchs="arm64,x86_64" applicationCategory="public.app-category.games"
@@ -392,6 +444,8 @@
392444
<MODULEPATH id="squarepine_animation" path="../modules"/>
393445
<MODULEPATH id="squarepine_cryptography" path="../modules"/>
394446
<MODULEPATH id="juce_audio_processors_headless" path="../../JUCE/modules"/>
447+
<MODULEPATH id="juce_javascript" path="../../JUCE/modules"/>
448+
<MODULEPATH id="juce_midi_ci" path="../../JUCE/modules"/>
395449
</MODULEPATHS>
396450
</XCODE_MAC>
397451
</EXPORTFORMATS>
@@ -414,6 +468,8 @@
414468
<MODULE id="juce_graphics" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
415469
<MODULE id="juce_gui_basics" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
416470
<MODULE id="juce_gui_extra" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
471+
<MODULE id="juce_javascript" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
472+
<MODULE id="juce_midi_ci" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
417473
<MODULE id="juce_opengl" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
418474
<MODULE id="juce_osc" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
419475
<MODULE id="juce_product_unlocking" showAllCode="1" useLocalCopy="0"

‎demo/source/demos/CRCDemo.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ class CRCTableListBoxModel final : public TableListBoxModel
362362
void paintRowBackground (Graphics&, int, int, int, bool) override { }
363363

364364
/** @internal */
365-
void paintCell (Graphics& g, int rowNumber, int columnId, int width, int height, bool rowIsSelected) override
365+
void paintCell (Graphics& g, int rowNumber, int columnId, int width, int height, bool) override
366366
{
367367
SQUAREPINE_CRASH_TRACER
368368

‎demo/source/demos/EffectChainDemo.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ class DemoEffectFactory final : public EffectProcessorFactory
66
DemoEffectFactory (KnownPluginList& kpl) :
77
EffectProcessorFactory (kpl)
88
{
9-
auto* effectFormat = new SquarePineAudioPluginFormat();
9+
auto effectFormat = std::make_unique<SquarePineAudioPluginFormat>();
1010
effectFormat->addEffectPluginDescriptionsTo (kpl);
11-
apfm.addFormat (effectFormat);
11+
apfm.addFormat (std::move (effectFormat));
1212
}
1313

1414
//==============================================================================

‎demo/source/main/MainComponent.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ MainComponent::MainComponent (SharedObjects& sharedObjs) :
3434
addDemo (new EffectChainDemo (sharedObjs));
3535
addDemo (new MediaDeviceListerDemo (sharedObjs));
3636

37+
#if SQUAREPINE_USE_GOOGLE_API
38+
addDemo (new GoogleAPIDemo (sharedObjs));
39+
#endif
40+
3741
#if SQUAREPINE_USE_ICUESDK
3842
addDemo (new iCUESDKDemo (sharedObjs));
3943
#endif

‎modules/squarepine_audio/core/ChildProcessPluginScanner.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ void ChildProcessPluginScanner::performScanInChildProcess (const String& fileOrI
160160
}
161161

162162
AudioPluginFormatManager pluginFormatManager;
163-
pluginFormatManager.addDefaultFormats();
163+
addHeadlessDefaultFormatsToManager (pluginFormatManager);
164164

165165
for (auto i = customFormats.size(); --i >= 0;)
166-
pluginFormatManager.addFormat (customFormats.removeAndReturn (i));
166+
pluginFormatManager.addFormat (rawToUniquePtr (customFormats.removeAndReturn (i)));
167167

168168
for (auto i = 0; i < pluginFormatManager.getNumFormats(); ++i)
169169
{

0 commit comments

Comments
 (0)