aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2022-05-30 17:29:34 -0400
committerDavid Robillard <d@drobilla.net>2022-08-17 13:50:18 -0400
commit7a7522a335d70c0d0035b7d713a6b3fda9ee2ec0 (patch)
tree3c8f0352d8745eb396f9d6eb3a3412539f1079ec
parent630072071fd852d9f5ee7d0f99862f3d0f19bf1d (diff)
downloadjalv-7a7522a335d70c0d0035b7d713a6b3fda9ee2ec0.tar.gz
jalv-7a7522a335d70c0d0035b7d713a6b3fda9ee2ec0.tar.bz2
jalv-7a7522a335d70c0d0035b7d713a6b3fda9ee2ec0.zip
Separate ui.h from jalv_internal.h
-rw-r--r--src/jalv.c1
-rw-r--r--src/jalv_console.c1
-rw-r--r--src/jalv_gtk.c1
-rw-r--r--src/jalv_internal.h21
-rw-r--r--src/jalv_qt.cpp1
-rw-r--r--src/ui.h44
6 files changed, 48 insertions, 21 deletions
diff --git a/src/jalv.c b/src/jalv.c
index 43b7451..024a201 100644
--- a/src/jalv.c
+++ b/src/jalv.c
@@ -11,6 +11,7 @@
#include "log.h"
#include "lv2_evbuf.h"
#include "state.h"
+#include "ui.h"
#include "worker.h"
#include "lilv/lilv.h"
diff --git a/src/jalv_console.c b/src/jalv_console.c
index e39d2cc..5f6a36b 100644
--- a/src/jalv_console.c
+++ b/src/jalv_console.c
@@ -10,6 +10,7 @@
#include "jalv_internal.h"
#include "log.h"
#include "state.h"
+#include "ui.h"
#include "lilv/lilv.h"
#include "lv2/ui/ui.h"
diff --git a/src/jalv_gtk.c b/src/jalv_gtk.c
index 6e10811..5f36aaf 100644
--- a/src/jalv_gtk.c
+++ b/src/jalv_gtk.c
@@ -3,6 +3,7 @@
#include "jalv_internal.h"
#include "state.h"
+#include "ui.h"
#include "lilv/lilv.h"
#include "lv2/atom/atom.h"
diff --git a/src/jalv_internal.h b/src/jalv_internal.h
index 6b242a6..adaa86e 100644
--- a/src/jalv_internal.h
+++ b/src/jalv_internal.h
@@ -323,9 +323,6 @@ int
jalv_open(Jalv* jalv, int* argc, char*** argv);
int
-jalv_init(int* argc, char*** argv, JalvOptions* opts);
-
-int
jalv_close(Jalv* jalv);
void
@@ -349,24 +346,6 @@ jalv_set_control(const ControlID* control,
LV2_URID type,
const void* body);
-const char*
-jalv_native_ui_type(void);
-
-bool
-jalv_discover_ui(Jalv* jalv);
-
-float
-jalv_ui_refresh_rate(Jalv* jalv);
-
-float
-jalv_ui_scale_factor(Jalv* jalv);
-
-int
-jalv_open_ui(Jalv* jalv);
-
-LilvNode*
-jalv_select_plugin(Jalv* jalv);
-
void
jalv_init_ui(Jalv* jalv);
diff --git a/src/jalv_qt.cpp b/src/jalv_qt.cpp
index 5920b2c..d9bfc57 100644
--- a/src/jalv_qt.cpp
+++ b/src/jalv_qt.cpp
@@ -3,6 +3,7 @@
#include "jalv_qt.hpp"
#include "jalv_internal.h"
+#include "ui.h"
#include "lilv/lilv.h"
#include "suil/suil.h"
diff --git a/src/ui.h b/src/ui.h
new file mode 100644
index 0000000..7eddafa
--- /dev/null
+++ b/src/ui.h
@@ -0,0 +1,44 @@
+// Copyright 2007-2022 David Robillard <d@drobilla.net>
+// SPDX-License-Identifier: ISC
+
+#ifndef JALV_UI_H
+#define JALV_UI_H
+
+#include "jalv_internal.h"
+
+#include "lilv/lilv.h"
+
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Interface that must be implemented by UIs
+
+int
+jalv_init(int* argc, char*** argv, JalvOptions* opts);
+
+const char*
+jalv_native_ui_type(void);
+
+bool
+jalv_discover_ui(Jalv* jalv);
+
+float
+jalv_ui_refresh_rate(Jalv* jalv);
+
+float
+jalv_ui_scale_factor(Jalv* jalv);
+
+int
+jalv_open_ui(Jalv* jalv);
+
+LilvNode*
+jalv_select_plugin(Jalv* jalv);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // JALV_UI_H