diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/host.c | 2 | ||||
| -rw-r--r-- | src/instance.c | 24 | ||||
| -rw-r--r-- | src/qt5_in_gtk2.cpp | 4 | ||||
| -rw-r--r-- | src/suil_internal.h | 1 | ||||
| -rw-r--r-- | src/x11_in_gtk2.c | 9 |
5 files changed, 20 insertions, 20 deletions
@@ -65,7 +65,7 @@ suil_load_init_module(const char* module_name) return; } - SuilVoidFunc init_func = (SuilVoidFunc)suil_dlfunc(lib, "suil_host_init"); + SuilVoidFunc init_func = suil_dlfunc(lib, "suil_host_init"); if (init_func) { (*init_func)(); } else { diff --git a/src/instance.c b/src/instance.c index 2563bf6..42ea7b8 100644 --- a/src/instance.c +++ b/src/instance.c @@ -32,7 +32,7 @@ SUIL_API unsigned -suil_ui_supported(const char* container_type_uri, +suil_ui_supported(const char* host_type_uri, const char* ui_type_uri) { enum { @@ -40,27 +40,27 @@ suil_ui_supported(const char* container_type_uri, SUIL_WRAPPING_NATIVE = 1, SUIL_WRAPPING_EMBEDDED = 2 }; - if (!strcmp(container_type_uri, ui_type_uri)) { + if (!strcmp(host_type_uri, ui_type_uri)) { return SUIL_WRAPPING_NATIVE; - } else if ((!strcmp(container_type_uri, GTK2_UI_URI) + } else if ((!strcmp(host_type_uri, GTK2_UI_URI) && !strcmp(ui_type_uri, QT4_UI_URI)) - || (!strcmp(container_type_uri, GTK2_UI_URI) + || (!strcmp(host_type_uri, GTK2_UI_URI) && !strcmp(ui_type_uri, QT5_UI_URI)) - || (!strcmp(container_type_uri, QT4_UI_URI) + || (!strcmp(host_type_uri, QT4_UI_URI) && !strcmp(ui_type_uri, GTK2_UI_URI)) - || (!strcmp(container_type_uri, QT5_UI_URI) + || (!strcmp(host_type_uri, QT5_UI_URI) && !strcmp(ui_type_uri, GTK2_UI_URI)) - || (!strcmp(container_type_uri, GTK2_UI_URI) + || (!strcmp(host_type_uri, GTK2_UI_URI) && !strcmp(ui_type_uri, X11_UI_URI)) - || (!strcmp(container_type_uri, GTK3_UI_URI) + || (!strcmp(host_type_uri, GTK3_UI_URI) && !strcmp(ui_type_uri, X11_UI_URI)) - || (!strcmp(container_type_uri, GTK2_UI_URI) + || (!strcmp(host_type_uri, GTK2_UI_URI) && !strcmp(ui_type_uri, WIN_UI_URI)) - || (!strcmp(container_type_uri, GTK2_UI_URI) + || (!strcmp(host_type_uri, GTK2_UI_URI) && !strcmp(ui_type_uri, COCOA_UI_URI)) - || (!strcmp(container_type_uri, QT4_UI_URI) + || (!strcmp(host_type_uri, QT4_UI_URI) && !strcmp(ui_type_uri, X11_UI_URI)) - || (!strcmp(container_type_uri, QT5_UI_URI) + || (!strcmp(host_type_uri, QT5_UI_URI) && !strcmp(ui_type_uri, X11_UI_URI))) { return SUIL_WRAPPING_EMBEDDED; } else { diff --git a/src/qt5_in_gtk2.cpp b/src/qt5_in_gtk2.cpp index 66ee674..500fdf4 100644 --- a/src/qt5_in_gtk2.cpp +++ b/src/qt5_in_gtk2.cpp @@ -45,7 +45,7 @@ struct _SuilQtWrapperClass GtkSocketClass parent_class; }; -GType suil_qt_wrapper_get_type(void); // Accessor for SUIL_TYPE_QT_WRAPPER +GType suil_qt_wrapper_get_type(void); // Accessor for SUIL_TYPE_QT_WRAPPER G_DEFINE_TYPE(SuilQtWrapper, suil_qt_wrapper, GTK_TYPE_SOCKET) @@ -155,4 +155,4 @@ suil_wrapper_new(SuilHost* host, return wrapper; } -} // extern "C" +} // extern "C" diff --git a/src/suil_internal.h b/src/suil_internal.h index 4b7452f..ecafbcf 100644 --- a/src/suil_internal.h +++ b/src/suil_internal.h @@ -36,6 +36,7 @@ static inline char* dlerror(void) { return "Unknown error"; } #include "lv2/lv2plug.in/ns/extensions/ui/ui.h" #include "suil/suil.h" +#include "./suil_config.h" #ifdef __cplusplus extern "C" { diff --git a/src/x11_in_gtk2.c b/src/x11_in_gtk2.c index 268e312..21390cd 100644 --- a/src/x11_in_gtk2.c +++ b/src/x11_in_gtk2.c @@ -14,16 +14,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <string.h> - -#include <gtk/gtk.h> #include <gdk/gdkx.h> - -#include "./suil_internal.h" +#include <gtk/gtk.h> +#include <string.h> #include "lv2/lv2plug.in/ns/ext/options/options.h" #include "lv2/lv2plug.in/ns/ext/urid/urid.h" +#include "./suil_internal.h" + #define SUIL_TYPE_X11_WRAPPER (suil_x11_wrapper_get_type()) #define SUIL_X11_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SUIL_TYPE_X11_WRAPPER, SuilX11Wrapper)) |