diff options
| author | yo mama <pepper@scannerjammer.com> | 2015-01-27 08:48:45 -0800 |
|---|---|---|
| committer | yo mama <pepper@scannerjammer.com> | 2015-01-27 08:48:45 -0800 |
| commit | 4fc4ebe425d032f4c251e72b89334409de204de6 (patch) | |
| tree | ae3c1fb6a921f5a6463598ff0454f9fc0a80f72b | |
| parent | e49ddd41e5549c1c6abab8005edd2e8b18ee0e09 (diff) | |
needs to detect output buffers, only works with synthv1
| -rw-r--r-- | .lock-waf_linux2_build | 10 | ||||
| -rw-r--r-- | build/.conf_check_623450d91353b10e839bd52fd98cd354/testbuild/.wafpickle-linux2-34015472-98 | bin | 556 -> 556 bytes | |||
| -rw-r--r-- | build/.conf_check_af37a22df4c19cf0432d3404a6b219d1/testbuild/.wafpickle-linux2-34015472-98 | bin | 552 -> 552 bytes | |||
| -rw-r--r-- | build/.lock-waf_linux2_build | 10 | ||||
| -rw-r--r-- | build/.wafpickle-linux2-34015472-98 | bin | 88262 -> 96568 bytes | |||
| -rwxr-xr-x | build/LV2-render | bin | 72852 -> 73108 bytes | |||
| -rw-r--r-- | build/c4che/_cache.py | 6 | ||||
| -rw-r--r-- | build/config.log | 14 | ||||
| -rw-r--r-- | build/src/LV2-render.c.1.o | bin | 30000 -> 30328 bytes | |||
| -rw-r--r-- | src/LV2-render.c | 41 |
10 files changed, 43 insertions, 38 deletions
diff --git a/.lock-waf_linux2_build b/.lock-waf_linux2_build index c089c9c..3ff64ca 100644 --- a/.lock-waf_linux2_build +++ b/.lock-waf_linux2_build @@ -1,8 +1,8 @@ argv = ['./waf', 'configure'] -environ = {'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:/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/', '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': '3', 'DBUS_SESSION_BUS_ADDRESS': 'unix:abstract=/tmp/dbus-AtdPifsQ9w,guid=1c8a4fb2d96ee041948d9c9554c5d823', 'WINDOWPATH': '1', 'EDITOR': 'vim', 'JAVA_HOME': '/usr/lib/jvm/java-7-openjdk', 'ANDROID_SWT': '/usr/share/java', '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', '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', 'DEVKITPPC': '/opt/devkitpro/devkitPPC', 'PWD': '/home/pepper/LV2_render', 'calla': '3109381479', 'COLORTERM': 'gnome-terminal', 'MAIL': '/var/spool/mail/pepper', 'XDG_SEAT': 'seat0'} -files = ['/home/pepper/LV2_render/wscript'] +environ = {'WINDOWID': '20971816', '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:/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/', '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': '3', 'DBUS_SESSION_BUS_ADDRESS': 'unix:abstract=/tmp/dbus-q8Glzzx1D0,guid=98eb615718ccf533f9efb3c154c746ab', 'WINDOWPATH': '1', 'EDITOR': 'vim', 'JAVA_HOME': '/usr/lib/jvm/java-7-openjdk', 'ANDROID_SWT': '/usr/share/java', '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', 'GREP_OPTIONS': '--color=auto', 'DISPLAY': ':0', 'GTK_MODULES': 'canberra-gtk-module', 'INFINALITY_FT_CHROMEOS_STYLE_SHARPENING_STRENGTH': '20', 'OLDPWD': '/home/pepper', 'ANT_HOME': '/usr/share/apache-ant', 'DEVKITPPC': '/opt/devkitpro/devkitPPC', 'PWD': '/home/pepper/LV2-render', 'calla': '3109381479', 'COLORTERM': 'gnome-terminal', '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' 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' -top_dir = '/home/pepper/LV2_render' +out_dir = '/home/pepper/LV2-render/build' +run_dir = '/home/pepper/LV2-render' +top_dir = '/home/pepper/LV2-render' diff --git a/build/.conf_check_623450d91353b10e839bd52fd98cd354/testbuild/.wafpickle-linux2-34015472-98 b/build/.conf_check_623450d91353b10e839bd52fd98cd354/testbuild/.wafpickle-linux2-34015472-98 Binary files differindex 877d270..816a53b 100644 --- a/build/.conf_check_623450d91353b10e839bd52fd98cd354/testbuild/.wafpickle-linux2-34015472-98 +++ b/build/.conf_check_623450d91353b10e839bd52fd98cd354/testbuild/.wafpickle-linux2-34015472-98 diff --git a/build/.conf_check_af37a22df4c19cf0432d3404a6b219d1/testbuild/.wafpickle-linux2-34015472-98 b/build/.conf_check_af37a22df4c19cf0432d3404a6b219d1/testbuild/.wafpickle-linux2-34015472-98 Binary files differindex 882cb23..32baf2f 100644 --- a/build/.conf_check_af37a22df4c19cf0432d3404a6b219d1/testbuild/.wafpickle-linux2-34015472-98 +++ b/build/.conf_check_af37a22df4c19cf0432d3404a6b219d1/testbuild/.wafpickle-linux2-34015472-98 diff --git a/build/.lock-waf_linux2_build b/build/.lock-waf_linux2_build index c089c9c..3ff64ca 100644 --- a/build/.lock-waf_linux2_build +++ b/build/.lock-waf_linux2_build @@ -1,8 +1,8 @@ argv = ['./waf', 'configure'] -environ = {'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:/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/', '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': '3', 'DBUS_SESSION_BUS_ADDRESS': 'unix:abstract=/tmp/dbus-AtdPifsQ9w,guid=1c8a4fb2d96ee041948d9c9554c5d823', 'WINDOWPATH': '1', 'EDITOR': 'vim', 'JAVA_HOME': '/usr/lib/jvm/java-7-openjdk', 'ANDROID_SWT': '/usr/share/java', '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', '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', 'DEVKITPPC': '/opt/devkitpro/devkitPPC', 'PWD': '/home/pepper/LV2_render', 'calla': '3109381479', 'COLORTERM': 'gnome-terminal', 'MAIL': '/var/spool/mail/pepper', 'XDG_SEAT': 'seat0'} -files = ['/home/pepper/LV2_render/wscript'] +environ = {'WINDOWID': '20971816', '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:/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/', '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': '3', 'DBUS_SESSION_BUS_ADDRESS': 'unix:abstract=/tmp/dbus-q8Glzzx1D0,guid=98eb615718ccf533f9efb3c154c746ab', 'WINDOWPATH': '1', 'EDITOR': 'vim', 'JAVA_HOME': '/usr/lib/jvm/java-7-openjdk', 'ANDROID_SWT': '/usr/share/java', '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', 'GREP_OPTIONS': '--color=auto', 'DISPLAY': ':0', 'GTK_MODULES': 'canberra-gtk-module', 'INFINALITY_FT_CHROMEOS_STYLE_SHARPENING_STRENGTH': '20', 'OLDPWD': '/home/pepper', 'ANT_HOME': '/usr/share/apache-ant', 'DEVKITPPC': '/opt/devkitpro/devkitPPC', 'PWD': '/home/pepper/LV2-render', 'calla': '3109381479', 'COLORTERM': 'gnome-terminal', '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' 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' -top_dir = '/home/pepper/LV2_render' +out_dir = '/home/pepper/LV2-render/build' +run_dir = '/home/pepper/LV2-render' +top_dir = '/home/pepper/LV2-render' diff --git a/build/.wafpickle-linux2-34015472-98 b/build/.wafpickle-linux2-34015472-98 Binary files differindex 24d874e..48f8353 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 769457e..7febce3 100755 --- a/build/LV2-render +++ b/build/LV2-render diff --git a/build/c4che/_cache.py b/build/c4che/_cache.py index 1f95c39..39f1c0f 100644 --- a/build/c4che/_cache.py +++ b/build/c4che/_cache.py @@ -8,7 +8,7 @@ CC_NAME = 'gcc' CC_SRC_F = [] CC_TGT_F = ['-c', '-o'] CC_VERSION = ('4', '9', '2') -CFLAGS = ['-I/home/pepper/LV2_render', '-DNDEBUG', '-fshow-column', '-std=c99'] +CFLAGS = ['-I/home/pepper/LV2-render', '-DNDEBUG', '-fshow-column', '-std=c99'] CFLAGS_MACBUNDLE = ['-fPIC'] CFLAGS_cshlib = ['-fPIC'] CHECKED_JACK = 2 @@ -22,7 +22,7 @@ COMPILER_CC = 'gcc' COMPILER_CXX = 'g++' CPPPATH_ST = '-I%s' CXX = ['/usr/bin/g++'] -CXXFLAGS = ['-I/home/pepper/LV2_render', '-DNDEBUG', '-fshow-column'] +CXXFLAGS = ['-I/home/pepper/LV2-render', '-DNDEBUG', '-fshow-column'] CXXFLAGS_MACBUNDLE = ['-fPIC'] CXXFLAGS_cxxshlib = ['-fPIC'] CXXLNK_SRC_F = [] @@ -90,7 +90,7 @@ VERSION_serd-0 = '0.14.0' VERSION_sord-0 = '0.12.0' VERSION_sratom-0 = '0.4.0' VERSION_suil-0 = '0.6.0' -cfg_files = ['/home/pepper/LV2_render/build/jalv_config.h'] +cfg_files = ['/home/pepper/LV2-render/build/jalv_config.h'] cprogram_PATTERN = '%s' cshlib_PATTERN = 'lib%s.so' cstlib_PATTERN = 'lib%s.a' diff --git a/build/config.log b/build/config.log index 53933a4..715c01e 100644 --- a/build/config.log +++ b/build/config.log @@ -1,13 +1,13 @@ -# project LV2-render (1.4.6) configured on Sun Jan 25 23:28:57 2015 by +# project LV2-render (1.4.6) configured on Tue Jan 27 01:36:36 2015 by # waf 1.7.16 (abi 98, python 20708f0 on linux2) # using ./waf configure # ---------------------------------------- Setting top to -/home/pepper/LV2_render +/home/pepper/LV2-render ---------------------------------------- Setting out to -/home/pepper/LV2_render/build +/home/pepper/LV2-render/build ---------------------------------------------------- Checking for 'gcc' (c compiler) find program=['gcc', 'cc'] paths=['/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/'] var='CC' -> '/usr/bin/gcc' @@ -86,10 +86,10 @@ int main(int argc, char **argv) { <== [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'] +['/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'] +['/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 @@ -106,8 +106,8 @@ int main(int argc, char **argv) { <== [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'] +['/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'] +['/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/src/LV2-render.c.1.o b/build/src/LV2-render.c.1.o Binary files differindex b7674d1..3981920 100644 --- a/build/src/LV2-render.c.1.o +++ b/build/src/LV2-render.c.1.o diff --git a/src/LV2-render.c b/src/LV2-render.c index d1be763..b13f50d 100644 --- a/src/LV2-render.c +++ b/src/LV2-render.c @@ -71,14 +71,14 @@ really ought to be enough for anybody(TM). */ #define N_BUFFER_CYCLES 16 +#define SAMPLE_RATE 48000 + #include <alsa/asoundlib.h> #include <sndfile.h> #include "midi/midi_loader.h" #include "midi/fluidsynth_priv.h" -#define SAMPLE_RATE 48000 // here -//so min is here, how come it doesn't see it? not sure, try remove inline int min(int x, int y) { return (x < y) ? x : y; } @@ -171,18 +171,30 @@ int process_midi_cb(fluid_midi_event_t *event, size_t msecs, process_midi_ctx_t } - lilv_instance_run(jalv->instance, nframes); +//TODO +// /* Interleaving for libsndfile. */ + int nchannels = 2; + float sf_output[nchannels * nframes]; //nframes is n times longer now + for (int i = 0; i < nframes; i++) { + /* First, write all the obvious channels */ + /* If outs > nchannels, we *could* do mixing - but don't. */ + //actually you need another for loop in here for 10 channel wavs + sf_output[i * nchannels + 0] = pluginOutputBuffers[3][i]; + sf_output[i * nchannels + 1] = pluginOutputBuffers[4][i]; + /* Then, if user wants *more* output channels than there are + * audio output ports (ie outs < nchannels), copy the last audio + * out to all the remaining channels. If outs >= nchannels, this + * loop is never entered. */ + } - write_audio_to_file(ctx->outfile, pluginOutputBuffers[3], nframes); //TODO ADD LATER -// printf("total ports: %d\n", jalv->num_ports); + write_audio_to_file(ctx->outfile, sf_output, nframes); for(int i=0; i<jalv->num_ports; i++){ if(pluginOutputBuffers[i]){ - //printf("buffer: %x content:", i); - //print_audio_to_terminal(pluginOutputBuffers[i], nframes); free(pluginOutputBuffers[i]); } } +//something like this<F @@ -684,8 +696,8 @@ main(int argc, char** argv) lilv_node_free(name); - jalv.sample_rate = SAMPLE_RATE; - jalv.block_length = 1024; //TODO used to be 256 + jalv.sample_rate = SAMPLE_RATE; + jalv.block_length = 256; //TODO used to be 256 try 1024 4096 jalv.midi_buf_size = 32768; //used to be 256 printf("Block length: %u frames\n", jalv.block_length); @@ -764,9 +776,9 @@ main(int argc, char** argv) // open_wav_file here char *output_file = "output.wav"; - size_t length = SAMPLE_RATE; + size_t length = SAMPLE_RATE; //gets changed when file is closed float sample_rate = SAMPLE_RATE; - int nchannels = 1; + int nchannels = 2; SNDFILE *outfile = open_wav_file(output_file, sample_rate, nchannels, length); process_midi_ctx_t process_midi_ctx; process_midi_ctx.jalv = &jalv; @@ -780,13 +792,6 @@ main(int argc, char** argv) sf_close(outfile); - /* Run UI (or prompt at console) */ -// jalv_open_ui(&jalv); - - -// zix_sem_wait(&exit_sem); -// jalv.exit = true; - fprintf(stderr, "Exiting...\n"); /* Terminate the worker */ |
