summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--README2
-rw-r--r--SConstruct18
-rw-r--r--configure.ac10
-rw-r--r--src/plugin.c48
-rw-r--r--utils/ladspa2lv2.c2
6 files changed, 14 insertions, 69 deletions
diff --git a/Makefile.am b/Makefile.am
index 5ac646b..280f48d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,5 @@ pkgconfig_DATA = libslv2.pc
dist-hook: dist-check-doxygen
distclean-local:
- rm -rf doc/html
- rm -rf doc/man
+ rm -rf doc/slv2
rm -rf doc/reference.doxygen
diff --git a/README b/README
index d3c7293..ba95341 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
SLV2 is a library for LV2 hosts intended to make using LV2 Plugins as simple
as possible (without sacrificing capabilities).
-More information about LV2 plugins can be found at http://lv2plug.in.
+More information about LV2 plugins can be found at <http://lv2plug.in>.
diff --git a/SConstruct b/SConstruct
index 1f05e9c..daaaaf1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,8 +1,6 @@
-#!/bin/env python
-# Run scons in this directory to build
+#!python (This script must be run with scons)
# See INSTALL for build instructions, and COPYING for licensing information.
-import sys
import os
print "WARNING: SCons building is experimental"
@@ -41,19 +39,23 @@ else:
print "Using default CFLAGS:\t", opt_cflags
env.Append(CCFLAGS = opt_cflags)
+env.Append(CCFLAGS = "-DCONFIG_H_PATH=\\\"" + os.path.abspath(".") + "/config/config.h\\\"")
+
slv2_sources = Split('''
+src/plugin.c
src/pluginclass.c
src/pluginclasses.c
-src/query.c
src/plugininstance.c
-src/value.c
+src/plugins.c
+src/pluginui.c
+src/pluginuis.c
+src/pluginuiinstance.c
src/port.c
+src/query.c
src/util.c
-src/pluginguiinstance.c
+src/value.c
src/values.c
-src/plugins.c
src/world.c
-src/plugin.c
''')
diff --git a/configure.ac b/configure.ac
index 5e31243..7584363 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,5 @@
AC_PREREQ(2.59)
-# SLV2 follows the even/odd minor = stable/development convention
AC_INIT([slv2],0.3.0,[dave@drobilla.net])
AC_CONFIG_AUX_DIR([config])
@@ -25,7 +24,7 @@ AM_INIT_AUTOMAKE
# 0.0.1 = 0,0,0
# 0.1.0 = 2,0,0
# 0.2.0 = 3,0,0
-# current svn = 4,0,0
+# 0.3.0 = 4,0,0
SLV2_VERSION="0.3.0"
SLV2_API_CURRENT="4"
@@ -91,13 +90,6 @@ if test "$bindings" = "yes"; then
fi
AM_CONDITIONAL(WITH_SWIG, [test "$bindings" = "yes"])
-
-# Check for RAPTOR
-#PKG_CHECK_MODULES(RAPTOR, raptor >= 0.21)
-
-# Check for RASQAL
-#PKG_CHECK_MODULES(RASQAL, rasqal >= 0.9.11)
-
# Check for Redland
#PKG_CHECK_MODULES(REDLAND, redland >= 1.0.0)
# No pkg-config?! Booo!
diff --git a/src/plugin.c b/src/plugin.c
index f40cff5..9f57d6c 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -600,51 +600,3 @@ slv2_plugin_get_uis(SLV2Plugin plugin)
}
}
-#if 0
-SLV2Value
-slv2_plugin_get_ui_library_uri(SLV2Plugin plugin,
- SLV2Value ui)
-{
- assert(ui->type == SLV2_VALUE_UI);
-
- if (!plugin->rdf)
- slv2_plugin_load(plugin);
-
- SLV2Values values = slv2_plugin_get_value_for_subject(plugin, ui, SLV2_URI,
- "http://ll-plugins.nongnu.org/lv2/ext/gui/dev/1#binary");
-
- if (!values || slv2_values_size(values) == 0) {
- slv2_values_free(values);
- return NULL;
- }
-
- SLV2Value value = slv2_values_get_at(values, 0);
- if (!slv2_value_is_uri(value)) {
- slv2_values_free(values);
- return NULL;
- }
-
- value = slv2_value_duplicate(value);
- slv2_values_free(values);
-
- return value;
-}
-#endif
-
-
-void*
-slv2_plugin_load_ui(SLV2Plugin plugin,
- SLV2Value ui)
-{
-#if 0
- SLV2Value lib_uri = slv2_plugin_get_ui_library_uri(plugin, ui);
-
- if (!lib_uri)
- return NULL;
-
- //LV2UI_Handle handle =
- //
-#endif
- return NULL;
-}
-
diff --git a/utils/ladspa2lv2.c b/utils/ladspa2lv2.c
index be6ef13..576f66d 100644
--- a/utils/ladspa2lv2.c
+++ b/utils/ladspa2lv2.c
@@ -164,7 +164,7 @@ add_port_range(LADSPA_Descriptor* plugin,
= plugin->PortRangeHints[port_index].HintDescriptor;
bool range_valid = false;
- float upper, lower, normal;
+ float upper=1.0f, lower=0.0f, normal=0.0f;
/* Convert hints */