diff options
Diffstat (limited to 'src')
33 files changed, 508 insertions, 655 deletions
diff --git a/src/.deps/dssi-render.Po b/src/.deps/dssi-render.Po index c0b6c2a..4d102e5 100644 --- a/src/.deps/dssi-render.Po +++ b/src/.deps/dssi-render.Po @@ -1,61 +1,43 @@ dssi-render.o: dssi-render.c /usr/include/stdc-predef.h dssi-render.h \ /usr/include/sndfile.h /usr/include/stdio.h /usr/include/features.h \ - /usr/include/x86_64-linux-gnu/sys/cdefs.h \ - /usr/include/x86_64-linux-gnu/bits/wordsize.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h \ - /usr/include/x86_64-linux-gnu/bits/types.h \ - /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h \ - /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \ - /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \ - /usr/include/x86_64-linux-gnu/bits/stdio.h \ - /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \ - /usr/include/endian.h /usr/include/x86_64-linux-gnu/bits/endian.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \ - /usr/include/x86_64-linux-gnu/sys/select.h \ - /usr/include/x86_64-linux-gnu/bits/select.h \ - /usr/include/x86_64-linux-gnu/bits/sigset.h \ - /usr/include/x86_64-linux-gnu/bits/time.h \ - /usr/include/x86_64-linux-gnu/sys/sysmacros.h /usr/include/ladspa.h \ - /usr/include/dssi.h /usr/include/alsa/seq_event.h /usr/include/stdlib.h \ - /usr/include/alloca.h \ - /usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h \ - /usr/include/x86_64-linux-gnu/bits/stdlib-float.h /usr/include/string.h \ - /usr/include/x86_64-linux-gnu/bits/string.h \ - /usr/include/x86_64-linux-gnu/bits/string2.h /usr/include/assert.h \ - /usr/include/dlfcn.h /usr/include/x86_64-linux-gnu/bits/dlfcn.h \ - /usr/include/unistd.h /usr/include/x86_64-linux-gnu/bits/posix_opt.h \ - /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/math.h \ - /usr/include/x86_64-linux-gnu/bits/huge_val.h \ - /usr/include/x86_64-linux-gnu/bits/huge_valf.h \ - /usr/include/x86_64-linux-gnu/bits/huge_vall.h \ - /usr/include/x86_64-linux-gnu/bits/inf.h \ - /usr/include/x86_64-linux-gnu/bits/nan.h \ - /usr/include/x86_64-linux-gnu/bits/mathdef.h \ - /usr/include/x86_64-linux-gnu/bits/mathcalls.h \ - /usr/include/x86_64-linux-gnu/bits/mathinline.h \ - /usr/include/x86_64-linux-gnu/sys/stat.h \ - /usr/include/x86_64-linux-gnu/bits/stat.h \ - /usr/include/x86_64-linux-gnu/sys/time.h \ - /usr/include/x86_64-linux-gnu/sys/wait.h /usr/include/signal.h \ - /usr/include/x86_64-linux-gnu/bits/signum.h \ - /usr/include/x86_64-linux-gnu/bits/sigcontext.h \ - /usr/include/x86_64-linux-gnu/bits/sigstack.h \ - /usr/include/x86_64-linux-gnu/bits/waitflags.h \ - /usr/include/x86_64-linux-gnu/bits/waitstatus.h \ - /usr/include/x86_64-linux-gnu/bits/siginfo.h /usr/include/dirent.h \ - /usr/include/x86_64-linux-gnu/bits/dirent.h \ - /usr/include/x86_64-linux-gnu/bits/posix1_lim.h \ - /usr/include/x86_64-linux-gnu/bits/local_lim.h \ + /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ + /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h \ + /usr/include/bits/types.h /usr/include/bits/typesizes.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h \ + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h /usr/include/sys/types.h /usr/include/time.h \ + /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/bits/byteswap.h /usr/include/bits/byteswap-16.h \ + /usr/include/sys/select.h /usr/include/bits/select.h \ + /usr/include/bits/sigset.h /usr/include/bits/time.h \ + /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ + /usr/include/ladspa.h /usr/include/dssi.h /usr/include/alsa/seq_event.h \ + /usr/include/stdlib.h /usr/include/bits/waitflags.h \ + /usr/include/bits/waitstatus.h /usr/include/alloca.h \ + /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \ + /usr/include/string.h /usr/include/xlocale.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h /usr/include/assert.h /usr/include/dlfcn.h \ + /usr/include/bits/dlfcn.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ + /usr/include/bits/confname.h /usr/include/getopt.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \ + /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ + /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h \ + /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/sys/time.h \ + /usr/include/sys/wait.h /usr/include/signal.h /usr/include/bits/signum.h \ + /usr/include/bits/siginfo.h /usr/include/bits/sigaction.h \ + /usr/include/bits/sigcontext.h /usr/include/bits/sigstack.h \ + /usr/include/sys/ucontext.h /usr/include/bits/sigthread.h \ + /usr/include/dirent.h /usr/include/bits/dirent.h \ + /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h \ /usr/include/linux/limits.h /usr/include/libgen.h ladspa_run_synth.h \ midi/midi_loader.h midi/fluid_list.h midi/fluidsynth_priv.h \ midi/fluid_midi_custom.h midi/midi_loader.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h /usr/include/stdint.h \ - /usr/include/x86_64-linux-gnu/bits/wchar.h midi/fluid_midi.h + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h \ + /usr/include/stdint.h /usr/include/bits/wchar.h midi/fluid_midi.h /usr/include/stdc-predef.h: @@ -67,19 +49,19 @@ dssi-render.h: /usr/include/features.h: -/usr/include/x86_64-linux-gnu/sys/cdefs.h: +/usr/include/sys/cdefs.h: -/usr/include/x86_64-linux-gnu/bits/wordsize.h: +/usr/include/bits/wordsize.h: -/usr/include/x86_64-linux-gnu/gnu/stubs.h: +/usr/include/gnu/stubs.h: -/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: +/usr/include/gnu/stubs-64.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h: -/usr/include/x86_64-linux-gnu/bits/types.h: +/usr/include/bits/types.h: -/usr/include/x86_64-linux-gnu/bits/typesizes.h: +/usr/include/bits/typesizes.h: /usr/include/libio.h: @@ -87,35 +69,37 @@ dssi-render.h: /usr/include/wchar.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h: -/usr/include/x86_64-linux-gnu/bits/stdio_lim.h: +/usr/include/bits/stdio_lim.h: -/usr/include/x86_64-linux-gnu/bits/sys_errlist.h: +/usr/include/bits/sys_errlist.h: -/usr/include/x86_64-linux-gnu/bits/stdio.h: +/usr/include/bits/stdio.h: -/usr/include/x86_64-linux-gnu/sys/types.h: +/usr/include/sys/types.h: /usr/include/time.h: /usr/include/endian.h: -/usr/include/x86_64-linux-gnu/bits/endian.h: +/usr/include/bits/endian.h: -/usr/include/x86_64-linux-gnu/bits/byteswap.h: +/usr/include/bits/byteswap.h: -/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: +/usr/include/bits/byteswap-16.h: -/usr/include/x86_64-linux-gnu/sys/select.h: +/usr/include/sys/select.h: -/usr/include/x86_64-linux-gnu/bits/select.h: +/usr/include/bits/select.h: -/usr/include/x86_64-linux-gnu/bits/sigset.h: +/usr/include/bits/sigset.h: -/usr/include/x86_64-linux-gnu/bits/time.h: +/usr/include/bits/time.h: -/usr/include/x86_64-linux-gnu/sys/sysmacros.h: +/usr/include/sys/sysmacros.h: + +/usr/include/bits/pthreadtypes.h: /usr/include/ladspa.h: @@ -125,77 +109,89 @@ dssi-render.h: /usr/include/stdlib.h: +/usr/include/bits/waitflags.h: + +/usr/include/bits/waitstatus.h: + /usr/include/alloca.h: -/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h: +/usr/include/bits/stdlib-bsearch.h: -/usr/include/x86_64-linux-gnu/bits/stdlib-float.h: +/usr/include/bits/stdlib-float.h: /usr/include/string.h: -/usr/include/x86_64-linux-gnu/bits/string.h: +/usr/include/xlocale.h: + +/usr/include/bits/string.h: -/usr/include/x86_64-linux-gnu/bits/string2.h: +/usr/include/bits/string2.h: /usr/include/assert.h: /usr/include/dlfcn.h: -/usr/include/x86_64-linux-gnu/bits/dlfcn.h: +/usr/include/bits/dlfcn.h: /usr/include/unistd.h: -/usr/include/x86_64-linux-gnu/bits/posix_opt.h: +/usr/include/bits/posix_opt.h: -/usr/include/x86_64-linux-gnu/bits/confname.h: +/usr/include/bits/environments.h: + +/usr/include/bits/confname.h: + +/usr/include/getopt.h: /usr/include/math.h: -/usr/include/x86_64-linux-gnu/bits/huge_val.h: +/usr/include/bits/huge_val.h: -/usr/include/x86_64-linux-gnu/bits/huge_valf.h: +/usr/include/bits/huge_valf.h: -/usr/include/x86_64-linux-gnu/bits/huge_vall.h: +/usr/include/bits/huge_vall.h: -/usr/include/x86_64-linux-gnu/bits/inf.h: +/usr/include/bits/inf.h: -/usr/include/x86_64-linux-gnu/bits/nan.h: +/usr/include/bits/nan.h: -/usr/include/x86_64-linux-gnu/bits/mathdef.h: +/usr/include/bits/mathdef.h: -/usr/include/x86_64-linux-gnu/bits/mathcalls.h: +/usr/include/bits/mathcalls.h: -/usr/include/x86_64-linux-gnu/bits/mathinline.h: +/usr/include/bits/mathinline.h: -/usr/include/x86_64-linux-gnu/sys/stat.h: +/usr/include/sys/stat.h: -/usr/include/x86_64-linux-gnu/bits/stat.h: +/usr/include/bits/stat.h: -/usr/include/x86_64-linux-gnu/sys/time.h: +/usr/include/sys/time.h: -/usr/include/x86_64-linux-gnu/sys/wait.h: +/usr/include/sys/wait.h: /usr/include/signal.h: -/usr/include/x86_64-linux-gnu/bits/signum.h: +/usr/include/bits/signum.h: + +/usr/include/bits/siginfo.h: -/usr/include/x86_64-linux-gnu/bits/sigcontext.h: +/usr/include/bits/sigaction.h: -/usr/include/x86_64-linux-gnu/bits/sigstack.h: +/usr/include/bits/sigcontext.h: -/usr/include/x86_64-linux-gnu/bits/waitflags.h: +/usr/include/bits/sigstack.h: -/usr/include/x86_64-linux-gnu/bits/waitstatus.h: +/usr/include/sys/ucontext.h: -/usr/include/x86_64-linux-gnu/bits/siginfo.h: +/usr/include/bits/sigthread.h: /usr/include/dirent.h: -/usr/include/x86_64-linux-gnu/bits/dirent.h: +/usr/include/bits/dirent.h: -/usr/include/x86_64-linux-gnu/bits/posix1_lim.h: +/usr/include/bits/posix1_lim.h: -/usr/include/x86_64-linux-gnu/bits/local_lim.h: +/usr/include/bits/local_lim.h: /usr/include/linux/limits.h: @@ -213,10 +209,10 @@ midi/fluid_midi_custom.h: midi/midi_loader.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h: /usr/include/stdint.h: -/usr/include/x86_64-linux-gnu/bits/wchar.h: +/usr/include/bits/wchar.h: midi/fluid_midi.h: diff --git a/src/.deps/ladspa_run_synth.Po b/src/.deps/ladspa_run_synth.Po index cd2de68..6a2cfc1 100644 --- a/src/.deps/ladspa_run_synth.Po +++ b/src/.deps/ladspa_run_synth.Po @@ -1,61 +1,44 @@ ladspa_run_synth.o: ladspa_run_synth.c /usr/include/stdc-predef.h \ dssi-render.h /usr/include/sndfile.h /usr/include/stdio.h \ - /usr/include/features.h /usr/include/x86_64-linux-gnu/sys/cdefs.h \ - /usr/include/x86_64-linux-gnu/bits/wordsize.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h \ - /usr/include/x86_64-linux-gnu/bits/types.h \ - /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h \ - /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \ - /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \ - /usr/include/x86_64-linux-gnu/bits/stdio.h \ - /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \ - /usr/include/endian.h /usr/include/x86_64-linux-gnu/bits/endian.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \ - /usr/include/x86_64-linux-gnu/sys/select.h \ - /usr/include/x86_64-linux-gnu/bits/select.h \ - /usr/include/x86_64-linux-gnu/bits/sigset.h \ - /usr/include/x86_64-linux-gnu/bits/time.h \ - /usr/include/x86_64-linux-gnu/sys/sysmacros.h /usr/include/ladspa.h \ - /usr/include/dssi.h /usr/include/alsa/seq_event.h /usr/include/stdlib.h \ - /usr/include/alloca.h \ - /usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h \ - /usr/include/x86_64-linux-gnu/bits/stdlib-float.h /usr/include/string.h \ - /usr/include/x86_64-linux-gnu/bits/string.h \ - /usr/include/x86_64-linux-gnu/bits/string2.h /usr/include/assert.h \ - /usr/include/dlfcn.h /usr/include/x86_64-linux-gnu/bits/dlfcn.h \ - /usr/include/unistd.h /usr/include/x86_64-linux-gnu/bits/posix_opt.h \ - /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/math.h \ - /usr/include/x86_64-linux-gnu/bits/huge_val.h \ - /usr/include/x86_64-linux-gnu/bits/huge_valf.h \ - /usr/include/x86_64-linux-gnu/bits/huge_vall.h \ - /usr/include/x86_64-linux-gnu/bits/inf.h \ - /usr/include/x86_64-linux-gnu/bits/nan.h \ - /usr/include/x86_64-linux-gnu/bits/mathdef.h \ - /usr/include/x86_64-linux-gnu/bits/mathcalls.h \ - /usr/include/x86_64-linux-gnu/bits/mathinline.h \ - /usr/include/x86_64-linux-gnu/sys/stat.h \ - /usr/include/x86_64-linux-gnu/bits/stat.h \ - /usr/include/x86_64-linux-gnu/sys/time.h \ - /usr/include/x86_64-linux-gnu/sys/wait.h /usr/include/signal.h \ - /usr/include/x86_64-linux-gnu/bits/signum.h \ - /usr/include/x86_64-linux-gnu/bits/sigcontext.h \ - /usr/include/x86_64-linux-gnu/bits/sigstack.h \ - /usr/include/x86_64-linux-gnu/bits/waitflags.h \ - /usr/include/x86_64-linux-gnu/bits/waitstatus.h \ - /usr/include/x86_64-linux-gnu/bits/siginfo.h /usr/include/dirent.h \ - /usr/include/x86_64-linux-gnu/bits/dirent.h \ - /usr/include/x86_64-linux-gnu/bits/posix1_lim.h \ - /usr/include/x86_64-linux-gnu/bits/local_lim.h \ + /usr/include/features.h /usr/include/sys/cdefs.h \ + /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ + /usr/include/gnu/stubs-64.h \ + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h \ + /usr/include/bits/types.h /usr/include/bits/typesizes.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h \ + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h /usr/include/sys/types.h /usr/include/time.h \ + /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/bits/byteswap.h /usr/include/bits/byteswap-16.h \ + /usr/include/sys/select.h /usr/include/bits/select.h \ + /usr/include/bits/sigset.h /usr/include/bits/time.h \ + /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ + /usr/include/ladspa.h /usr/include/dssi.h /usr/include/alsa/seq_event.h \ + /usr/include/stdlib.h /usr/include/bits/waitflags.h \ + /usr/include/bits/waitstatus.h /usr/include/alloca.h \ + /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \ + /usr/include/string.h /usr/include/xlocale.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h /usr/include/assert.h /usr/include/dlfcn.h \ + /usr/include/bits/dlfcn.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ + /usr/include/bits/confname.h /usr/include/getopt.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \ + /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ + /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h \ + /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/sys/time.h \ + /usr/include/sys/wait.h /usr/include/signal.h /usr/include/bits/signum.h \ + /usr/include/bits/siginfo.h /usr/include/bits/sigaction.h \ + /usr/include/bits/sigcontext.h /usr/include/bits/sigstack.h \ + /usr/include/sys/ucontext.h /usr/include/bits/sigthread.h \ + /usr/include/dirent.h /usr/include/bits/dirent.h \ + /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h \ /usr/include/linux/limits.h /usr/include/libgen.h midi/midi_loader.h \ midi/fluid_list.h midi/fluidsynth_priv.h midi/fluid_midi_custom.h \ - midi/midi_loader.h /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h \ - /usr/include/stdint.h /usr/include/x86_64-linux-gnu/bits/wchar.h \ - midi/fluid_midi.h + midi/midi_loader.h \ + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h \ + /usr/include/stdint.h /usr/include/bits/wchar.h midi/fluid_midi.h /usr/include/stdc-predef.h: @@ -67,19 +50,19 @@ dssi-render.h: /usr/include/features.h: -/usr/include/x86_64-linux-gnu/sys/cdefs.h: +/usr/include/sys/cdefs.h: -/usr/include/x86_64-linux-gnu/bits/wordsize.h: +/usr/include/bits/wordsize.h: -/usr/include/x86_64-linux-gnu/gnu/stubs.h: +/usr/include/gnu/stubs.h: -/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: +/usr/include/gnu/stubs-64.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h: -/usr/include/x86_64-linux-gnu/bits/types.h: +/usr/include/bits/types.h: -/usr/include/x86_64-linux-gnu/bits/typesizes.h: +/usr/include/bits/typesizes.h: /usr/include/libio.h: @@ -87,35 +70,37 @@ dssi-render.h: /usr/include/wchar.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h: -/usr/include/x86_64-linux-gnu/bits/stdio_lim.h: +/usr/include/bits/stdio_lim.h: -/usr/include/x86_64-linux-gnu/bits/sys_errlist.h: +/usr/include/bits/sys_errlist.h: -/usr/include/x86_64-linux-gnu/bits/stdio.h: +/usr/include/bits/stdio.h: -/usr/include/x86_64-linux-gnu/sys/types.h: +/usr/include/sys/types.h: /usr/include/time.h: /usr/include/endian.h: -/usr/include/x86_64-linux-gnu/bits/endian.h: +/usr/include/bits/endian.h: -/usr/include/x86_64-linux-gnu/bits/byteswap.h: +/usr/include/bits/byteswap.h: -/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: +/usr/include/bits/byteswap-16.h: -/usr/include/x86_64-linux-gnu/sys/select.h: +/usr/include/sys/select.h: -/usr/include/x86_64-linux-gnu/bits/select.h: +/usr/include/bits/select.h: -/usr/include/x86_64-linux-gnu/bits/sigset.h: +/usr/include/bits/sigset.h: -/usr/include/x86_64-linux-gnu/bits/time.h: +/usr/include/bits/time.h: -/usr/include/x86_64-linux-gnu/sys/sysmacros.h: +/usr/include/sys/sysmacros.h: + +/usr/include/bits/pthreadtypes.h: /usr/include/ladspa.h: @@ -125,77 +110,89 @@ dssi-render.h: /usr/include/stdlib.h: +/usr/include/bits/waitflags.h: + +/usr/include/bits/waitstatus.h: + /usr/include/alloca.h: -/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h: +/usr/include/bits/stdlib-bsearch.h: -/usr/include/x86_64-linux-gnu/bits/stdlib-float.h: +/usr/include/bits/stdlib-float.h: /usr/include/string.h: -/usr/include/x86_64-linux-gnu/bits/string.h: +/usr/include/xlocale.h: + +/usr/include/bits/string.h: -/usr/include/x86_64-linux-gnu/bits/string2.h: +/usr/include/bits/string2.h: /usr/include/assert.h: /usr/include/dlfcn.h: -/usr/include/x86_64-linux-gnu/bits/dlfcn.h: +/usr/include/bits/dlfcn.h: /usr/include/unistd.h: -/usr/include/x86_64-linux-gnu/bits/posix_opt.h: +/usr/include/bits/posix_opt.h: -/usr/include/x86_64-linux-gnu/bits/confname.h: +/usr/include/bits/environments.h: + +/usr/include/bits/confname.h: + +/usr/include/getopt.h: /usr/include/math.h: -/usr/include/x86_64-linux-gnu/bits/huge_val.h: +/usr/include/bits/huge_val.h: -/usr/include/x86_64-linux-gnu/bits/huge_valf.h: +/usr/include/bits/huge_valf.h: -/usr/include/x86_64-linux-gnu/bits/huge_vall.h: +/usr/include/bits/huge_vall.h: -/usr/include/x86_64-linux-gnu/bits/inf.h: +/usr/include/bits/inf.h: -/usr/include/x86_64-linux-gnu/bits/nan.h: +/usr/include/bits/nan.h: -/usr/include/x86_64-linux-gnu/bits/mathdef.h: +/usr/include/bits/mathdef.h: -/usr/include/x86_64-linux-gnu/bits/mathcalls.h: +/usr/include/bits/mathcalls.h: -/usr/include/x86_64-linux-gnu/bits/mathinline.h: +/usr/include/bits/mathinline.h: -/usr/include/x86_64-linux-gnu/sys/stat.h: +/usr/include/sys/stat.h: -/usr/include/x86_64-linux-gnu/bits/stat.h: +/usr/include/bits/stat.h: -/usr/include/x86_64-linux-gnu/sys/time.h: +/usr/include/sys/time.h: -/usr/include/x86_64-linux-gnu/sys/wait.h: +/usr/include/sys/wait.h: /usr/include/signal.h: -/usr/include/x86_64-linux-gnu/bits/signum.h: +/usr/include/bits/signum.h: + +/usr/include/bits/siginfo.h: -/usr/include/x86_64-linux-gnu/bits/sigcontext.h: +/usr/include/bits/sigaction.h: -/usr/include/x86_64-linux-gnu/bits/sigstack.h: +/usr/include/bits/sigcontext.h: -/usr/include/x86_64-linux-gnu/bits/waitflags.h: +/usr/include/bits/sigstack.h: -/usr/include/x86_64-linux-gnu/bits/waitstatus.h: +/usr/include/sys/ucontext.h: -/usr/include/x86_64-linux-gnu/bits/siginfo.h: +/usr/include/bits/sigthread.h: /usr/include/dirent.h: -/usr/include/x86_64-linux-gnu/bits/dirent.h: +/usr/include/bits/dirent.h: -/usr/include/x86_64-linux-gnu/bits/posix1_lim.h: +/usr/include/bits/posix1_lim.h: -/usr/include/x86_64-linux-gnu/bits/local_lim.h: +/usr/include/bits/local_lim.h: /usr/include/linux/limits.h: @@ -211,10 +208,10 @@ midi/fluid_midi_custom.h: midi/midi_loader.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h: /usr/include/stdint.h: -/usr/include/x86_64-linux-gnu/bits/wchar.h: +/usr/include/bits/wchar.h: midi/fluid_midi.h: diff --git a/src/.ladspa_run_synth.c.swp b/src/.ladspa_run_synth.c.swp Binary files differindex 196caf1..416d76b 100644 --- a/src/.ladspa_run_synth.c.swp +++ b/src/.ladspa_run_synth.c.swp diff --git a/src/Makefile b/src/Makefile index 45dd42a..f4ee7b6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -81,7 +81,7 @@ host_triplet = x86_64-unknown-linux-gnu bin_PROGRAMS = dssi-render$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp TODO + $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -231,10 +231,10 @@ DUMPBIN = ECHO_C = ECHO_N = -n ECHO_T = -EGREP = /bin/grep -E +EGREP = /usr/bin/grep -E EXEEXT = -FGREP = /bin/grep -F -GREP = /bin/grep +FGREP = /usr/bin/grep -F +GREP = /usr/bin/grep INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} @@ -250,7 +250,7 @@ LN_S = ln -s LTLIBOBJS = MAKEINFO = ${SHELL} /home/pepper/dssi-render/missing makeinfo MANIFEST_TOOL = : -MKDIR_P = /bin/mkdir -p +MKDIR_P = /usr/bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = OBJDUMP = objdump @@ -269,9 +269,9 @@ PKG_CONFIG = /usr/bin/pkg-config PKG_CONFIG_LIBDIR = PKG_CONFIG_PATH = RANLIB = ranlib -SED = /bin/sed +SED = /usr/bin/sed SET_MAKE = -SHELL = /bin/bash +SHELL = /bin/sh SNDFILE_CFLAGS = SNDFILE_LIBS = -lsndfile STRIP = strip diff --git a/src/Makefile.in b/src/Makefile.in index 69d6c74..99d1fad 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -81,7 +81,7 @@ host_triplet = @host@ bin_PROGRAMS = dssi-render$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp TODO + $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -3,6 +3,9 @@ ==19216== Using Valgrind-3.10.1 and LibVEX; rerun with -h for copyright info ==19216== Command: ./dssi-render /usr/local/lib/dssi/amsynth_dssi.so -p 1 ==19216== +//so I've got a memory leak here, at least I'm pretty sure that's what this is...basically if a midi file is too long, it segfaults. + +this is the output from valgrind... is this helpful? or do I need to recompile with -g? ==19216== Conditional jump or move depends on uninitialised value(s) ==19216== at 0x6DBEC62: revmodel::update() (in /usr/local/lib/dssi/amsynth_dssi.so) ==19216== by 0x6DBEE88: revmodel::setwet(float) (in /usr/local/lib/dssi/amsynth_dssi.so) @@ -281156,8 +281159,9 @@ dssi-render: Wrote 255 frames to output.wav event table last nframe: 8904056 run_synth(instancehandle, 255, - 1: event_type: NOTE_ONchannel: 0 note: 68 veloci==19216== Argument 'size' of function realloc has a fishy (possibly negative) value: -173348 +so it's invalid size calulcation, need to check those functions ==19216== at 0x4C2C29E: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) -==19216== by 0x4027AE: ladspa_run_sample_callback (ladspa_run_synth.c:15) +==19216== by 0x4027AE: ladspa_run_sample_callback (ladspa_run_synth.c:15) //here? yes: ==19216== by 0x4030FA: get_events (midi_loader.c:228) ==19216== by 0x4047BC: fluid_track_send_events (fluid_midi.c:1212) ==19216== by 0x40326B: load_midi_file (midi_loader.c:297) diff --git a/src/dssi-render b/src/dssi-render Binary files differindex 14a5b9a..a5f946a 100755 --- a/src/dssi-render +++ b/src/dssi-render diff --git a/src/dssi-render.c b/src/dssi-render.c index c4b560f..03a9b98 100644 --- a/src/dssi-render.c +++ b/src/dssi-render.c @@ -4,6 +4,7 @@ #include "ladspa_run_synth.h" #include "midi/midi_loader.h" +#define SAMPLE_RATE 44100 #define DEBUG 1 void @@ -63,7 +64,7 @@ DSSI_Descriptor_Function descfn; size_t length = SAMPLE_RATE; size_t release_tail = -1; - size_t nframes = 256; + size_t nframes = 256; //here I guess? yeah ok size_t items_written = 0; float **pluginInputBuffers, **pluginOutputBuffers; diff --git a/src/dssi-render.h b/src/dssi-render.h index 136ef34..6870f0e 100644 --- a/src/dssi-render.h +++ b/src/dssi-render.h @@ -1,5 +1,3 @@ -//it's most likely defined in one of alsa libs, just copy headers include from here to get it. right but it's -//a pointer right? it's a structure. do we need to know what's in it? yes we need to fill it porperly for run_synth /* cli-dssi-host.h * Copyright (C) 2005 James McDermott * jamesmichaelmcdermott@gmail.com @@ -32,7 +30,6 @@ #define MAX_LENGTH (15.0f) -#define SAMPLE_RATE 44100 /* character used to separate SO names from plugin labels on command line */ #define LABEL_SEP ':' #define KEYVAL_SEP '=' @@ -65,6 +62,8 @@ + +extern float sample_rate; extern char *midi_filename; extern const DSSI_Descriptor *descriptor; extern LADSPA_Handle instanceHandle; @@ -102,8 +101,8 @@ extern float *pluginControlOuts; //awesome, worked, right? yeah //so what is extern doing? basically it says that there is a variable, but doesn't allocate it by itself, so same varable can be shared between two code from different object files. and are extern definitions like this usually kept in the header files? yes ok char *my_name; -#ifdef CLI_FUNCS -static float sample_rate; +#ifdef CLI_FUNCS +float sample_rate; static int verbose = 0; LADSPA_Data get_port_random(const LADSPA_Descriptor *plugin, int port) diff --git a/src/dssi-render.o b/src/dssi-render.o Binary files differindex 71599b4..ca09674 100644 --- a/src/dssi-render.o +++ b/src/dssi-render.o diff --git a/src/ladspa_run_synth.c b/src/ladspa_run_synth.c index 84f944e..92f0782 100644 --- a/src/ladspa_run_synth.c +++ b/src/ladspa_run_synth.c @@ -7,12 +7,17 @@ inline int min(int x, int y) { return (x < y) ? x : y; } +// where is nframes defined? void ladspa_run_sample_callback(event_table_t *event_table, void *userdata){ nframes = event_table->nframes_since_last; nframes = nframes > 0 ? nframes : 1; +//is it nframes that has the negative value? or event_table length? well they are both size_t, can't be negative. i guess need to add prints to see what's going on + printf("nframes: 0x%x\n", nframes); + printf("outs: 0x%x\n", outs); for (int i = 0; i < outs; i++) { pluginOutputBuffers[i] = (float *)realloc(pluginOutputBuffers[i], nframes * sizeof(float)); + printf("i: 0x%x buff: 0x%x\n", i, pluginOutputBuffers[i]); memset(pluginOutputBuffers[i], 0, nframes * sizeof(float)); } connect_ports(); @@ -47,7 +52,6 @@ void ladspa_run_sample_callback(event_table_t *event_table, void *userdata){ sf_output[i * nchannels + j] = pluginOutputBuffers[outs - 1][i]; } } -//clip = 1; // FIXME if (clip) { for (int i = 0; i < nframes * nchannels; i++) { if (!finite(sf_output[i])) { @@ -112,7 +116,8 @@ void ladspa_run_sample_callback(event_table_t *event_table, void *userdata){ } + void ladspa_run_synth(void){ - load_midi_file(midi_filename, ladspa_run_sample_callback, NULL); + load_midi_file(midi_filename, sample_rate, ladspa_run_sample_callback, NULL); } diff --git a/src/ladspa_run_synth.o b/src/ladspa_run_synth.o Binary files differindex 3014a49..2722b0d 100644 --- a/src/ladspa_run_synth.o +++ b/src/ladspa_run_synth.o diff --git a/src/midi/.deps/fluid_list.Plo b/src/midi/.deps/fluid_list.Plo index 1166ac5..5b5edf9 100644 --- a/src/midi/.deps/fluid_list.Plo +++ b/src/midi/.deps/fluid_list.Plo @@ -1,43 +1,31 @@ fluid_list.lo: fluid_list.c /usr/include/stdc-predef.h fluid_list.h \ fluidsynth_priv.h fluid_midi_custom.h midi_loader.h fluid_midi.h \ - /usr/include/stdlib.h /usr/include/features.h \ - /usr/include/x86_64-linux-gnu/sys/cdefs.h \ - /usr/include/x86_64-linux-gnu/bits/wordsize.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h \ - /usr/include/x86_64-linux-gnu/bits/waitflags.h \ - /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \ - /usr/include/x86_64-linux-gnu/bits/endian.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap.h \ - /usr/include/x86_64-linux-gnu/bits/types.h \ - /usr/include/x86_64-linux-gnu/bits/typesizes.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \ - /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \ - /usr/include/x86_64-linux-gnu/sys/select.h \ - /usr/include/x86_64-linux-gnu/bits/select.h \ - /usr/include/x86_64-linux-gnu/bits/sigset.h \ - /usr/include/x86_64-linux-gnu/bits/time.h \ - /usr/include/x86_64-linux-gnu/sys/sysmacros.h \ - /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \ - /usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h \ - /usr/include/x86_64-linux-gnu/bits/stdlib-float.h /usr/include/stdio.h \ - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h \ - /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \ - /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \ - /usr/include/x86_64-linux-gnu/bits/stdio.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h /usr/include/stdint.h \ - /usr/include/x86_64-linux-gnu/bits/wchar.h /usr/include/sndfile.h \ - /usr/include/string.h /usr/include/xlocale.h \ - /usr/include/x86_64-linux-gnu/bits/string.h \ - /usr/include/x86_64-linux-gnu/bits/string2.h /usr/include/ladspa.h \ - /usr/include/dssi.h /usr/include/alsa/seq_event.h /usr/include/unistd.h \ - /usr/include/x86_64-linux-gnu/bits/posix_opt.h \ - /usr/include/x86_64-linux-gnu/bits/environments.h \ - /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \ - /usr/include/x86_64-linux-gnu/sys/stat.h \ - /usr/include/x86_64-linux-gnu/bits/stat.h + /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \ + /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ + /usr/include/gnu/stubs-64.h \ + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h \ + /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ + /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/bits/byteswap.h /usr/include/bits/types.h \ + /usr/include/bits/typesizes.h /usr/include/bits/byteswap-16.h \ + /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \ + /usr/include/bits/select.h /usr/include/bits/sigset.h \ + /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ + /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \ + /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \ + /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ + /usr/include/wchar.h \ + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h \ + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h \ + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h \ + /usr/include/stdint.h /usr/include/bits/wchar.h /usr/include/sndfile.h \ + /usr/include/string.h /usr/include/xlocale.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h /usr/include/ladspa.h /usr/include/dssi.h \ + /usr/include/alsa/seq_event.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ + /usr/include/bits/confname.h /usr/include/getopt.h \ + /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/stdc-predef.h: @@ -55,53 +43,53 @@ fluid_midi.h: /usr/include/features.h: -/usr/include/x86_64-linux-gnu/sys/cdefs.h: +/usr/include/sys/cdefs.h: -/usr/include/x86_64-linux-gnu/bits/wordsize.h: +/usr/include/bits/wordsize.h: -/usr/include/x86_64-linux-gnu/gnu/stubs.h: +/usr/include/gnu/stubs.h: -/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: +/usr/include/gnu/stubs-64.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h: -/usr/include/x86_64-linux-gnu/bits/waitflags.h: +/usr/include/bits/waitflags.h: -/usr/include/x86_64-linux-gnu/bits/waitstatus.h: +/usr/include/bits/waitstatus.h: /usr/include/endian.h: -/usr/include/x86_64-linux-gnu/bits/endian.h: +/usr/include/bits/endian.h: -/usr/include/x86_64-linux-gnu/bits/byteswap.h: +/usr/include/bits/byteswap.h: -/usr/include/x86_64-linux-gnu/bits/types.h: +/usr/include/bits/types.h: -/usr/include/x86_64-linux-gnu/bits/typesizes.h: +/usr/include/bits/typesizes.h: -/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: +/usr/include/bits/byteswap-16.h: -/usr/include/x86_64-linux-gnu/sys/types.h: +/usr/include/sys/types.h: /usr/include/time.h: -/usr/include/x86_64-linux-gnu/sys/select.h: +/usr/include/sys/select.h: -/usr/include/x86_64-linux-gnu/bits/select.h: +/usr/include/bits/select.h: -/usr/include/x86_64-linux-gnu/bits/sigset.h: +/usr/include/bits/sigset.h: -/usr/include/x86_64-linux-gnu/bits/time.h: +/usr/include/bits/time.h: -/usr/include/x86_64-linux-gnu/sys/sysmacros.h: +/usr/include/sys/sysmacros.h: -/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h: +/usr/include/bits/pthreadtypes.h: /usr/include/alloca.h: -/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h: +/usr/include/bits/stdlib-bsearch.h: -/usr/include/x86_64-linux-gnu/bits/stdlib-float.h: +/usr/include/bits/stdlib-float.h: /usr/include/stdio.h: @@ -111,19 +99,19 @@ fluid_midi.h: /usr/include/wchar.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h: -/usr/include/x86_64-linux-gnu/bits/stdio_lim.h: +/usr/include/bits/stdio_lim.h: -/usr/include/x86_64-linux-gnu/bits/sys_errlist.h: +/usr/include/bits/sys_errlist.h: -/usr/include/x86_64-linux-gnu/bits/stdio.h: +/usr/include/bits/stdio.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h: /usr/include/stdint.h: -/usr/include/x86_64-linux-gnu/bits/wchar.h: +/usr/include/bits/wchar.h: /usr/include/sndfile.h: @@ -131,9 +119,9 @@ fluid_midi.h: /usr/include/xlocale.h: -/usr/include/x86_64-linux-gnu/bits/string.h: +/usr/include/bits/string.h: -/usr/include/x86_64-linux-gnu/bits/string2.h: +/usr/include/bits/string2.h: /usr/include/ladspa.h: @@ -143,14 +131,14 @@ fluid_midi.h: /usr/include/unistd.h: -/usr/include/x86_64-linux-gnu/bits/posix_opt.h: +/usr/include/bits/posix_opt.h: -/usr/include/x86_64-linux-gnu/bits/environments.h: +/usr/include/bits/environments.h: -/usr/include/x86_64-linux-gnu/bits/confname.h: +/usr/include/bits/confname.h: /usr/include/getopt.h: -/usr/include/x86_64-linux-gnu/sys/stat.h: +/usr/include/sys/stat.h: -/usr/include/x86_64-linux-gnu/bits/stat.h: +/usr/include/bits/stat.h: diff --git a/src/midi/.deps/fluid_midi.Plo b/src/midi/.deps/fluid_midi.Plo index d829e21..3de2838 100644 --- a/src/midi/.deps/fluid_midi.Plo +++ b/src/midi/.deps/fluid_midi.Plo @@ -1,50 +1,34 @@ fluid_midi.lo: fluid_midi.c /usr/include/stdc-predef.h fluid_midi.h \ fluidsynth_priv.h fluid_midi_custom.h midi_loader.h fluid_list.h \ /usr/include/sndfile.h /usr/include/stdio.h /usr/include/features.h \ - /usr/include/x86_64-linux-gnu/sys/cdefs.h \ - /usr/include/x86_64-linux-gnu/bits/wordsize.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h \ - /usr/include/x86_64-linux-gnu/bits/types.h \ - /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h \ - /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \ - /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \ - /usr/include/x86_64-linux-gnu/bits/stdio.h \ - /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \ - /usr/include/endian.h /usr/include/x86_64-linux-gnu/bits/endian.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \ - /usr/include/x86_64-linux-gnu/sys/select.h \ - /usr/include/x86_64-linux-gnu/bits/select.h \ - /usr/include/x86_64-linux-gnu/bits/sigset.h \ - /usr/include/x86_64-linux-gnu/bits/time.h \ - /usr/include/x86_64-linux-gnu/sys/sysmacros.h \ - /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/string.h \ - /usr/include/xlocale.h /usr/include/x86_64-linux-gnu/bits/string.h \ - /usr/include/x86_64-linux-gnu/bits/string2.h /usr/include/stdlib.h \ - /usr/include/ladspa.h /usr/include/dssi.h /usr/include/alsa/seq_event.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h /usr/include/stdint.h \ - /usr/include/x86_64-linux-gnu/bits/wchar.h \ - /usr/include/x86_64-linux-gnu/bits/waitflags.h \ - /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/alloca.h \ - /usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h \ - /usr/include/x86_64-linux-gnu/bits/stdlib-float.h /usr/include/unistd.h \ - /usr/include/x86_64-linux-gnu/bits/posix_opt.h \ - /usr/include/x86_64-linux-gnu/bits/environments.h \ - /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \ - /usr/include/x86_64-linux-gnu/sys/stat.h \ - /usr/include/x86_64-linux-gnu/bits/stat.h /usr/include/math.h \ - /usr/include/x86_64-linux-gnu/bits/huge_val.h \ - /usr/include/x86_64-linux-gnu/bits/huge_valf.h \ - /usr/include/x86_64-linux-gnu/bits/huge_vall.h \ - /usr/include/x86_64-linux-gnu/bits/inf.h \ - /usr/include/x86_64-linux-gnu/bits/nan.h \ - /usr/include/x86_64-linux-gnu/bits/mathdef.h \ - /usr/include/x86_64-linux-gnu/bits/mathcalls.h \ - /usr/include/x86_64-linux-gnu/bits/mathinline.h + /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ + /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h \ + /usr/include/bits/types.h /usr/include/bits/typesizes.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h \ + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h /usr/include/sys/types.h /usr/include/time.h \ + /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/bits/byteswap.h /usr/include/bits/byteswap-16.h \ + /usr/include/sys/select.h /usr/include/bits/select.h \ + /usr/include/bits/sigset.h /usr/include/bits/time.h \ + /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ + /usr/include/string.h /usr/include/xlocale.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h /usr/include/stdlib.h /usr/include/ladspa.h \ + /usr/include/dssi.h /usr/include/alsa/seq_event.h \ + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h \ + /usr/include/stdint.h /usr/include/bits/wchar.h \ + /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ + /usr/include/alloca.h /usr/include/bits/stdlib-bsearch.h \ + /usr/include/bits/stdlib-float.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ + /usr/include/bits/confname.h /usr/include/getopt.h \ + /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \ + /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ + /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h /usr/include/stdc-predef.h: @@ -64,19 +48,19 @@ fluid_list.h: /usr/include/features.h: -/usr/include/x86_64-linux-gnu/sys/cdefs.h: +/usr/include/sys/cdefs.h: -/usr/include/x86_64-linux-gnu/bits/wordsize.h: +/usr/include/bits/wordsize.h: -/usr/include/x86_64-linux-gnu/gnu/stubs.h: +/usr/include/gnu/stubs.h: -/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: +/usr/include/gnu/stubs-64.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h: -/usr/include/x86_64-linux-gnu/bits/types.h: +/usr/include/bits/types.h: -/usr/include/x86_64-linux-gnu/bits/typesizes.h: +/usr/include/bits/typesizes.h: /usr/include/libio.h: @@ -84,45 +68,45 @@ fluid_list.h: /usr/include/wchar.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h: -/usr/include/x86_64-linux-gnu/bits/stdio_lim.h: +/usr/include/bits/stdio_lim.h: -/usr/include/x86_64-linux-gnu/bits/sys_errlist.h: +/usr/include/bits/sys_errlist.h: -/usr/include/x86_64-linux-gnu/bits/stdio.h: +/usr/include/bits/stdio.h: -/usr/include/x86_64-linux-gnu/sys/types.h: +/usr/include/sys/types.h: /usr/include/time.h: /usr/include/endian.h: -/usr/include/x86_64-linux-gnu/bits/endian.h: +/usr/include/bits/endian.h: -/usr/include/x86_64-linux-gnu/bits/byteswap.h: +/usr/include/bits/byteswap.h: -/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: +/usr/include/bits/byteswap-16.h: -/usr/include/x86_64-linux-gnu/sys/select.h: +/usr/include/sys/select.h: -/usr/include/x86_64-linux-gnu/bits/select.h: +/usr/include/bits/select.h: -/usr/include/x86_64-linux-gnu/bits/sigset.h: +/usr/include/bits/sigset.h: -/usr/include/x86_64-linux-gnu/bits/time.h: +/usr/include/bits/time.h: -/usr/include/x86_64-linux-gnu/sys/sysmacros.h: +/usr/include/sys/sysmacros.h: -/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h: +/usr/include/bits/pthreadtypes.h: /usr/include/string.h: /usr/include/xlocale.h: -/usr/include/x86_64-linux-gnu/bits/string.h: +/usr/include/bits/string.h: -/usr/include/x86_64-linux-gnu/bits/string2.h: +/usr/include/bits/string2.h: /usr/include/stdlib.h: @@ -132,50 +116,50 @@ fluid_list.h: /usr/include/alsa/seq_event.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h: /usr/include/stdint.h: -/usr/include/x86_64-linux-gnu/bits/wchar.h: +/usr/include/bits/wchar.h: -/usr/include/x86_64-linux-gnu/bits/waitflags.h: +/usr/include/bits/waitflags.h: -/usr/include/x86_64-linux-gnu/bits/waitstatus.h: +/usr/include/bits/waitstatus.h: /usr/include/alloca.h: -/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h: +/usr/include/bits/stdlib-bsearch.h: -/usr/include/x86_64-linux-gnu/bits/stdlib-float.h: +/usr/include/bits/stdlib-float.h: /usr/include/unistd.h: -/usr/include/x86_64-linux-gnu/bits/posix_opt.h: +/usr/include/bits/posix_opt.h: -/usr/include/x86_64-linux-gnu/bits/environments.h: +/usr/include/bits/environments.h: -/usr/include/x86_64-linux-gnu/bits/confname.h: +/usr/include/bits/confname.h: /usr/include/getopt.h: -/usr/include/x86_64-linux-gnu/sys/stat.h: +/usr/include/sys/stat.h: -/usr/include/x86_64-linux-gnu/bits/stat.h: +/usr/include/bits/stat.h: /usr/include/math.h: -/usr/include/x86_64-linux-gnu/bits/huge_val.h: +/usr/include/bits/huge_val.h: -/usr/include/x86_64-linux-gnu/bits/huge_valf.h: +/usr/include/bits/huge_valf.h: -/usr/include/x86_64-linux-gnu/bits/huge_vall.h: +/usr/include/bits/huge_vall.h: -/usr/include/x86_64-linux-gnu/bits/inf.h: +/usr/include/bits/inf.h: -/usr/include/x86_64-linux-gnu/bits/nan.h: +/usr/include/bits/nan.h: -/usr/include/x86_64-linux-gnu/bits/mathdef.h: +/usr/include/bits/mathdef.h: -/usr/include/x86_64-linux-gnu/bits/mathcalls.h: +/usr/include/bits/mathcalls.h: -/usr/include/x86_64-linux-gnu/bits/mathinline.h: +/usr/include/bits/mathinline.h: diff --git a/src/midi/.deps/midi_loader.Plo b/src/midi/.deps/midi_loader.Plo index 9a76aa8..f6b91a3 100644 --- a/src/midi/.deps/midi_loader.Plo +++ b/src/midi/.deps/midi_loader.Plo @@ -1,40 +1,29 @@ midi_loader.lo: midi_loader.c /usr/include/stdc-predef.h midi_loader.h \ fluid_list.h fluidsynth_priv.h fluid_midi_custom.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h /usr/include/stdint.h \ - /usr/include/features.h /usr/include/x86_64-linux-gnu/sys/cdefs.h \ - /usr/include/x86_64-linux-gnu/bits/wordsize.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ - /usr/include/x86_64-linux-gnu/bits/wchar.h /usr/include/stdio.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h \ - /usr/include/x86_64-linux-gnu/bits/types.h \ - /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h \ - /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \ - /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \ - /usr/include/x86_64-linux-gnu/bits/stdio.h /usr/include/stdlib.h \ - /usr/include/x86_64-linux-gnu/bits/waitflags.h \ - /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \ - /usr/include/x86_64-linux-gnu/bits/endian.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \ - /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \ - /usr/include/x86_64-linux-gnu/sys/select.h \ - /usr/include/x86_64-linux-gnu/bits/select.h \ - /usr/include/x86_64-linux-gnu/bits/sigset.h \ - /usr/include/x86_64-linux-gnu/bits/time.h \ - /usr/include/x86_64-linux-gnu/sys/sysmacros.h \ - /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \ - /usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h \ - /usr/include/x86_64-linux-gnu/bits/stdlib-float.h /usr/include/string.h \ - /usr/include/xlocale.h /usr/include/x86_64-linux-gnu/bits/string.h \ - /usr/include/x86_64-linux-gnu/bits/string2.h /usr/include/unistd.h \ - /usr/include/x86_64-linux-gnu/bits/posix_opt.h \ - /usr/include/x86_64-linux-gnu/bits/environments.h \ - /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \ - /usr/include/x86_64-linux-gnu/sys/stat.h \ - /usr/include/x86_64-linux-gnu/bits/stat.h fluid_midi.h \ + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h \ + /usr/include/stdint.h /usr/include/features.h /usr/include/sys/cdefs.h \ + /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ + /usr/include/gnu/stubs-64.h /usr/include/bits/wchar.h \ + /usr/include/stdio.h \ + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h \ + /usr/include/bits/types.h /usr/include/bits/typesizes.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h \ + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h /usr/include/stdlib.h \ + /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ + /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/bits/byteswap.h /usr/include/bits/byteswap-16.h \ + /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \ + /usr/include/bits/select.h /usr/include/bits/sigset.h \ + /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ + /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \ + /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \ + /usr/include/string.h /usr/include/xlocale.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ + /usr/include/bits/confname.h /usr/include/getopt.h \ + /usr/include/sys/stat.h /usr/include/bits/stat.h fluid_midi.h \ /usr/include/sndfile.h /usr/include/ladspa.h /usr/include/dssi.h \ /usr/include/alsa/seq_event.h @@ -48,29 +37,29 @@ fluidsynth_priv.h: fluid_midi_custom.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h: /usr/include/stdint.h: /usr/include/features.h: -/usr/include/x86_64-linux-gnu/sys/cdefs.h: +/usr/include/sys/cdefs.h: -/usr/include/x86_64-linux-gnu/bits/wordsize.h: +/usr/include/bits/wordsize.h: -/usr/include/x86_64-linux-gnu/gnu/stubs.h: +/usr/include/gnu/stubs.h: -/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: +/usr/include/gnu/stubs-64.h: -/usr/include/x86_64-linux-gnu/bits/wchar.h: +/usr/include/bits/wchar.h: /usr/include/stdio.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h: -/usr/include/x86_64-linux-gnu/bits/types.h: +/usr/include/bits/types.h: -/usr/include/x86_64-linux-gnu/bits/typesizes.h: +/usr/include/bits/typesizes.h: /usr/include/libio.h: @@ -78,71 +67,71 @@ fluid_midi_custom.h: /usr/include/wchar.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h: -/usr/include/x86_64-linux-gnu/bits/stdio_lim.h: +/usr/include/bits/stdio_lim.h: -/usr/include/x86_64-linux-gnu/bits/sys_errlist.h: +/usr/include/bits/sys_errlist.h: -/usr/include/x86_64-linux-gnu/bits/stdio.h: +/usr/include/bits/stdio.h: /usr/include/stdlib.h: -/usr/include/x86_64-linux-gnu/bits/waitflags.h: +/usr/include/bits/waitflags.h: -/usr/include/x86_64-linux-gnu/bits/waitstatus.h: +/usr/include/bits/waitstatus.h: /usr/include/endian.h: -/usr/include/x86_64-linux-gnu/bits/endian.h: +/usr/include/bits/endian.h: -/usr/include/x86_64-linux-gnu/bits/byteswap.h: +/usr/include/bits/byteswap.h: -/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: +/usr/include/bits/byteswap-16.h: -/usr/include/x86_64-linux-gnu/sys/types.h: +/usr/include/sys/types.h: /usr/include/time.h: -/usr/include/x86_64-linux-gnu/sys/select.h: +/usr/include/sys/select.h: -/usr/include/x86_64-linux-gnu/bits/select.h: +/usr/include/bits/select.h: -/usr/include/x86_64-linux-gnu/bits/sigset.h: +/usr/include/bits/sigset.h: -/usr/include/x86_64-linux-gnu/bits/time.h: +/usr/include/bits/time.h: -/usr/include/x86_64-linux-gnu/sys/sysmacros.h: +/usr/include/sys/sysmacros.h: -/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h: +/usr/include/bits/pthreadtypes.h: /usr/include/alloca.h: -/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h: +/usr/include/bits/stdlib-bsearch.h: -/usr/include/x86_64-linux-gnu/bits/stdlib-float.h: +/usr/include/bits/stdlib-float.h: /usr/include/string.h: /usr/include/xlocale.h: -/usr/include/x86_64-linux-gnu/bits/string.h: +/usr/include/bits/string.h: -/usr/include/x86_64-linux-gnu/bits/string2.h: +/usr/include/bits/string2.h: /usr/include/unistd.h: -/usr/include/x86_64-linux-gnu/bits/posix_opt.h: +/usr/include/bits/posix_opt.h: -/usr/include/x86_64-linux-gnu/bits/environments.h: +/usr/include/bits/environments.h: -/usr/include/x86_64-linux-gnu/bits/confname.h: +/usr/include/bits/confname.h: /usr/include/getopt.h: -/usr/include/x86_64-linux-gnu/sys/stat.h: +/usr/include/sys/stat.h: -/usr/include/x86_64-linux-gnu/bits/stat.h: +/usr/include/bits/stat.h: fluid_midi.h: diff --git a/src/midi/.deps/test_midi_loader.Po b/src/midi/.deps/test_midi_loader.Po index 8b14bf4..46719e6 100644 --- a/src/midi/.deps/test_midi_loader.Po +++ b/src/midi/.deps/test_midi_loader.Po @@ -1,40 +1,29 @@ test_midi_loader.o: test_midi_loader.c /usr/include/stdc-predef.h \ midi_loader.h fluid_list.h fluidsynth_priv.h fluid_midi_custom.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h /usr/include/stdint.h \ - /usr/include/features.h /usr/include/x86_64-linux-gnu/sys/cdefs.h \ - /usr/include/x86_64-linux-gnu/bits/wordsize.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ - /usr/include/x86_64-linux-gnu/bits/wchar.h /usr/include/stdio.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h \ - /usr/include/x86_64-linux-gnu/bits/types.h \ - /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h \ - /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \ - /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \ - /usr/include/x86_64-linux-gnu/bits/stdio.h /usr/include/stdlib.h \ - /usr/include/x86_64-linux-gnu/bits/waitflags.h \ - /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \ - /usr/include/x86_64-linux-gnu/bits/endian.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \ - /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \ - /usr/include/x86_64-linux-gnu/sys/select.h \ - /usr/include/x86_64-linux-gnu/bits/select.h \ - /usr/include/x86_64-linux-gnu/bits/sigset.h \ - /usr/include/x86_64-linux-gnu/bits/time.h \ - /usr/include/x86_64-linux-gnu/sys/sysmacros.h \ - /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \ - /usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h \ - /usr/include/x86_64-linux-gnu/bits/stdlib-float.h /usr/include/string.h \ - /usr/include/xlocale.h /usr/include/x86_64-linux-gnu/bits/string.h \ - /usr/include/x86_64-linux-gnu/bits/string2.h /usr/include/unistd.h \ - /usr/include/x86_64-linux-gnu/bits/posix_opt.h \ - /usr/include/x86_64-linux-gnu/bits/environments.h \ - /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \ - /usr/include/x86_64-linux-gnu/sys/stat.h \ - /usr/include/x86_64-linux-gnu/bits/stat.h fluid_midi.h \ + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h \ + /usr/include/stdint.h /usr/include/features.h /usr/include/sys/cdefs.h \ + /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ + /usr/include/gnu/stubs-64.h /usr/include/bits/wchar.h \ + /usr/include/stdio.h \ + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h \ + /usr/include/bits/types.h /usr/include/bits/typesizes.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h \ + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h /usr/include/stdlib.h \ + /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ + /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/bits/byteswap.h /usr/include/bits/byteswap-16.h \ + /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \ + /usr/include/bits/select.h /usr/include/bits/sigset.h \ + /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ + /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \ + /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \ + /usr/include/string.h /usr/include/xlocale.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ + /usr/include/bits/confname.h /usr/include/getopt.h \ + /usr/include/sys/stat.h /usr/include/bits/stat.h fluid_midi.h \ /usr/include/sndfile.h /usr/include/ladspa.h /usr/include/dssi.h \ /usr/include/alsa/seq_event.h @@ -48,29 +37,29 @@ fluidsynth_priv.h: fluid_midi_custom.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h: /usr/include/stdint.h: /usr/include/features.h: -/usr/include/x86_64-linux-gnu/sys/cdefs.h: +/usr/include/sys/cdefs.h: -/usr/include/x86_64-linux-gnu/bits/wordsize.h: +/usr/include/bits/wordsize.h: -/usr/include/x86_64-linux-gnu/gnu/stubs.h: +/usr/include/gnu/stubs.h: -/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: +/usr/include/gnu/stubs-64.h: -/usr/include/x86_64-linux-gnu/bits/wchar.h: +/usr/include/bits/wchar.h: /usr/include/stdio.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h: -/usr/include/x86_64-linux-gnu/bits/types.h: +/usr/include/bits/types.h: -/usr/include/x86_64-linux-gnu/bits/typesizes.h: +/usr/include/bits/typesizes.h: /usr/include/libio.h: @@ -78,71 +67,71 @@ fluid_midi_custom.h: /usr/include/wchar.h: -/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h: +/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h: -/usr/include/x86_64-linux-gnu/bits/stdio_lim.h: +/usr/include/bits/stdio_lim.h: -/usr/include/x86_64-linux-gnu/bits/sys_errlist.h: +/usr/include/bits/sys_errlist.h: -/usr/include/x86_64-linux-gnu/bits/stdio.h: +/usr/include/bits/stdio.h: /usr/include/stdlib.h: -/usr/include/x86_64-linux-gnu/bits/waitflags.h: +/usr/include/bits/waitflags.h: -/usr/include/x86_64-linux-gnu/bits/waitstatus.h: +/usr/include/bits/waitstatus.h: /usr/include/endian.h: -/usr/include/x86_64-linux-gnu/bits/endian.h: +/usr/include/bits/endian.h: -/usr/include/x86_64-linux-gnu/bits/byteswap.h: +/usr/include/bits/byteswap.h: -/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: +/usr/include/bits/byteswap-16.h: -/usr/include/x86_64-linux-gnu/sys/types.h: +/usr/include/sys/types.h: /usr/include/time.h: -/usr/include/x86_64-linux-gnu/sys/select.h: +/usr/include/sys/select.h: -/usr/include/x86_64-linux-gnu/bits/select.h: +/usr/include/bits/select.h: -/usr/include/x86_64-linux-gnu/bits/sigset.h: +/usr/include/bits/sigset.h: -/usr/include/x86_64-linux-gnu/bits/time.h: +/usr/include/bits/time.h: -/usr/include/x86_64-linux-gnu/sys/sysmacros.h: +/usr/include/sys/sysmacros.h: -/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h: +/usr/include/bits/pthreadtypes.h: /usr/include/alloca.h: -/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h: +/usr/include/bits/stdlib-bsearch.h: -/usr/include/x86_64-linux-gnu/bits/stdlib-float.h: +/usr/include/bits/stdlib-float.h: /usr/include/string.h: /usr/include/xlocale.h: -/usr/include/x86_64-linux-gnu/bits/string.h: +/usr/include/bits/string.h: -/usr/include/x86_64-linux-gnu/bits/string2.h: +/usr/include/bits/string2.h: /usr/include/unistd.h: -/usr/include/x86_64-linux-gnu/bits/posix_opt.h: +/usr/include/bits/posix_opt.h: -/usr/include/x86_64-linux-gnu/bits/environments.h: +/usr/include/bits/environments.h: -/usr/include/x86_64-linux-gnu/bits/confname.h: +/usr/include/bits/confname.h: /usr/include/getopt.h: -/usr/include/x86_64-linux-gnu/sys/stat.h: +/usr/include/sys/stat.h: -/usr/include/x86_64-linux-gnu/bits/stat.h: +/usr/include/bits/stat.h: fluid_midi.h: diff --git a/src/midi/.libs/fluid_list.o b/src/midi/.libs/fluid_list.o Binary files differindex 2df0fa8..086ddda 100644 --- a/src/midi/.libs/fluid_list.o +++ b/src/midi/.libs/fluid_list.o diff --git a/src/midi/.libs/fluid_midi.o b/src/midi/.libs/fluid_midi.o Binary files differindex e761d24..a760d5c 100644 --- a/src/midi/.libs/fluid_midi.o +++ b/src/midi/.libs/fluid_midi.o diff --git a/src/midi/.libs/libfluidmidi.a b/src/midi/.libs/libfluidmidi.a Binary files differindex 2590580..d8612b1 100644 --- a/src/midi/.libs/libfluidmidi.a +++ b/src/midi/.libs/libfluidmidi.a diff --git a/src/midi/.libs/midi_loader.o b/src/midi/.libs/midi_loader.o Binary files differindex 46a82c9..63edb32 100644 --- a/src/midi/.libs/midi_loader.o +++ b/src/midi/.libs/midi_loader.o diff --git a/src/midi/Makefile b/src/midi/Makefile index 3025341..8a35d60 100644 --- a/src/midi/Makefile +++ b/src/midi/Makefile @@ -191,10 +191,10 @@ DUMPBIN = ECHO_C = ECHO_N = -n ECHO_T = -EGREP = /bin/grep -E +EGREP = /usr/bin/grep -E EXEEXT = -FGREP = /bin/grep -F -GREP = /bin/grep +FGREP = /usr/bin/grep -F +GREP = /usr/bin/grep INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} @@ -210,7 +210,7 @@ LN_S = ln -s LTLIBOBJS = MAKEINFO = ${SHELL} /home/pepper/dssi-render/missing makeinfo MANIFEST_TOOL = : -MKDIR_P = /bin/mkdir -p +MKDIR_P = /usr/bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = OBJDUMP = objdump @@ -229,9 +229,9 @@ PKG_CONFIG = /usr/bin/pkg-config PKG_CONFIG_LIBDIR = PKG_CONFIG_PATH = RANLIB = ranlib -SED = /bin/sed +SED = /usr/bin/sed SET_MAKE = -SHELL = /bin/bash +SHELL = /bin/sh SNDFILE_CFLAGS = SNDFILE_LIBS = -lsndfile STRIP = strip diff --git a/src/midi/fluid_list.lo b/src/midi/fluid_list.lo index 9eb16d0..bbc909d 100644 --- a/src/midi/fluid_list.lo +++ b/src/midi/fluid_list.lo @@ -1,5 +1,5 @@ # fluid_list.lo - a libtool object file -# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11 +# Generated by libtool (GNU libtool) 2.4.2 # # Please DO NOT delete this file! # It is necessary for linking the library. diff --git a/src/midi/fluid_list.o b/src/midi/fluid_list.o Binary files differindex 853ca93..d754d92 100644 --- a/src/midi/fluid_list.o +++ b/src/midi/fluid_list.o diff --git a/src/midi/fluid_midi.lo b/src/midi/fluid_midi.lo index 3781e7b..09c84c0 100644 --- a/src/midi/fluid_midi.lo +++ b/src/midi/fluid_midi.lo @@ -1,5 +1,5 @@ # fluid_midi.lo - a libtool object file -# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11 +# Generated by libtool (GNU libtool) 2.4.2 # # Please DO NOT delete this file! # It is necessary for linking the library. diff --git a/src/midi/fluid_midi.o b/src/midi/fluid_midi.o Binary files differindex ac2c3d1..eadbdd4 100644 --- a/src/midi/fluid_midi.o +++ b/src/midi/fluid_midi.o diff --git a/src/midi/libfluidmidi.la b/src/midi/libfluidmidi.la index 52b7120..8da7fe7 100644 --- a/src/midi/libfluidmidi.la +++ b/src/midi/libfluidmidi.la @@ -1,5 +1,5 @@ # libfluidmidi.la - a libtool library file -# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11 +# Generated by libtool (GNU libtool) 2.4.2 # # Please DO NOT delete this file! # It is necessary for linking the library. diff --git a/src/midi/midi_loader.c b/src/midi/midi_loader.c index a3173ad..a0553ac 100644 --- a/src/midi/midi_loader.c +++ b/src/midi/midi_loader.c @@ -1,5 +1,5 @@ #include "midi_loader.h" -#define DEBUG 0 +#define DEBUG 1 event_table_t *event_table; int @@ -186,22 +186,25 @@ int get_events(void *data, fluid_midi_event_t *event){ fluid_track_t *track = ctx->track; snd_seq_event_t seq_event; - size_t last_nframe = event_table->last_nframe; - event_table->last_nframe = (player->deltatime * track->ticks) * 44100 / 1000; // FIXME 44100 to ctx->samplerate - event_table->nframes_since_last = event_table->last_nframe - last_nframe; + size_t last_tick = event_table->last_tick; + size_t tick_current = track->ticks; // (player->deltatime * track->ticks) / 1000 * 44100; + if (last_tick > tick_current){ + if (DEBUG){ + printf("SKIPPING EVENT, event out of order in midi file. Last: %d, current tick: %d\n", last_tick, track->ticks); + }// nope, doesn't trigger if ticks is same any way we can print that tick number and compare it with the file? sure + return 0; + } + event_table->last_tick = tick_current;// FIXME 44100 to ctx->samplerate oh yeah this needs to be passed in + event_table->ticks_since_last = event_table->last_tick - last_tick; + event_table->nframes_since_last = event_table->ticks_since_last * player->deltatime * ctx->sample_rate / 1000; convert_event_format(event, &seq_event); - //print_snd_seq_event(&seq_event); read_midi_callback cb = ctx->callback; if(cb){ - //size_t i; - // for(i = 0; i < event_table->nframes_since_last / 256; i++){ // FIXME //it could be something weird somewhere in this script though, right? -//some part that we haven't been looking at at all... well yeah, i think of setting this to run whole nframes, and compiling hexter with debug symbols to check it again in valgrind. what is segfaulting...we don't know which part, right? yeah could it be something like an old printf statement somewhere in the code from cli-dssi-host? hm it actually can be code from cli-dssi which is initalizing plugin for only 256 frames and we are trying to run more inside.. yeah that seems right it saves it in "descriptor" right? yeah some buffer there cb(event_table, ctx->callback_userdata); //} } - // so i fixed logic a bit, should work now oh ok I have the new file delete_note_off_events(event_table); switch(event->type){ @@ -226,7 +229,7 @@ int get_events(void *data, fluid_midi_event_t *event){ -void load_midi_file(char *filename, read_midi_callback callback, void *callback_userdata){ //like that? +void load_midi_file(char *filename, float sample_rate, read_midi_callback callback, void *callback_userdata){ //like that? int i; fluid_player_t *player; fluid_playlist_item playlist_item; @@ -237,129 +240,24 @@ void load_midi_file(char *filename, read_midi_callback callback, void *callback_ event_table->length = 0; event_table->last_nframe = 0; event_table->nframes_since_last = 0; -//where is this calculated? + event_table->last_tick = 0; + event_table->ticks_since_last = 0; playlist_item.filename = filename; - // - // so the only arg to the callback is ctx, right? yes - // player = (fluid_player_t *)new_fluid_player(); + player = (fluid_player_t *)new_fluid_player(); - player->playback_callback = &get_events; //how do I pass it to the callback? no way to do that, we can only pass one variable as "data" - player->playback_userdata = (void *)&ctx; // here. so i guess need to make a structure and put player, track pointers into it. + player->playback_callback = &get_events; + + player->playback_userdata = (void *)&ctx; ctx.player = player; ctx.callback = callback; ctx.callback_userdata = callback_userdata; + ctx.sample_rate = sample_rate; fluid_player_load(player, &playlist_item); -// -// for(i = 0; i < player->ntracks; i++){ - ctx.track = player->track[i];// here. so i guess need to make a structure and put player, track pointers into it. + ctx.track = player->track[i]; fluid_track_send_events(player->track[i], player->synth, player, (unsigned int)-1); } delete_fluid_player(player); } -// -//should I grab the run_synth call from the other program just so that we know what it requires? yep -// -// something like this, need to fix it a bit ok I'll load example.mid, should we try it before taking a break from this? well it won't compile i think, get_events should be consistent with callback prototype -// -//EXPLANATION: -//LADSPA_Handle instanceHandle; -//instanceHandle = descriptor->LADSPA_Plugin->instantiate -// -// -// -//int nframes (number of frames) - -// current_event is pointer to on/off event -// snd_seq_event_t on_event, off_event, *current_event; -// on_event.type = SND_SEQ_EVENT_NOTEON; -// on_event.data.note.channel = 0; // this one oh ok, so we save this data, and don't worry about it until we get to run_synth? looks so ok perfect -// on_event.data.note.note = midi_note; -// on_event.data.note.velocity = midi_velocity; -// on_event.time.tick = 0; -// -// off_event.type = SND_SEQ_EVENT_NOTEOFF; -// off_event.data.note.channel = 0; -// off_event.data.note.note = midi_note; -// off_event.data.note.off_velocity = midi_velocity; // yeah off_velocity instead -// off_event.time.tick = 0; - - -//weird, negative numbers type problem...is it because we need to print as %u? or something similar? might be -//ok so it's the event table that we pass in, right? yes -// descriptor->run_synth(instanceHandle, //instance handle is taken care of for us, current_event is our event_table, right? event_table->events -// player->msec, //like this? not really -// event_table->events, -// event_table->length); -// -// so with nfraes, we need to track how many samples we should generate from last get_events call. so it should be something like: -// ok something like this wow, ok, do we need print this now too, or should we try hooking it up? let's print it first - -//only thing is, I'm not sure what they mean by start of the block, do they mean start of the track? not sure, i guess to start of events we send to plugin one more time to check this note_on\off -// * The Events pointer points to a block of EventCount ALSA -// * sequencer events, which is used to communicate MIDI and related -// * events to the synth. Each event is timestamped relative to the -// * start of the block, (mis)using the ALSA "tick time" field as a -// * frame count. The host is responsible for ensuring that events -// * with differing timestamps are already ordered by time. - //FIXME msec - /*printf("track=%02d msec=%05d ticks=%05u dtime=%05u next=%05u type=Ox%x\n", - track->num, - track->ticks * player->deltatime, - track->ticks, - event->dtime, - track->ticks + event->dtime, -//ok so do we still have an issue with the ticks calculation? yeah but anyway there is something weird with note generation, if i put event on_event from original code, there is something in output file, if i put our events it's silence - event->type); */ -//{{{ mrswatson time calculation -// case TIME_DIVISION_TYPE_TICKS_PER_BEAT: { -// double ticksPerSecond = (double)timeDivision * getTempo() / 60.0; -// double sampleFramesPerTick = getSampleRate() / ticksPerSecond; -// currentTimeInSampleFrames += (long)(unpackedVariableLength * sampleFramesPerTick); //so do we need the same calculation, currentTimeinFrames? or do we need deltaframes? what are the units we need exactly? basically need timestamp in msec for each event -// } -//}}} - -/* - -get_events original -int get_events(void *data, fluid_midi_event_t *event){ - read_midi_ctx_t *ctx = (read_midi_ctx_t *)data; - fluid_player_t *player = ctx->player; - fluid_track_t *track = ctx->track; - snd_seq_event_t seq_event; - - size_t last_nframe = event_table->last_nframe; - event_table->last_nframe = (player->deltatime * track->ticks) * 44100 / 1000; // FIXME 44100 to ctx->samplerate - event_table->nframes_since_last = event_table->last_nframe - last_nframe; - - - convert_event_format(event, &seq_event); - print_snd_seq_event(&seq_event); - - read_midi_callback cb = ctx->callback; - if(cb){ - size_t i; - for(i = 0; i < event_table->nframes_since_last; i++){ - cb(event_table, ctx->callback_userdata); - } - } - - switch(event->type){ - case NOTE_ON: - insert_event(event_table, &seq_event); - break; - case NOTE_OFF: - delete_event(event_table, &seq_event); - break; - default: - break; - } - printf("event table last nframe: %u\n", event_table->last_nframe); - printf("run_synth(instancehandle, %u,\n", event_table->nframes_since_last); - print_event_table(event_table); - printf(", %u)\n", event_table->length); - -} -*/ diff --git a/src/midi/midi_loader.h b/src/midi/midi_loader.h index bf249aa..6793099 100644 --- a/src/midi/midi_loader.h +++ b/src/midi/midi_loader.h @@ -16,6 +16,8 @@ typedef struct event_table_t{ size_t length; size_t last_nframe; size_t nframes_since_last; + size_t last_tick; + size_t ticks_since_last; } event_table_t; typedef void(*read_midi_callback)(event_table_t *event_table, void *userdata); @@ -27,6 +29,7 @@ typedef struct read_midi_ctx_t { fluid_track_t *track; read_midi_callback callback; void *callback_userdata; + size_t sample_rate; } read_midi_ctx_t; @@ -41,5 +44,5 @@ typedef struct read_midi_ctx_t { //int get_events(void *data, fluid_midi_event_t *event); void print_snd_seq_event(snd_seq_event_t *event); -void load_midi_file(char *filename, read_midi_callback callback, void *callback_userdata); +void load_midi_file(char *filename, float sample_rate, read_midi_callback callback, void *callback_userdata); #endif diff --git a/src/midi/midi_loader.lo b/src/midi/midi_loader.lo index f08d581..a259e49 100644 --- a/src/midi/midi_loader.lo +++ b/src/midi/midi_loader.lo @@ -1,5 +1,5 @@ # midi_loader.lo - a libtool object file -# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11 +# Generated by libtool (GNU libtool) 2.4.2 # # Please DO NOT delete this file! # It is necessary for linking the library. diff --git a/src/midi/midi_loader.o b/src/midi/midi_loader.o Binary files differindex 3f733e7..2215836 100644 --- a/src/midi/midi_loader.o +++ b/src/midi/midi_loader.o diff --git a/src/midi/test_midi_loader b/src/midi/test_midi_loader Binary files differindex 7d262cf..3d191ad 100755 --- a/src/midi/test_midi_loader +++ b/src/midi/test_midi_loader diff --git a/src/midi/test_midi_loader.c b/src/midi/test_midi_loader.c index 9482a19..4c39b58 100644 --- a/src/midi/test_midi_loader.c +++ b/src/midi/test_midi_loader.c @@ -1,5 +1,5 @@ #include "midi_loader.h" int main(void){ char *filename = "example.mid"; - load_midi_file(filename, NULL, NULL); //do you think this will all compile? hope so + load_midi_file(filename, 44100, NULL, NULL); //do you think this will all compile? hope so } diff --git a/src/midi/test_midi_loader.o b/src/midi/test_midi_loader.o Binary files differindex 72ccde7..35a11a4 100644 --- a/src/midi/test_midi_loader.o +++ b/src/midi/test_midi_loader.o |