From: terminatorX <>
Date: Wed, 16 Apr 2003 21:41:27 +0000 (+0000)
Subject: Fixing no ALSA builds, sequencer initialization and URLs in the manual
X-Git-Url: https://lisas.de/git/?p=terminatorX.git;a=commitdiff_plain;h=6eb62836c9a2841d6c3a876b5151b3b29d675127

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 9188198..4d98a51 100644
--- 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 &#34;terminatorX&#34;. 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>
@@ -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
-      url="http://terminatorX.cx/aseqjoy">terminatorX website</ulink>, too.</para>
+      url="http://terminatorX.cx/aseqjoy.html">terminatorX website</ulink>, too.</para>
     </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>
-</article>
\ No newline at end of file
+</article>
diff --git a/src/Makefile.am b/src/Makefile.am
index edf97cd..c090d7a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,8 @@ LIBS=@X_LIBS@ @GTK_LIBS@ @LIBS@
 
 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
diff --git a/src/tX_engine.cc b/src/tX_engine.cc
index 2f6a2b8..047e0b1 100644
--- a/src/tX_engine.cc
+++ b/src/tX_engine.cc
@@ -322,6 +322,8 @@ tX_engine :: ~tX_engine() {
 	pthread_join(thread, &dummy);	
 	
 	delete mouse;
+#ifdef USE_ALSA_MIDI_IN		
 	delete midi;
+#endif	
 	delete tape;	
 }
diff --git a/src/tX_sequencer.cc b/src/tX_sequencer.cc
index 3a04af7..4647823 100644
--- 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);
+				max_timestamp=ev->get_timestamp();
 				song_list.push_back(ev);
 			} else {
 				tX_warning("unhandled sequencer element %s.", cur->name);