diff options
Diffstat (limited to 'swig')
| -rw-r--r-- | swig/Makefile.am | 2 | ||||
| -rw-r--r-- | swig/chicken/Makefile.am | 8 | ||||
| -rw-r--r-- | swig/chicken/lilv.setup | 4 | ||||
| -rw-r--r-- | swig/chicken/lv2_list.scm | 12 | ||||
| -rw-r--r-- | swig/mzscheme/Makefile.am | 4 | ||||
| -rw-r--r-- | swig/python/Makefile.am | 6 | ||||
| -rwxr-xr-x | swig/python/lv2_apply.py | 14 | ||||
| -rwxr-xr-x | swig/python/lv2_list.py | 4 |
8 files changed, 27 insertions, 27 deletions
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(): |