From 7f75c5a3698cd223a667d3eae5c6b6611264e03f Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 24 Dec 2023 00:30:41 +0100 Subject: [PATCH] Tweaks to make ttl validators happy Signed-off-by: falkTX --- .github/workflows/dpf.yml | 4 +++- source/plugin/carla-lv2-export.cpp | 32 ++++++++++++++++++++---------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.github/workflows/dpf.yml b/.github/workflows/dpf.yml index 7f36bda57..954381060 100644 --- a/.github/workflows/dpf.yml +++ b/.github/workflows/dpf.yml @@ -10,7 +10,9 @@ jobs: linux: strategy: matrix: - target: [linux-arm64, linux-armhf, linux-i686, linux-riscv64, linux-x86_64] + target: [linux-x86_64] + # TODO: add PawPaw bootstrap type + # linux-arm64, linux-armhf, linux-i686, linux-riscv64, runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 diff --git a/source/plugin/carla-lv2-export.cpp b/source/plugin/carla-lv2-export.cpp index b64df5482..72c9a5129 100644 --- a/source/plugin/carla-lv2-export.cpp +++ b/source/plugin/carla-lv2-export.cpp @@ -118,6 +118,7 @@ static void writeManifestFile(PluginListManager& plm, const uint32_t microVersio text += "@prefix atom: <" LV2_ATOM_PREFIX "> .\n"; text += "@prefix doap: .\n"; text += "@prefix foaf: .\n"; + text += "@prefix idpy: .\n"; text += "@prefix lv2: <" LV2_CORE_PREFIX "> .\n"; text += "@prefix mod: .\n"; text += "@prefix opts: <" LV2_OPTIONS_PREFIX "> .\n"; @@ -143,6 +144,17 @@ static void writeManifestFile(PluginListManager& plm, const uint32_t microVersio text += " lv2:symbol \"carla\" .\n"; text += "\n"; + // ------------------------------------------------------------------- + // Extensions + + text += "idpy:interface\n"; + text += " a lv2:ExtensionData .\n"; + text += "\n"; + + text += "idpy:queue_draw\n"; + text += " a lv2:Feature .\n"; + text += "\n"; + // ------------------------------------------------------------------- // Plugins @@ -291,28 +303,28 @@ static void writePluginFile(const NativePluginDescriptor* const pluginDesc, switch (pluginDesc->category) { case NATIVE_PLUGIN_CATEGORY_SYNTH: - text += " a lv2:InstrumentPlugin, lv2:Plugin ;\n"; + text += " a lv2:InstrumentPlugin, lv2:Plugin, doap:Project ;\n"; break; case NATIVE_PLUGIN_CATEGORY_DELAY: - text += " a lv2:DelayPlugin, lv2:Plugin ;\n"; + text += " a lv2:DelayPlugin, lv2:Plugin, doap:Project ;\n"; break; case NATIVE_PLUGIN_CATEGORY_EQ: - text += " a lv2:EQPlugin, lv2:Plugin ;\n"; + text += " a lv2:EQPlugin, lv2:Plugin, doap:Project ;\n"; break; case NATIVE_PLUGIN_CATEGORY_FILTER: - text += " a lv2:FilterPlugin, lv2:Plugin ;\n"; + text += " a lv2:FilterPlugin, lv2:Plugin, doap:Project ;\n"; break; case NATIVE_PLUGIN_CATEGORY_DYNAMICS: - text += " a lv2:DynamicsPlugin, lv2:Plugin ;\n"; + text += " a lv2:DynamicsPlugin, lv2:Plugin, doap:Project ;\n"; break; case NATIVE_PLUGIN_CATEGORY_MODULATOR: - text += " a lv2:ModulatorPlugin, lv2:Plugin ;\n"; + text += " a lv2:ModulatorPlugin, lv2:Plugin, doap:Project ;\n"; break; case NATIVE_PLUGIN_CATEGORY_UTILITY: - text += " a lv2:UtilityPlugin, lv2:Plugin ;\n"; + text += " a lv2:UtilityPlugin, lv2:Plugin, doap:Project ;\n"; break; default: - text += " a lv2:Plugin ;\n"; + text += " a lv2:Plugin, doap:Project ;\n"; break; } @@ -325,7 +337,7 @@ static void writePluginFile(const NativePluginDescriptor* const pluginDesc, if (pluginDesc->hints & NATIVE_PLUGIN_IS_RTSAFE) text += " lv2:optionalFeature <" LV2_CORE__hardRTCapable "> ;\n"; if (pluginDesc->hints & NATIVE_PLUGIN_HAS_INLINE_DISPLAY) - text += " lv2:optionalFeature <" LV2_INLINEDISPLAY__queue_draw "> ;\n"; + text += " lv2:optionalFeature idpy:queue_draw ;\n"; if ((pluginDesc->hints & NATIVE_PLUGIN_USES_STATE) || (pluginDesc->hints & NATIVE_PLUGIN_NEEDS_UI_OPEN_SAVE)) text += " lv2:optionalFeature <" LV2_STATE__threadSafeRestore "> ;\n"; text += "\n"; @@ -358,7 +370,7 @@ static void writePluginFile(const NativePluginDescriptor* const pluginDesc, text += " lv2:extensionData <" LV2_WORKER__interface "> ;\n"; if (pluginDesc->hints & NATIVE_PLUGIN_HAS_INLINE_DISPLAY) - text += " lv2:extensionData <" LV2_INLINEDISPLAY__interface "> ;\n"; + text += " lv2:extensionData idpy:interface ;\n"; text += "\n";