Skip to content

Commit 8fe048c

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into develop
2 parents dfaa64f + ae805ff commit 8fe048c

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

modules/juce_audio_plugin_client/juce_audio_plugin_client_AU_1.mm

+6-1
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,9 @@ ComponentResult GetProperty (AudioUnitPropertyID inID,
589589
*ptr = contextObserver;
590590
return noErr;
591591
}
592+
593+
jassertfalse;
594+
break;
592595
}
593596
#endif
594597

@@ -619,7 +622,6 @@ ComponentResult GetProperty (AudioUnitPropertyID inID,
619622
else
620623
pv->outValue = param->getValueForText (text) * getMaximumParameterValue (param);
621624

622-
623625
return noErr;
624626
}
625627
}
@@ -2019,6 +2021,8 @@ explicit ScopedMIDIEventListBlock (AUMIDIEventListBlock b) : midiEventListBlock
20192021
int totalInChannels, totalOutChannels;
20202022
HeapBlock<bool> pulledSucceeded;
20212023
HeapBlock<MIDIPacketList> packetList { packetListBytes, 1 };
2024+
2025+
#if JUCE_AUDIOWORKGROUP_TYPES_AVAILABLE
20222026
ObjCBlock<AURenderContextObserver> contextObserver { ^(const AudioUnitRenderContext* context)
20232027
{
20242028
if (juceFilter == nullptr)
@@ -2027,6 +2031,7 @@ explicit ScopedMIDIEventListBlock (AUMIDIEventListBlock b) : midiEventListBlock
20272031
auto workgroup = makeRealAudioWorkgroup (context != nullptr ? context->workgroup : nullptr);
20282032
juceFilter->audioWorkgroupContextChanged (std::move (workgroup));
20292033
} };
2034+
#endif
20302035

20312036
ThreadLocalValue<bool> inParameterChangedCallback;
20322037

modules/juce_audio_plugin_client/juce_audio_plugin_client_VST3.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -4235,10 +4235,6 @@ struct JucePluginFactory : public IPluginFactory3
42354235

42364236
static const ClassEntry classEntries[]
42374237
{
4238-
ClassEntry { compatibilityClass, [] (Vst::IHostApplication*) -> Steinberg::FUnknown*
4239-
{
4240-
return new JucePluginCompatibility;
4241-
} },
42424238
ClassEntry { componentClass, [] (Vst::IHostApplication* h) -> Steinberg::FUnknown*
42434239
{
42444240
return static_cast<Vst::IAudioProcessor*> (new JuceVST3Component (h));
@@ -4247,6 +4243,10 @@ struct JucePluginFactory : public IPluginFactory3
42474243
{
42484244
return static_cast<Vst::IEditController*> (new JuceVST3EditController (h));
42494245
} },
4246+
ClassEntry { compatibilityClass, [] (Vst::IHostApplication*) -> Steinberg::FUnknown*
4247+
{
4248+
return new JucePluginCompatibility;
4249+
} },
42504250
#if JucePlugin_Enable_ARA
42514251
ClassEntry { araFactoryClass, [] (Vst::IHostApplication*) -> Steinberg::FUnknown*
42524252
{

0 commit comments

Comments
 (0)