From f2e20d35eb38098fa5f850e787b3328782cf239a Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 18 Nov 2024 17:50:49 -0500
Subject: Move features struct to a separate file

---
 src/features.h      | 42 ++++++++++++++++++++++++++++++++++++++++++
 src/jalv_internal.h | 27 +--------------------------
 2 files changed, 43 insertions(+), 26 deletions(-)
 create mode 100644 src/features.h

(limited to 'src')

diff --git a/src/features.h b/src/features.h
new file mode 100644
index 0000000..b6855f5
--- /dev/null
+++ b/src/features.h
@@ -0,0 +1,42 @@
+// Copyright 2018-2024 David Robillard <d@drobilla.net>
+// SPDX-License-Identifier: ISC
+
+#ifndef JALV_FEATURES_H
+#define JALV_FEATURES_H
+
+#include "attributes.h"
+
+#include <lv2/core/lv2.h>
+#include <lv2/data-access/data-access.h>
+#include <lv2/log/log.h>
+#include <lv2/options/options.h>
+#include <lv2/state/state.h>
+#include <lv2/ui/ui.h>
+#include <lv2/worker/worker.h>
+
+// LV2 feature support
+JALV_BEGIN_DECLS
+
+/// LV2 features and associated data to be passed to plugins
+typedef struct {
+  LV2_Feature                map_feature;
+  LV2_Feature                unmap_feature;
+  LV2_State_Make_Path        make_path;
+  LV2_Feature                make_path_feature;
+  LV2_Worker_Schedule        sched;
+  LV2_Feature                sched_feature;
+  LV2_Worker_Schedule        ssched;
+  LV2_Feature                state_sched_feature;
+  LV2_Log_Log                llog;
+  LV2_Feature                log_feature;
+  LV2_Options_Option         options[7];
+  LV2_Feature                options_feature;
+  LV2_Feature                safe_restore_feature;
+  LV2UI_Request_Value        request_value;
+  LV2_Feature                request_value_feature;
+  LV2_Extension_Data_Feature ext_data;
+} JalvFeatures;
+
+JALV_END_DECLS
+
+#endif // JALV_FEATURES_H
diff --git a/src/jalv_internal.h b/src/jalv_internal.h
index 592d9c8..9ac458e 100644
--- a/src/jalv_internal.h
+++ b/src/jalv_internal.h
@@ -7,6 +7,7 @@
 #include "attributes.h"
 #include "control.h"
 #include "dumper.h"
+#include "features.h"
 #include "jalv_config.h"
 #include "log.h"
 #include "mapper.h"
@@ -24,13 +25,7 @@
 #include <lilv/lilv.h>
 #include <lv2/atom/forge.h>
 #include <lv2/core/lv2.h>
-#include <lv2/data-access/data-access.h>
-#include <lv2/log/log.h>
-#include <lv2/options/options.h>
-#include <lv2/state/state.h>
-#include <lv2/ui/ui.h>
 #include <lv2/urid/urid.h>
-#include <lv2/worker/worker.h>
 #include <zix/ring.h>
 #include <zix/sem.h>
 
@@ -41,26 +36,6 @@
 // "Shared" internal application declarations
 JALV_BEGIN_DECLS
 
-/// LV2 features and associated data to be passed to plugins
-typedef struct {
-  LV2_Feature                map_feature;
-  LV2_Feature                unmap_feature;
-  LV2_State_Make_Path        make_path;
-  LV2_Feature                make_path_feature;
-  LV2_Worker_Schedule        sched;
-  LV2_Feature                sched_feature;
-  LV2_Worker_Schedule        ssched;
-  LV2_Feature                state_sched_feature;
-  LV2_Log_Log                llog;
-  LV2_Feature                log_feature;
-  LV2_Options_Option         options[7];
-  LV2_Feature                options_feature;
-  LV2_Feature                safe_restore_feature;
-  LV2UI_Request_Value        request_value;
-  LV2_Feature                request_value_feature;
-  LV2_Extension_Data_Feature ext_data;
-} JalvFeatures;
-
 /// Internal application state
 struct JalvImpl {
   JalvOptions       opts;         ///< Command-line options
-- 
cgit v1.2.1