From c85f3ab4c7d4c1e793519a400f10fc8499459d80 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Tue, 24 May 2011 20:52:22 +0000
Subject: Remove use of ingen-config.h in soon-to-be-public headers. Make Lilv
 dependency mandatory. Reduce dependency on ingen-config.h.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3316 a436a847-0d15-0410-975c-d299462d15a1
---
 src/client/NodeModel.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/client/NodeModel.cpp')

diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp
index 39ce7c8d..8adbfe90 100644
--- a/src/client/NodeModel.cpp
+++ b/src/client/NodeModel.cpp
@@ -17,7 +17,7 @@
 
 #include <cassert>
 #include <cmath>
-#include "ingen-config.h"
+
 #include "ingen/Port.hpp"
 #include "shared/World.hpp"
 #include "shared/LV2URIMap.hpp"
@@ -174,9 +174,7 @@ NodeModel::default_port_value_range(SharedPtr<const PortModel> port,
 	max = 1.0;
 
 	// Get range from client-side LV2 data
-#ifdef HAVE_LILV
 	if (_plugin && _plugin->type() == PluginModel::LV2) {
-
 		if (!_min_values) {
 			_num_values = lilv_plugin_get_num_ports(_plugin->lilv_plugin());
 			_min_values = new float[_num_values];
@@ -190,7 +188,6 @@ NodeModel::default_port_value_range(SharedPtr<const PortModel> port,
 		if (!std::isnan(_max_values[port->index()]))
 			max = _max_values[port->index()];
 	}
-#endif
 }
 
 void
@@ -220,7 +217,6 @@ NodeModel::port_label(SharedPtr<const PortModel> port) const
 		return name.get_string();
 	}
 
-#ifdef HAVE_LILV
 	if (_plugin && _plugin->type() == PluginModel::LV2) {
 		LilvWorld*        c_world  = _plugin->lilv_world();
 		const LilvPlugin* c_plugin = _plugin->lilv_plugin();
@@ -236,7 +232,6 @@ NodeModel::port_label(SharedPtr<const PortModel> port) const
 			lilv_node_free(c_name);
 		}
 	}
-#endif
 
 	return port->symbol().c_str();
 }
-- 
cgit v1.2.1