summaryrefslogtreecommitdiffstats
path: root/src/libs/client
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-04-19 18:29:16 +0000
committerDavid Robillard <d@drobilla.net>2007-04-19 18:29:16 +0000
commit6b3443ebabdeec0b908fb505e30c1422b96589b7 (patch)
tree7cfe81e88cfa92a8ef413f319dd143bd9a1a5e0d /src/libs/client
parent71d83ce627f8d8ddfc381312155d1a05082618b2 (diff)
downloadingen-6b3443ebabdeec0b908fb505e30c1422b96589b7.tar.gz
ingen-6b3443ebabdeec0b908fb505e30c1422b96589b7.tar.bz2
ingen-6b3443ebabdeec0b908fb505e30c1422b96589b7.zip
Renamed SLV2Model SLV2World.
Updated Ingen for SLV2 API changes. git-svn-id: http://svn.drobilla.net/lad/ingen@459 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/client')
-rw-r--r--src/libs/client/Makefile.am4
-rw-r--r--src/libs/client/PluginModel.h9
2 files changed, 8 insertions, 5 deletions
diff --git a/src/libs/client/Makefile.am b/src/libs/client/Makefile.am
index e7296268..89dff982 100644
--- a/src/libs/client/Makefile.am
+++ b/src/libs/client/Makefile.am
@@ -2,9 +2,9 @@ if BUILD_CLIENT_LIB
noinst_LTLIBRARIES = libingenclient.la
-libingenclient_la_CXXFLAGS = @RAUL_CFLAGS@ @LXML2_CFLAGS@ @RASQAL_CFLAGS@ @RAPTOR_CFLAGS@ @LSIGCPP_CFLAGS@ @GLIBMM_CFLAGS@ -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\"
+libingenclient_la_CXXFLAGS = @RAUL_CFLAGS@ @SLV2_CFLAGS@ @LXML2_CFLAGS@ @RASQAL_CFLAGS@ @RAPTOR_CFLAGS@ @LSIGCPP_CFLAGS@ @GLIBMM_CFLAGS@ -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\"
-libingenclient_la_LIBADD = @RAUL_LIBS@ @LXML2_LIBS@ @LOSC_LIBS@ @RASQAL_LIBS@ @RAPTOR_LIBS@ @LSIGCPP_LIBS@ @GLIBMM_LIBS@
+libingenclient_la_LIBADD = @RAUL_LIBS@ @SLV2_LIBS@ @LXML2_LIBS@ @LOSC_LIBS@ @RASQAL_LIBS@ @RAPTOR_LIBS@ @LSIGCPP_LIBS@ @GLIBMM_LIBS@
libingenclient_la_SOURCES = \
OSCEngineSender.h \
diff --git a/src/libs/client/PluginModel.h b/src/libs/client/PluginModel.h
index d6ffb2cc..f1c83377 100644
--- a/src/libs/client/PluginModel.h
+++ b/src/libs/client/PluginModel.h
@@ -46,10 +46,13 @@ public:
{
set_type_from_uri(type_uri);
#ifdef HAVE_SLV2
+ static SLV2World world = NULL;
static SLV2Plugins plugins = NULL;
- if (!plugins) {
- plugins = slv2_plugins_new();
- slv2_plugins_load_all(plugins);
+
+ if (!world) {
+ world = slv2_world_new();
+ slv2_world_load_all(world);
+ plugins = slv2_world_get_all_plugins(world);
}
_slv2_plugin = slv2_plugins_get_by_uri(plugins, uri.c_str());