diff options
| author | David Robillard <d@drobilla.net> | 2013-12-25 05:22:57 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2013-12-25 05:22:57 +0000 |
| commit | e580018b756c3af6545eb7a705c709b03d7f79cf (patch) | |
| tree | 3ab9a68a475bc5289069e1846b805316059493ad | |
| parent | 5af77e355b15c7330f77ee4216e1f2bb725b339d (diff) | |
| download | suil-e580018b756c3af6545eb7a705c709b03d7f79cf.tar.gz suil-e580018b756c3af6545eb7a705c709b03d7f79cf.tar.bz2 suil-e580018b756c3af6545eb7a705c709b03d7f79cf.zip | |
Don't call suil_instance_extension_data from modules (fix #926).
git-svn-id: http://svn.drobilla.net/lad/trunk/suil@5200 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | src/x11_in_gtk2.c | 7 | ||||
| -rw-r--r-- | src/x11_in_qt4.cpp | 6 | ||||
| -rw-r--r-- | wscript | 2 |
4 files changed, 17 insertions, 5 deletions
@@ -1,3 +1,10 @@ +suil 0.6.17 unstable; + + * Fix compilation errors on some systems + * Upgrade to waf 1.7.14 + + -- David Robillard <d@drobilla.net> Wed, 25 Dec 2013 00:16:55 -0500 + suil (0.6.16) stable; * Fix suil_instance_extension_data() for UIs with NULL extension_data diff --git a/src/x11_in_gtk2.c b/src/x11_in_gtk2.c index 0536f13..72be250 100644 --- a/src/x11_in_gtk2.c +++ b/src/x11_in_gtk2.c @@ -257,8 +257,11 @@ wrapper_wrap(SuilWrapper* wrapper, wrap->instance = instance; #ifdef HAVE_LV2_1_6_0 - const LV2UI_Idle_Interface* idle_iface = suil_instance_extension_data( - instance, LV2_UI__idleInterface); + const LV2UI_Idle_Interface* idle_iface = NULL; + if (instance->descriptor->extension_data) { + idle_iface = (const LV2UI_Idle_Interface*) + instance->descriptor->extension_data(LV2_UI__idleInterface); + } if (idle_iface) { wrap->idle_iface = idle_iface; wrap->idle_id = g_timeout_add( diff --git a/src/x11_in_qt4.cpp b/src/x11_in_qt4.cpp index 338ae12..5d5f935 100644 --- a/src/x11_in_qt4.cpp +++ b/src/x11_in_qt4.cpp @@ -91,8 +91,10 @@ wrapper_wrap(SuilWrapper* wrapper, { const LV2UI_Idle_Interface* idle_iface = NULL; #ifdef HAVE_LV2_1_6_0 - idle_iface = (const LV2UI_Idle_Interface*)suil_instance_extension_data( - instance, LV2_UI__idleInterface); + if (instance->descriptor->extension_data) { + idle_iface = (const LV2UI_Idle_Interface*) + instance->descriptor->extension_data(LV2_UI__idleInterface); + } #endif SuilX11InQt4Wrapper* const impl = (SuilX11InQt4Wrapper*)wrapper->impl; @@ -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.16' +SUIL_VERSION = '0.6.17' SUIL_MAJOR_VERSION = '0' # Mandatory waf variables |