autotools working a bit better

8 files changed, 14 insertions, 101 deletions

diff --git a/src/DSSI-render b/src/DSSI-render
index 344edec..6f73fb4 100755
--- a/src/DSSI-render
+++ b/src/DSSI-render
diff --git a/src/DSSI-render.c b/src/DSSI-render.c
index f9e3fad..0f7185a 100644
--- a/src/DSSI-render.c
+++ b/src/DSSI-render.c
@@ -1,32 +1,9 @@
-/*
- * Copyright (C) 2005 James McDermott
- * jamesmichaelmcdermott@gmail.com
- *
- * This program is derived from jack-dssi-host (Copyright 2004 Chris
- * Cannam, Steve Harris and Sean Bolton).
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 01222-1307
- * USA
- */
 #define CLI_FUNCS
 
 #include "DSSI-render.h"
 #include "ladspa_run_synth.h"
 #include "midi/midi_loader.h" 
 
-
 void
 print_usage(void) {
   fprintf(stderr, "A command-line DSSI host.\n");
@@ -122,8 +99,6 @@ void connect_ports(void){
       }
     }
   }  /* 'for (j...'  LADSPA port number */
-
-
 }
   
 int
@@ -131,7 +106,6 @@ main(int argc, char **argv) {
 
   my_name = basename(argv[0]);
 
-
   sample_rate = SAMPLE_RATE;
   
   /* Probably an unorthodox srandom() technique... */
@@ -233,7 +207,6 @@ main(int argc, char **argv) {
     exit(1);
   }
 
-
   /* Get the plugin descriptor and check the run_synth*() function
    * exists */
   int j = 0;
@@ -626,4 +599,3 @@ main(int argc, char **argv) {
 
   return 0;
 }
-
diff --git a/src/DSSI-render.o b/src/DSSI-render.o
index ba90714..5d9d711 100644
--- a/src/DSSI-render.o
+++ b/src/DSSI-render.o
diff --git a/src/DSSI_NOTES b/src/DSSI_NOTES
deleted file mode 100644
index be197ce..0000000
--- a/src/DSSI_NOTES
+++ /dev/null
@@ -1,59 +0,0 @@
- /**
-//all dssi functions are documented in... dssi.h
-//
-     * run_synth()
-     *
-     * This member is a function pointer that runs a synth for a
-     * block.  This is identical in function to the LADSPA run()
-     * function, except that it also supplies events to the synth.
-     *
-     * A plugin may provide this function, run_multiple_synths() (see
-     * below), both, or neither (if it is not in fact a synth).  A
-     * plugin that does not provide this function must set this member
-     * to NULL.  Authors of synth plugins are encouraged to provide
-     * this function if at all possible.
-     *
-     * 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.
-     *
-     * See also the notes on activation, port connection etc in
-     * ladpsa.h, in the context of the LADSPA run() function.
-     *
-     * Note Events
-     * ~~~~~~~~~~~
-     * There are two minor requirements aimed at making the plugin
-     * writer's life as simple as possible:
-     * 
-     * 1. A host must never send events of type SND_SEQ_EVENT_NOTE.
-     * Notes should always be sent as separate SND_SEQ_EVENT_NOTE_ON
-     * and NOTE_OFF events.  A plugin should discard any one-point
-     * NOTE events it sees.
-     * 
-     * 2. A host must not attempt to switch notes off by sending
-     * zero-velocity NOTE_ON events.  It should always send true ///interesting ..this is probably what was going on with all of those NOTE_ONs, some of them were probably zero velocity
-     * NOTE_OFFs.  It is the host's responsibility to remap events in 
-     * cases where an external MIDI source has sent it zero-velocity
-     * NOTE_ONs.
-     *
-     * Bank and Program Events
-     * ~~~~~~~~~~~~~~~~~~~~~~~
-     * Hosts must map MIDI Bank Select MSB and LSB (0 and 32)
-     * controllers and MIDI Program Change events onto the banks and
-     * programs specified by the plugin, using the DSSI select_program
-     * call.  No host should ever deliver a program change or bank
-     * select controller to a plugin via run_synth.
-     */
-    void (*run_synth)(LADSPA_Handle    Instance,
-          unsigned long    SampleCount,
-          snd_seq_event_t *Events,
-          unsigned long    EventCount); //is this any different from how we are using it? nope, same nothing about samplecount though 
- you mean we haven't been sending sample count? I thought that's what nframes was? yes it is, i mean no docs about it ok I'll look
-the second
-     indicates the block size (in samples) for which the plugin
-     instance may run.
-
-    /**
diff --git a/src/Makefile b/src/Makefile
index 5237a3b..df7b968 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -60,10 +60,10 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/cli-dssi-host
-pkgincludedir = $(includedir)/cli-dssi-host
-pkglibdir = $(libdir)/cli-dssi-host
-pkglibexecdir = $(libexecdir)/cli-dssi-host
+pkgdatadir = $(datadir)/dssi-render
+pkgincludedir = $(includedir)/dssi-render
+pkglibdir = $(libdir)/dssi-render
+pkglibexecdir = $(libexecdir)/dssi-render
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -221,7 +221,7 @@ CFLAGS = -g -O2
 CPP = gcc -E
 CPPFLAGS = 
 CYGPATH_W = echo
-DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"cli-dssi-host\" -DVERSION=\"0.1.3\"
+DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"dssi-render\" -DVERSION=\"0.0.1\"
 DEPDIR = .deps
 DLLTOOL = false
 DSSI_CFLAGS = 
@@ -258,7 +258,7 @@ OBJDUMP = objdump
 OBJEXT = o
 OTOOL = 
 OTOOL64 = 
-PACKAGE = cli-dssi-host
+PACKAGE = dssi-render
 PACKAGE_BUGREPORT = 
 PACKAGE_NAME = 
 PACKAGE_STRING = 
@@ -276,7 +276,7 @@ SHELL = /bin/sh
 SNDFILE_CFLAGS = 
 SNDFILE_LIBS = -lsndfile 
 STRIP = strip
-VERSION = 0.1.3
+VERSION = 0.0.1
 abs_builddir = /home/pepper/DSSI/dssi-render/src
 abs_srcdir = /home/pepper/DSSI/dssi-render/src
 abs_top_builddir = /home/pepper/DSSI/dssi-render
diff --git a/src/midi/.libs/libfluidmidi.a b/src/midi/.libs/libfluidmidi.a
index d6786cd..94d693a 100644
--- a/src/midi/.libs/libfluidmidi.a
+++ b/src/midi/.libs/libfluidmidi.a
diff --git a/src/midi/Makefile b/src/midi/Makefile
index 5240831..f46b272 100644
--- a/src/midi/Makefile
+++ b/src/midi/Makefile
@@ -61,10 +61,10 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/cli-dssi-host
-pkgincludedir = $(includedir)/cli-dssi-host
-pkglibdir = $(libdir)/cli-dssi-host
-pkglibexecdir = $(libexecdir)/cli-dssi-host
+pkgdatadir = $(datadir)/dssi-render
+pkgincludedir = $(includedir)/dssi-render
+pkglibdir = $(libdir)/dssi-render
+pkglibexecdir = $(libexecdir)/dssi-render
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -181,7 +181,7 @@ CFLAGS = -g -O2
 CPP = gcc -E
 CPPFLAGS = 
 CYGPATH_W = echo
-DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"cli-dssi-host\" -DVERSION=\"0.1.3\"
+DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"dssi-render\" -DVERSION=\"0.0.1\"
 DEPDIR = .deps
 DLLTOOL = false
 DSSI_CFLAGS = 
@@ -218,7 +218,7 @@ OBJDUMP = objdump
 OBJEXT = o
 OTOOL = 
 OTOOL64 = 
-PACKAGE = cli-dssi-host
+PACKAGE = dssi-render
 PACKAGE_BUGREPORT = 
 PACKAGE_NAME = 
 PACKAGE_STRING = 
@@ -236,7 +236,7 @@ SHELL = /bin/sh
 SNDFILE_CFLAGS = 
 SNDFILE_LIBS = -lsndfile 
 STRIP = strip
-VERSION = 0.1.3
+VERSION = 0.0.1
 abs_builddir = /home/pepper/DSSI/dssi-render/src/midi
 abs_srcdir = /home/pepper/DSSI/dssi-render/src/midi
 abs_top_builddir = /home/pepper/DSSI/dssi-render
diff --git a/src/new_example.wav b/src/new_example.wav
deleted file mode 100644
index bd348e1..0000000
--- a/src/new_example.wav
+++ /dev/null