Fixing no ALSA builds, sequencer initialization and URLs in the manual

- Alex

diff --git a/doc/terminatorX-manual/C/terminatorX-manual.xml b/doc/terminatorX-manual/C/terminatorX-manual.xml
index 91881987554ea716bb53e9561ed5c07f7421acc9..4d98a51cd898024336979e4992e0bde434814051 100644 (file)
--- a/doc/terminatorX-manual/C/terminatorX-manual.xml
+++ b/doc/terminatorX-manual/C/terminatorX-manual.xml
@@ -1250,7 +1250,7 @@
       it is possible to control parameters through MIDI events (since 3.80).
       The MIDI interface is based upon the ALSA sequencer API. On startup
       terminatorX creates a MIDI input port called "terminatorX". You
       it is possible to control parameters through MIDI events (since 3.80).
       The MIDI interface is based upon the ALSA sequencer API. On startup
       terminatorX creates a MIDI input port called "terminatorX". You

-      can now use for example the <ulink url="alsa-patch-bay link here">alsa-patch-pay</ulink>
+      can now use for example the <ulink url="http://pkl.net/%7Enode/alsa-patch-bay.html">alsa-patch-pay</ulink>

       to connect an output port of your choice (either a hardware MIDI input
       device or a software generating midi events) to the terminatorX input
       port.</para>
       to connect an output port of your choice (either a hardware MIDI input
       device or a software generating midi events) to the terminatorX input
       port.</para>


@@ -1285,7 +1285,7 @@
       <para>If you want to use your joystick to control terminatorX - I wrote
       a tiny tool to create MIDI events from joystick motion called
       <emphasis>aseqjoy</emphasis>. It&#39;s available from the <ulink
       <para>If you want to use your joystick to control terminatorX - I wrote
       a tiny tool to create MIDI events from joystick motion called
       <emphasis>aseqjoy</emphasis>. It&#39;s available from the <ulink

-      url="http://terminatorX.cx/aseqjoy">terminatorX website</ulink>, too.</para>
+      url="http://terminatorX.cx/aseqjoy.html">terminatorX website</ulink>, too.</para>

     </sect2>
   </sect1>
 
     </sect2>
   </sect1>
 


@@ -1412,4 +1412,4 @@
     <para>Send me comments, bug-reports, patches or scratches (see scratches
     section on the terminatorX homepage) at: <email>alex@lisas.de</email></para>
   </sect1>
     <para>Send me comments, bug-reports, patches or scratches (see scratches
     section on the terminatorX homepage) at: <email>alex@lisas.de</email></para>
   </sect1>

-</article>
\ No newline at end of file
+</article>

diff --git a/src/Makefile.am b/src/Makefile.am
index edf97cd3627440c1466c1ab57b57971c9ee31a69..c090d7a4f5961ec077007e6e6267d485ef067c68 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,8 @@ LIBS=@X_LIBS@ @GTK_LIBS@ @LIBS@
 
 SUBDIRS = gui_icons smallknob
 
 
 SUBDIRS = gui_icons smallknob
 

-CFLAGS=@CFLAGS@ @GTK_CFLAGS@ -D_REENTRANT
-CXXFLAGS=@CFLAGS@ @GTK_CFLAGS@ -D_REENTRANT
+AM_CFLAGS=@CFLAGS@ @GTK_CFLAGS@ -D_REENTRANT
+AM_CXXFLAGS=@CFLAGS@ @GTK_CFLAGS@ -D_REENTRANT

 
 license.c: $(top_srcdir)/COPYING
        @AWK@ -f $(srcdir)/licmak.awk < $(top_srcdir)/COPYING > $(srcdir)/license.c
 
 license.c: $(top_srcdir)/COPYING
        @AWK@ -f $(srcdir)/licmak.awk < $(top_srcdir)/COPYING > $(srcdir)/license.c

diff --git a/src/tX_engine.cc b/src/tX_engine.cc
index 2f6a2b8697546a4d0a1ec5f94f63620f0c17a578..047e0b18bd34acbfd56d3807a40c5d0ce36d5957 100644 (file)
--- a/src/tX_engine.cc
+++ b/src/tX_engine.cc
@@ -322,6 +322,8 @@ tX_engine :: ~tX_engine() {
        pthread_join(thread, &dummy);   
        
        delete mouse;
        pthread_join(thread, &dummy);   
        
        delete mouse;

+#ifdef USE_ALSA_MIDI_IN                

        delete midi;
        delete midi;

+#endif 

        delete tape;    
 }
        delete tape;    
 }

diff --git a/src/tX_sequencer.cc b/src/tX_sequencer.cc
index 3a04af7ebc1c515a6d6b1495d4f9647706bd35b3..4647823d1e0ca9ed08e495995257099f58aa9007 100644 (file)
--- a/src/tX_sequencer.cc
+++ b/src/tX_sequencer.cc
@@ -329,6 +329,7 @@ void tX_sequencer :: load(xmlDocPtr doc, xmlNodePtr node) {
                if (cur->type == XML_ELEMENT_NODE) {
                        if (xmlStrcmp(cur->name, (xmlChar *) "event")==0) {
                                ev=new tX_event(doc, cur);
                if (cur->type == XML_ELEMENT_NODE) {
                        if (xmlStrcmp(cur->name, (xmlChar *) "event")==0) {
                                ev=new tX_event(doc, cur);

+                               max_timestamp=ev->get_timestamp();

                                song_list.push_back(ev);
                        } else {
                                tX_warning("unhandled sequencer element %s.", cur->name);
                                song_list.push_back(ev);
                        } else {
                                tX_warning("unhandled sequencer element %s.", cur->name);