diff --git a/modules/juce_audio_plugin_client/juce_audio_plugin_client_LV2.cpp b/modules/juce_audio_plugin_client/juce_audio_plugin_client_LV2.cpp index f11e6fc151..7d494752a6 100644 --- a/modules/juce_audio_plugin_client/juce_audio_plugin_client_LV2.cpp +++ b/modules/juce_audio_plugin_client/juce_audio_plugin_client_LV2.cpp @@ -346,12 +346,12 @@ public: const auto numerator = parser.parseNumericAtom (atomBeatsPerBar); const auto denominator = parser.parseNumericAtom (atomBeatUnit); - if (numerator.hasValue() && denominator.hasValue()) + if (numerator.has_value() && denominator.has_value()) info->setTimeSignature (TimeSignature { (int) *numerator, (int) *denominator }); info->setBpm (parser.parseNumericAtom (atomBeatsPerMinute)); info->setPpqPosition (parser.parseNumericAtom (atomBeat)); - info->setIsPlaying (! approximatelyEqual (parser.parseNumericAtom (atomSpeed).orFallback (0.0f), 0.0f)); + info->setIsPlaying (! approximatelyEqual (parser.parseNumericAtom (atomSpeed).value_or (0.0f), 0.0f)); info->setBarCount (parser.parseNumericAtom (atomBar)); if (const auto parsed = parser.parseNumericAtom (atomFrame)) @@ -1451,7 +1451,7 @@ LV2_SYMBOL_EXPORT const LV2_Descriptor* lv2_descriptor (uint32_t index) const auto blockLengthUrid = mapFeature->map (mapFeature->handle, LV2_BUF_SIZE__maxBlockLength); const auto blockSize = parser.parseNumericOption (findMatchingOption (options, blockLengthUrid)); - if (! blockSize.hasValue()) + if (! blockSize.has_value()) { // The host doesn't specify a maximum block size jassertfalse; diff --git a/modules/juce_audio_processors_headless/format_types/juce_LV2Common.h b/modules/juce_audio_processors_headless/format_types/juce_LV2Common.h index 051ebc15fe..2f4886e4ff 100644 --- a/modules/juce_audio_processors_headless/format_types/juce_LV2Common.h +++ b/modules/juce_audio_processors_headless/format_types/juce_LV2Common.h @@ -151,13 +151,13 @@ struct NumericAtomParser template struct Tag { LV2_URID urid; }; template - static Optional tryParse (const LV2_Atom&, const void*) + static std::optional tryParse (const LV2_Atom&, const void*) { return {}; } template - static Optional tryParse (const LV2_Atom& atom, const void* data, Tag head, Tag... tail) + static std::optional tryParse (const LV2_Atom& atom, const void* data, Tag head, Tag... tail) { if (atom.type == head.urid && atom.size == sizeof (Head)) return static_cast (*reinterpret_cast (data)); @@ -166,7 +166,7 @@ struct NumericAtomParser } template - Optional parseNumericAtom (const LV2_Atom* atom, const void* data) const + std::optional parseNumericAtom (const LV2_Atom* atom, const void* data) const { if (atom == nullptr) return {}; @@ -181,13 +181,13 @@ struct NumericAtomParser } template - Optional parseNumericAtom (const LV2_Atom* atom) const + std::optional parseNumericAtom (const LV2_Atom* atom) const { return parseNumericAtom (atom, atom + 1); } template - Optional parseNumericOption (const LV2_Options_Option* option) const + std::optional parseNumericOption (const LV2_Options_Option* option) const { if (option != nullptr) { @@ -278,7 +278,7 @@ struct PatchSetHelper const auto parseResult = parser.parseNumericAtom (value); - if (! parseResult.hasValue()) + if (! parseResult.has_value()) { // Didn't understand the type of this atom. jassertfalse;