From 784f82ffec6b67d853025ea3ea64c793e84e622b Mon Sep 17 00:00:00 2001 From: Tom Poole Date: Thu, 16 Jun 2022 12:10:10 +0100 Subject: [PATCH] Fix some Doxygen issues --- .../LV2_SDK/generate_lv2_bundle_sources.py | 10 +++++++--- .../format_types/juce_AU_Shared.h | 8 ++++---- .../format_types/juce_LV2Common.h | 4 ++++ .../format_types/juce_LV2Resources.h | 4 ++++ modules/juce_core/containers/juce_Optional.h | 2 ++ 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/modules/juce_audio_processors/format_types/LV2_SDK/generate_lv2_bundle_sources.py b/modules/juce_audio_processors/format_types/LV2_SDK/generate_lv2_bundle_sources.py index 5b74f0a83f..299361a4a3 100644 --- a/modules/juce_audio_processors/format_types/LV2_SDK/generate_lv2_bundle_sources.py +++ b/modules/juce_audio_processors/format_types/LV2_SDK/generate_lv2_bundle_sources.py @@ -52,7 +52,7 @@ FUNCTION_TEMPLATE = """/* ============================================================================== This file is part of the JUCE library. - Copyright (c) 2020 - Raw Material Software Limited + Copyright (c) 2022 - Raw Material Software Limited JUCE is an open source library subject to commercial or open-source licensing. @@ -79,6 +79,8 @@ FUNCTION_TEMPLATE = """/* #pragma once +#ifndef DOXYGEN + #include namespace juce @@ -109,7 +111,8 @@ std::vector juce::lv2::Bundle::getAllBundles() {} }}; }} -""" + +#endif""" def chunks(lst, n): @@ -149,5 +152,6 @@ args = parser.parse_args() print(FUNCTION_TEMPLATE.format(", ".join(generate_bundle_source(root, files) for root, files in filter_ttl_files(args.lv2_dir) - if len(files) != 0)), + if len(files) != 0)) + .replace("\t", " "), end = "\r\n") diff --git a/modules/juce_audio_processors/format_types/juce_AU_Shared.h b/modules/juce_audio_processors/format_types/juce_AU_Shared.h index de0b7650cc..5ef274d034 100644 --- a/modules/juce_audio_processors/format_types/juce_AU_Shared.h +++ b/modules/juce_audio_processors/format_types/juce_AU_Shared.h @@ -23,6 +23,8 @@ ============================================================================== */ +#ifndef DOXYGEN + // This macro can be set if you need to override this internal name for some reason.. #ifndef JUCE_STATE_DICTIONARY_KEY #define JUCE_STATE_DICTIONARY_KEY "jucePluginState" @@ -31,8 +33,6 @@ namespace juce { -#ifndef DOXYGEN - struct AudioUnitHelpers { class ChannelRemapper @@ -560,6 +560,6 @@ struct AudioUnitHelpers } }; -#endif - } // namespace juce + +#endif diff --git a/modules/juce_audio_processors/format_types/juce_LV2Common.h b/modules/juce_audio_processors/format_types/juce_LV2Common.h index edcf956114..d3f3275dbc 100644 --- a/modules/juce_audio_processors/format_types/juce_LV2Common.h +++ b/modules/juce_audio_processors/format_types/juce_LV2Common.h @@ -25,6 +25,8 @@ #pragma once +#ifndef DOXYGEN + #include "juce_lv2_config.h" #ifdef Bool @@ -615,3 +617,5 @@ static inline std::vector findStableBusOrder (const String& mainGro } } + +#endif diff --git a/modules/juce_audio_processors/format_types/juce_LV2Resources.h b/modules/juce_audio_processors/format_types/juce_LV2Resources.h index 1404f6aa55..0ff36da91a 100644 --- a/modules/juce_audio_processors/format_types/juce_LV2Resources.h +++ b/modules/juce_audio_processors/format_types/juce_LV2Resources.h @@ -29,6 +29,8 @@ #pragma once +#ifndef DOXYGEN + #include namespace juce @@ -10229,3 +10231,5 @@ to an instance of LV2_Extension_Data_Feature. }; } + +#endif diff --git a/modules/juce_core/containers/juce_Optional.h b/modules/juce_core/containers/juce_Optional.h index a99d581932..6e2333ce98 100644 --- a/modules/juce_core/containers/juce_Optional.h +++ b/modules/juce_core/containers/juce_Optional.h @@ -66,6 +66,8 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4702) used internally in JUCE code, with an API close-enough to std::optional that the types can be swapped with fairly minor disruption at some point in the future, but *without breaking any public APIs*. + + @tags{Core} */ template class Optional