diff options
| author | pepper <peppersclothescult@gmail.com> | 2015-01-29 23:17:32 -0800 |
|---|---|---|
| committer | pepper <peppersclothescult@gmail.com> | 2015-01-29 23:17:32 -0800 |
| commit | 3b1f919e65c4c88d0d760121d61456eb68dc79b6 (patch) | |
| tree | 32f23a64ef33a41011fd857f5bf50021bbd768b3 /src | |
| parent | aa2d7c0ec0a0c69dcf41993bf8bae9c2c97cea9d (diff) | |
still working out issues, fixed some cli things
Diffstat (limited to 'src')
29 files changed, 588 insertions, 558 deletions
diff --git a/src/.deps/dssi-render.Po b/src/.deps/dssi-render.Po index 0b33806..c0b6c2a 100644 --- a/src/.deps/dssi-render.Po +++ b/src/.deps/dssi-render.Po @@ -1,43 +1,61 @@ 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/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.2/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.2/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/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/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-unknown-linux-gnu/4.9.2/include/stdint.h \ - /usr/include/stdint.h /usr/include/bits/wchar.h midi/fluid_midi.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/include/stdc-predef.h: @@ -49,19 +67,19 @@ dssi-render.h: /usr/include/features.h: -/usr/include/sys/cdefs.h: +/usr/include/x86_64-linux-gnu/sys/cdefs.h: -/usr/include/bits/wordsize.h: +/usr/include/x86_64-linux-gnu/bits/wordsize.h: -/usr/include/gnu/stubs.h: +/usr/include/x86_64-linux-gnu/gnu/stubs.h: -/usr/include/gnu/stubs-64.h: +/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h: -/usr/include/bits/types.h: +/usr/include/x86_64-linux-gnu/bits/types.h: -/usr/include/bits/typesizes.h: +/usr/include/x86_64-linux-gnu/bits/typesizes.h: /usr/include/libio.h: @@ -69,37 +87,35 @@ dssi-render.h: /usr/include/wchar.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h: -/usr/include/bits/stdio_lim.h: +/usr/include/x86_64-linux-gnu/bits/stdio_lim.h: -/usr/include/bits/sys_errlist.h: +/usr/include/x86_64-linux-gnu/bits/sys_errlist.h: -/usr/include/bits/stdio.h: +/usr/include/x86_64-linux-gnu/bits/stdio.h: -/usr/include/sys/types.h: +/usr/include/x86_64-linux-gnu/sys/types.h: /usr/include/time.h: /usr/include/endian.h: -/usr/include/bits/endian.h: +/usr/include/x86_64-linux-gnu/bits/endian.h: -/usr/include/bits/byteswap.h: +/usr/include/x86_64-linux-gnu/bits/byteswap.h: -/usr/include/bits/byteswap-16.h: +/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: -/usr/include/sys/select.h: +/usr/include/x86_64-linux-gnu/sys/select.h: -/usr/include/bits/select.h: +/usr/include/x86_64-linux-gnu/bits/select.h: -/usr/include/bits/sigset.h: +/usr/include/x86_64-linux-gnu/bits/sigset.h: -/usr/include/bits/time.h: +/usr/include/x86_64-linux-gnu/bits/time.h: -/usr/include/sys/sysmacros.h: - -/usr/include/bits/pthreadtypes.h: +/usr/include/x86_64-linux-gnu/sys/sysmacros.h: /usr/include/ladspa.h: @@ -109,89 +125,77 @@ dssi-render.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/x86_64-linux-gnu/bits/stdlib-bsearch.h: -/usr/include/bits/stdlib-float.h: +/usr/include/x86_64-linux-gnu/bits/stdlib-float.h: /usr/include/string.h: -/usr/include/xlocale.h: - -/usr/include/bits/string.h: +/usr/include/x86_64-linux-gnu/bits/string.h: -/usr/include/bits/string2.h: +/usr/include/x86_64-linux-gnu/bits/string2.h: /usr/include/assert.h: /usr/include/dlfcn.h: -/usr/include/bits/dlfcn.h: +/usr/include/x86_64-linux-gnu/bits/dlfcn.h: /usr/include/unistd.h: -/usr/include/bits/posix_opt.h: +/usr/include/x86_64-linux-gnu/bits/posix_opt.h: -/usr/include/bits/environments.h: - -/usr/include/bits/confname.h: - -/usr/include/getopt.h: +/usr/include/x86_64-linux-gnu/bits/confname.h: /usr/include/math.h: -/usr/include/bits/huge_val.h: +/usr/include/x86_64-linux-gnu/bits/huge_val.h: -/usr/include/bits/huge_valf.h: +/usr/include/x86_64-linux-gnu/bits/huge_valf.h: -/usr/include/bits/huge_vall.h: +/usr/include/x86_64-linux-gnu/bits/huge_vall.h: -/usr/include/bits/inf.h: +/usr/include/x86_64-linux-gnu/bits/inf.h: -/usr/include/bits/nan.h: +/usr/include/x86_64-linux-gnu/bits/nan.h: -/usr/include/bits/mathdef.h: +/usr/include/x86_64-linux-gnu/bits/mathdef.h: -/usr/include/bits/mathcalls.h: +/usr/include/x86_64-linux-gnu/bits/mathcalls.h: -/usr/include/bits/mathinline.h: +/usr/include/x86_64-linux-gnu/bits/mathinline.h: -/usr/include/sys/stat.h: +/usr/include/x86_64-linux-gnu/sys/stat.h: -/usr/include/bits/stat.h: +/usr/include/x86_64-linux-gnu/bits/stat.h: -/usr/include/sys/time.h: +/usr/include/x86_64-linux-gnu/sys/time.h: -/usr/include/sys/wait.h: +/usr/include/x86_64-linux-gnu/sys/wait.h: /usr/include/signal.h: -/usr/include/bits/signum.h: - -/usr/include/bits/siginfo.h: +/usr/include/x86_64-linux-gnu/bits/signum.h: -/usr/include/bits/sigaction.h: +/usr/include/x86_64-linux-gnu/bits/sigcontext.h: -/usr/include/bits/sigcontext.h: +/usr/include/x86_64-linux-gnu/bits/sigstack.h: -/usr/include/bits/sigstack.h: +/usr/include/x86_64-linux-gnu/bits/waitflags.h: -/usr/include/sys/ucontext.h: +/usr/include/x86_64-linux-gnu/bits/waitstatus.h: -/usr/include/bits/sigthread.h: +/usr/include/x86_64-linux-gnu/bits/siginfo.h: /usr/include/dirent.h: -/usr/include/bits/dirent.h: +/usr/include/x86_64-linux-gnu/bits/dirent.h: -/usr/include/bits/posix1_lim.h: +/usr/include/x86_64-linux-gnu/bits/posix1_lim.h: -/usr/include/bits/local_lim.h: +/usr/include/x86_64-linux-gnu/bits/local_lim.h: /usr/include/linux/limits.h: @@ -209,10 +213,10 @@ midi/fluid_midi_custom.h: midi/midi_loader.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h: /usr/include/stdint.h: -/usr/include/bits/wchar.h: +/usr/include/x86_64-linux-gnu/bits/wchar.h: midi/fluid_midi.h: diff --git a/src/.deps/ladspa_run_synth.Po b/src/.deps/ladspa_run_synth.Po index 004d67f..cd2de68 100644 --- a/src/.deps/ladspa_run_synth.Po +++ b/src/.deps/ladspa_run_synth.Po @@ -1,44 +1,61 @@ 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/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.2/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.2/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/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/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-unknown-linux-gnu/4.9.2/include/stdint.h \ - /usr/include/stdint.h /usr/include/bits/wchar.h midi/fluid_midi.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/include/stdc-predef.h: @@ -50,19 +67,19 @@ dssi-render.h: /usr/include/features.h: -/usr/include/sys/cdefs.h: +/usr/include/x86_64-linux-gnu/sys/cdefs.h: -/usr/include/bits/wordsize.h: +/usr/include/x86_64-linux-gnu/bits/wordsize.h: -/usr/include/gnu/stubs.h: +/usr/include/x86_64-linux-gnu/gnu/stubs.h: -/usr/include/gnu/stubs-64.h: +/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h: -/usr/include/bits/types.h: +/usr/include/x86_64-linux-gnu/bits/types.h: -/usr/include/bits/typesizes.h: +/usr/include/x86_64-linux-gnu/bits/typesizes.h: /usr/include/libio.h: @@ -70,37 +87,35 @@ dssi-render.h: /usr/include/wchar.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h: -/usr/include/bits/stdio_lim.h: +/usr/include/x86_64-linux-gnu/bits/stdio_lim.h: -/usr/include/bits/sys_errlist.h: +/usr/include/x86_64-linux-gnu/bits/sys_errlist.h: -/usr/include/bits/stdio.h: +/usr/include/x86_64-linux-gnu/bits/stdio.h: -/usr/include/sys/types.h: +/usr/include/x86_64-linux-gnu/sys/types.h: /usr/include/time.h: /usr/include/endian.h: -/usr/include/bits/endian.h: +/usr/include/x86_64-linux-gnu/bits/endian.h: -/usr/include/bits/byteswap.h: +/usr/include/x86_64-linux-gnu/bits/byteswap.h: -/usr/include/bits/byteswap-16.h: +/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: -/usr/include/sys/select.h: +/usr/include/x86_64-linux-gnu/sys/select.h: -/usr/include/bits/select.h: +/usr/include/x86_64-linux-gnu/bits/select.h: -/usr/include/bits/sigset.h: +/usr/include/x86_64-linux-gnu/bits/sigset.h: -/usr/include/bits/time.h: +/usr/include/x86_64-linux-gnu/bits/time.h: -/usr/include/sys/sysmacros.h: - -/usr/include/bits/pthreadtypes.h: +/usr/include/x86_64-linux-gnu/sys/sysmacros.h: /usr/include/ladspa.h: @@ -110,89 +125,77 @@ dssi-render.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/x86_64-linux-gnu/bits/stdlib-bsearch.h: -/usr/include/bits/stdlib-float.h: +/usr/include/x86_64-linux-gnu/bits/stdlib-float.h: /usr/include/string.h: -/usr/include/xlocale.h: - -/usr/include/bits/string.h: +/usr/include/x86_64-linux-gnu/bits/string.h: -/usr/include/bits/string2.h: +/usr/include/x86_64-linux-gnu/bits/string2.h: /usr/include/assert.h: /usr/include/dlfcn.h: -/usr/include/bits/dlfcn.h: +/usr/include/x86_64-linux-gnu/bits/dlfcn.h: /usr/include/unistd.h: -/usr/include/bits/posix_opt.h: +/usr/include/x86_64-linux-gnu/bits/posix_opt.h: -/usr/include/bits/environments.h: - -/usr/include/bits/confname.h: - -/usr/include/getopt.h: +/usr/include/x86_64-linux-gnu/bits/confname.h: /usr/include/math.h: -/usr/include/bits/huge_val.h: +/usr/include/x86_64-linux-gnu/bits/huge_val.h: -/usr/include/bits/huge_valf.h: +/usr/include/x86_64-linux-gnu/bits/huge_valf.h: -/usr/include/bits/huge_vall.h: +/usr/include/x86_64-linux-gnu/bits/huge_vall.h: -/usr/include/bits/inf.h: +/usr/include/x86_64-linux-gnu/bits/inf.h: -/usr/include/bits/nan.h: +/usr/include/x86_64-linux-gnu/bits/nan.h: -/usr/include/bits/mathdef.h: +/usr/include/x86_64-linux-gnu/bits/mathdef.h: -/usr/include/bits/mathcalls.h: +/usr/include/x86_64-linux-gnu/bits/mathcalls.h: -/usr/include/bits/mathinline.h: +/usr/include/x86_64-linux-gnu/bits/mathinline.h: -/usr/include/sys/stat.h: +/usr/include/x86_64-linux-gnu/sys/stat.h: -/usr/include/bits/stat.h: +/usr/include/x86_64-linux-gnu/bits/stat.h: -/usr/include/sys/time.h: +/usr/include/x86_64-linux-gnu/sys/time.h: -/usr/include/sys/wait.h: +/usr/include/x86_64-linux-gnu/sys/wait.h: /usr/include/signal.h: -/usr/include/bits/signum.h: - -/usr/include/bits/siginfo.h: +/usr/include/x86_64-linux-gnu/bits/signum.h: -/usr/include/bits/sigaction.h: +/usr/include/x86_64-linux-gnu/bits/sigcontext.h: -/usr/include/bits/sigcontext.h: +/usr/include/x86_64-linux-gnu/bits/sigstack.h: -/usr/include/bits/sigstack.h: +/usr/include/x86_64-linux-gnu/bits/waitflags.h: -/usr/include/sys/ucontext.h: +/usr/include/x86_64-linux-gnu/bits/waitstatus.h: -/usr/include/bits/sigthread.h: +/usr/include/x86_64-linux-gnu/bits/siginfo.h: /usr/include/dirent.h: -/usr/include/bits/dirent.h: +/usr/include/x86_64-linux-gnu/bits/dirent.h: -/usr/include/bits/posix1_lim.h: +/usr/include/x86_64-linux-gnu/bits/posix1_lim.h: -/usr/include/bits/local_lim.h: +/usr/include/x86_64-linux-gnu/bits/local_lim.h: /usr/include/linux/limits.h: @@ -208,10 +211,10 @@ midi/fluid_midi_custom.h: midi/midi_loader.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h: /usr/include/stdint.h: -/usr/include/bits/wchar.h: +/usr/include/x86_64-linux-gnu/bits/wchar.h: midi/fluid_midi.h: diff --git a/src/Makefile b/src/Makefile index bc24694..45dd42a 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 + $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp TODO ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -205,15 +205,15 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -ACLOCAL = ${SHELL} /tmp/mybaby/dssi-render/missing aclocal-1.14 +ACLOCAL = ${SHELL} /home/pepper/dssi-render/missing aclocal-1.14 ALSA_CFLAGS = -I/usr/include/alsa ALSA_LIBS = -lasound AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 1 AR = ar -AUTOCONF = ${SHELL} /tmp/mybaby/dssi-render/missing autoconf -AUTOHEADER = ${SHELL} /tmp/mybaby/dssi-render/missing autoheader -AUTOMAKE = ${SHELL} /tmp/mybaby/dssi-render/missing automake-1.14 +AUTOCONF = ${SHELL} /home/pepper/dssi-render/missing autoconf +AUTOHEADER = ${SHELL} /home/pepper/dssi-render/missing autoheader +AUTOMAKE = ${SHELL} /home/pepper/dssi-render/missing automake-1.14 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -231,10 +231,10 @@ DUMPBIN = ECHO_C = ECHO_N = -n ECHO_T = -EGREP = /usr/bin/grep -E +EGREP = /bin/grep -E EXEEXT = -FGREP = /usr/bin/grep -F -GREP = /usr/bin/grep +FGREP = /bin/grep -F +GREP = /bin/grep INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} @@ -248,10 +248,9 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool LIPO = LN_S = ln -s LTLIBOBJS = -LT_SYS_LIBRARY_PATH = -MAKEINFO = ${SHELL} /tmp/mybaby/dssi-render/missing makeinfo +MAKEINFO = ${SHELL} /home/pepper/dssi-render/missing makeinfo MANIFEST_TOOL = : -MKDIR_P = /usr/bin/mkdir -p +MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = OBJDUMP = objdump @@ -270,17 +269,17 @@ PKG_CONFIG = /usr/bin/pkg-config PKG_CONFIG_LIBDIR = PKG_CONFIG_PATH = RANLIB = ranlib -SED = /usr/bin/sed +SED = /bin/sed SET_MAKE = -SHELL = /bin/sh +SHELL = /bin/bash SNDFILE_CFLAGS = SNDFILE_LIBS = -lsndfile STRIP = strip VERSION = 0.0.1 -abs_builddir = /tmp/mybaby/dssi-render/src -abs_srcdir = /tmp/mybaby/dssi-render/src -abs_top_builddir = /tmp/mybaby/dssi-render -abs_top_srcdir = /tmp/mybaby/dssi-render +abs_builddir = /home/pepper/dssi-render/src +abs_srcdir = /home/pepper/dssi-render/src +abs_top_builddir = /home/pepper/dssi-render +abs_top_srcdir = /home/pepper/dssi-render ac_ct_AR = ar ac_ct_CC = gcc ac_ct_DUMPBIN = @@ -309,7 +308,7 @@ host_vendor = unknown htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /tmp/mybaby/dssi-render/install-sh +install_sh = ${SHELL} /home/pepper/dssi-render/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff --git a/src/Makefile.in b/src/Makefile.in index d6310c7..69d6c74 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 + $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp TODO ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -248,7 +248,6 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ diff --git a/src/dssi-render b/src/dssi-render Binary files differindex d820130..14a5b9a 100755 --- a/src/dssi-render +++ b/src/dssi-render diff --git a/src/dssi-render.c b/src/dssi-render.c index feec1f2..c4b560f 100644 --- a/src/dssi-render.c +++ b/src/dssi-render.c @@ -4,6 +4,8 @@ #include "ladspa_run_synth.h" #include "midi/midi_loader.h" +#define DEBUG 1 + void print_usage(void) { fprintf(stderr, "Render a midi file with a DSSI instrument.\n"); @@ -21,11 +23,17 @@ print_usage(void) { fprintf(stderr, " [-b] (clip out-of-bounds values, including Inf and NaN, to within bounds\n (calls exit()) if -b is omitted)\n"); exit(1); } + +int file_exist (char *filename) +{ + struct stat buffer; + return (stat (filename, &buffer) == 0); +} const DSSI_Descriptor *descriptor; LADSPA_Handle instanceHandle; SNDFILE *outfile; -char *output_file = "output.wav"; +char *output_file = "output.wav"; //ask anton...needs malloc? char *midi_filename = "test.mid"; int clip = 0; int have_warned = 0; @@ -171,6 +179,16 @@ main(int argc, char **argv) { } } + //make sure input and output exist + if(!file_exist(midi_filename)){ + fprintf(stderr, "ERROR:Could not find %s\n Please specify an input file with -i\n", midi_filename); + exit(1); + } + if(!file_exist(output_file)){ + fprintf(stderr, "ERROR:Could not find %s\n Please specify an output file with -o\n", output_file); + exit(1); + } + if (DEBUG) { for (int i = 0; i < nkeys; i++) { printf("key %d: %s; value: %s\n", i, configure_key[i], @@ -357,8 +375,7 @@ main(int argc, char **argv) { pluginControlIns[controlIn] = def; } if (DEBUG) { - fprintf(stderr, - "port %3d; prhd %3d; lb %6.2f; ub %6.2f; val %6.2f (%s)\n", + fprintf(stderr, "port %3d; prhd %3d; lb %6.2f; ub %6.2f; val %6.2f (%s)\n", j, prhd, lb, ub, val, pname); } controlIn++; @@ -394,6 +411,7 @@ main(int argc, char **argv) { "%s: Warning: plugin doesn't like " "configure key-value pair: \"%s\"\n", my_name, rv); + exit(1); } } } diff --git a/src/dssi-render.h b/src/dssi-render.h index 3f6d0cc..136ef34 100644 --- a/src/dssi-render.h +++ b/src/dssi-render.h @@ -31,7 +31,6 @@ #define _ISOC99_SOURCE 1 -#define DEBUG 0 #define MAX_LENGTH (15.0f) #define SAMPLE_RATE 44100 /* character used to separate SO names from plugin labels on command line */ diff --git a/src/dssi-render.o b/src/dssi-render.o Binary files differindex 756abf3..71599b4 100644 --- a/src/dssi-render.o +++ b/src/dssi-render.o diff --git a/src/ladspa_run_synth.o b/src/ladspa_run_synth.o Binary files differindex 080c51d..3014a49 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 1923619..1166ac5 100644 --- a/src/midi/.deps/fluid_list.Plo +++ b/src/midi/.deps/fluid_list.Plo @@ -1,31 +1,43 @@ 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/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.2/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.2/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.2/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/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/stdc-predef.h: @@ -43,53 +55,53 @@ fluid_midi.h: /usr/include/features.h: -/usr/include/sys/cdefs.h: +/usr/include/x86_64-linux-gnu/sys/cdefs.h: -/usr/include/bits/wordsize.h: +/usr/include/x86_64-linux-gnu/bits/wordsize.h: -/usr/include/gnu/stubs.h: +/usr/include/x86_64-linux-gnu/gnu/stubs.h: -/usr/include/gnu/stubs-64.h: +/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h: -/usr/include/bits/waitflags.h: +/usr/include/x86_64-linux-gnu/bits/waitflags.h: -/usr/include/bits/waitstatus.h: +/usr/include/x86_64-linux-gnu/bits/waitstatus.h: /usr/include/endian.h: -/usr/include/bits/endian.h: +/usr/include/x86_64-linux-gnu/bits/endian.h: -/usr/include/bits/byteswap.h: +/usr/include/x86_64-linux-gnu/bits/byteswap.h: -/usr/include/bits/types.h: +/usr/include/x86_64-linux-gnu/bits/types.h: -/usr/include/bits/typesizes.h: +/usr/include/x86_64-linux-gnu/bits/typesizes.h: -/usr/include/bits/byteswap-16.h: +/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: -/usr/include/sys/types.h: +/usr/include/x86_64-linux-gnu/sys/types.h: /usr/include/time.h: -/usr/include/sys/select.h: +/usr/include/x86_64-linux-gnu/sys/select.h: -/usr/include/bits/select.h: +/usr/include/x86_64-linux-gnu/bits/select.h: -/usr/include/bits/sigset.h: +/usr/include/x86_64-linux-gnu/bits/sigset.h: -/usr/include/bits/time.h: +/usr/include/x86_64-linux-gnu/bits/time.h: -/usr/include/sys/sysmacros.h: +/usr/include/x86_64-linux-gnu/sys/sysmacros.h: -/usr/include/bits/pthreadtypes.h: +/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h: /usr/include/alloca.h: -/usr/include/bits/stdlib-bsearch.h: +/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h: -/usr/include/bits/stdlib-float.h: +/usr/include/x86_64-linux-gnu/bits/stdlib-float.h: /usr/include/stdio.h: @@ -99,19 +111,19 @@ fluid_midi.h: /usr/include/wchar.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h: -/usr/include/bits/stdio_lim.h: +/usr/include/x86_64-linux-gnu/bits/stdio_lim.h: -/usr/include/bits/sys_errlist.h: +/usr/include/x86_64-linux-gnu/bits/sys_errlist.h: -/usr/include/bits/stdio.h: +/usr/include/x86_64-linux-gnu/bits/stdio.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h: /usr/include/stdint.h: -/usr/include/bits/wchar.h: +/usr/include/x86_64-linux-gnu/bits/wchar.h: /usr/include/sndfile.h: @@ -119,9 +131,9 @@ fluid_midi.h: /usr/include/xlocale.h: -/usr/include/bits/string.h: +/usr/include/x86_64-linux-gnu/bits/string.h: -/usr/include/bits/string2.h: +/usr/include/x86_64-linux-gnu/bits/string2.h: /usr/include/ladspa.h: @@ -131,14 +143,14 @@ fluid_midi.h: /usr/include/unistd.h: -/usr/include/bits/posix_opt.h: +/usr/include/x86_64-linux-gnu/bits/posix_opt.h: -/usr/include/bits/environments.h: +/usr/include/x86_64-linux-gnu/bits/environments.h: -/usr/include/bits/confname.h: +/usr/include/x86_64-linux-gnu/bits/confname.h: /usr/include/getopt.h: -/usr/include/sys/stat.h: +/usr/include/x86_64-linux-gnu/sys/stat.h: -/usr/include/bits/stat.h: +/usr/include/x86_64-linux-gnu/bits/stat.h: diff --git a/src/midi/.deps/fluid_midi.Plo b/src/midi/.deps/fluid_midi.Plo index 3dde083..d829e21 100644 --- a/src/midi/.deps/fluid_midi.Plo +++ b/src/midi/.deps/fluid_midi.Plo @@ -1,34 +1,50 @@ 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/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.2/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.2/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.2/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/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/stdc-predef.h: @@ -48,19 +64,19 @@ fluid_list.h: /usr/include/features.h: -/usr/include/sys/cdefs.h: +/usr/include/x86_64-linux-gnu/sys/cdefs.h: -/usr/include/bits/wordsize.h: +/usr/include/x86_64-linux-gnu/bits/wordsize.h: -/usr/include/gnu/stubs.h: +/usr/include/x86_64-linux-gnu/gnu/stubs.h: -/usr/include/gnu/stubs-64.h: +/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h: -/usr/include/bits/types.h: +/usr/include/x86_64-linux-gnu/bits/types.h: -/usr/include/bits/typesizes.h: +/usr/include/x86_64-linux-gnu/bits/typesizes.h: /usr/include/libio.h: @@ -68,45 +84,45 @@ fluid_list.h: /usr/include/wchar.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h: -/usr/include/bits/stdio_lim.h: +/usr/include/x86_64-linux-gnu/bits/stdio_lim.h: -/usr/include/bits/sys_errlist.h: +/usr/include/x86_64-linux-gnu/bits/sys_errlist.h: -/usr/include/bits/stdio.h: +/usr/include/x86_64-linux-gnu/bits/stdio.h: -/usr/include/sys/types.h: +/usr/include/x86_64-linux-gnu/sys/types.h: /usr/include/time.h: /usr/include/endian.h: -/usr/include/bits/endian.h: +/usr/include/x86_64-linux-gnu/bits/endian.h: -/usr/include/bits/byteswap.h: +/usr/include/x86_64-linux-gnu/bits/byteswap.h: -/usr/include/bits/byteswap-16.h: +/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: -/usr/include/sys/select.h: +/usr/include/x86_64-linux-gnu/sys/select.h: -/usr/include/bits/select.h: +/usr/include/x86_64-linux-gnu/bits/select.h: -/usr/include/bits/sigset.h: +/usr/include/x86_64-linux-gnu/bits/sigset.h: -/usr/include/bits/time.h: +/usr/include/x86_64-linux-gnu/bits/time.h: -/usr/include/sys/sysmacros.h: +/usr/include/x86_64-linux-gnu/sys/sysmacros.h: -/usr/include/bits/pthreadtypes.h: +/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h: /usr/include/string.h: /usr/include/xlocale.h: -/usr/include/bits/string.h: +/usr/include/x86_64-linux-gnu/bits/string.h: -/usr/include/bits/string2.h: +/usr/include/x86_64-linux-gnu/bits/string2.h: /usr/include/stdlib.h: @@ -116,50 +132,50 @@ fluid_list.h: /usr/include/alsa/seq_event.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h: /usr/include/stdint.h: -/usr/include/bits/wchar.h: +/usr/include/x86_64-linux-gnu/bits/wchar.h: -/usr/include/bits/waitflags.h: +/usr/include/x86_64-linux-gnu/bits/waitflags.h: -/usr/include/bits/waitstatus.h: +/usr/include/x86_64-linux-gnu/bits/waitstatus.h: /usr/include/alloca.h: -/usr/include/bits/stdlib-bsearch.h: +/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h: -/usr/include/bits/stdlib-float.h: +/usr/include/x86_64-linux-gnu/bits/stdlib-float.h: /usr/include/unistd.h: -/usr/include/bits/posix_opt.h: +/usr/include/x86_64-linux-gnu/bits/posix_opt.h: -/usr/include/bits/environments.h: +/usr/include/x86_64-linux-gnu/bits/environments.h: -/usr/include/bits/confname.h: +/usr/include/x86_64-linux-gnu/bits/confname.h: /usr/include/getopt.h: -/usr/include/sys/stat.h: +/usr/include/x86_64-linux-gnu/sys/stat.h: -/usr/include/bits/stat.h: +/usr/include/x86_64-linux-gnu/bits/stat.h: /usr/include/math.h: -/usr/include/bits/huge_val.h: +/usr/include/x86_64-linux-gnu/bits/huge_val.h: -/usr/include/bits/huge_valf.h: +/usr/include/x86_64-linux-gnu/bits/huge_valf.h: -/usr/include/bits/huge_vall.h: +/usr/include/x86_64-linux-gnu/bits/huge_vall.h: -/usr/include/bits/inf.h: +/usr/include/x86_64-linux-gnu/bits/inf.h: -/usr/include/bits/nan.h: +/usr/include/x86_64-linux-gnu/bits/nan.h: -/usr/include/bits/mathdef.h: +/usr/include/x86_64-linux-gnu/bits/mathdef.h: -/usr/include/bits/mathcalls.h: +/usr/include/x86_64-linux-gnu/bits/mathcalls.h: -/usr/include/bits/mathinline.h: +/usr/include/x86_64-linux-gnu/bits/mathinline.h: diff --git a/src/midi/.deps/midi_loader.Plo b/src/midi/.deps/midi_loader.Plo index 52eeb10..9a76aa8 100644 --- a/src/midi/.deps/midi_loader.Plo +++ b/src/midi/.deps/midi_loader.Plo @@ -1,29 +1,40 @@ 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-unknown-linux-gnu/4.9.2/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.2/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.2/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/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/include/sndfile.h /usr/include/ladspa.h /usr/include/dssi.h \ /usr/include/alsa/seq_event.h @@ -37,29 +48,29 @@ fluidsynth_priv.h: fluid_midi_custom.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h: /usr/include/stdint.h: /usr/include/features.h: -/usr/include/sys/cdefs.h: +/usr/include/x86_64-linux-gnu/sys/cdefs.h: -/usr/include/bits/wordsize.h: +/usr/include/x86_64-linux-gnu/bits/wordsize.h: -/usr/include/gnu/stubs.h: +/usr/include/x86_64-linux-gnu/gnu/stubs.h: -/usr/include/gnu/stubs-64.h: +/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: -/usr/include/bits/wchar.h: +/usr/include/x86_64-linux-gnu/bits/wchar.h: /usr/include/stdio.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h: -/usr/include/bits/types.h: +/usr/include/x86_64-linux-gnu/bits/types.h: -/usr/include/bits/typesizes.h: +/usr/include/x86_64-linux-gnu/bits/typesizes.h: /usr/include/libio.h: @@ -67,71 +78,71 @@ fluid_midi_custom.h: /usr/include/wchar.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h: -/usr/include/bits/stdio_lim.h: +/usr/include/x86_64-linux-gnu/bits/stdio_lim.h: -/usr/include/bits/sys_errlist.h: +/usr/include/x86_64-linux-gnu/bits/sys_errlist.h: -/usr/include/bits/stdio.h: +/usr/include/x86_64-linux-gnu/bits/stdio.h: /usr/include/stdlib.h: -/usr/include/bits/waitflags.h: +/usr/include/x86_64-linux-gnu/bits/waitflags.h: -/usr/include/bits/waitstatus.h: +/usr/include/x86_64-linux-gnu/bits/waitstatus.h: /usr/include/endian.h: -/usr/include/bits/endian.h: +/usr/include/x86_64-linux-gnu/bits/endian.h: -/usr/include/bits/byteswap.h: +/usr/include/x86_64-linux-gnu/bits/byteswap.h: -/usr/include/bits/byteswap-16.h: +/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: -/usr/include/sys/types.h: +/usr/include/x86_64-linux-gnu/sys/types.h: /usr/include/time.h: -/usr/include/sys/select.h: +/usr/include/x86_64-linux-gnu/sys/select.h: -/usr/include/bits/select.h: +/usr/include/x86_64-linux-gnu/bits/select.h: -/usr/include/bits/sigset.h: +/usr/include/x86_64-linux-gnu/bits/sigset.h: -/usr/include/bits/time.h: +/usr/include/x86_64-linux-gnu/bits/time.h: -/usr/include/sys/sysmacros.h: +/usr/include/x86_64-linux-gnu/sys/sysmacros.h: -/usr/include/bits/pthreadtypes.h: +/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h: /usr/include/alloca.h: -/usr/include/bits/stdlib-bsearch.h: +/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h: -/usr/include/bits/stdlib-float.h: +/usr/include/x86_64-linux-gnu/bits/stdlib-float.h: /usr/include/string.h: /usr/include/xlocale.h: -/usr/include/bits/string.h: +/usr/include/x86_64-linux-gnu/bits/string.h: -/usr/include/bits/string2.h: +/usr/include/x86_64-linux-gnu/bits/string2.h: /usr/include/unistd.h: -/usr/include/bits/posix_opt.h: +/usr/include/x86_64-linux-gnu/bits/posix_opt.h: -/usr/include/bits/environments.h: +/usr/include/x86_64-linux-gnu/bits/environments.h: -/usr/include/bits/confname.h: +/usr/include/x86_64-linux-gnu/bits/confname.h: /usr/include/getopt.h: -/usr/include/sys/stat.h: +/usr/include/x86_64-linux-gnu/sys/stat.h: -/usr/include/bits/stat.h: +/usr/include/x86_64-linux-gnu/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 6a06868..8b14bf4 100644 --- a/src/midi/.deps/test_midi_loader.Po +++ b/src/midi/.deps/test_midi_loader.Po @@ -1,29 +1,40 @@ 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-unknown-linux-gnu/4.9.2/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.2/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.2/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/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/include/sndfile.h /usr/include/ladspa.h /usr/include/dssi.h \ /usr/include/alsa/seq_event.h @@ -37,29 +48,29 @@ fluidsynth_priv.h: fluid_midi_custom.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h: /usr/include/stdint.h: /usr/include/features.h: -/usr/include/sys/cdefs.h: +/usr/include/x86_64-linux-gnu/sys/cdefs.h: -/usr/include/bits/wordsize.h: +/usr/include/x86_64-linux-gnu/bits/wordsize.h: -/usr/include/gnu/stubs.h: +/usr/include/x86_64-linux-gnu/gnu/stubs.h: -/usr/include/gnu/stubs-64.h: +/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: -/usr/include/bits/wchar.h: +/usr/include/x86_64-linux-gnu/bits/wchar.h: /usr/include/stdio.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h: -/usr/include/bits/types.h: +/usr/include/x86_64-linux-gnu/bits/types.h: -/usr/include/bits/typesizes.h: +/usr/include/x86_64-linux-gnu/bits/typesizes.h: /usr/include/libio.h: @@ -67,71 +78,71 @@ fluid_midi_custom.h: /usr/include/wchar.h: -/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h: +/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h: -/usr/include/bits/stdio_lim.h: +/usr/include/x86_64-linux-gnu/bits/stdio_lim.h: -/usr/include/bits/sys_errlist.h: +/usr/include/x86_64-linux-gnu/bits/sys_errlist.h: -/usr/include/bits/stdio.h: +/usr/include/x86_64-linux-gnu/bits/stdio.h: /usr/include/stdlib.h: -/usr/include/bits/waitflags.h: +/usr/include/x86_64-linux-gnu/bits/waitflags.h: -/usr/include/bits/waitstatus.h: +/usr/include/x86_64-linux-gnu/bits/waitstatus.h: /usr/include/endian.h: -/usr/include/bits/endian.h: +/usr/include/x86_64-linux-gnu/bits/endian.h: -/usr/include/bits/byteswap.h: +/usr/include/x86_64-linux-gnu/bits/byteswap.h: -/usr/include/bits/byteswap-16.h: +/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: -/usr/include/sys/types.h: +/usr/include/x86_64-linux-gnu/sys/types.h: /usr/include/time.h: -/usr/include/sys/select.h: +/usr/include/x86_64-linux-gnu/sys/select.h: -/usr/include/bits/select.h: +/usr/include/x86_64-linux-gnu/bits/select.h: -/usr/include/bits/sigset.h: +/usr/include/x86_64-linux-gnu/bits/sigset.h: -/usr/include/bits/time.h: +/usr/include/x86_64-linux-gnu/bits/time.h: -/usr/include/sys/sysmacros.h: +/usr/include/x86_64-linux-gnu/sys/sysmacros.h: -/usr/include/bits/pthreadtypes.h: +/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h: /usr/include/alloca.h: -/usr/include/bits/stdlib-bsearch.h: +/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h: -/usr/include/bits/stdlib-float.h: +/usr/include/x86_64-linux-gnu/bits/stdlib-float.h: /usr/include/string.h: /usr/include/xlocale.h: -/usr/include/bits/string.h: +/usr/include/x86_64-linux-gnu/bits/string.h: -/usr/include/bits/string2.h: +/usr/include/x86_64-linux-gnu/bits/string2.h: /usr/include/unistd.h: -/usr/include/bits/posix_opt.h: +/usr/include/x86_64-linux-gnu/bits/posix_opt.h: -/usr/include/bits/environments.h: +/usr/include/x86_64-linux-gnu/bits/environments.h: -/usr/include/bits/confname.h: +/usr/include/x86_64-linux-gnu/bits/confname.h: /usr/include/getopt.h: -/usr/include/sys/stat.h: +/usr/include/x86_64-linux-gnu/sys/stat.h: -/usr/include/bits/stat.h: +/usr/include/x86_64-linux-gnu/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 47cf711..2df0fa8 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 ebd933d..e761d24 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 8b08563..2590580 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 cc96d74..46a82c9 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 37310c9..3025341 100644 --- a/src/midi/Makefile +++ b/src/midi/Makefile @@ -165,15 +165,15 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /tmp/mybaby/dssi-render/missing aclocal-1.14 +ACLOCAL = ${SHELL} /home/pepper/dssi-render/missing aclocal-1.14 ALSA_CFLAGS = -I/usr/include/alsa ALSA_LIBS = -lasound AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 1 AR = ar -AUTOCONF = ${SHELL} /tmp/mybaby/dssi-render/missing autoconf -AUTOHEADER = ${SHELL} /tmp/mybaby/dssi-render/missing autoheader -AUTOMAKE = ${SHELL} /tmp/mybaby/dssi-render/missing automake-1.14 +AUTOCONF = ${SHELL} /home/pepper/dssi-render/missing autoconf +AUTOHEADER = ${SHELL} /home/pepper/dssi-render/missing autoheader +AUTOMAKE = ${SHELL} /home/pepper/dssi-render/missing automake-1.14 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -191,10 +191,10 @@ DUMPBIN = ECHO_C = ECHO_N = -n ECHO_T = -EGREP = /usr/bin/grep -E +EGREP = /bin/grep -E EXEEXT = -FGREP = /usr/bin/grep -F -GREP = /usr/bin/grep +FGREP = /bin/grep -F +GREP = /bin/grep INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} @@ -208,10 +208,9 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool LIPO = LN_S = ln -s LTLIBOBJS = -LT_SYS_LIBRARY_PATH = -MAKEINFO = ${SHELL} /tmp/mybaby/dssi-render/missing makeinfo +MAKEINFO = ${SHELL} /home/pepper/dssi-render/missing makeinfo MANIFEST_TOOL = : -MKDIR_P = /usr/bin/mkdir -p +MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = OBJDUMP = objdump @@ -230,17 +229,17 @@ PKG_CONFIG = /usr/bin/pkg-config PKG_CONFIG_LIBDIR = PKG_CONFIG_PATH = RANLIB = ranlib -SED = /usr/bin/sed +SED = /bin/sed SET_MAKE = -SHELL = /bin/sh +SHELL = /bin/bash SNDFILE_CFLAGS = SNDFILE_LIBS = -lsndfile STRIP = strip VERSION = 0.0.1 -abs_builddir = /tmp/mybaby/dssi-render/src/midi -abs_srcdir = /tmp/mybaby/dssi-render/src/midi -abs_top_builddir = /tmp/mybaby/dssi-render -abs_top_srcdir = /tmp/mybaby/dssi-render +abs_builddir = /home/pepper/dssi-render/src/midi +abs_srcdir = /home/pepper/dssi-render/src/midi +abs_top_builddir = /home/pepper/dssi-render +abs_top_srcdir = /home/pepper/dssi-render ac_ct_AR = ar ac_ct_CC = gcc ac_ct_DUMPBIN = @@ -269,7 +268,7 @@ host_vendor = unknown htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /tmp/mybaby/dssi-render/install-sh +install_sh = ${SHELL} /home/pepper/dssi-render/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff --git a/src/midi/Makefile.in b/src/midi/Makefile.in index 277a1d2..f406eb8 100644 --- a/src/midi/Makefile.in +++ b/src/midi/Makefile.in @@ -208,7 +208,6 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ diff --git a/src/midi/fluid_list.lo b/src/midi/fluid_list.lo index d64b0af..9eb16d0 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.5 +# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11 # # 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 3dfd263..853ca93 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 e6c8f8c..3781e7b 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.5 +# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11 # # 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 1eb3b2c..ac2c3d1 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 ba6337a..52b7120 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.5 +# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11 # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -13,7 +13,7 @@ library_names='' # The name of the static archive. old_library='libfluidmidi.a' -# Linker flags that cannot go in dependency_libs. +# Linker flags that can not go in dependency_libs. inherited_linker_flags='' # Libraries that this one depends upon. diff --git a/src/midi/midi_loader.c b/src/midi/midi_loader.c index b2de0c4..a3173ad 100644 --- a/src/midi/midi_loader.c +++ b/src/midi/midi_loader.c @@ -1,5 +1,5 @@ #include "midi_loader.h" - +#define DEBUG 0 event_table_t *event_table; int @@ -7,26 +7,6 @@ fluid_log(int level, const char* fmt, ...) { } -//{{{OLD -//fluid_midi_event_t * -//new_fluid_midi_event () -//{ -// fluid_midi_event_t* evt; //oh it's just the name -// evt = FLUID_NEW(fluid_midi_event_t); -// if (evt == NULL) { -// FLUID_LOG(FLUID_ERR, "Out of memory"); -// return NULL; -// } -// evt->dtime = 0; -// evt->type = 0; -// evt->channel = 0; -// evt->param1 = 0; -// evt->param2 = 0; -// evt->next = NULL; //so this looks like it's set up to be a linked list, right? each event contains pointer to the next yes -// evt->paramptr = NULL; -// return evt; -//} -//}}} void insert_event(event_table_t *event_table, snd_seq_event_t *event){ event_table->events = realloc(event_table->events, (event_table->length + 1) * sizeof(snd_seq_event_t)); @@ -37,7 +17,9 @@ void delete_event(event_table_t *event_table, snd_seq_event_t *event){ size_t i; for (i=0; i< event_table->length; i++){ if(compare_events(&event_table->events[i], event)){ - printf("removed_event\n"); + if (DEBUG){ + printf("removed_event\n"); + } memcpy(&event_table->events[i], &event_table->events[i+1], sizeof(snd_seq_event_t)*(event_table->length - i -1)); event_table->events = realloc(event_table->events, event_table->length * sizeof(snd_seq_event_t)); event_table->length--; @@ -49,7 +31,9 @@ void delete_note_off_events(event_table_t *event_table){ size_t i; for (i=0; i< event_table->length; i++){ if(event_table->events[i].type == SND_SEQ_EVENT_NOTEOFF){ - printf("removed_note_off_event\n"); + if(DEBUG){ + printf("removed_note_off_event\n"); + } memcpy(&event_table->events[i], &event_table->events[i+1], sizeof(snd_seq_event_t)*(event_table->length - i -1)); event_table->events = realloc(event_table->events, event_table->length * sizeof(snd_seq_event_t)); event_table->length--; @@ -70,28 +54,14 @@ void replace_events(event_table_t *event_table, snd_seq_event_t *event){ size_t i; for (i=0; i< event_table->length; i++){ if(compare_events(&event_table->events[i], event)){ - printf("replaced_event\n"); + if (DEBUG){ + printf("replaced_event\n"); + } memcpy(&event_table->events[i], event, sizeof(snd_seq_event_t)); } } } -//{{{ type conversion stuff -//struct _fluid_midi_event_t { -// fluid_midi_event_t* next; /* Link to next event */ -// void *paramptr; /* Pointer parameter (for SYSEX data), size is stored to param1, param2 indicates if pointer should be freed (dynamic if TRUE) */ -// unsigned int dtime; /* Delay (ticks) between this and previous event. midi tracks. */ -// unsigned int param1; /* First parameter */ DONE -// unsigned int param2; /* Second parameter */ DONE -// unsigned char type; /* MIDI event type */ DONE -// unsigned char channel; /* MIDI channel */ DONE -//}; -// 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; -// }}} void convert_event_format(fluid_midi_event_t *from, snd_seq_event_t *to){ memset(to, 0, sizeof(snd_seq_event_t)); //{{{ from->type @@ -185,16 +155,19 @@ void print_snd_seq_event(snd_seq_event_t *event){ break; break; } - printf("event_type: %s", note_event); - printf("channel: %d ", event->data.note.channel); - printf("note: %d ", event->data.note.note); - printf("velocity: %d ", event->data.note.velocity); - printf("tick: %d ", event->time.tick); - printf("\n"); + if (DEBUG){ + printf("event_type: %s", note_event); + printf("channel: %d ", event->data.note.channel); + printf("note: %d ", event->data.note.note); + printf("velocity: %d ", event->data.note.velocity); + printf("tick: %d ", event->time.tick); + printf("\n"); + } } void print_event_table (event_table_t *event_table){ + unsigned int i; for(i=0; i< event_table->length; i++){ printf(" - %d: ", i + 1); @@ -242,25 +215,12 @@ int get_events(void *data, fluid_midi_event_t *event){ 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); - - - /* - flow - call 1: - - note_on - insert_note() - call 2: - cb() - - note_off - replace_events() note_on in table is now note_off - call 3: - cb() - delete_note_off_events() - */ + if (DEBUG){ + 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.lo b/src/midi/midi_loader.lo index 81ceea5..f08d581 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.5 +# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11 # # 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 98a71f2..3f733e7 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 ef0a324..7d262cf 100755 --- a/src/midi/test_midi_loader +++ b/src/midi/test_midi_loader diff --git a/src/midi/test_midi_loader.o b/src/midi/test_midi_loader.o Binary files differindex 4804447..72ccde7 100644 --- a/src/midi/test_midi_loader.o +++ b/src/midi/test_midi_loader.o |