summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-12-25 05:22:57 +0000
committerDavid Robillard <d@drobilla.net>2013-12-25 05:22:57 +0000
commite580018b756c3af6545eb7a705c709b03d7f79cf (patch)
tree3ab9a68a475bc5289069e1846b805316059493ad /src
parent5af77e355b15c7330f77ee4216e1f2bb725b339d (diff)
downloadsuil-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
Diffstat (limited to 'src')
-rw-r--r--src/x11_in_gtk2.c7
-rw-r--r--src/x11_in_qt4.cpp6
2 files changed, 9 insertions, 4 deletions
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;