Move JalvURIDs and JalvNodes to their own headers

10 files changed, 120 insertions, 74 deletions

diff --git a/src/control.h b/src/control.h
index 609d75a..037ef31 100644
--- a/src/control.h
+++ b/src/control.h
@@ -5,6 +5,7 @@
 #define JALV_CONTROL_H
 
 #include "jalv_internal.h"
+#include "nodes.h"
 
 #include "lilv/lilv.h"
 #include "lv2/atom/forge.h"
diff --git a/src/jack.c b/src/jack.c
index fe92902..20b8aeb 100644
--- a/src/jack.c
+++ b/src/jack.c
@@ -8,6 +8,8 @@
 #include "jalv_internal.h"
 #include "log.h"
 #include "lv2_evbuf.h"
+#include "nodes.h"
+#include "urids.h"
 
 #include "lilv/lilv.h"
 #include "lv2/atom/atom.h"
diff --git a/src/jalv.c b/src/jalv.c
index be676f4..b0b88c4 100644
--- a/src/jalv.c
+++ b/src/jalv.c
@@ -12,7 +12,9 @@
 #include "jalv_internal.h"
 #include "log.h"
 #include "lv2_evbuf.h"
+#include "nodes.h"
 #include "state.h"
+#include "urids.h"
 #include "worker.h"
 
 #include "lilv/lilv.h"
diff --git a/src/jalv_gtk.c b/src/jalv_gtk.c
index 4d9248c..5b6bc16 100644
--- a/src/jalv_gtk.c
+++ b/src/jalv_gtk.c
@@ -4,7 +4,9 @@
 #include "control.h"
 #include "frontend.h"
 #include "jalv_internal.h"
+#include "nodes.h"
 #include "state.h"
+#include "urids.h"
 
 #include "lilv/lilv.h"
 #include "lv2/atom/atom.h"
diff --git a/src/jalv_internal.h b/src/jalv_internal.h
index d186679..989b6cb 100644
--- a/src/jalv_internal.h
+++ b/src/jalv_internal.h
@@ -6,7 +6,9 @@
 
 #include "jalv_config.h"
 #include "lv2_evbuf.h"
+#include "nodes.h"
 #include "symap.h"
+#include "urids.h"
 
 #include "zix/ring.h"
 #include "zix/sem.h"
@@ -137,80 +139,6 @@ typedef struct {
   char*    ui_uri;          ///< URI of UI to load
 } JalvOptions;
 
-typedef struct {
-  LV2_URID atom_Float;
-  LV2_URID atom_Int;
-  LV2_URID atom_Object;
-  LV2_URID atom_Path;
-  LV2_URID atom_String;
-  LV2_URID atom_eventTransfer;
-  LV2_URID bufsz_maxBlockLength;
-  LV2_URID bufsz_minBlockLength;
-  LV2_URID bufsz_sequenceSize;
-  LV2_URID log_Error;
-  LV2_URID log_Trace;
-  LV2_URID log_Warning;
-  LV2_URID midi_MidiEvent;
-  LV2_URID param_sampleRate;
-  LV2_URID patch_Get;
-  LV2_URID patch_Put;
-  LV2_URID patch_Set;
-  LV2_URID patch_body;
-  LV2_URID patch_property;
-  LV2_URID patch_value;
-  LV2_URID time_Position;
-  LV2_URID time_bar;
-  LV2_URID time_barBeat;
-  LV2_URID time_beatUnit;
-  LV2_URID time_beatsPerBar;
-  LV2_URID time_beatsPerMinute;
-  LV2_URID time_frame;
-  LV2_URID time_speed;
-  LV2_URID ui_scaleFactor;
-  LV2_URID ui_updateRate;
-} JalvURIDs;
-
-typedef struct {
-  LilvNode* atom_AtomPort;
-  LilvNode* atom_Chunk;
-  LilvNode* atom_Float;
-  LilvNode* atom_Path;
-  LilvNode* atom_Sequence;
-  LilvNode* lv2_AudioPort;
-  LilvNode* lv2_CVPort;
-  LilvNode* lv2_ControlPort;
-  LilvNode* lv2_InputPort;
-  LilvNode* lv2_OutputPort;
-  LilvNode* lv2_connectionOptional;
-  LilvNode* lv2_control;
-  LilvNode* lv2_default;
-  LilvNode* lv2_enumeration;
-  LilvNode* lv2_extensionData;
-  LilvNode* lv2_integer;
-  LilvNode* lv2_maximum;
-  LilvNode* lv2_minimum;
-  LilvNode* lv2_name;
-  LilvNode* lv2_reportsLatency;
-  LilvNode* lv2_sampleRate;
-  LilvNode* lv2_symbol;
-  LilvNode* lv2_toggled;
-  LilvNode* midi_MidiEvent;
-  LilvNode* pg_group;
-  LilvNode* pprops_logarithmic;
-  LilvNode* pprops_notOnGUI;
-  LilvNode* pprops_rangeSteps;
-  LilvNode* pset_Preset;
-  LilvNode* pset_bank;
-  LilvNode* rdfs_comment;
-  LilvNode* rdfs_label;
-  LilvNode* rdfs_range;
-  LilvNode* rsz_minimumSize;
-  LilvNode* ui_showInterface;
-  LilvNode* work_interface;
-  LilvNode* work_schedule;
-  LilvNode* end; ///< NULL terminator for easy freeing of entire structure
-} JalvNodes;
-
 typedef enum { JALV_RUNNING, JALV_PAUSE_REQUESTED, JALV_PAUSED } JalvPlayState;
 
 typedef struct {
diff --git a/src/jalv_qt.cpp b/src/jalv_qt.cpp
index 434cf9e..6b734b3 100644
--- a/src/jalv_qt.cpp
+++ b/src/jalv_qt.cpp
@@ -4,6 +4,7 @@
 #include "jalv_qt.hpp"
 #include "frontend.h"
 #include "jalv_internal.h"
+#include "nodes.h"
 
 #include "lilv/lilv.h"
 #include "suil/suil.h"
diff --git a/src/log.c b/src/log.c
index 70b272d..e2defa7 100644
--- a/src/log.c
+++ b/src/log.c
@@ -7,6 +7,7 @@
 
 #include "jalv_config.h"
 #include "jalv_internal.h"
+#include "urids.h"
 
 #include "lilv/lilv.h"
 #include "lv2/log/log.h"
diff --git a/src/nodes.h b/src/nodes.h
new file mode 100644
index 0000000..d1adcd7
--- /dev/null
+++ b/src/nodes.h
@@ -0,0 +1,58 @@
+// Copyright 2007-2022 David Robillard <d@drobilla.net>
+// SPDX-License-Identifier: ISC
+
+#ifndef JALV_NODES_H
+#define JALV_NODES_H
+
+#include "lilv/lilv.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+  LilvNode* atom_AtomPort;
+  LilvNode* atom_Chunk;
+  LilvNode* atom_Float;
+  LilvNode* atom_Path;
+  LilvNode* atom_Sequence;
+  LilvNode* lv2_AudioPort;
+  LilvNode* lv2_CVPort;
+  LilvNode* lv2_ControlPort;
+  LilvNode* lv2_InputPort;
+  LilvNode* lv2_OutputPort;
+  LilvNode* lv2_connectionOptional;
+  LilvNode* lv2_control;
+  LilvNode* lv2_default;
+  LilvNode* lv2_enumeration;
+  LilvNode* lv2_extensionData;
+  LilvNode* lv2_integer;
+  LilvNode* lv2_maximum;
+  LilvNode* lv2_minimum;
+  LilvNode* lv2_name;
+  LilvNode* lv2_reportsLatency;
+  LilvNode* lv2_sampleRate;
+  LilvNode* lv2_symbol;
+  LilvNode* lv2_toggled;
+  LilvNode* midi_MidiEvent;
+  LilvNode* pg_group;
+  LilvNode* pprops_logarithmic;
+  LilvNode* pprops_notOnGUI;
+  LilvNode* pprops_rangeSteps;
+  LilvNode* pset_Preset;
+  LilvNode* pset_bank;
+  LilvNode* rdfs_comment;
+  LilvNode* rdfs_label;
+  LilvNode* rdfs_range;
+  LilvNode* rsz_minimumSize;
+  LilvNode* ui_showInterface;
+  LilvNode* work_interface;
+  LilvNode* work_schedule;
+  LilvNode* end; ///< NULL terminator for easy freeing of entire structure
+} JalvNodes;
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // JALV_NODES_H
diff --git a/src/state.c b/src/state.c
index 2be7de5..ab06c23 100644
--- a/src/state.c
+++ b/src/state.c
@@ -5,6 +5,7 @@
 
 #include "jalv_internal.h"
 #include "log.h"
+#include "nodes.h"
 
 #include "lilv/lilv.h"
 #include "lv2/atom/forge.h"
diff --git a/src/urids.h b/src/urids.h
new file mode 100644
index 0000000..9363419
--- /dev/null
+++ b/src/urids.h
@@ -0,0 +1,50 @@
+// Copyright 2007-2022 David Robillard <d@drobilla.net>
+// SPDX-License-Identifier: ISC
+
+#ifndef JALV_URIDS_H
+#define JALV_URIDS_H
+
+#include "lv2/urid/urid.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+  LV2_URID atom_Float;
+  LV2_URID atom_Int;
+  LV2_URID atom_Object;
+  LV2_URID atom_Path;
+  LV2_URID atom_String;
+  LV2_URID atom_eventTransfer;
+  LV2_URID bufsz_maxBlockLength;
+  LV2_URID bufsz_minBlockLength;
+  LV2_URID bufsz_sequenceSize;
+  LV2_URID log_Error;
+  LV2_URID log_Trace;
+  LV2_URID log_Warning;
+  LV2_URID midi_MidiEvent;
+  LV2_URID param_sampleRate;
+  LV2_URID patch_Get;
+  LV2_URID patch_Put;
+  LV2_URID patch_Set;
+  LV2_URID patch_body;
+  LV2_URID patch_property;
+  LV2_URID patch_value;
+  LV2_URID time_Position;
+  LV2_URID time_bar;
+  LV2_URID time_barBeat;
+  LV2_URID time_beatUnit;
+  LV2_URID time_beatsPerBar;
+  LV2_URID time_beatsPerMinute;
+  LV2_URID time_frame;
+  LV2_URID time_speed;
+  LV2_URID ui_scaleFactor;
+  LV2_URID ui_updateRate;
+} JalvURIDs;
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // JALV_URIDS_H