diff options
| -rw-r--r-- | .lock-waf_linux2_build | 4 | ||||
| -rw-r--r-- | HOWTO | 4 | ||||
| -rw-r--r-- | build/.lock-waf_linux2_build | 4 | ||||
| -rw-r--r-- | build/.wafpickle-linux2-34015472-98 | bin | 7394 -> 7538 bytes | |||
| -rwxr-xr-x | build/LV2-render | bin | 77520 -> 77216 bytes | |||
| -rw-r--r-- | build/c4che/_cache.py | 8 | ||||
| -rw-r--r-- | build/config.log | 49 | ||||
| -rw-r--r-- | build/jalv_config.h | 3 | ||||
| -rw-r--r-- | build/src/LV2-render.c.1.o | bin | 34312 -> 34808 bytes | |||
| -rw-r--r-- | build/src/worker.c.1.o | bin | 5272 -> 4248 bytes | |||
| -rw-r--r-- | src/LV2-render.c | 16 | ||||
| -rw-r--r-- | src/worker.c | 38 | ||||
| -rw-r--r-- | test.mid | bin | 0 -> 21504 bytes | |||
| -rw-r--r-- | wscript | 25 |
14 files changed, 46 insertions, 105 deletions
diff --git a/.lock-waf_linux2_build b/.lock-waf_linux2_build index cac94c1..2d39bc5 100644 --- a/.lock-waf_linux2_build +++ b/.lock-waf_linux2_build @@ -1,7 +1,7 @@ argv = ['./waf', 'configure'] -environ = {'MYVIMRC': '/home/pepper/.vimrc', 'WINDOWID': '20971526', 'INFINALITY_FT_FRINGE_FILTER_STRENGTH': '50', 'INFINALITY_FT_USE_VARIOUS_TWEAKS': 'true', 'LOGNAME': 'pepper', 'USER': 'pepper', 'PATH': '/home/pepper/.gem/ruby/2.1.0/bin:/home/pepper/.gem/ruby/2.1.0/bin:/home/pepper/.gem/ruby/2.1.0/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/firstscripts:/root/.gem/ruby/2.1.0/bin:/opt/android-sdk/build-tools/19.0.2/:/opt/android-sdk/platform-tools:/opt/android-sdk/tools:/opt/devkitpro/devkitPPC/bin:/opt/marytts/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/opt/android-sdk/tools/:/opt/android-sdk/platform-tools/:/opt/android-sdk/tools/:/opt/android-sdk/platform-tools/:/opt/android-sdk/tools/:/opt/android-sdk/platform-tools/', 'XDG_VTNR': '1', 'HOME': '/home/pepper', 'paul': '6172753373', 'HG': '/usr/bin/hg', 'LANG': 'en_US.UTF-8', 'TERM': 'xterm-256color', 'SHELL': '/bin/bash', 'XAUTHORITY': '/home/pepper/.Xauthority', 'SHLVL': '4', 'DBUS_SESSION_BUS_ADDRESS': 'unix:abstract=/tmp/dbus-T6Au7f7Fl5,guid=81865062af681cd21891a50754cc5e26', 'WINDOWPATH': '1', 'EDITOR': 'vim', 'JAVA_HOME': '/usr/lib/jvm/java-7-openjdk', 'ANDROID_SWT': '/usr/share/java', 'COLORTERM': 'gnome-terminal', 'dad': '6174598251', 'XDG_RUNTIME_DIR': '/run/user/1002', 'VTE_VERSION': '3603', 'INFINALITY_FT_FILTER_PARAMS': '06 22 36 22 06', 'ANDROID_HOME': '/opt/android-sdk', 'XDG_SESSION_ID': 'c1', 'DEVKITPRO': '/opt/devkitpro', '_': './waf', 'MOZ_PLUGIN_PATH': '/usr/lib/mozilla/plugins', 'VIMRUNTIME': '/usr/share/vim/vim74', 'GREP_OPTIONS': '--color=auto', 'DISPLAY': ':0', 'GTK_MODULES': 'canberra-gtk-module', 'INFINALITY_FT_CHROMEOS_STYLE_SHARPENING_STRENGTH': '20', 'ANT_HOME': '/usr/share/apache-ant', 'VIM': '/usr/share/vim', 'PWD': '/home/pepper/LV2-render', 'calla': '3109381479', 'DEVKITPPC': '/opt/devkitpro/devkitPPC', 'MAIL': '/var/spool/mail/pepper', 'XDG_SEAT': 'seat0'} +environ = {'MYVIMRC': '/home/pepper/.vimrc', 'WINDOWID': '20971526', 'INFINALITY_FT_FRINGE_FILTER_STRENGTH': '50', 'INFINALITY_FT_USE_VARIOUS_TWEAKS': 'true', 'LOGNAME': 'pepper', 'USER': 'pepper', 'PATH': '/home/pepper/.gem/ruby/2.1.0/bin:/home/pepper/.gem/ruby/2.1.0/bin:/home/pepper/.gem/ruby/2.1.0/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/firstscripts:/root/.gem/ruby/2.1.0/bin:/opt/android-sdk/build-tools/19.0.2/:/opt/android-sdk/platform-tools:/opt/android-sdk/tools:/opt/devkitpro/devkitPPC/bin:/opt/marytts/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/opt/android-sdk/tools/:/opt/android-sdk/platform-tools/:/opt/android-sdk/tools/:/opt/android-sdk/platform-tools/:/opt/android-sdk/tools/:/opt/android-sdk/platform-tools/', 'XDG_VTNR': '1', 'HOME': '/home/pepper', 'paul': '6172753373', 'HG': '/usr/bin/hg', 'LANG': 'en_US.UTF-8', 'TERM': 'xterm-256color', 'SHELL': '/bin/bash', 'XAUTHORITY': '/home/pepper/.Xauthority', 'SHLVL': '4', 'DBUS_SESSION_BUS_ADDRESS': 'unix:abstract=/tmp/dbus-T6Au7f7Fl5,guid=81865062af681cd21891a50754cc5e26', 'WINDOWPATH': '1', 'EDITOR': 'vim', 'JAVA_HOME': '/usr/lib/jvm/java-7-openjdk', 'ANDROID_SWT': '/usr/share/java', 'COLORTERM': 'gnome-terminal', 'dad': '6174598251', 'XDG_RUNTIME_DIR': '/run/user/1002', 'VTE_VERSION': '3603', 'INFINALITY_FT_FILTER_PARAMS': '06 22 36 22 06', 'ANDROID_HOME': '/opt/android-sdk', 'XDG_SESSION_ID': 'c1', 'DEVKITPRO': '/opt/devkitpro', '_': './waf', 'MOZ_PLUGIN_PATH': '/usr/lib/mozilla/plugins', 'VIMRUNTIME': '/usr/share/vim/vim74', 'GREP_OPTIONS': '--color=auto', 'DISPLAY': ':0', 'GTK_MODULES': 'canberra-gtk-module', 'INFINALITY_FT_CHROMEOS_STYLE_SHARPENING_STRENGTH': '20', 'OLDPWD': '/home/pepper/LV2-render/src', 'ANT_HOME': '/usr/share/apache-ant', 'VIM': '/usr/share/vim', 'PWD': '/home/pepper/LV2-render', 'calla': '3109381479', 'DEVKITPPC': '/opt/devkitpro/devkitPPC', 'MAIL': '/var/spool/mail/pepper', 'XDG_SEAT': 'seat0'} files = ['/home/pepper/LV2-render/wscript'] -hash = '~\x8a\x88\x18\xd5\xff\\\xc7\x1e+Y\xf0\xa2hK\xb4' +hash = '\x9c\x1c\xe2\xa4\xf9\xba\x84\x8e\xa8\xed6\xef\xbfY\xdc\x8a' options = {'docdir': None, 'ultra_strict': False, 'force': False, 'verbose': 0, 'pardebug': False, 'destdir': '', 'no_jack_session': False, 'zones': '', 'prefix': '/usr/local/', 'download': False, 'grind': False, 'targets': '', 'configdir': None, 'mandir': None, 'nocache': False, 'progress_bar': 0, 'top': '', 'libdir': None, 'strict': False, 'datadir': None, 'lv2_user': False, 'out': '', 'check_cxx_compiler': 'g++ icpc', 'bindir': None, 'files': '', 'lv2_system': False, 'jobs': 4, 'docs': False, 'distcheck_args': None, 'no_qt': False, 'lv2dir': None, 'keep': 0, 'includedir': None, 'debug': False, 'check_c_compiler': 'gcc icc'} out_dir = '/home/pepper/LV2-render/build' run_dir = '/home/pepper/LV2-render' @@ -0,0 +1,4 @@ +CONTROL VALUES CAN BE SET WITH CLI ARGS eg. +-c PHA1_DAFT=1.00 + +also with -l from a file... diff --git a/build/.lock-waf_linux2_build b/build/.lock-waf_linux2_build index cac94c1..2d39bc5 100644 --- a/build/.lock-waf_linux2_build +++ b/build/.lock-waf_linux2_build @@ -1,7 +1,7 @@ argv = ['./waf', 'configure'] -environ = {'MYVIMRC': '/home/pepper/.vimrc', 'WINDOWID': '20971526', 'INFINALITY_FT_FRINGE_FILTER_STRENGTH': '50', 'INFINALITY_FT_USE_VARIOUS_TWEAKS': 'true', 'LOGNAME': 'pepper', 'USER': 'pepper', 'PATH': '/home/pepper/.gem/ruby/2.1.0/bin:/home/pepper/.gem/ruby/2.1.0/bin:/home/pepper/.gem/ruby/2.1.0/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/firstscripts:/root/.gem/ruby/2.1.0/bin:/opt/android-sdk/build-tools/19.0.2/:/opt/android-sdk/platform-tools:/opt/android-sdk/tools:/opt/devkitpro/devkitPPC/bin:/opt/marytts/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/opt/android-sdk/tools/:/opt/android-sdk/platform-tools/:/opt/android-sdk/tools/:/opt/android-sdk/platform-tools/:/opt/android-sdk/tools/:/opt/android-sdk/platform-tools/', 'XDG_VTNR': '1', 'HOME': '/home/pepper', 'paul': '6172753373', 'HG': '/usr/bin/hg', 'LANG': 'en_US.UTF-8', 'TERM': 'xterm-256color', 'SHELL': '/bin/bash', 'XAUTHORITY': '/home/pepper/.Xauthority', 'SHLVL': '4', 'DBUS_SESSION_BUS_ADDRESS': 'unix:abstract=/tmp/dbus-T6Au7f7Fl5,guid=81865062af681cd21891a50754cc5e26', 'WINDOWPATH': '1', 'EDITOR': 'vim', 'JAVA_HOME': '/usr/lib/jvm/java-7-openjdk', 'ANDROID_SWT': '/usr/share/java', 'COLORTERM': 'gnome-terminal', 'dad': '6174598251', 'XDG_RUNTIME_DIR': '/run/user/1002', 'VTE_VERSION': '3603', 'INFINALITY_FT_FILTER_PARAMS': '06 22 36 22 06', 'ANDROID_HOME': '/opt/android-sdk', 'XDG_SESSION_ID': 'c1', 'DEVKITPRO': '/opt/devkitpro', '_': './waf', 'MOZ_PLUGIN_PATH': '/usr/lib/mozilla/plugins', 'VIMRUNTIME': '/usr/share/vim/vim74', 'GREP_OPTIONS': '--color=auto', 'DISPLAY': ':0', 'GTK_MODULES': 'canberra-gtk-module', 'INFINALITY_FT_CHROMEOS_STYLE_SHARPENING_STRENGTH': '20', 'ANT_HOME': '/usr/share/apache-ant', 'VIM': '/usr/share/vim', 'PWD': '/home/pepper/LV2-render', 'calla': '3109381479', 'DEVKITPPC': '/opt/devkitpro/devkitPPC', 'MAIL': '/var/spool/mail/pepper', 'XDG_SEAT': 'seat0'} +environ = {'MYVIMRC': '/home/pepper/.vimrc', 'WINDOWID': '20971526', 'INFINALITY_FT_FRINGE_FILTER_STRENGTH': '50', 'INFINALITY_FT_USE_VARIOUS_TWEAKS': 'true', 'LOGNAME': 'pepper', 'USER': 'pepper', 'PATH': '/home/pepper/.gem/ruby/2.1.0/bin:/home/pepper/.gem/ruby/2.1.0/bin:/home/pepper/.gem/ruby/2.1.0/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/firstscripts:/root/.gem/ruby/2.1.0/bin:/opt/android-sdk/build-tools/19.0.2/:/opt/android-sdk/platform-tools:/opt/android-sdk/tools:/opt/devkitpro/devkitPPC/bin:/opt/marytts/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/opt/android-sdk/tools/:/opt/android-sdk/platform-tools/:/opt/android-sdk/tools/:/opt/android-sdk/platform-tools/:/opt/android-sdk/tools/:/opt/android-sdk/platform-tools/', 'XDG_VTNR': '1', 'HOME': '/home/pepper', 'paul': '6172753373', 'HG': '/usr/bin/hg', 'LANG': 'en_US.UTF-8', 'TERM': 'xterm-256color', 'SHELL': '/bin/bash', 'XAUTHORITY': '/home/pepper/.Xauthority', 'SHLVL': '4', 'DBUS_SESSION_BUS_ADDRESS': 'unix:abstract=/tmp/dbus-T6Au7f7Fl5,guid=81865062af681cd21891a50754cc5e26', 'WINDOWPATH': '1', 'EDITOR': 'vim', 'JAVA_HOME': '/usr/lib/jvm/java-7-openjdk', 'ANDROID_SWT': '/usr/share/java', 'COLORTERM': 'gnome-terminal', 'dad': '6174598251', 'XDG_RUNTIME_DIR': '/run/user/1002', 'VTE_VERSION': '3603', 'INFINALITY_FT_FILTER_PARAMS': '06 22 36 22 06', 'ANDROID_HOME': '/opt/android-sdk', 'XDG_SESSION_ID': 'c1', 'DEVKITPRO': '/opt/devkitpro', '_': './waf', 'MOZ_PLUGIN_PATH': '/usr/lib/mozilla/plugins', 'VIMRUNTIME': '/usr/share/vim/vim74', 'GREP_OPTIONS': '--color=auto', 'DISPLAY': ':0', 'GTK_MODULES': 'canberra-gtk-module', 'INFINALITY_FT_CHROMEOS_STYLE_SHARPENING_STRENGTH': '20', 'OLDPWD': '/home/pepper/LV2-render/src', 'ANT_HOME': '/usr/share/apache-ant', 'VIM': '/usr/share/vim', 'PWD': '/home/pepper/LV2-render', 'calla': '3109381479', 'DEVKITPPC': '/opt/devkitpro/devkitPPC', 'MAIL': '/var/spool/mail/pepper', 'XDG_SEAT': 'seat0'} files = ['/home/pepper/LV2-render/wscript'] -hash = '~\x8a\x88\x18\xd5\xff\\\xc7\x1e+Y\xf0\xa2hK\xb4' +hash = '\x9c\x1c\xe2\xa4\xf9\xba\x84\x8e\xa8\xed6\xef\xbfY\xdc\x8a' options = {'docdir': None, 'ultra_strict': False, 'force': False, 'verbose': 0, 'pardebug': False, 'destdir': '', 'no_jack_session': False, 'zones': '', 'prefix': '/usr/local/', 'download': False, 'grind': False, 'targets': '', 'configdir': None, 'mandir': None, 'nocache': False, 'progress_bar': 0, 'top': '', 'libdir': None, 'strict': False, 'datadir': None, 'lv2_user': False, 'out': '', 'check_cxx_compiler': 'g++ icpc', 'bindir': None, 'files': '', 'lv2_system': False, 'jobs': 4, 'docs': False, 'distcheck_args': None, 'no_qt': False, 'lv2dir': None, 'keep': 0, 'includedir': None, 'debug': False, 'check_c_compiler': 'gcc icc'} out_dir = '/home/pepper/LV2-render/build' run_dir = '/home/pepper/LV2-render' diff --git a/build/.wafpickle-linux2-34015472-98 b/build/.wafpickle-linux2-34015472-98 Binary files differindex 2b666ad..d46e68c 100644 --- a/build/.wafpickle-linux2-34015472-98 +++ b/build/.wafpickle-linux2-34015472-98 diff --git a/build/LV2-render b/build/LV2-render Binary files differindex ed51a9f..82c3790 100755 --- a/build/LV2-render +++ b/build/LV2-render diff --git a/build/c4che/_cache.py b/build/c4che/_cache.py index 39f1c0f..95b4fd0 100644 --- a/build/c4che/_cache.py +++ b/build/c4che/_cache.py @@ -11,7 +11,6 @@ CC_VERSION = ('4', '9', '2') CFLAGS = ['-I/home/pepper/LV2-render', '-DNDEBUG', '-fshow-column', '-std=c99'] CFLAGS_MACBUNDLE = ['-fPIC'] CFLAGS_cshlib = ['-fPIC'] -CHECKED_JACK = 2 CHECKED_LILV = 2 CHECKED_LV2 = 2 CHECKED_SERD = 2 @@ -32,7 +31,7 @@ CXX_SRC_F = [] CXX_TGT_F = ['-c', '-o'] DATADIR = '/usr/local/share' DEBUG = False -DEFINES = ['HAVE_LV2=1', 'HAVE_LILV=1', 'HAVE_SERD=1', 'HAVE_SORD=1', 'HAVE_SUIL=1', 'HAVE_SRATOM=1', 'HAVE_JACK=1', 'HAVE_JACK_PORT_TYPE_GET_BUFFER_SIZE=1', 'HAVE_JACK_METADATA=1', 'JALV_JACK_SESSION=1', 'JALV_VERSION="1.4.6"'] +DEFINES = ['HAVE_LV2=1', 'HAVE_LILV=1', 'HAVE_SERD=1', 'HAVE_SORD=1', 'HAVE_SUIL=1', 'HAVE_SRATOM=1', 'JALV_JACK_SESSION=1', 'JALV_VERSION="1.4.6"'] DEFINES_ST = '-D%s' DEST_BINFMT = 'elf' DEST_CPU = 'x86_64' @@ -50,7 +49,6 @@ JALV_VERSION = '1.4.6' LIB = ['m', 'sndfile'] LIBDIR = '/usr/local/lib' LIBPATH_ST = '-L%s' -LIB_JACK = ['jack'] LIB_LILV = ['lilv-0', 'dl', 'sratom-0', 'sord-0', 'serd-0'] LIB_SERD = ['serd-0'] LIB_SORD = ['sord-0', 'serd-0'] @@ -68,7 +66,6 @@ LV2DIR = '/usr/local/lib/lv2' MANDIR = '/usr/local/share/man' PARDEBUG = False PKGCONFIG = '/usr/bin/pkg-config' -PKG_jack = 'jack' PKG_lilv_0 = 'lilv-0' PKG_lv2 = 'lv2' PKG_serd_0 = 'serd-0' @@ -83,7 +80,6 @@ STLIBPATH_ST = '-L%s' STLIB_MARKER = '-Wl,-Bstatic' STLIB_ST = '-l%s' SYSCONFDIR = '/usr/local/etc' -VERSION_jack = '0.120.0' VERSION_lilv-0 = '0.19.2' VERSION_lv2 = '1.8.1' VERSION_serd-0 = '0.14.0' @@ -97,5 +93,5 @@ cstlib_PATTERN = 'lib%s.a' cxxprogram_PATTERN = '%s' cxxshlib_PATTERN = 'lib%s.so' cxxstlib_PATTERN = 'lib%s.a' -define_key = ['HAVE_LV2', 'HAVE_LILV', 'HAVE_SERD', 'HAVE_SORD', 'HAVE_SUIL', 'HAVE_SRATOM', 'HAVE_JACK', 'HAVE_JACK_PORT_TYPE_GET_BUFFER_SIZE', 'HAVE_JACK_METADATA', 'JALV_JACK_SESSION', 'JALV_VERSION'] +define_key = ['HAVE_LV2', 'HAVE_LILV', 'HAVE_SERD', 'HAVE_SORD', 'HAVE_SUIL', 'HAVE_SRATOM', 'JALV_JACK_SESSION', 'JALV_VERSION'] macbundle_PATTERN = '%s.bundle' diff --git a/build/config.log b/build/config.log index 0d10f83..0a536a3 100644 --- a/build/config.log +++ b/build/config.log @@ -1,4 +1,4 @@ -# project LV2-render (1.4.6) configured on Fri Jan 30 22:42:18 2015 by +# project LV2-render (1.4.6) configured on Sat Jan 31 00:14:07 2015 by # waf 1.7.16 (abi 98, python 20708f0 on linux2) # using ./waf configure # @@ -64,50 +64,3 @@ Checking for 'sratom-0' >= 0.4.0 out: -I/usr/include/sratom-0 -I/usr/include/sord-0 -I/usr/include/serd-0 -lsratom-0 -lsord-0 -lserd-0 yes ----------------------------------------------------- -Checking for 'jack' >= 0.120.0 -['/usr/bin/pkg-config', '--atleast-version=0.120.0', 'jack'] -['/usr/bin/pkg-config', '--cflags', '--libs', 'jack'] -out: -ljack - -yes ----------------------------------------------------- -Checking for function jack_port_type_get_buffer_size -==> -#include <jack/jack.h> - -int main(int argc, char **argv) { - void *p; - (void)argc; (void)argv; - p=(void*)(jack_port_type_get_buffer_size); - return 0; -} - -<== -[1/2] [32mcxx: build/.conf_check_af37a22df4c19cf0432d3404a6b219d1/test.cpp -> build/.conf_check_af37a22df4c19cf0432d3404a6b219d1/testbuild/test.cpp.1.o -[0m -['/usr/bin/g++', '-I/home/pepper/LV2-render', '-DNDEBUG', '-fshow-column', '-I/home/pepper/LV2-render/build/.conf_check_af37a22df4c19cf0432d3404a6b219d1/testbuild', '-DHAVE_LV2=1', '-DHAVE_LILV=1', '-DHAVE_SERD=1', '-DHAVE_SORD=1', '-DHAVE_SUIL=1', '-DHAVE_SRATOM=1', '-DHAVE_JACK=1', '../test.cpp', '-c', '-o', 'test.cpp.1.o'] -[2/2] [33mcxxprogram: build/.conf_check_af37a22df4c19cf0432d3404a6b219d1/testbuild/test.cpp.1.o -> build/.conf_check_af37a22df4c19cf0432d3404a6b219d1/testbuild/testprog -[0m -['/usr/bin/g++', 'test.cpp.1.o', '-o', '/home/pepper/LV2-render/build/.conf_check_af37a22df4c19cf0432d3404a6b219d1/testbuild/testprog', '-Wl,-Bstatic', '-Wl,-Bdynamic', '-lm', '-lsndfile', '-ljack'] -yes ----------------------------------------------------- -Checking for function jack_set_property -==> -#include <jack/metadata.h> - -int main(int argc, char **argv) { - void *p; - (void)argc; (void)argv; - p=(void*)(jack_set_property); - return 0; -} - -<== -[1/2] [32mcxx: build/.conf_check_623450d91353b10e839bd52fd98cd354/test.cpp -> build/.conf_check_623450d91353b10e839bd52fd98cd354/testbuild/test.cpp.1.o -[0m -['/usr/bin/g++', '-I/home/pepper/LV2-render', '-DNDEBUG', '-fshow-column', '-I/home/pepper/LV2-render/build/.conf_check_623450d91353b10e839bd52fd98cd354/testbuild', '-DHAVE_LV2=1', '-DHAVE_LILV=1', '-DHAVE_SERD=1', '-DHAVE_SORD=1', '-DHAVE_SUIL=1', '-DHAVE_SRATOM=1', '-DHAVE_JACK=1', '-DHAVE_JACK_PORT_TYPE_GET_BUFFER_SIZE=1', '../test.cpp', '-c', '-o', 'test.cpp.1.o'] -[2/2] [33mcxxprogram: build/.conf_check_623450d91353b10e839bd52fd98cd354/testbuild/test.cpp.1.o -> build/.conf_check_623450d91353b10e839bd52fd98cd354/testbuild/testprog -[0m -['/usr/bin/g++', 'test.cpp.1.o', '-o', '/home/pepper/LV2-render/build/.conf_check_623450d91353b10e839bd52fd98cd354/testbuild/testprog', '-Wl,-Bstatic', '-Wl,-Bdynamic', '-lm', '-lsndfile', '-ljack'] -yes diff --git a/build/jalv_config.h b/build/jalv_config.h index d9ddc94..7edb253 100644 --- a/build/jalv_config.h +++ b/build/jalv_config.h @@ -9,9 +9,6 @@ #define HAVE_SORD 1 #define HAVE_SUIL 1 #define HAVE_SRATOM 1 -#define HAVE_JACK 1 -#define HAVE_JACK_PORT_TYPE_GET_BUFFER_SIZE 1 -#define HAVE_JACK_METADATA 1 #define JALV_JACK_SESSION 1 #define JALV_VERSION "1.4.6" diff --git a/build/src/LV2-render.c.1.o b/build/src/LV2-render.c.1.o Binary files differindex 53b2f89..6f1e84d 100644 --- a/build/src/LV2-render.c.1.o +++ b/build/src/LV2-render.c.1.o diff --git a/build/src/worker.c.1.o b/build/src/worker.c.1.o Binary files differindex efbb6e1..9c3341c 100644 --- a/build/src/worker.c.1.o +++ b/build/src/worker.c.1.o diff --git a/src/LV2-render.c b/src/LV2-render.c index 490f1ae..124c6dd 100644 --- a/src/LV2-render.c +++ b/src/LV2-render.c @@ -79,6 +79,9 @@ #include "midi/fluidsynth_priv.h" #define DEBUG 0 +#define FILE_OK 0x0 +#define WRITE_OK 0x2 + int min(int x, int y) { return (x < y) ? x : y; @@ -592,6 +595,19 @@ main(int argc, char** argv) strcpy(jalv.opts.infile, "test.mid"); } + + //make sure input and output exist + if(access(jalv.opts.infile, FILE_OK)){ + fprintf(stderr, "ERROR:Could not find %s\n Please specify an input file with -i\n", jalv.opts.infile); + exit(1); + } + if(!access(jalv.opts.outfile, WRITE_OK)){ + fprintf(stderr, "ERROR:Could not write to %s\n.", jalv.opts.outfile); + exit(1); + } + + + if (! jalv.opts.sample_rate){ jalv.opts.sample_rate = 48000; } diff --git a/src/worker.c b/src/worker.c index 074ecf2..9fb92e2 100644 --- a/src/worker.c +++ b/src/worker.c @@ -22,9 +22,9 @@ jalv_worker_respond(LV2_Worker_Respond_Handle handle, const void* data) { Jalv* jalv = (Jalv*)handle; - jack_ringbuffer_write(jalv->worker.responses, - (const char*)&size, sizeof(size)); - jack_ringbuffer_write(jalv->worker.responses, (const char*)data, size); +// jack_ringbuffer_write(jalv->worker.responses, +// (const char*)&size, sizeof(size)); +// jack_ringbuffer_write(jalv->worker.responses, (const char*)data, size); return LV2_WORKER_SUCCESS; } @@ -40,7 +40,7 @@ worker_func(void* data) } uint32_t size = 0; - jack_ringbuffer_read(jalv->worker.requests, (char*)&size, sizeof(size)); +// jack_ringbuffer_read(jalv->worker.requests, (char*)&size, sizeof(size)); if (!(buf = realloc(buf, size))) { fprintf(stderr, "error: realloc() failed\n"); @@ -48,7 +48,7 @@ worker_func(void* data) return NULL; } - jack_ringbuffer_read(jalv->worker.requests, (char*)buf, size); +// jack_ringbuffer_read(jalv->worker.requests, (char*)buf, size); jalv->worker.iface->work( jalv->instance->lv2_handle, jalv_worker_respond, jalv, size, buf); @@ -65,11 +65,11 @@ jalv_worker_init(Jalv* jalv, { worker->iface = iface; zix_thread_create(&worker->thread, 4096, worker_func, jalv); - worker->requests = jack_ringbuffer_create(4096); - worker->responses = jack_ringbuffer_create(4096); +// worker->requests = jack_ringbuffer_create(4096); +// worker->responses = jack_ringbuffer_create(4096); worker->response = malloc(4096); - jack_ringbuffer_mlock(worker->requests); - jack_ringbuffer_mlock(worker->responses); +// jack_ringbuffer_mlock(worker->requests); +// jack_ringbuffer_mlock(worker->responses); } void @@ -78,8 +78,8 @@ jalv_worker_finish(JalvWorker* worker) if (worker->requests) { zix_sem_post(&worker->sem); zix_thread_join(worker->thread, NULL); - jack_ringbuffer_free(worker->requests); - jack_ringbuffer_free(worker->responses); +// jack_ringbuffer_free(worker->requests); +// jack_ringbuffer_free(worker->responses); free(worker->response); } } @@ -90,9 +90,9 @@ jalv_worker_schedule(LV2_Worker_Schedule_Handle handle, const void* data) { Jalv* jalv = (Jalv*)handle; - jack_ringbuffer_write(jalv->worker.requests, - (const char*)&size, sizeof(size)); - jack_ringbuffer_write(jalv->worker.requests, (const char*)data, size); +// jack_ringbuffer_write(jalv->worker.requests, +// (const char*)&size, sizeof(size)); +// jack_ringbuffer_write(jalv->worker.requests, (const char*)data, size); zix_sem_post(&jalv->worker.sem); return LV2_WORKER_SUCCESS; } @@ -101,13 +101,13 @@ void jalv_worker_emit_responses(Jalv* jalv, JalvWorker* worker) { if (worker->responses) { - uint32_t read_space = jack_ringbuffer_read_space(worker->responses); + uint32_t read_space;// = jack_ringbuffer_read_space(worker->responses); while (read_space) { uint32_t size = 0; - jack_ringbuffer_read(worker->responses, (char*)&size, sizeof(size)); - - jack_ringbuffer_read( - worker->responses, (char*)worker->response, size); +// jack_ringbuffer_read(worker->responses, (char*)&size, sizeof(size)); +// +// jack_ringbuffer_read( +// worker->responses, (char*)worker->response, size); worker->iface->work_response( jalv->instance->lv2_handle, size, worker->response); diff --git a/test.mid b/test.mid Binary files differnew file mode 100644 index 0000000..bf3bfc0 --- /dev/null +++ b/test.mid @@ -47,20 +47,6 @@ def configure(conf): atleast_version='0.6.0', mandatory=True) autowaf.check_pkg(conf, 'sratom-0', uselib_store='SRATOM', atleast_version='0.4.0', mandatory=True) - autowaf.check_pkg(conf, 'jack', uselib_store='JACK', - atleast_version='0.120.0', mandatory=True) - - conf.check(function_name='jack_port_type_get_buffer_size', - header_name='jack/jack.h', - define_name='HAVE_JACK_PORT_TYPE_GET_BUFFER_SIZE', - uselib='JACK', - mandatory=False) - - conf.check(function_name='jack_set_property', - header_name='jack/metadata.h', - define_name='HAVE_JACK_METADATA', - uselib='JACK', - mandatory=False) if not Options.options.no_jack_session: autowaf.define(conf, 'JALV_JACK_SESSION', 1) @@ -88,16 +74,5 @@ def build(bld): autowaf.use_lib(bld, obj, libs) - # Man pages - bld.install_files('${MANDIR}/man1', bld.path.ant_glob('doc/*.1')) - -def upload_docs(ctx): - import glob - import os - for page in glob.glob('doc/*.[1-8]'): - os.system('mkdir -p build/doc') - os.system('soelim %s | pre-grohtml troff -man -wall -Thtml | post-grohtml > build/%s.html' % (page, page)) - os.system('rsync -avz --delete -e ssh build/%s.html drobilla@drobilla.net:~/drobilla.net/man/' % page) - def lint(ctx): subprocess.call('cpplint.py --filter=+whitespace/comments,-whitespace/tab,-whitespace/braces,-whitespace/labels,-build/header_guard,-readability/casting,-readability/todo,-build/include,-runtime/sizeof src/* jalv/*', shell=True) |