From 1eea83ed8193ae18c3e7b5e152e7e0808511b746 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 13 Sep 2015 02:47:19 +0000
Subject: Require LV2 1.6.0.

git-svn-id: http://svn.drobilla.net/lad/trunk/suil@5727 a436a847-0d15-0410-975c-d299462d15a1
---
 src/cocoa_in_gtk2.mm | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

(limited to 'src/cocoa_in_gtk2.mm')

diff --git a/src/cocoa_in_gtk2.mm b/src/cocoa_in_gtk2.mm
index f2866fe..623ded3 100644
--- a/src/cocoa_in_gtk2.mm
+++ b/src/cocoa_in_gtk2.mm
@@ -22,10 +22,8 @@
 
 #include "./suil_internal.h"
 
-#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
+#include "lv2/lv2plug.in/ns/ext/options/options.h"
+#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
 
 extern "C" {
 
@@ -47,11 +45,10 @@ struct _SuilCocoaWrapper {
 	int        req_height;
 	int        alo_width;
 	int        alo_height;
-#ifdef HAVE_LV2_1_6_0
+
 	const LV2UI_Idle_Interface* idle_iface;
 	guint                       idle_id;
 	guint                       idle_ms;
-#endif
 };
 
 struct _SuilCocoaWrapperClass {
@@ -235,10 +232,8 @@ suil_cocoa_wrapper_init(SuilCocoaWrapper* self)
 	self->mapped      = false;
 	self->req_width   = self->req_height = 0;
 	self->alo_width   = self->alo_height = 0;
-#ifdef HAVE_LV2_1_6_0
-	self->idle_iface = NULL;
-	self->idle_ms    = 1000 / 30;  // 30 Hz default
-#endif
+	self->idle_iface  = NULL;
+	self->idle_ms     = 1000 / 30;  // 30 Hz default
 }
 
 static int
@@ -252,7 +247,6 @@ wrapper_resize(LV2UI_Feature_Handle handle, int width, int height)
 	return 0;
 }
 
-#ifdef HAVE_LV2_1_6_0
 static gboolean
 suil_cocoa_wrapper_idle(void* data)
 {
@@ -260,7 +254,6 @@ suil_cocoa_wrapper_idle(void* data)
 	wrap->idle_iface->idle(wrap->instance->handle);
 	return TRUE;  // Continue calling
 }
-#endif
 
 static GdkFilterReturn
 event_filter(GdkXEvent* xevent, GdkEvent* event, gpointer data)
@@ -323,7 +316,6 @@ wrapper_wrap(SuilWrapper* wrapper, SuilInstance* instance)
 	wrap->wrapper         = wrapper;
 	wrap->instance        = instance;
 
-#ifdef HAVE_LV2_1_6_0
 	const LV2UI_Idle_Interface* idle_iface = NULL;
 	if (instance->descriptor->extension_data) {
 		idle_iface = (const LV2UI_Idle_Interface*)
@@ -334,7 +326,7 @@ wrapper_wrap(SuilWrapper* wrapper, SuilInstance* instance)
 		wrap->idle_id    = g_timeout_add(
 			wrap->idle_ms, suil_cocoa_wrapper_idle, wrap);
 	}
-#endif
+
 	return 0;
 }
 
@@ -343,12 +335,11 @@ wrapper_free(SuilWrapper* wrapper)
 {
 	if (wrapper->impl) {
 		SuilCocoaWrapper* const wrap = SUIL_COCOA_WRAPPER(wrapper->impl);
-#ifdef HAVE_LV2_1_6_0
 		if (wrap->idle_id) {
 			g_source_remove(wrap->idle_id);
 			wrap->idle_id = 0;
 		}
-#endif
+
 		gdk_window_remove_filter(wrap->flt_win, event_filter, wrapper->impl);
 		gtk_object_destroy(GTK_OBJECT(wrap));
 	}
@@ -401,7 +392,7 @@ suil_wrapper_new(SuilHost*      host,
 
 	suil_add_feature(features, &n_features, LV2_UI__resize,
 	                 &wrapper->resize);
-#ifdef HAVE_LV2_1_6_0
+
 	suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL);
 
 	// Scan for URID map and options
@@ -425,7 +416,7 @@ suil_wrapper_new(SuilHost*      host,
 			}
 		}
 	}
-#endif
+
 	return wrapper;
 }
 
-- 
cgit v1.2.1