From 6b3443ebabdeec0b908fb505e30c1422b96589b7 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 19 Apr 2007 18:29:16 +0000
Subject: Renamed SLV2Model SLV2World. Updated Ingen for SLV2 API changes.

git-svn-id: http://svn.drobilla.net/lad/ingen@459 a436a847-0d15-0410-975c-d299462d15a1
---
 src/progs/ingenuity/ControlGroups.cpp |  6 ++++--
 src/progs/ingenuity/main.cpp          | 10 ----------
 2 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'src/progs')

diff --git a/src/progs/ingenuity/ControlGroups.cpp b/src/progs/ingenuity/ControlGroups.cpp
index 5234e9fe..9bd96204 100644
--- a/src/progs/ingenuity/ControlGroups.cpp
+++ b/src/progs/ingenuity/ControlGroups.cpp
@@ -106,10 +106,12 @@ SliderControlGroup::init(ControlPanel* panel, SharedPtr<PortModel> pm, bool sepa
 	if (parent && parent->plugin() && parent->plugin()->type() == PluginModel::LV2) {
 		min = slv2_port_get_minimum_value(
 				parent->plugin()->slv2_plugin(),
-				slv2_port_by_symbol(pm->path().name().c_str()));
+				slv2_plugin_get_port_by_symbol(parent->plugin()->slv2_plugin(),
+					pm->path().name().c_str()));
 		max = slv2_port_get_maximum_value(
 					parent->plugin()->slv2_plugin(),
-					slv2_port_by_symbol(pm->path().name().c_str()));
+					slv2_plugin_get_port_by_symbol(parent->plugin()->slv2_plugin(),
+						pm->path().name().c_str()));
 	}
 
 	if (max <= min)
diff --git a/src/progs/ingenuity/main.cpp b/src/progs/ingenuity/main.cpp
index a21c0a8d..4e5789c8 100644
--- a/src/progs/ingenuity/main.cpp
+++ b/src/progs/ingenuity/main.cpp
@@ -23,9 +23,6 @@
 #ifdef HAVE_LASH
 	#include "LashController.h"
 #endif
-#ifdef HAVE_SLV2
-	#include <slv2/slv2.h>
-#endif
 
 using namespace Ingenuity;
 
@@ -55,9 +52,6 @@ main(int argc, char** argv)
 	/* Load settings */
 	App::instance().configuration()->load_settings();
 	App::instance().configuration()->apply_settings();
-#ifdef HAVE_SLV2
-	slv2_init();
-#endif
 
 #ifdef HAVE_LASH
 	lash_args_t* lash_args = lash_extract_args(&argc, &argv);
@@ -67,10 +61,6 @@ main(int argc, char** argv)
 	App::instance().connect_window()->start();
 	gtk_main.run();
 
-#ifdef HAVE_SLV2
-	slv2_finish();
-#endif
-
 	return 0;
 }
 
-- 
cgit v1.2.1