Move extensions out of draft

free-audio · Dec 20, 2023 · bd62a29 · bd62a29
1 parent 8415273
commit bd62a29
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 27 deletions.
diff --git a/include/clap/clap.h b/include/clap/clap.h
@@ -28,44 +28,45 @@
 #include "entry.h"
 
 #include "factory/plugin-factory.h"
+#include "factory/preset-discovery.h"
+
 #include "factory/draft/plugin-invalidation.h"
-#include "factory/draft/preset-discovery.h"
 
 #include "plugin.h"
 #include "plugin-features.h"
 #include "host.h"
 
+#include "ext/audio-ports-activation.h"
 #include "ext/audio-ports-config.h"
 #include "ext/audio-ports.h"
+#include "ext/configurable-audio-ports.h"
+#include "ext/context-menu.h"
 #include "ext/event-registry.h"
 #include "ext/gui.h"
 #include "ext/latency.h"
 #include "ext/log.h"
 #include "ext/note-name.h"
 #include "ext/note-ports.h"
+#include "ext/param-indication.h"
 #include "ext/params.h"
 #include "ext/posix-fd-support.h"
+#include "ext/preset-load.h"
+#include "ext/remote-controls.h"
 #include "ext/render.h"
+#include "ext/state-context.h"
 #include "ext/state.h"
+#include "ext/surround.h"
 #include "ext/tail.h"
 #include "ext/thread-check.h"
 #include "ext/thread-pool.h"
 #include "ext/timer-support.h"
+#include "ext/track-info.h"
 #include "ext/voice-info.h"
 
 #include "ext/draft/ambisonic.h"
-#include "ext/draft/audio-ports-activation.h"
-#include "ext/draft/context-menu.h"
 #include "ext/draft/cv.h"
 #include "ext/draft/midi-mappings.h"
-#include "ext/draft/param-indication.h"
-#include "ext/draft/preset-load.h"
-#include "ext/draft/remote-controls.h"
 #include "ext/draft/resource-directory.h"
-#include "ext/draft/state-context.h"
-#include "ext/draft/surround.h"
-#include "ext/draft/track-info.h"
 #include "ext/draft/triggers.h"
 #include "ext/draft/tuning.h"
-#include "ext/draft/configurable-audio-ports.h"
 #include "ext/draft/extensible-audio-ports.h"
diff --git a/...e/clap/ext/draft/audio-ports-activation.h → include/clap/ext/audio-ports-activation.h b/...e/clap/ext/draft/audio-ports-activation.h → include/clap/ext/audio-ports-activation.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../plugin.h"
+#include "../plugin.h"
 
 /// @page Audio Ports Activation
 ///

diff --git a/...clap/ext/draft/configurable-audio-ports.h → include/clap/ext/configurable-audio-ports.h b/...clap/ext/draft/configurable-audio-ports.h → include/clap/ext/configurable-audio-ports.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../audio-ports.h"
+#include "audio-ports.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/clap/ext/draft/context-menu.h → include/clap/ext/context-menu.h b/include/clap/ext/draft/context-menu.h → include/clap/ext/context-menu.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../plugin.h"
+#include "../plugin.h"
 
 // This extension lets the host and plugin exchange menu items and let the plugin ask the host to
 // show its context menu.

diff --git a/include/clap/ext/draft/param-indication.h → include/clap/ext/param-indication.h b/include/clap/ext/draft/param-indication.h → include/clap/ext/param-indication.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../params.h"
-#include "../../color.h"
+#include "params.h"
+#include "../color.h"
 
 // This extension lets the host tell the plugin to display a little color based indication on the
 // parameter. This can be used to indicate:

diff --git a/include/clap/ext/draft/preset-load.h → include/clap/ext/preset-load.h b/include/clap/ext/draft/preset-load.h → include/clap/ext/preset-load.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../plugin.h"
+#include "../plugin.h"
 
 static const char CLAP_EXT_PRESET_LOAD[] = "clap.preset-load.draft/2";
 

diff --git a/include/clap/ext/draft/remote-controls.h → include/clap/ext/remote-controls.h b/include/clap/ext/draft/remote-controls.h → include/clap/ext/remote-controls.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../plugin.h"
-#include "../../string-sizes.h"
+#include "../plugin.h"
+#include "../string-sizes.h"
 
 // This extension let the plugin provide a structured way of mapping parameters to an hardware
 // controller.

diff --git a/include/clap/ext/draft/state-context.h → include/clap/ext/state-context.h b/include/clap/ext/draft/state-context.h → include/clap/ext/state-context.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../plugin.h"
-#include "../../stream.h"
+#include "../plugin.h"
+#include "../stream.h"
 
 /// @page state-context extension
 /// @brief extended state handling

diff --git a/include/clap/ext/draft/surround.h → include/clap/ext/surround.h b/include/clap/ext/draft/surround.h → include/clap/ext/surround.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../plugin.h"
+#include "../plugin.h"
 
 // This extension can be used to specify the channel mapping used by the plugin.
 //

diff --git a/include/clap/ext/draft/track-info.h → include/clap/ext/track-info.h b/include/clap/ext/draft/track-info.h → include/clap/ext/track-info.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../plugin.h"
-#include "../../color.h"
-#include "../../string-sizes.h"
+#include "../plugin.h"
+#include "../color.h"
+#include "../string-sizes.h"
 
 // This extension let the plugin query info about the track it's in.
 // It is useful when the plugin is created, to initialize some parameters (mix, dry, wet)

diff --git a/...ude/clap/factory/draft/preset-discovery.h → include/clap/factory/preset-discovery.h b/...ude/clap/factory/draft/preset-discovery.h → include/clap/factory/preset-discovery.h
@@ -41,9 +41,9 @@
 
 #pragma once
 
-#include "../../private/std.h"
-#include "../../private/macros.h"
-#include "../../version.h"
+#include "../private/std.h"
+#include "../private/macros.h"
+#include "../version.h"
 
 // Use it to retrieve const clap_preset_discovery_factory_t* from
 // clap_plugin_entry.get_factory()