summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-08-09 14:39:29 +0000
committerDavid Robillard <d@drobilla.net>2013-08-09 14:39:29 +0000
commita27fdbdbd30fa2be7fdcfe2930ccdc10e0a8f390 (patch)
tree4135deedbb407ef1bba0ec245fd5f59eac4c2760
parent8b2a971c42e5588555488c56966adf1687e38140 (diff)
downloadsuil-0.6.14.tar.gz
suil-0.6.14.tar.bz2
suil-0.6.14.zip
Suil 0.6.14.v0.6.14
git-svn-id: http://svn.drobilla.net/lad/trunk/suil@5149 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--NEWS5
-rw-r--r--src/x11_in_gtk2.c20
-rw-r--r--src/x11_in_qt4.cpp8
-rwxr-xr-xwafbin83110 -> 96114 bytes
-rw-r--r--wscript6
5 files changed, 20 insertions, 19 deletions
diff --git a/NEWS b/NEWS
index 3f3908c..05747bc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,12 @@
-suil (0.6.13) unstable;
+suil (0.6.14) stable;
* Print system error message if module fails to load
* Lower dependency from Gtk 2.24 introduced in 0.6.12
* Add support for new LV2 idle interface
* Support resizing for X11 in Gtk (patch from Robin Gareus)
+ * Upgrade to waf 1.7.11
- -- David Robillard <d@drobilla.net> Sun, 24 Feb 2013 12:02:41 -0500
+ -- David Robillard <d@drobilla.net> Fri, 09 Aug 2013 00:16:48 -0400
suil (0.6.12) stable;
diff --git a/src/x11_in_gtk2.c b/src/x11_in_gtk2.c
index 3fd23cf..7fc9158 100644
--- a/src/x11_in_gtk2.c
+++ b/src/x11_in_gtk2.c
@@ -21,7 +21,7 @@
#include "./suil_internal.h"
-#ifdef HAVE_LV2_1_4_3
+#ifdef HAVE_LV2_1_6_0
# include "lv2/lv2plug.in/ns/ext/options/options.h"
# include "lv2/lv2plug.in/ns/ext/urid/urid.h"
#endif
@@ -37,7 +37,7 @@ struct _SuilX11Wrapper {
GtkPlug* plug;
SuilWrapper* wrapper;
SuilInstance* instance;
-#ifdef HAVE_LV2_1_4_3
+#ifdef HAVE_LV2_1_6_0
const LV2UI_Idle_Interface* idle_iface;
guint idle_id;
guint idle_ms;
@@ -55,9 +55,9 @@ G_DEFINE_TYPE(SuilX11Wrapper, suil_x11_wrapper, GTK_TYPE_SOCKET)
/**
Check if 'swallowed' subwindow is known to the X server.
- Gdk/GTK can mark the window as realized, mapped and visible even though there
- is no window-ID on the X server for it, yet. -> suil_x11_on_size_allocate()
- will make the application crash with "BadWinow"
+ Gdk/GTK can mark the window as realized, mapped and visible even though
+ there is no window-ID on the X server for it yet. Then,
+ suil_x11_on_size_allocate() will cause a "BadWinow" X error.
*/
static bool
x_window_is_valid(SuilX11Wrapper* socket)
@@ -84,7 +84,7 @@ on_plug_removed(GtkSocket* sock, gpointer data)
{
SuilX11Wrapper* const self = SUIL_X11_WRAPPER(sock);
-#ifdef HAVE_LV2_1_4_3
+#ifdef HAVE_LV2_1_6_0
if (self->idle_id) {
g_source_remove(self->idle_id);
self->idle_id = 0;
@@ -221,7 +221,7 @@ suil_x11_wrapper_init(SuilX11Wrapper* self)
self->plug = GTK_PLUG(gtk_plug_new(0));
self->wrapper = NULL;
self->instance = NULL;
-#ifdef HAVE_LV2_1_4_3
+#ifdef HAVE_LV2_1_6_0
self->idle_iface = NULL;
self->idle_ms = 1000 / 30; // 30 Hz default
#endif
@@ -234,7 +234,7 @@ wrapper_resize(LV2UI_Feature_Handle handle, int width, int height)
return 0;
}
-#ifdef HAVE_LV2_1_4_3
+#ifdef HAVE_LV2_1_6_0
static gboolean
suil_x11_wrapper_idle(void* data)
{
@@ -256,7 +256,7 @@ wrapper_wrap(SuilWrapper* wrapper,
wrap->wrapper = wrapper;
wrap->instance = instance;
-#ifdef HAVE_LV2_1_4_3
+#ifdef HAVE_LV2_1_6_0
const LV2UI_Idle_Interface* idle_iface = suil_instance_extension_data(
instance, LV2_UI__idleInterface);
if (idle_iface) {
@@ -316,7 +316,7 @@ suil_wrapper_new(SuilHost* host,
suil_add_feature(features, &n_features, LV2_UI__resize,
&wrapper->resize);
-#ifdef HAVE_LV2_1_4_3
+#ifdef HAVE_LV2_1_6_0
suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL);
// Scan for URID map and options
diff --git a/src/x11_in_qt4.cpp b/src/x11_in_qt4.cpp
index 33a2e18..ee55207 100644
--- a/src/x11_in_qt4.cpp
+++ b/src/x11_in_qt4.cpp
@@ -21,7 +21,7 @@
#include "./suil_config.h"
#include "./suil_internal.h"
-#ifndef HAVE_LV2_1_4_3
+#ifndef HAVE_LV2_1_6_0
typedef struct _LV2UI_Idle_Interface LV2UI_Idle_Interface;
#endif
@@ -40,7 +40,7 @@ public:
, _ui_timer(0)
{}
-#ifdef HAVE_LV2_1_4_3
+#ifdef HAVE_LV2_1_6_0
void showEvent(QShowEvent* event) {
if (_idle_iface && _ui_timer == 0) {
_ui_timer = this->startTimer(30);
@@ -68,7 +68,7 @@ wrapper_wrap(SuilWrapper* wrapper,
SuilInstance* instance)
{
const LV2UI_Idle_Interface* idle_iface = NULL;
-#ifdef HAVE_LV2_1_4_3
+#ifdef HAVE_LV2_1_6_0
idle_iface = (const LV2UI_Idle_Interface*)suil_instance_extension_data(
instance, LV2_UI__idleInterface);
#endif
@@ -113,7 +113,7 @@ suil_wrapper_new(SuilHost* host,
suil_add_feature(features, &n_features, LV2_UI__resize,
&wrapper->resize);
-#ifdef HAVE_LV2_1_4_3
+#ifdef HAVE_LV2_1_6_0
suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL);
#endif
diff --git a/waf b/waf
index 75dc2b7..c825c3b 100755
--- a/waf
+++ b/waf
Binary files differ
diff --git a/wscript b/wscript
index 6a05a15..15928a7 100644
--- a/wscript
+++ b/wscript
@@ -9,7 +9,7 @@ import waflib.extras.autowaf as autowaf
# major increment <=> incompatible changes
# minor increment <=> compatible changes (additions)
# micro increment <=> no interface changes
-SUIL_VERSION = '0.6.13'
+SUIL_VERSION = '0.6.14'
SUIL_MAJOR_VERSION = '0'
# Mandatory waf variables
@@ -52,8 +52,8 @@ def configure(conf):
conf.env.NODELETE_FLAGS = ['-Wl,-z,nodelete']
autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2')
- autowaf.check_pkg(conf, 'lv2', atleast_version='1.4.3',
- uselib_store='LV2_1_4_3', mandatory=False)
+ autowaf.check_pkg(conf, 'lv2', atleast_version='1.6.0',
+ uselib_store='LV2_1_6_0', mandatory=False)
autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK2',
atleast_version='2.18.0', mandatory=False)