Fix up the last remnants of the old name.

git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@3219 a436a847-0d15-0410-975c-d299462d15a1

15 files changed, 33 insertions, 93 deletions

diff --git a/doc/lv2_inspect.1 b/doc/lv2_inspect.1
index b46e2f6..63adf9c 100644
--- a/doc/lv2_inspect.1
+++ b/doc/lv2_inspect.1
@@ -20,7 +20,7 @@
 .B lv2_inspect PLUGIN_URI
 
 .SH SEE ALSO
-.BR slv2(3),
+.BR lilv(3),
 .BR lv2_list(1),
 .BR lv2_jack_host(1),
 .BR lv2_simple_jack_host(1)
diff --git a/doc/lv2_jack_host.1 b/doc/lv2_jack_host.1
index c8ec44e..d8e4bed 100644
--- a/doc/lv2_jack_host.1
+++ b/doc/lv2_jack_host.1
@@ -21,7 +21,7 @@
 .B lv2_jack_host PLUGIN_URI
 
 .SH SEE ALSO
-.BR slv2(3),
+.BR lilv(3),
 .BR lv2_list(1),
 .BR lv2_jack_host(1),
 .BR lv2_simple_jack_host(1),
diff --git a/doc/lv2_list.1 b/doc/lv2_list.1
index 642e8f0..ee091aa 100644
--- a/doc/lv2_list.1
+++ b/doc/lv2_list.1
@@ -21,7 +21,7 @@
 .B lv2_list
 
 .SH SEE ALSO
-.BR slv2(3),
+.BR lilv(3),
 .BR lv2_list(1),
 .BR lv2_jack_host(1),
 .BR lv2_simple_jack_host(1)
diff --git a/doc/lv2_simple_jack_host.1 b/doc/lv2_simple_jack_host.1
index 74d8e6c..cf289a4 100644
--- a/doc/lv2_simple_jack_host.1
+++ b/doc/lv2_simple_jack_host.1
@@ -21,7 +21,7 @@
 .B lv2_simple_jack_host PLUGIN_URI
 
 .SH SEE ALSO
-.BR slv2(3),
+.BR lilv(3),
 .BR lv2_list(1),
 .BR lv2_jack_host(1),
 .BR lv2_simple_jack_host(1),
diff --git a/doc/mainpage.dox b/doc/mainpage.dox
deleted file mode 100644
index 21840b2..0000000
--- a/doc/mainpage.dox
+++ /dev/null
@@ -1,60 +0,0 @@
-/* This duplication sucks :( */
-
-/* HTML */
-
-/** @mainpage
- * @section Overview
- * 
- * SLV2 is a host library to simplify the discovery, loading, and use of LV2
- * plugins (http://lv2plug.in).
- * 
- * SLV2 is written in standard C99, and depends only on the Redland RDF library
- * (http://librdf.org).  It should be portable to any system with Redland, and
- * is tested on various GNU/Linux distributions (often), and MacOS X (occasionally).
- * 
- * The data (RDF) and code (shared library) functionality in SLV2 is strictly
- * separated so it is simple to control where each is used (e.g. it is
- * possible to discover/investigate plugins and related data without loading
- * any shared libraries, avoiding the associated risks).
- * 
- * The SLV2 documentation is broken into several pages:
- * 
- * \li \link slv2_world slv2_world \endlink - Global library initialisation, state, plugin discovery, etc.
- * 
- * \li \link slv2_util slv2_util \endlink - Generally useful utility functions
- * 
- * \li \link slv2_collections slv2_collections \endlink - Collections of values (literals and URIs) and objects
- * 
- * \li \link slv2_data slv2_data \endlink - Access to plugin RDF data
- * 
- * \li \link slv2_library slv2_library \endlink - Access to plugin shared libraries
- */
-
-
-/* man page */
-
-/** @defgroup slv2 SLV2
- * SLV2 is a host library to simplify the discovery, loading, and use of LV2
- * plugins (http://lv2plug.in).
- * 
- * SLV2 is written in standard C99, and depends only on the Redland RDF library
- * (http://librdf.org).  It should be portable to any system with Redland, and
- * is tested on various GNU/Linux distributions (often), and MacOS X (occasionally).
- * 
- * The data (RDF) and code (shared library) functionality in SLV2 is strictly
- * separated so it is simple to control where each is used (e.g. it is
- * possible to discover/investigate plugins and related data without loading
- * any shared libraries, avoiding the associated risks).
- * 
- * The SLV2 documentation is broken into several pages:
- * 
- * \li \link slv2_world slv2_world \endlink - Global library initialisation, state, plugin discovery, etc.
- * 
- * \li \link slv2_util slv2_util \endlink - Generally useful utility functions
- * 
- * \li \link slv2_collections slv2_collections \endlink - Collections of values (literals and URIs) and objects
- * 
- * \li \link slv2_data slv2_data \endlink - Access to plugin RDF data
- * 
- * \li \link slv2_library slv2_library \endlink - Access to plugin shared libraries
- */
diff --git a/swig/Makefile.am b/swig/Makefile.am
index 8a6f8ae..790bf31 100644
--- a/swig/Makefile.am
+++ b/swig/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = slv2.i
+EXTRA_DIST = lilv.i
 
 if WITH_SWIG
 
diff --git a/swig/chicken/Makefile.am b/swig/chicken/Makefile.am
index 16cb115..da3645d 100644
--- a/swig/chicken/Makefile.am
+++ b/swig/chicken/Makefile.am
@@ -2,14 +2,14 @@ EXTRA_DIST = lilv.setup lv2_list.scm
 
 if WITH_CHICKEN
 all:
-	rm -f lilv.scm slv2_wrap.c
-	swig -DCHICKEN -Wall -chicken -proxy -nounit -I../.. -o lilv_wrap.c -oh slv2_wrap.h ../slv2.i
-	tar -czf lilv.egg slv2.setup slv2.scm slv2_wrap.c
+	rm -f lilv.scm lilv_wrap.c
+	swig -DCHICKEN -Wall -chicken -proxy -nounit -I../.. -o lilv_wrap.c -oh lilv_wrap.h ../lilv.i
+	tar -czf lilv.egg lilv.setup lilv.scm lilv_wrap.c
 
 #install-exec-local:
 #	chicken-setup ./lilv.egg
 
 clean-local:
-	rm -f *.[ch] *.so *.o lilv.egg slv2.scm
+	rm -f *.[ch] *.so *.o lilv.egg lilv.scm
 endif
 
diff --git a/swig/chicken/lilv.setup b/swig/chicken/lilv.setup
index ef15f6d..bac6aa3 100644
--- a/swig/chicken/lilv.setup
+++ b/swig/chicken/lilv.setup
@@ -1,2 +1,2 @@
-(run (csc -s -o slv2.so slv2.scm slv2_wrap.c -lslv2))
-(install-extension 'slv2 '("slv2.so"))
+(run (csc -s -o lilv.so lilv.scm lilv_wrap.c -llilv))
+(install-extension 'lilv '("lilv.so"))
diff --git a/swig/chicken/lv2_list.scm b/swig/chicken/lv2_list.scm
index cc23e0d..3978a12 100644
--- a/swig/chicken/lv2_list.scm
+++ b/swig/chicken/lv2_list.scm
@@ -1,13 +1,13 @@
 ; Least idiomatic scheme bindings ever.  Work in progress...
 
-(require-extension slv2)
+(require-extension lilv)
 
-(define world (slv2-world-new))
-(slv2-world-load-all world)
+(define world (lilv-world-new))
+(lilv-world-load-all world)
 
-(define plugins (slv2-world-get-all-plugins world))
+(define plugins (lilv-world-get-all-plugins world))
 
-(let ((p (slv2-plugins-get-at plugins 0)))
-  (display (slv2-value-as-string (slv2-plugin-get-uri p)))
+(let ((p (lilv-plugins-get-at plugins 0)))
+  (display (lilv-value-as-string (lilv-plugin-get-uri p)))
   (newline))
 
diff --git a/swig/mzscheme/Makefile.am b/swig/mzscheme/Makefile.am
index afc8f10..42740b2 100644
--- a/swig/mzscheme/Makefile.am
+++ b/swig/mzscheme/Makefile.am
@@ -1,8 +1,8 @@
 if WITH_MZSCHEME
 all:
-	swig -DMZSCHEME -Wall -mzscheme -I../.. -o slv2_mzscheme.c -oh slv2_mzscheme.h ../slv2.i
+	swig -DMZSCHEME -Wall -mzscheme -I../.. -o lilv_mzscheme.c -oh lilv_mzscheme.h ../lilv.i
 	gcc -fPIC -shared -Iplt -I../.. \
-		-I/usr/include/plt slv2_mzscheme.c -o libslv2_mzscheme.so
+		-I/usr/include/plt lilv_mzscheme.c -o liblilv_mzscheme.so
 
 clean-local:
 	rm -f *.[ch] *.so *.o
diff --git a/swig/python/Makefile.am b/swig/python/Makefile.am
index 8a7afc7..3054524 100644
--- a/swig/python/Makefile.am
+++ b/swig/python/Makefile.am
@@ -2,11 +2,11 @@ EXTRA_DIST = lv2_list.py
 
 if WITH_PYTHON
 all:
-	swig -DPYTHON -Wall -python -I../.. -o slv2_python.c -oh slv2_python.h ../slv2.i
+	swig -DPYTHON -Wall -python -I../.. -o lilv_python.c -oh lilv_python.h ../lilv.i
 	gcc -fPIC -shared -I../.. $(PYTHON_CPPFLAGS) $(PYTHON_EXTRA_LDFLAGS) \
 		$(PYTHON_EXTRA_LIBS) $(PYTHON_EXTRA_LDFLAGS) \
-		slv2_python.c ../../src/.libs/libslv2.so -o _slv2.so
+		lilv_python.c ../../src/.libs/liblilv.so -o _lilv.so
 
 clean-local:
-	rm -f *.[ch] *.so *.o slv2.py
+	rm -f *.[ch] *.so *.o lilv.py
 endif
diff --git a/swig/python/lv2_apply.py b/swig/python/lv2_apply.py
index 3eb4ea7..736311f 100755
--- a/swig/python/lv2_apply.py
+++ b/swig/python/lv2_apply.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import math
-import slv2
+import lilv
 import sys
 import wave
 import numpy
@@ -16,8 +16,8 @@ plugin_uri   = sys.argv[1]
 wav_in_path  = sys.argv[2]
 wav_out_path = sys.argv[3]
 
-# Initialise SLV2
-world = slv2.World()
+# Initialise LILV
+world = lilv.World()
 world.load_all()
 
 # Find plugin
@@ -26,9 +26,9 @@ if not plugin:
     print "Unknown plugin `%s'\n" % plugin_uri
     sys.exit(1)
 
-lv2_InputPort  = world.new_uri(slv2.SLV2_PORT_CLASS_INPUT)
-lv2_OutputPort = world.new_uri(slv2.SLV2_PORT_CLASS_OUTPUT)
-lv2_AudioPort  = world.new_uri(slv2.SLV2_PORT_CLASS_AUDIO)
+lv2_InputPort  = world.new_uri(lilv.LILV_PORT_CLASS_INPUT)
+lv2_OutputPort = world.new_uri(lilv.LILV_PORT_CLASS_OUTPUT)
+lv2_AudioPort  = world.new_uri(lilv.LILV_PORT_CLASS_AUDIO)
 
 n_audio_in  = plugin.get_num_ports_of_class(lv2_InputPort,  lv2_AudioPort)
 n_audio_out = plugin.get_num_ports_of_class(lv2_OutputPort, lv2_AudioPort)
@@ -60,7 +60,7 @@ rate    = wav_in.getframerate()
 nframes = wav_in.getnframes()
 
 # Instantiate plugin
-instance = slv2.Instance(plugin, rate)
+instance = lilv.Instance(plugin, rate)
 
 def read_float(wf, nframes):
     wav        = wf.readframes(nframes)
diff --git a/swig/python/lv2_list.py b/swig/python/lv2_list.py
index 786326b..babe1b4 100755
--- a/swig/python/lv2_list.py
+++ b/swig/python/lv2_list.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-import slv2
+import lilv
 
-world = slv2.World()
+world = lilv.World()
 world.load_all()
 
 for i in world.get_all_plugins():
diff --git a/utils/lv2_inspect.c b/utils/lv2_inspect.c
index 20b5a3c..e9b7cf5 100644
--- a/utils/lv2_inspect.c
+++ b/utils/lv2_inspect.c
@@ -290,7 +290,7 @@ void
 print_version()
 {
 	printf(
-		"lv2_inspect (slv2) " LILV_VERSION "\n"
+		"lv2_inspect (lilv) " LILV_VERSION "\n"
 		"Copyright 2007-2011 David Robillard <http://drobilla.net>\n"
 		"License: <http://www.opensource.org/licenses/isc-license>\n"
 		"This is free software: you are free to change and redistribute it.\n"
diff --git a/utils/lv2_list.c b/utils/lv2_list.c
index 88769ae..34d8670 100644
--- a/utils/lv2_list.c
+++ b/utils/lv2_list.c
@@ -59,7 +59,7 @@ print_usage()
 	printf("  --version      Output version information and exit\n");
 	printf("\n");
 	printf("The environment variable LV2_PATH can be used to control where\n");
-	printf("this (and all other slv2 based LV2 hosts) will search for plugins.\n");
+	printf("this (and all other lilv based LV2 hosts) will search for plugins.\n");
 }
 
 int