diff -rNu melys-0.0.14/ChangeLog melys-0.0.15/ChangeLog
--- melys-0.0.14/ChangeLog	Tue Sep 28 16:08:02 1999
+++ melys-0.0.15/ChangeLog	Sun Oct  3 11:52:07 1999
@@ -1,5 +1,90 @@
+1999-10-02  Steve Ratcliffe  <steve@ariel>
+
+	* midi/play.m: Improved the play start/stop code.
+
+	* song/song.m: fix to set the signal connects in a sensible place
+
+	* gui/trackprop.m: call routine to set program
+
+	* seq/seqmidi.m: Fix for when sending to non-existant devices.
+	Wouldn't it be better to just not send?!
+
+	* gui/main.m: there is now a routine to set the trackview
+
+	* files/mdmlread.m:
+	Fix for tracks with many parts that was broken with the
+	change to the SAX parser.
+
+	* files/mdmlread.m: Move over to the SAX interface.
+	Reading is now about twice as fast and uses
+	much less memory...
+
+	* widgets/melystrackdisplay.m: The ruler code is now in melysrule.m
+
+	* widgets/melysrule.m:
+	Now ruler shows correct bar divisions, even when there
+	are timesignature changes in it.
+
+	* midi/play.m: Trigger start timer on the root now.
+	Head no longer contains the ppq value.
+
+	* programs/melplay.m: Now trigger timer on ROOT rather than head
+
+	* md/elements.m: Timebase and program changes
+
+	* md/mdutil.m:
+	New functions for dealing with the meters/beats/ticks representation.
+
+	* files/mdmlread.m, files/mdmlwrite.m, files/midiread.m,
+	  files/midiwrite.m, files/file.m:
+	Timebase changes and also
+	fix for files that already contain program information.
+
+	* files/file.m: Default time_base on the tempomap
+
+	* files/file.m:
+	Add a routine to check a root and default various things
+	if missing.  At present it does timesig and keysig.
+
+	* doc/mdml.dtd: Remove timebase from head and add ppq to tempomap.
+	Correct cue to cuepoint.
+	Add program to track
+
+1999-09-30  Steve Ratcliffe  <steve@ariel>
+
+	* widgets/melysrule.m: Put in the temporary ruler code.
+	Next step is to actually take notice of the timesignatures etc.
+
+	* md/mdseq.m: Problem showed on empty tracks when muting and would just
+	cause it not to play sometimes.
+	Reset some variables at the top of the loop to
+	find the next event.
+
+1999-09-29  Steve Ratcliffe  <steve@ariel>
+
+	* files/mdmlread.m: Modified error reporting.
+
+	* files/mdmlread.m: Converted to use the SAX interface
+
+	* programs/melys.m: Fix for building without debug.
+
+	* md/elements.m: Made the text type to string a separate routine.
+
+	* files/midiread.m: Fixed a couple of problems with reading midi files.
+	Zero length data reads and program numbers using MSB.
+
 1999-09-28  Steve Ratcliffe  <steve@ariel>
 
+	* song/song.m, md/mdutil.m:
+	After recording, shrink the size of the root element
+	back down the the maximum size of any of the tracks.
+	This prevents a large empty space at the end of the song.
+
+	* gui/menus.m: Added a menu item to bring up track properties.
+	Perhaps this is not so useful, as a track has to be selected anyway.
+
+	* README: Add latest features
+	* ChangeLog: For release REL-0-0-14
 	* version: Version 0.0.14
 
 	* md/elements.m, md/mdadd.m, md/mdutil.m, widgets/melyspartitem.m,
diff -rNu melys-0.0.14/INSTALL melys-0.0.15/INSTALL
--- melys-0.0.14/INSTALL	Sun Sep 19 23:02:58 1999
+++ melys-0.0.15/INSTALL	Sun Oct  3 11:52:07 1999
@@ -13,16 +13,15 @@
 Install
 -------
 
-*New* in 0.0.11 there are installation targets.
-if you want you can edit make.conf to place things in
-the gnome non-stardard places.
+If you want you can edit make.conf to place things in
+non-standard places.
 
 	make install
 
-This should install the binary, the manual.  The internationalisation
+This should install the binary and the manual.  The internationalisation
 catalogues are not installed yet, but the only existing one is a pseudo
 language used for testing.  I don't plan on asking for translations
-until later in the project.
+until somewhat later in the project.
 
 Run
 ---
@@ -36,7 +35,7 @@
 export ALSA_INPUT_PORTS=64:0
 export ALSA_OUTPUT_PORTS='65:0 65:1 65:2 65:3'
 
-Go to the programs directory and type:
+Now it can be run with just:
 
-	./melys
+	melys
 
diff -rNu melys-0.0.14/README melys-0.0.15/README
--- melys-0.0.14/README	Wed Sep 22 21:43:52 1999
+++ melys-0.0.15/README	Sun Oct  3 11:52:07 1999
@@ -24,12 +24,11 @@
 - Record new tracks, include merging in new events to an already
   existing track.
 
-- Save the file.
+- Modify a few properties of the track such as instrument and
+  channel number.
 
-- Mute and solo tracks.
+- Save the file.
 
-There is little of the gui implemented so it is difficult to see what
-is going on.  This release is only for the adventurous.
 
 Requirements.
 -------------
@@ -68,7 +67,7 @@
 
 My attitude to bugs is that they are not allowed even in software under
 heavy development as this is.  So if you find any, then please mail them
-to melys@parabola.demon.co.uk
+to melys-bugs@parabola.demon.co.uk
 
 Authors
 -------
diff -rNu melys-0.0.14/doc/mdml.dtd melys-0.0.15/doc/mdml.dtd
--- melys-0.0.14/doc/mdml.dtd	Wed Sep 22 20:51:10 1999
+++ melys-0.0.15/doc/mdml.dtd	Sat Oct  2 17:46:50 1999
@@ -1,5 +1,5 @@
 <!--
-	 This is version 1.2.1 of the MDML specification.
+	 This is version 1.3.0 of the MDML specification.
 
 	 Copyright (C) 1998, 1999 Steve Ratcliffe <steve@parabola.demon.co.uk>
 
@@ -8,8 +8,21 @@
 	 It concentrates on midi at present, but it is intended to add
 	 audio events as well.
 
+	Changes
+
+	991002:
+		The 'division' entity is deprecated.  Instead there is a ppq
+		attribute to tempomap.
+		
+		The attibute 'program' is added to 'track'
+
+		The 'cue' element corrected to 'cuepoint'.  This was an
+		error in the DTD.  The word 'cue' has never been recognised.
 -->
 
+<!ENTITY % old.compat 'INCLUDE'>
+<!ENTITY % strict     'IGNORE'>
+
 <!-- Often a reference to a part can be used as well as a part -->
 <!ENTITY % part.types "part | partref">
 
@@ -22,7 +35,7 @@
 
 <!-- All the text midi events -->
 <!ENTITY % events.text "copyright | lyric | text | trackname
-		| marker | instrument | cue">
+		| marker | instrument | cuepoint">
 
 <!ENTITY % events.track "%events.music; | %events.text;">
 
@@ -32,22 +45,42 @@
 -->
 <!ENTITY % att.common
 	"t        CDATA        #IMPLIED
-	 channel  CDATA        #IMPLIED"
+	 channel  CDATA        #IMPLIED
+	 selected (yes|no)	   #IMPLIED
+	 "
 >
 
 <!ELEMENT mdml (head, tempomap, track*)>
 
+<![ %old.compat; [
+<!--
+	The old dtd had a timebase element here which was really
+	associated with the tempomap.  This is now an attribute of
+	the tempomap.
+
+	The old format will still be recognised for some time.
+-->
 <!ELEMENT head (COPYRIGHT?,
 	version, format, timebase,
 	title?, author?, comment?)>
+]]>
+<![ %strict; [
+<!ELEMENT head (COPYRIGHT?,
+	version, format,
+	title?, author?, comment?)>
+]]>
 
 <!ELEMENT tempomap (%events.tempo;)* >
+<!ATTLIST tempomap
+	ppq         CDATA       #REQUIRED
+	>
 
 <!ELEMENT track (%part.types;)*>
 <!ATTLIST track
 	%att.common;
 	duration    CDATA       #IMPLIED
 	name        CDATA       #IMPLIED
+	program     CDATA       #IMPLIED
 	>
 
 <!-- The 'part' element is used for spitting up tracks.
@@ -93,7 +126,6 @@
 	%att.common;
 	duration    CDATA       #IMPLIED
 	name        CDATA       #IMPLIED
-	selected    (yes|no)    'no'
 	>
 
 <!-- Elements found within the header -->
@@ -162,8 +194,8 @@
 <!ELEMENT instrument (#PCDATA)>
 <!ATTLIST instrument
 	%att.common;>
-<!ELEMENT cue       (#PCDATA)>
-<!ATTLIST cue
+<!ELEMENT cuepoint       (#PCDATA)>
+<!ATTLIST cuepoint
 	%att.common;>
 
 <!-- ENTITY % events.music "note | control | pitch | keytouch | pressure | sysex
diff -rNu melys-0.0.14/files/file.c melys-0.0.15/files/file.c
--- melys-0.0.14/files/file.c	Tue Sep 28 16:09:32 1999
+++ melys-0.0.15/files/file.c	Sun Oct  3 12:54:30 1999
@@ -336,6 +336,64 @@
 }
 
 /*
+ * After a file is read in of whatever kind, this routine is run
+ * allows various checks to be made and defaults added.
+ * 
+ */
+void 
+file_check_root(struct rootElement *root)
+{
+	struct mapElement *map;
+	struct timesigElement *tsig;
+	struct keysigElement *ksig;
+	struct tempomapElement *tempomap;
+	int  i;
+
+	tempomap = md_get_tempomap(root);
+
+	/* Default timebase in case it is not set */
+	if (tempomap->timebase == 0)
+		tempomap->timebase = 192;
+
+	/*
+	 * First check is to ensure that there is a time signature at
+	 * the very beginning.  If not we add a default one.
+	 */
+	tsig = NULL;
+	for (i = 0; i < MD_CONTAINER_LEN(tempomap); i++) {
+		map = MD_MAP(MD_GET_INDEX(tempomap, i));
+		if (MD_TYPE(map) == MD_TYPE_TIMESIG) {
+			if (MD_TIME(map) == 0)
+				tsig = MD_TIMESIG(map); /* We got one */
+
+			break;
+		}
+	}
+	if (tsig == NULL) {
+		tsig = md_timesig_new(4, 4, 24, 8);
+		MD_SET_TIME(tsig, 0);
+		md_add_elem_sort(MD_CONTAINER(tempomap), MD_ELEMENT(tsig));
+	}
+
+	/* Key signature */
+	ksig = NULL;
+	for (i = 0; i < MD_CONTAINER_LEN(tempomap); i++) {
+		map = MD_MAP(MD_GET_INDEX(tempomap, i));
+		if (MD_TYPE(map) == MD_TYPE_KEYSIG) {
+			if (MD_TIME(map) == 0)
+				ksig = MD_KEYSIG(map); /* We got one */
+
+			break;
+		}
+	}
+	if (ksig == NULL) {
+		ksig = md_keysig_new(0, 0);
+		MD_SET_TIME(ksig, 0);
+		md_add_elem_sort(MD_CONTAINER(tempomap), MD_ELEMENT(ksig));
+	}
+}
+
+/*
  * Take the filename and guess the type of the file. First will
  * look at the extension and then may use magic numbers in the
  * file to deduce the type.
diff -rNu melys-0.0.14/files/file.m melys-0.0.15/files/file.m
--- melys-0.0.14/files/file.m	Tue Sep 14 14:56:48 1999
+++ melys-0.0.15/files/file.m	Sat Oct  2 20:17:44 1999
@@ -385,6 +385,65 @@
 	file_set_success(file);
 
 
+>>function file_check_root
+void
+struct rootElement *root;
+
+>>description
+After a file is read in of whatever kind, this routine is
+run allows various checks to be made and defaults added.
+
+>>code
+	struct mapElement *map;
+	struct timesigElement *tsig;
+	struct keysigElement *ksig;
+	struct tempomapElement *tempomap;
+	int  i;
+
+	tempomap = md_get_tempomap(root);
+
+	/* Default timebase in case it is not set */
+	if (tempomap->timebase == 0)
+		tempomap->timebase = 192;
+
+	/*
+	 * First check is to ensure that there is a time signature at
+	 * the very beginning.  If not we add a default one.
+	 */
+	tsig = NULL;
+	for (i = 0; i < MD_CONTAINER_LEN(tempomap); i++) {
+		map = MD_MAP(MD_GET_INDEX(tempomap, i));
+		if (MD_TYPE(map) == MD_TYPE_TIMESIG) {
+			if (MD_TIME(map) == 0)
+				tsig = MD_TIMESIG(map); /* We got one */
+
+			break;
+		}
+	}
+	if (tsig == NULL) {
+		tsig = md_timesig_new(4, 4, 24, 8);
+		MD_SET_TIME(tsig, 0);
+		md_add_elem_sort(MD_CONTAINER(tempomap), MD_ELEMENT(tsig));
+	}
+
+	/* Key signature */
+	ksig = NULL;
+	for (i = 0; i < MD_CONTAINER_LEN(tempomap); i++) {
+		map = MD_MAP(MD_GET_INDEX(tempomap, i));
+		if (MD_TYPE(map) == MD_TYPE_KEYSIG) {
+			if (MD_TIME(map) == 0)
+				ksig = MD_KEYSIG(map); /* We got one */
+
+			break;
+		}
+	}
+	if (ksig == NULL) {
+		ksig = md_keysig_new(0, 0);
+		MD_SET_TIME(ksig, 0);
+		md_add_elem_sort(MD_CONTAINER(tempomap), MD_ELEMENT(ksig));
+	}
+
+
 
 >>function guess_type
 static void
diff -rNu melys-0.0.14/files/mdmlread.c melys-0.0.15/files/mdmlread.c
--- melys-0.0.14/files/mdmlread.c	Tue Sep 28 16:09:33 1999
+++ melys-0.0.15/files/mdmlread.c	Sun Oct  3 12:54:31 1999
@@ -11,11 +11,9 @@
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  * 
- * TODO: libxml 1.1.0 now has a working SAX parser, so this could
- *       all be moved over to use that.
- * 
- * 	  Reading in files with this code is too slow mainly (I believe) because
- * 	  of the very large amount of memory that gets used.
+ * This is the new mdmlread using the SAX parser.
+ * It is about twice as fast as the old one and uses very
+ * much less memory.
  * 
  * 
  */
@@ -28,6 +26,7 @@
 #include <stdio.h>
 #include <gnome-xml/tree.h>
 #include <gnome-xml/parser.h>
+#include <gnome-xml/parserInternals.h>
 #include <string.h>
 #include "melfile.h"
 #include "md.h"
@@ -47,57 +46,85 @@
 	int  devchan;	/* Current dev/channel */
 	struct rootElement *root; /* Pointer to root of MD tree */
 	struct headElement *head; /* Pointer to head element */
-	GArray *toffsets;	/* Time offsets for each container level */
+	GStack *estack;	/* Element stack */
 	int  level;		/* Container level */
+	char *errmsg;	/* Error message */
+	char *headname;	/* A head element is in progress */
 
+	int  timebase;	/* The division time base */
 	int  program;	/* Saved program for track */
+	int  hasprogram:1;	/* Has embeded program changes */
 	int  note_seen:1;	/* Seen first note on track */
+	int  error:1;	/* Set if an error occurred reading in file */
+};
+
+struct levelstate {
+	struct element *elem;
+	char *text;
+	int  textlen;
 };
 
-static struct element *node_to_md(struct mdmlstate *msp, xmlNodePtr node);
-static void common_atts(struct mdmlstate *msp, xmlNodePtr node, 
+static struct element *tag_to_md(struct mdmlstate *msp, const xmlChar *name, 
+        const xmlChar **attrs);
+static void common_atts(struct mdmlstate *msp, const xmlChar **attrs, 
         struct element *el);
-static int get_int(xmlNodePtr node, char *name);
-static double get_double(xmlNodePtr node, char *name);
-static int get_note(xmlNodePtr node, char *name);
+static xmlChar *get_str(const xmlChar **attrs, const xmlChar *name);
+static int get_int(const xmlChar **attrs, const xmlChar *name);
+static double get_double(const xmlChar **attrs, const xmlChar *name);
+static int get_note(const xmlChar **attrs, const xmlChar *name);
 static unsigned char *get_hex_data(char *hexchars, int *lenp);
 static void init_sax_handler(void);
+static void startDocument(void *data);
+static void endDocument(void *data);
+static void startElement(void *data, const xmlChar *name, 
+        const xmlChar **attrs);
+static void endElement(void *data, const xmlChar *name);
+static xmlEntityPtr getEntity(void *data, const CHAR *name);
+static void characters(void *data, const xmlChar *ch, int len);
+static int ourParseFile(xmlSAXHandlerPtr sax, const char *filename, 
+        void *data);
+static void warning(void *data, const char *msg, ...);
+static void error(void *data, const char *msg, ...);
+static void fatalError(void *data, const char *msg, ...);
 
 
 /*
  * Read in an mdml file given the filename. A pointer to a
- * rootElement is returned. This really needs to use a SAX
- * parser. At present it builds an extremely large document
- * tree which is simply thrown away, but not before it has
- * expanded the memory usage of the program beyond reasonable
- * bounds for large files.
+ * rootElement is returned.
+ * 
  */
 struct rootElement *
 mdml_read_file(struct File *file)
 {
-	xmlDocPtr doc;
 	struct rootElement *root;
 	struct mdmlstate mstate;
 
 	memset(&mstate, 0, sizeof(mstate));
-	mstate.toffsets = g_array_new(0, 0, sizeof(unsigned long));
+	mstate.estack = gx_stack_new(sizeof(struct levelstate));
 	mstate.file = file;
+	mstate.root = NULL;
+	mstate.errmsg = NULL;
+	mstate.headname = NULL;
 
-	/* Will use later XXX */ init_sax_handler();
-	//doc = xmlSAXParseFile(NULL, file->name, 0);
-	doc = xmlParseFile(file->name);
+	init_sax_handler();
+	ourParseFile(&SAXhandler, file->name, &mstate);
+	/*
+	 * This can be used when v > 1.7.2 is widely available
+	xmlSAXUserParseFile(&SAXhandler, &mstate, file->name);
+	 */
+	root = mstate.root;
 
-	if (doc == NULL) {
-		file_set_error(file, FILE_STATUS_BAD_FORMAT, _("Failed to read file"));
+	if (mstate.error) {
+		file_set_error(file, FILE_STATUS_BAD_FORMAT, mstate.errmsg);
+		if (root)
+			md_free(MD_ELEMENT(root));
 		return NULL;
 	}
 
-	root = MD_ROOT(node_to_md(&mstate, doc->root));
-	xmlFreeDoc(doc);
-
 	if (root)
 		file_set_success(file);
 
+	file_check_root(root);
 	return root;
 }
 
@@ -107,24 +134,13 @@
  * 
  *  Arguments:
  *    msp       - Mdml write state
- *    node      - XML document to convert, or subnode in it
  */
 static struct element *
-node_to_md(struct mdmlstate *msp, xmlNodePtr node)
+tag_to_md(struct mdmlstate *msp, const xmlChar *name, const xmlChar **attrs)
 {
 	struct element *retel = NULL;
-	xmlNodePtr child;
-	const char *name;
-	char *tmp;
 	unsigned long ostart = 0;
 
-	if (node->type != XML_ELEMENT_NODE)
-		return NULL;
-
-	name = node->name;
-
-	tmp = NULL;
-
 	/*
 	 * Its slightly important to have the most likely
 	 * matches appear at the top.
@@ -133,9 +149,9 @@
 		struct noteElement *note;
 		int  off;
 
-		note = md_note_new(get_note(node, "n"), get_int(node, "v"),
-			get_int(node, "len"));
-		off = get_int(node, "off");
+		note = md_note_new(get_note(attrs, "n"), get_int(attrs, "v"),
+			get_int(attrs, "len"));
+		off = get_int(attrs, "off");
 		if (off > 0)
 			note->offvel = off;
 
@@ -144,31 +160,32 @@
 		retel = MD_ELEMENT(note);
 
 	} else if (strcmp(name, "control") == 0) {
-		retel = MD_ELEMENT(md_control_new(get_int(node, "n"),
-				  get_int(node, "v")));
+		retel = MD_ELEMENT(md_control_new(get_int(attrs, "n"),
+				  get_int(attrs, "v")));
 
 	} else if (strcmp(name, "program") == 0) {
-		retel = MD_ELEMENT(md_program_new(get_int(node, "program")));
+		int  number;
+
+		number = get_int(attrs, "program");
+		retel = MD_ELEMENT(md_program_new(number));
 		if (!msp->note_seen)
-			msp->program = get_int(node, "program");
+			msp->program = number;
+		msp->hasprogram = TRUE;
 
 	} else if (strcmp(name, "pitch") == 0) {
-		retel = MD_ELEMENT(md_pitch_new(get_int(node, "p")));
+		retel = MD_ELEMENT(md_pitch_new(get_int(attrs, "p")));
 
 	} else if (strcmp(name, "keytouch") == 0) {
 		retel = MD_ELEMENT(
-			md_keytouch_new(get_int(node, "n"), get_int(node, "v")));
+			md_keytouch_new(get_int(attrs, "n"), get_int(attrs, "v")));
 
 	} else if (strcmp(name, "pressure") == 0) {
-		retel = MD_ELEMENT( md_pressure_new(get_int(node, "v")));
+		retel = MD_ELEMENT( md_pressure_new(get_int(attrs, "v")));
 
 	} else if (strcmp(name, "sysex") == 0) {
 		struct sysexElement *sep;
-		unsigned char *data;
-		int  len;
 
-		data = get_hex_data(tmp=xmlNodeGetContent(node->childs), &len);
-		sep = md_sysex_new(data[0], data+1, len - 1);
+		sep = md_sysex_new(0, NULL, 0);
 
 		retel = MD_ELEMENT(sep);
 
@@ -184,26 +201,17 @@
 		retel = MD_ELEMENT(msp->head);
 
 	} else if (strcmp(name, "version") == 0) {
-		msp->head->ver_major = get_int(node, "major");
-		msp->head->ver_minor = get_int(node, "minor");
+		msp->head->ver_major = get_int(attrs, "major");
+		msp->head->ver_minor = get_int(attrs, "minor");
 
 	} else if (strcmp(name, "format") == 0) {
-		msp->head->format = get_int(node, "type");
+		msp->head->format = get_int(attrs, "type");
 
+#ifndef MELYS_NO_COMPAT
+	/* This is the old way of doing it */
 	} else if (strcmp(name, "timebase") == 0) {
-		msp->head->time_base = get_int(node, "division");
-
-	} else if (strcmp(name, "COPYRIGHT") == 0) {
-		msp->head->copyright = g_strdup(xmlNodeGetContent(node));
-
-	} else if (strcmp(name, "title") == 0) {
-		msp->head->title = xmlNodeGetContent(node);
-
-	} else if (strcmp(name, "author") == 0) {
-		msp->head->author = xmlNodeGetContent(node);
-
-	} else if (strcmp(name, "comment") == 0) {
-		msp->head->comment = xmlNodeGetContent(node);
+		msp->timebase = get_int(attrs, "division");
+#endif
 
 	} else if (strcmp(name, "track") == 0) {
 		struct trackElement *tp;
@@ -213,26 +221,35 @@
 		msp->maxtime = 0;
 		msp->devchan = 0;
 		msp->program = 0;
+		msp->hasprogram = 0;
 		msp->note_seen = 0;
 
 		tp = md_track_new();
-		tp->name = xmlGetProp(node, "name");
-		res = get_int(node, "program");
+		tp->name = g_strdup(get_str(attrs, "name"));
+		res = get_int(attrs, "program");
 		if (res >= 0)
 			msp->program = res;
 		retel = MD_ELEMENT(tp);
 
 	} else if (strcmp(name, "tempomap") == 0) {
 		struct tempomapElement *tmap;
+		int  timebase;
+
 		tmap = md_tempomap_new();
+		timebase = get_int(attrs, "ppq");
+		if (timebase > 0)
+			tmap->timebase = timebase;
+		else
+			tmap->timebase = msp->timebase; /* Old compat */
+
 		retel = MD_ELEMENT(tmap);
 
 	} else if (strcmp(name, "part") == 0) {
 		struct partElement *pp;
 		int  id;
 		pp = md_part_new();
-		pp->name = xmlGetProp(node, "name");
-		id = get_int(node, "id");
+		pp->name = g_strdup(get_str(attrs, "name"));
+		id = get_int(attrs, "id");
 		if (id > 0)
 			pp->id = id;
 		retel = MD_ELEMENT(pp);
@@ -241,14 +258,14 @@
 		struct takeElement *tp;
 
 		tp = md_take_new();
-		tp->name = xmlGetProp(node, "name");
+		tp->name = g_strdup(get_str(attrs, "name"));
 		retel = MD_ELEMENT(tp);
 
 	} else if (strcmp(name, "tempo") == 0) {
 		struct tempoElement *tp;
 		int  us;
 		double bpm;
-		bpm = get_double(node, "bpm");
+		bpm = get_double(attrs, "bpm");
 		if (bpm) {
 			us = 60000000/bpm;
 			tp = md_tempo_new(us);
@@ -261,14 +278,13 @@
 		int  clocks, n32pq;
 		CHAR *prop;
 
-		prop = xmlGetProp(node, "signature");
+		prop = get_str(attrs, "signature");
 		sscanf(prop, "%d/%d", &top, &bottom);
-		clocks = get_int(node, "clocks");
-		n32pq = get_int(node, "n32PerQuarter");
+		clocks = get_int(attrs, "clocks");
+		n32pq = get_int(attrs, "n32PerQuarter");
 
 		tsp = md_timesig_new(top, bottom, clocks, n32pq);
 		retel = MD_ELEMENT(tsp);
-		free(prop);
 		
 	} else if (strcmp(name, "keysignature") == 0) {
 		struct keysigElement *ksp;
@@ -276,8 +292,8 @@
 		CHAR *mode;
 		int  m;
 
-		key = xmlGetProp(node, "key");
-		mode = xmlGetProp(node, "mode");
+		key = get_str(attrs, "key");
+		mode = get_str(attrs, "mode");
 		if (mode && strcmp(mode, "minor") == 0)
 			m = 1;
 		else
@@ -285,15 +301,13 @@
 
 		ksp = md_keysig_new(atoi(key), m);
 		retel = MD_ELEMENT(ksp);
-		free(key);
-		free(mode);
 
 	} else if (strcmp(name, "smpte") == 0) {
 		CHAR *off;
 		struct smpteoffsetElement *sp;
 		int  hours, minutes, seconds, frames, subframes;
 
-		off = xmlGetProp(node, "offset");
+		off = get_str(attrs, "offset");
 		if (off == NULL)
 			off = "0:0:0:0:0";
 
@@ -303,46 +317,50 @@
 		sp = md_smpteoffset_new(hours, minutes, seconds, frames, subframes);
 		retel = MD_ELEMENT(sp);
 
-		free(off);
-
 	} else if (strcmp(name, "text") == 0) {
-		retel = MD_ELEMENT(md_text_new(MIDI_META_TEXT,
-			tmp = xmlNodeGetContent(node)));
+		retel = MD_ELEMENT(md_text_new(MIDI_META_TEXT, NULL));
 
 	} else if (strcmp(name, "copyright") == 0) {
-		retel = MD_ELEMENT(md_text_new(MIDI_META_COPYRIGHT,
-			tmp = xmlNodeGetContent(node)));
+		retel = MD_ELEMENT(md_text_new(MIDI_META_COPYRIGHT, NULL));
 
 	} else if (strcmp(name, "trackname") == 0) {
-		retel = MD_ELEMENT(md_text_new(MIDI_META_TRACKNAME,
-			tmp = xmlNodeGetContent(node)));
+		retel = MD_ELEMENT(md_text_new(MIDI_META_TRACKNAME, NULL));
 
 	} else if (strcmp(name, "instrument") == 0) {
-		retel = MD_ELEMENT(md_text_new(MIDI_META_INSTRUMENT,
-			tmp = xmlNodeGetContent(node)));
+		retel = MD_ELEMENT(md_text_new(MIDI_META_INSTRUMENT, NULL));
 
 	} else if (strcmp(name, "lyric") == 0) {
-		retel = MD_ELEMENT(md_text_new(MIDI_META_LYRIC,
-			tmp = xmlNodeGetContent(node)));
+		retel = MD_ELEMENT(md_text_new(MIDI_META_LYRIC, NULL));
 
 	} else if (strcmp(name, "marker") == 0) {
-		retel = MD_ELEMENT(md_text_new(MIDI_META_MARKER,
-			tmp = xmlNodeGetContent(node)));
+		retel = MD_ELEMENT(md_text_new(MIDI_META_MARKER, NULL));
 
 	} else if (strcmp(name, "cuepoint") == 0) {
-		retel = MD_ELEMENT(md_text_new(MIDI_META_CUE,
-			tmp = xmlNodeGetContent(node)));
+		retel = MD_ELEMENT(md_text_new(MIDI_META_CUE, NULL));
+
+	} else if (strcmp(name, "COPYRIGHT") == 0) {
+		retel = NULL;
+		msp->headname = g_strdup(name);
+
+	} else if (strcmp(name, "title") == 0) {
+		retel = NULL;
+		msp->headname = g_strdup(name);
+
+	} else if (strcmp(name, "author") == 0) {
+		retel = NULL;
+		msp->headname = g_strdup(name);
+
+	} else if (strcmp(name, "comment") == 0) {
+		retel = NULL;
+		msp->headname = g_strdup(name);
 
 	} else {
 		printf("Unknown node name %s\n", name);
 		return NULL;
 	}
 
-	if (tmp)
-		free(tmp);
-
 	/* Set common attributes like time */
-	common_atts(msp, node, retel);	
+	common_atts(msp, attrs, retel);	
 
 	if (retel && iscontainer(retel)) {
 		ostart = msp->starttime;
@@ -350,32 +368,6 @@
 		msp->maxtime = 0;
 	}
 
-	for (child = node->childs; child; child = child->next) {
-		struct element *el;
-
-		el = node_to_md(msp, child);
-		if (el == NULL)
-			continue;
-		md_add_elem(MD_CONTAINER(retel), el);
-	}
-
-	if (retel && iscontainer(retel)) {
-		unsigned long dur = 0;
-
-		if (msp->maxtime > retel->element_time)
-			dur = msp->maxtime - retel->element_time;
-		if (MD_CONTAINER(retel)->duration > dur)
-			dur = MD_CONTAINER(retel)->duration;
-
-		if (retel->type == MD_TYPE_TRACK) {
-			MD_TRACK(retel)->program = msp->program;
-		}
-
-		MD_CONTAINER(retel)->duration = dur;
-		msp->currtime = msp->starttime + dur;
-		msp->starttime = ostart;
-	}
-
 	return retel;
 }
 
@@ -384,26 +376,36 @@
  * like time and channel that can apply to almost any element.
  * 
  *  Arguments:
- *    node      - Node to examine for attributes
+ *    attrs     - Node to examine for attributes
  *    el        - Element to set attributes
  */
 static void 
-common_atts(struct mdmlstate *msp, xmlNodePtr node, struct element *el)
+common_atts(struct mdmlstate *msp, const xmlChar **attrs, struct element *el)
 {
+	int  i;
 	int  ival;
-	char *str;
 	unsigned long t;
 
-	if (node == NULL || el == NULL)
+	if (attrs == NULL || el == NULL)
 		return;
 
-	ival = get_int(node, "t");
-	if (ival == -1)
-		ival = msp->currtime;
-	else
-		msp->currtime = msp->starttime + ival;
-	el->element_time = msp->currtime;
+	for (i = 0; attrs[i] != NULL; i += 2) {
+		if (strcmp(attrs[i], "t") == 0) {
+			ival = atoi(attrs[i+1]);
+			msp->currtime = msp->starttime + ival;
+		} else if (strcmp(attrs[i], "channel") == 0) {
+			msp->devchan = atoi(attrs[i+1]);
+#if 1
+		} else if (iscontainer(el) && strcmp(attrs[i], "duration") == 0) {
+			MD_CONTAINER(el)->duration = atoi(attrs[i+1]);
+#endif
+		} else if (strcmp(attrs[i], "selected") == 0) {
+			if (strcmp(attrs[i+1], "yes") == 0)
+				MD_SET_SELECTED(el, TRUE);
+		}
+	}
 
+	el->element_time = msp->currtime;
 	/*
 	 * Update the max time for this container.
 	 */
@@ -413,19 +415,23 @@
 	if (t > msp->maxtime)
 		msp->maxtime = t;
 
-	ival = get_int(node, "channel");
-	if (ival != -1)
-		msp->devchan = ival;
 	el->device_channel = msp->devchan;
+}
 
-	ival = get_int(node, "duration");
-	if (ival != -1)
-		MD_CONTAINER(el)->duration = ival;
-
-	str = xmlGetProp(node, "selected");
-	if (str && strcmp(str, "yes") == 0)
-		MD_SET_SELECTED(el, TRUE);
-	
+static xmlChar *
+get_str(const xmlChar **attrs, const xmlChar *name)
+{
+	int  i;
+
+	if (!attrs)
+		return NULL;
+
+	for (i = 0; attrs[i] != NULL; i += 2) {
+		if (strcmp(attrs[i], name) == 0)
+			return (xmlChar *)attrs[i+1];
+	}
+
+	return NULL;
 }
 
 /*
@@ -433,21 +439,20 @@
  * attribute does not exist then -1 is returned.
  * 
  *  Arguments:
- *    node      - Node to be examined
+ *    attrs     - Node to be examined
  *    name      - Name of attribute
  */
 static int 
-get_int(xmlNodePtr node, char *name)
+get_int(const xmlChar **attrs, const xmlChar *name)
 {
 	CHAR *cp;
 	int  n;
 
-	cp = xmlGetProp(node, name);
+	cp = get_str(attrs, name);
 	if (cp == NULL)
 		return -1;
 
 	n = atoi(cp);
-	free(cp);
 
 	return n;
 }
@@ -456,21 +461,20 @@
  * Get a property from a node and convert it to a double value.
  * 
  *  Arguments:
- *    node      - Node to get property from
+ *    attrs     - Node to get property from
  *    name      - Name of property to get
  */
 static double 
-get_double(xmlNodePtr node, char *name)
+get_double(const xmlChar **attrs, const xmlChar *name)
 {
-	CHAR *cp;
+	xmlChar *cp;
 	double d;
 
-	cp = xmlGetProp(node, name);
+	cp = get_str(attrs, name);
 	if (cp == NULL)
 		return 0.0;
 
 	d = strtod(cp, NULL);
-	free(cp);
 
 	return d;
 }
@@ -479,19 +483,19 @@
  * Get the note value from the specified note name.
  * 
  *  Arguments:
- *    node      - Node for this note
+ *    attrs     - Node for this note
  *    name      - Name of property to get
  */
 static int 
-get_note(xmlNodePtr node, char *name)
+get_note(const xmlChar **attrs, const xmlChar *name)
 {
-	CHAR *note;
+	xmlChar *note;
 	int  base;
 	int  oct;
-	CHAR *cp;
+	xmlChar *cp;
 	int  n;
 
-	note = xmlGetProp(node, name);
+	note = get_str(attrs, name);
 	if (note == NULL)
 		return 0;
 
@@ -519,9 +523,8 @@
 		break;
 	case '0': case '1': case '2': case '3': case '4':
 	case '5': case '6': case '7': case '8': case '9':
-		// This is not really a name at all
+		/* This is not really a name at all */
 		n = atoi(note);
-		free(note);
 		return n;
 	default:
 		base = 0;
@@ -536,8 +539,6 @@
 	}
 	oct = atoi(cp);
 
-	free(note);
-
 	return base + oct*12;
 }
 
@@ -574,31 +575,301 @@
  * Initialise the SAX handler callback set. This only needs to
  * be done once.
  * 
- * There seems to be no point in doing this. The whole point of
- * using an event driver interface is to avoid building up a
- * tree in memory, but gnome-xml appears to do this anyway. So
- * we may as well just traverse that.
- * 
  */
 static void 
 init_sax_handler(void)
 {
+	static xmlSAXHandler zerosax;
 
-#if 0
-    SAXhandler.resolveEntity = NULL;
-    SAXhandler.notationDecl = NULL;
-    SAXhandler.unparsedEntityDecl = NULL;
-    SAXhandler.setDocumentLocator = NULL;
-    SAXhandler.startDocument = NULL;
-    SAXhandler.endDocument = NULL;
-    SAXhandler.startElement = NULL;
-    SAXhandler.endElement = NULL;
-    SAXhandler.attribute = NULL;
-    SAXhandler.characters = NULL;
-    SAXhandler.ignorableWhitespace = NULL;
-    SAXhandler.processingInstruction = NULL;
-    SAXhandler.warning = NULL;
-    SAXhandler.error = NULL;
-    SAXhandler.fatalError = NULL;
-#endif
+	SAXhandler = zerosax;
+
+	SAXhandler.startDocument = startDocument;
+	SAXhandler.endDocument = endDocument;
+
+	SAXhandler.startElement = startElement;
+	SAXhandler.endElement = endElement;
+
+	SAXhandler.getEntity = getEntity;
+	SAXhandler.warning = warning;
+	SAXhandler.error = error;
+	SAXhandler.fatalError = fatalError;
+	SAXhandler.characters = characters;
+}
+
+static void 
+startDocument(void *data)
+{
+}
+
+static void 
+endDocument(void *data)
+{
+}
+
+static void 
+startElement(void *data, const xmlChar *name, const xmlChar **attrs)
+{
+	struct containerElement *con;
+	struct element *el;
+	struct levelstate state;
+	struct levelstate *ls;
+	struct mdmlstate *msp = data;
+
+	el = tag_to_md(msp, name, attrs);
+
+	ls = (struct levelstate *)gx_stack_top(msp->estack);
+	if (ls) {
+		con = MD_CONTAINER(ls->elem);
+
+		g_assert(iscontainer(con));
+
+		if (el)
+			md_add_elem(con, el);
+	}
+
+	state.elem = el;
+	state.text = NULL;
+	state.textlen = 0;
+	msp->headname = NULL;
+	gx_stack_push(msp->estack, (gpointer) &state);
+}
+
+static void 
+endElement(void *data, const xmlChar *name)
+{
+	struct levelstate *ls;
+	struct mdmlstate *msp = data;
+	struct element *el;
+	struct textElement *te;
+
+	ls = gx_stack_top(msp->estack);
+
+	el = ls->elem;
+	te = NULL;
+	if (el) {
+		if (MD_TYPE(el) == MD_TYPE_TRACK)
+			MD_TRACK(el)->hasprogram = msp->hasprogram;
+		else if (MD_TYPE(el) == MD_TYPE_TEXT)
+			te = MD_TEXT(el);
+
+		if (iscontainer(el)) {
+
+			if (el->type == MD_TYPE_TRACK)
+				MD_TRACK(el)->program = msp->program;
+
+			msp->currtime = MD_ENDTIME(el);
+		}
+	}
+
+
+	if (ls->text) {
+		if (strcmp(name, "sysex") == 0) {
+			unsigned char *data;
+			struct sysexElement *se;
+			int  len;
+
+			data = get_hex_data(ls->text, &len);
+			if (data && len > 0) {
+				se = MD_SYSEX(ls->elem);
+				se->status = data[0];
+				se->data = g_memdup(data+1, len-1);
+				se->length = len - 1;
+			}
+			g_free(ls->text);
+
+		} else if (strcmp(name, "COPYRIGHT") == 0) {
+			msp->head->copyright = ls->text;
+
+		} else if (strcmp(name, "title") == 0) {
+			msp->head->title = ls->text;
+
+		} else if (strcmp(name, "author") == 0) {
+			msp->head->author = ls->text;
+
+		} else if (strcmp(name, "comment") == 0) {
+			msp->head->comment = ls->text;
+
+		} else if (strcmp(name, "text") == 0) {
+			te->type = MIDI_META_TEXT;
+			te->name = md_textname(MIDI_META_TEXT);
+			te->text = ls->text;
+			te->length = ls->textlen;
+
+		} else if (strcmp(name, "copyright") == 0) {
+			te->type = MIDI_META_COPYRIGHT;
+			te->name = md_textname(MIDI_META_COPYRIGHT);
+			te->text = ls->text;
+			te->length = ls->textlen;
+
+		} else if (strcmp(name, "trackname") == 0) {
+			te->type = MIDI_META_TRACKNAME;
+			te->name = md_textname(MIDI_META_TRACKNAME);
+			te->text = ls->text;
+			te->length = ls->textlen;
+
+		} else if (strcmp(name, "instrument") == 0) {
+			te->type = MIDI_META_INSTRUMENT;
+			te->name = md_textname(MIDI_META_INSTRUMENT);
+			te->text = ls->text;
+			te->length = ls->textlen;
+
+		} else if (strcmp(name, "lyric") == 0) {
+			te->type = MIDI_META_LYRIC;
+			te->name = md_textname(MIDI_META_LYRIC);
+			te->text = ls->text;
+			te->length = ls->textlen;
+
+		} else if (strcmp(name, "marker") == 0) {
+			te->type = MIDI_META_MARKER;
+			te->name = md_textname(MIDI_META_MARKER);
+			te->text = ls->text;
+			te->length = ls->textlen;
+
+		} else if (strcmp(name, "cuepoint") == 0) {
+			te->type = MIDI_META_CUE;
+			te->name = md_textname(MIDI_META_CUE);
+			te->text = ls->text;
+			te->length = ls->textlen;
+
+			
+		} else if (ls->text) {
+			g_free(ls->text);
+		}
+	}
+
+	gx_stack_pop(msp->estack, NULL);
+	if (el && iscontainer(el)) {
+		ls = gx_stack_top(msp->estack);
+		if (ls && ls->elem)
+			msp->starttime = MD_TIME(ls->elem);
+	}
+}
+
+static xmlEntityPtr 
+getEntity(void *data, const CHAR *name)
+{
+    return xmlGetPredefinedEntity(name);
+}
+
+static void 
+characters(void *data, const xmlChar *ch, int len)
+{
+	struct levelstate *ls;
+	struct mdmlstate *msp = data;
+	struct element *el;
+	char *str;
+	int  type;
+
+	ls = gx_stack_top(msp->estack);
+	el = ls->elem;
+	if (el)
+		type = MD_TYPE(el);
+	else
+		type = -1;
+
+	switch (type) {
+	case MD_TYPE_NOTE:
+	case MD_TYPE_CONTROL:
+		/* if we know that there is no content then don't save */
+		ls->text = NULL;
+		ls->textlen = 0;
+		break;
+	default:
+		str = ls->text;
+		if (str == NULL) {
+			ls->text = g_memdup(ch, len+1);
+			ls->text[len] = '\0';
+			ls->textlen = len;
+		} else {
+			int  nlen = len + ls->textlen;
+			ls->text = g_realloc(ls->text, nlen+1);
+			memcpy(ls->text+ls->textlen, ch, len);
+			ls->textlen = nlen;
+			ls->text[nlen] = '\0';
+		}
+		break;
+	}
+}
+
+/*
+ * A replacement for xmlSAXParseFile that allows us to hand in
+ * a user data pointer. Taken from James Henstridge's
+ * document.
+ */
+static int 
+ourParseFile(xmlSAXHandlerPtr sax, const char *filename, void *data)
+{
+	struct mdmlstate *msp = data;
+	xmlParserCtxtPtr ctxt;
+	int  ret;
+
+	ctxt = xmlCreateFileParserCtxt(filename);
+	if (ctxt == NULL) {
+		msp->error = 1;
+
+		file_set_error(msp->file, FILE_STATUS_OPEN_FAIL,
+			_("Could not open file"), filename);
+		return -1;
+	}
+
+	ctxt->sax = sax;
+	ctxt->userData = data;
+
+	ret = xmlParseDocument(ctxt);
+	if (sax != NULL)
+		ctxt->sax = NULL;
+	xmlFreeParserCtxt(ctxt);
+
+	return ret;
+}
+
+static void 
+warning(void *data, const char *msg, ...)
+{
+	va_list args;
+	char *str;
+	struct mdmlstate *msp = data;
+
+	msp->error = 1;
+
+	va_start(args, msg);
+	str = g_strdup_vprintf(msg, args);
+	va_end(args);
+
+	if (!msp->errmsg)
+		msp->errmsg = str;
+}
+
+static void 
+error(void *data, const char *msg, ...)
+{
+	va_list args;
+	char *str;
+	struct mdmlstate *msp = data;
+
+	msp->error = 1;
+
+	va_start(args, msg);
+	str = g_strdup_vprintf(msg, args);
+	va_end(args);
+
+	if (!msp->errmsg)
+		msp->errmsg = str;
+}
+
+static void 
+fatalError(void *data, const char *msg, ...)
+{
+	va_list args;
+	char *str;
+	struct mdmlstate *msp = data;
+
+	msp->error = 1;
+
+	va_start(args, msg);
+	str = g_strdup_vprintf(msg, args);
+	va_end(args);
+
+	if (!msp->errmsg)
+		msp->errmsg = str;
 }
diff -rNu melys-0.0.14/files/mdmlread.m melys-0.0.15/files/mdmlread.m
--- melys-0.0.14/files/mdmlread.m	Sun Sep 26 20:53:58 1999
+++ melys-0.0.15/files/mdmlread.m	Sun Oct  3 12:24:46 1999
@@ -11,16 +11,15 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
 
-TODO: libxml 1.1.0 now has a working SAX parser, so this could
-      all be moved over to use that.
-
-	  Reading in files with this code is too slow mainly (I believe) because
-	  of the very large amount of memory that gets used.
+This is the new mdmlread using the SAX parser.
+It is about twice as fast as the old one and uses very
+much less memory.
 
 >>extern
 >>header <stdio.h>
 >>header <gnome-xml/tree.h>
 >>header <gnome-xml/parser.h>
+>>header <gnome-xml/parserInternals.h>
 >>header <string.h>
 >>header melfile.h
 >>header md.h
@@ -35,11 +34,22 @@
 	int  devchan;	/* Current dev/channel */
 	struct rootElement *root; /* Pointer to root of MD tree */
 	struct headElement *head; /* Pointer to head element */
-	GArray *toffsets;	/* Time offsets for each container level */
+	GStack *estack;	/* Element stack */
 	int  level;		/* Container level */
+	char *errmsg;	/* Error message */
+	char *headname;	/* A head element is in progress */
 
+	int  timebase;	/* The division time base */
 	int  program;	/* Saved program for track */
+	int  hasprogram:1;	/* Has embeded program changes */
 	int  note_seen:1;	/* Seen first note on track */
+	int  error:1;	/* Set if an error occurred reading in file */
+};
+
+struct levelstate {
+	struct element *elem;
+	char *text;
+	int  textlen;
 };
 
 >>headerdef --decl mdrw.h
@@ -51,42 +61,46 @@
 >>description
 Read in an mdml file given the filename.
 A pointer to a rootElement is returned.
-This really needs to use a SAX parser.
-At present it builds an extremely large document tree which is 
-simply thrown away, but not before it has expanded the memory
-usage of the program beyond reasonable bounds for large files.
+
 >>code
-	xmlDocPtr doc;
 	struct rootElement *root;
 	struct mdmlstate mstate;
 
 	memset(&mstate, 0, sizeof(mstate));
-	mstate.toffsets = g_array_new(0, 0, sizeof(unsigned long));
+	mstate.estack = gx_stack_new(sizeof(struct levelstate));
 	mstate.file = file;
+	mstate.root = NULL;
+	mstate.errmsg = NULL;
+	mstate.headname = NULL;
 
-	/* Will use later XXX */ init_sax_handler();
-	//doc = xmlSAXParseFile(NULL, file->name, 0);
-	doc = xmlParseFile(file->name);
+	init_sax_handler();
+	ourParseFile(&SAXhandler, file->name, &mstate);
+	/*
+	 * This can be used when v > 1.7.2 is widely available
+	xmlSAXUserParseFile(&SAXhandler, &mstate, file->name);
+	 */
+	root = mstate.root;
 
-	if (doc == NULL) {
-		file_set_error(file, FILE_STATUS_BAD_FORMAT, _("Failed to read file"));
+	if (mstate.error) {
+		file_set_error(file, FILE_STATUS_BAD_FORMAT, mstate.errmsg);
+		if (root)
+			md_free(MD_ELEMENT(root));
 		return NULL;
 	}
 
-	root = MD_ROOT(node_to_md(&mstate, doc->root));
-	xmlFreeDoc(doc);
-
 	if (root)
 		file_set_success(file);
 
+	file_check_root(root);
 	return root;
 
 >>header <stdlib.h>
 >>header midi.h
->>function node_to_md
+>>function tag_to_md
 static struct element *
 struct mdmlstate *msp;  Mdml write state
-xmlNodePtr node;  XML document to convert, or subnode in it
+const xmlChar *name;
+const xmlChar **attrs;
 
 >>description
 Take an XML document tree and convert it to an MD tree.
@@ -94,18 +108,8 @@
 
 >>code
 	struct element *retel = NULL;
-	xmlNodePtr child;
-	const char *name;
-	char *tmp;
 	unsigned long ostart = 0;
 
-	if (node->type != XML_ELEMENT_NODE)
-		return NULL;
-
-	name = node->name;
-
-	tmp = NULL;
-
 	/*
 	 * Its slightly important to have the most likely
 	 * matches appear at the top.
@@ -114,9 +118,9 @@
 		struct noteElement *note;
 		int  off;
 
-		note = md_note_new(get_note(node, "n"), get_int(node, "v"),
-			get_int(node, "len"));
-		off = get_int(node, "off");
+		note = md_note_new(get_note(attrs, "n"), get_int(attrs, "v"),
+			get_int(attrs, "len"));
+		off = get_int(attrs, "off");
 		if (off > 0)
 			note->offvel = off;
 
@@ -125,31 +129,32 @@
 		retel = MD_ELEMENT(note);
 
 	} else if (strcmp(name, "control") == 0) {
-		retel = MD_ELEMENT(md_control_new(get_int(node, "n"),
-				  get_int(node, "v")));
+		retel = MD_ELEMENT(md_control_new(get_int(attrs, "n"),
+				  get_int(attrs, "v")));
 
 	} else if (strcmp(name, "program") == 0) {
-		retel = MD_ELEMENT(md_program_new(get_int(node, "program")));
+		int  number;
+
+		number = get_int(attrs, "program");
+		retel = MD_ELEMENT(md_program_new(number));
 		if (!msp->note_seen)
-			msp->program = get_int(node, "program");
+			msp->program = number;
+		msp->hasprogram = TRUE;
 
 	} else if (strcmp(name, "pitch") == 0) {
-		retel = MD_ELEMENT(md_pitch_new(get_int(node, "p")));
+		retel = MD_ELEMENT(md_pitch_new(get_int(attrs, "p")));
 
 	} else if (strcmp(name, "keytouch") == 0) {
 		retel = MD_ELEMENT(
-			md_keytouch_new(get_int(node, "n"), get_int(node, "v")));
+			md_keytouch_new(get_int(attrs, "n"), get_int(attrs, "v")));
 
 	} else if (strcmp(name, "pressure") == 0) {
-		retel = MD_ELEMENT( md_pressure_new(get_int(node, "v")));
+		retel = MD_ELEMENT( md_pressure_new(get_int(attrs, "v")));
 
 	} else if (strcmp(name, "sysex") == 0) {
 		struct sysexElement *sep;
-		unsigned char *data;
-		int  len;
 
-		data = get_hex_data(tmp=xmlNodeGetContent(node->childs), &len);
-		sep = md_sysex_new(data[0], data+1, len - 1);
+		sep = md_sysex_new(0, NULL, 0);
 
 		retel = MD_ELEMENT(sep);
 
@@ -165,26 +170,17 @@
 		retel = MD_ELEMENT(msp->head);
 
 	} else if (strcmp(name, "version") == 0) {
-		msp->head->ver_major = get_int(node, "major");
-		msp->head->ver_minor = get_int(node, "minor");
+		msp->head->ver_major = get_int(attrs, "major");
+		msp->head->ver_minor = get_int(attrs, "minor");
 
 	} else if (strcmp(name, "format") == 0) {
-		msp->head->format = get_int(node, "type");
+		msp->head->format = get_int(attrs, "type");
 
+#ifndef MELYS_NO_COMPAT
+	/* This is the old way of doing it */
 	} else if (strcmp(name, "timebase") == 0) {
-		msp->head->time_base = get_int(node, "division");
-
-	} else if (strcmp(name, "COPYRIGHT") == 0) {
-		msp->head->copyright = g_strdup(xmlNodeGetContent(node));
-
-	} else if (strcmp(name, "title") == 0) {
-		msp->head->title = xmlNodeGetContent(node);
-
-	} else if (strcmp(name, "author") == 0) {
-		msp->head->author = xmlNodeGetContent(node);
-
-	} else if (strcmp(name, "comment") == 0) {
-		msp->head->comment = xmlNodeGetContent(node);
+		msp->timebase = get_int(attrs, "division");
+#endif
 
 	} else if (strcmp(name, "track") == 0) {
 		struct trackElement *tp;
@@ -194,26 +190,35 @@
 		msp->maxtime = 0;
 		msp->devchan = 0;
 		msp->program = 0;
+		msp->hasprogram = 0;
 		msp->note_seen = 0;
 
 		tp = md_track_new();
-		tp->name = xmlGetProp(node, "name");
-		res = get_int(node, "program");
+		tp->name = g_strdup(get_str(attrs, "name"));
+		res = get_int(attrs, "program");
 		if (res >= 0)
 			msp->program = res;
 		retel = MD_ELEMENT(tp);
 
 	} else if (strcmp(name, "tempomap") == 0) {
 		struct tempomapElement *tmap;
+		int  timebase;
+
 		tmap = md_tempomap_new();
+		timebase = get_int(attrs, "ppq");
+		if (timebase > 0)
+			tmap->timebase = timebase;
+		else
+			tmap->timebase = msp->timebase; /* Old compat */
+
 		retel = MD_ELEMENT(tmap);
 
 	} else if (strcmp(name, "part") == 0) {
 		struct partElement *pp;
 		int  id;
 		pp = md_part_new();
-		pp->name = xmlGetProp(node, "name");
-		id = get_int(node, "id");
+		pp->name = g_strdup(get_str(attrs, "name"));
+		id = get_int(attrs, "id");
 		if (id > 0)
 			pp->id = id;
 		retel = MD_ELEMENT(pp);
@@ -222,14 +227,14 @@
 		struct takeElement *tp;
 
 		tp = md_take_new();
-		tp->name = xmlGetProp(node, "name");
+		tp->name = g_strdup(get_str(attrs, "name"));
 		retel = MD_ELEMENT(tp);
 
 	} else if (strcmp(name, "tempo") == 0) {
 		struct tempoElement *tp;
 		int  us;
 		double bpm;
-		bpm = get_double(node, "bpm");
+		bpm = get_double(attrs, "bpm");
 		if (bpm) {
 			us = 60000000/bpm;
 			tp = md_tempo_new(us);
@@ -242,14 +247,13 @@
 		int  clocks, n32pq;
 		CHAR *prop;
 
-		prop = xmlGetProp(node, "signature");
+		prop = get_str(attrs, "signature");
 		sscanf(prop, "%d/%d", &top, &bottom);
-		clocks = get_int(node, "clocks");
-		n32pq = get_int(node, "n32PerQuarter");
+		clocks = get_int(attrs, "clocks");
+		n32pq = get_int(attrs, "n32PerQuarter");
 
 		tsp = md_timesig_new(top, bottom, clocks, n32pq);
 		retel = MD_ELEMENT(tsp);
-		free(prop);
 		
 	} else if (strcmp(name, "keysignature") == 0) {
 		struct keysigElement *ksp;
@@ -257,8 +261,8 @@
 		CHAR *mode;
 		int  m;
 
-		key = xmlGetProp(node, "key");
-		mode = xmlGetProp(node, "mode");
+		key = get_str(attrs, "key");
+		mode = get_str(attrs, "mode");
 		if (mode && strcmp(mode, "minor") == 0)
 			m = 1;
 		else
@@ -266,15 +270,13 @@
 
 		ksp = md_keysig_new(atoi(key), m);
 		retel = MD_ELEMENT(ksp);
-		free(key);
-		free(mode);
 
 	} else if (strcmp(name, "smpte") == 0) {
 		CHAR *off;
 		struct smpteoffsetElement *sp;
 		int  hours, minutes, seconds, frames, subframes;
 
-		off = xmlGetProp(node, "offset");
+		off = get_str(attrs, "offset");
 		if (off == NULL)
 			off = "0:0:0:0:0";
 
@@ -284,46 +286,50 @@
 		sp = md_smpteoffset_new(hours, minutes, seconds, frames, subframes);
 		retel = MD_ELEMENT(sp);
 
-		free(off);
-
 	} else if (strcmp(name, "text") == 0) {
-		retel = MD_ELEMENT(md_text_new(MIDI_META_TEXT,
-			tmp = xmlNodeGetContent(node)));
+		retel = MD_ELEMENT(md_text_new(MIDI_META_TEXT, NULL));
 
 	} else if (strcmp(name, "copyright") == 0) {
-		retel = MD_ELEMENT(md_text_new(MIDI_META_COPYRIGHT,
-			tmp = xmlNodeGetContent(node)));
+		retel = MD_ELEMENT(md_text_new(MIDI_META_COPYRIGHT, NULL));
 
 	} else if (strcmp(name, "trackname") == 0) {
-		retel = MD_ELEMENT(md_text_new(MIDI_META_TRACKNAME,
-			tmp = xmlNodeGetContent(node)));
+		retel = MD_ELEMENT(md_text_new(MIDI_META_TRACKNAME, NULL));
 
 	} else if (strcmp(name, "instrument") == 0) {
-		retel = MD_ELEMENT(md_text_new(MIDI_META_INSTRUMENT,
-			tmp = xmlNodeGetContent(node)));
+		retel = MD_ELEMENT(md_text_new(MIDI_META_INSTRUMENT, NULL));
 
 	} else if (strcmp(name, "lyric") == 0) {
-		retel = MD_ELEMENT(md_text_new(MIDI_META_LYRIC,
-			tmp = xmlNodeGetContent(node)));
+		retel = MD_ELEMENT(md_text_new(MIDI_META_LYRIC, NULL));
 
 	} else if (strcmp(name, "marker") == 0) {
-		retel = MD_ELEMENT(md_text_new(MIDI_META_MARKER,
-			tmp = xmlNodeGetContent(node)));
+		retel = MD_ELEMENT(md_text_new(MIDI_META_MARKER, NULL));
 
 	} else if (strcmp(name, "cuepoint") == 0) {
-		retel = MD_ELEMENT(md_text_new(MIDI_META_CUE,
-			tmp = xmlNodeGetContent(node)));
+		retel = MD_ELEMENT(md_text_new(MIDI_META_CUE, NULL));
+
+	} else if (strcmp(name, "COPYRIGHT") == 0) {
+		retel = NULL;
+		msp->headname = g_strdup(name);
+
+	} else if (strcmp(name, "title") == 0) {
+		retel = NULL;
+		msp->headname = g_strdup(name);
+
+	} else if (strcmp(name, "author") == 0) {
+		retel = NULL;
+		msp->headname = g_strdup(name);
+
+	} else if (strcmp(name, "comment") == 0) {
+		retel = NULL;
+		msp->headname = g_strdup(name);
 
 	} else {
 		printf("Unknown node name %s\n", name);
 		return NULL;
 	}
 
-	if (tmp)
-		free(tmp);
-
 	/* Set common attributes like time */
-	common_atts(msp, node, retel);	
+	common_atts(msp, attrs, retel);	
 
 	if (retel && iscontainer(retel)) {
 		ostart = msp->starttime;
@@ -331,39 +337,13 @@
 		msp->maxtime = 0;
 	}
 
-	for (child = node->childs; child; child = child->next) {
-		struct element *el;
-
-		el = node_to_md(msp, child);
-		if (el == NULL)
-			continue;
-		md_add_elem(MD_CONTAINER(retel), el);
-	}
-
-	if (retel && iscontainer(retel)) {
-		unsigned long dur = 0;
-
-		if (msp->maxtime > retel->element_time)
-			dur = msp->maxtime - retel->element_time;
-		if (MD_CONTAINER(retel)->duration > dur)
-			dur = MD_CONTAINER(retel)->duration;
-
-		if (retel->type == MD_TYPE_TRACK) {
-			MD_TRACK(retel)->program = msp->program;
-		}
-
-		MD_CONTAINER(retel)->duration = dur;
-		msp->currtime = msp->starttime + dur;
-		msp->starttime = ostart;
-	}
-
 	return retel;
 
 
 >>function common_atts
 static void
 struct mdmlstate *msp;
-xmlNodePtr node; Node to examine for attributes
+const xmlChar **attrs; Node to examine for attributes
 struct element *el; Element to set attributes
 
 >>description
@@ -372,20 +352,30 @@
 to almost any element.
 
 >>code
+	int  i;
 	int  ival;
-	char *str;
 	unsigned long t;
 
-	if (node == NULL || el == NULL)
+	if (attrs == NULL || el == NULL)
 		return;
 
-	ival = get_int(node, "t");
-	if (ival == -1)
-		ival = msp->currtime;
-	else
-		msp->currtime = msp->starttime + ival;
-	el->element_time = msp->currtime;
+	for (i = 0; attrs[i] != NULL; i += 2) {
+		if (strcmp(attrs[i], "t") == 0) {
+			ival = atoi(attrs[i+1]);
+			msp->currtime = msp->starttime + ival;
+		} else if (strcmp(attrs[i], "channel") == 0) {
+			msp->devchan = atoi(attrs[i+1]);
+#if 1
+		} else if (iscontainer(el) && strcmp(attrs[i], "duration") == 0) {
+			MD_CONTAINER(el)->duration = atoi(attrs[i+1]);
+#endif
+		} else if (strcmp(attrs[i], "selected") == 0) {
+			if (strcmp(attrs[i+1], "yes") == 0)
+				MD_SET_SELECTED(el, TRUE);
+		}
+	}
 
+	el->element_time = msp->currtime;
 	/*
 	 * Update the max time for this container.
 	 */
@@ -395,24 +385,32 @@
 	if (t > msp->maxtime)
 		msp->maxtime = t;
 
-	ival = get_int(node, "channel");
-	if (ival != -1)
-		msp->devchan = ival;
 	el->device_channel = msp->devchan;
 
-	ival = get_int(node, "duration");
-	if (ival != -1)
-		MD_CONTAINER(el)->duration = ival;
-
-	str = xmlGetProp(node, "selected");
-	if (str && strcmp(str, "yes") == 0)
-		MD_SET_SELECTED(el, TRUE);
-	
+
+>>function get_str
+static xmlChar *
+const xmlChar **attrs;
+const xmlChar *name;	Name of attribute to find
+
+>>code
+	int  i;
+
+	if (!attrs)
+		return NULL;
+
+	for (i = 0; attrs[i] != NULL; i += 2) {
+		if (strcmp(attrs[i], name) == 0)
+			return (xmlChar *)attrs[i+1];
+	}
+
+	return NULL;
+
 
 >>function get_int
 static int
-xmlNodePtr node; Node to be examined
-char *name; Name of attribute
+const xmlChar **attrs; Node to be examined
+const xmlChar *name; Name of attribute
 
 >>description
 Return an attribute, converted to an integer.
@@ -422,51 +420,49 @@
 	CHAR *cp;
 	int  n;
 
-	cp = xmlGetProp(node, name);
+	cp = get_str(attrs, name);
 	if (cp == NULL)
 		return -1;
 
 	n = atoi(cp);
-	free(cp);
 
 	return n;
 
 >>function get_double
 static double
-xmlNodePtr node;  Node to get property from
-char  *name;      Name of property to get
+const xmlChar **attrs;  Node to get property from
+const xmlChar  *name;      Name of property to get
 >>description
 Get a property from a node and convert it to a double value.
 
 >>code
-	CHAR *cp;
+	xmlChar *cp;
 	double d;
 
-	cp = xmlGetProp(node, name);
+	cp = get_str(attrs, name);
 	if (cp == NULL)
 		return 0.0;
 
 	d = strtod(cp, NULL);
-	free(cp);
 
 	return d;
 
 
 >>function get_note
 static int
-xmlNodePtr node;  Node for this note
-char *name;       Name of property to get
+const xmlChar **attrs;  Node for this note
+const xmlChar *name;       Name of property to get
 >>description
 Get the note value from the specified note name.
 
 >>code
-	CHAR *note;
+	xmlChar *note;
 	int  base;
 	int  oct;
-	CHAR *cp;
+	xmlChar *cp;
 	int  n;
 
-	note = xmlGetProp(node, name);
+	note = get_str(attrs, name);
 	if (note == NULL)
 		return 0;
 
@@ -494,9 +490,8 @@
 		break;
 	case '0': case '1': case '2': case '3': case '4':
 	case '5': case '6': case '7': case '8': case '9':
-		// This is not really a name at all
+		/* This is not really a name at all */
 		n = atoi(note);
-		free(note);
 		return n;
 	default:
 		base = 0;
@@ -511,8 +506,6 @@
 	}
 	oct = atoi(cp);
 
-	free(note);
-
 	return base + oct*12;
 
 
@@ -553,27 +546,321 @@
 Initialise the SAX handler callback set.
 This only needs to be done once.
 
-There seems to be no point in doing this.
-The whole point of using an event driver interface is to avoid building
-up a tree in memory, but gnome-xml appears to do this anyway.
-So we may as well just traverse that.
+>>code
+	static xmlSAXHandler zerosax;
+
+	SAXhandler = zerosax;
+
+	SAXhandler.startDocument = startDocument;
+	SAXhandler.endDocument = endDocument;
+
+	SAXhandler.startElement = startElement;
+	SAXhandler.endElement = endElement;
+
+	SAXhandler.getEntity = getEntity;
+	SAXhandler.warning = warning;
+	SAXhandler.error = error;
+	SAXhandler.fatalError = fatalError;
+	SAXhandler.characters = characters;
+
+>>function startDocument
+static void
+void *data;
+
+>>function endDocument
+static void
+void *data;
+
+
+>>function startElement
+static void
+void *data;
+const xmlChar *name;
+const xmlChar **attrs;
 
 >>code
+	struct containerElement *con;
+	struct element *el;
+	struct levelstate state;
+	struct levelstate *ls;
+	struct mdmlstate *msp = data;
+
+	el = tag_to_md(msp, name, attrs);
+
+	ls = (struct levelstate *)gx_stack_top(msp->estack);
+	if (ls) {
+		con = MD_CONTAINER(ls->elem);
+
+		g_assert(iscontainer(con));
+
+		if (el)
+			md_add_elem(con, el);
+	}
+
+	state.elem = el;
+	state.text = NULL;
+	state.textlen = 0;
+	msp->headname = NULL;
+	gx_stack_push(msp->estack, (gpointer) &state);
+
+
+>>function endElement
+static void
+void *data;
+const xmlChar *name;
+
+>>code
+	struct levelstate *ls;
+	struct mdmlstate *msp = data;
+	struct element *el;
+	struct textElement *te;
+
+	ls = gx_stack_top(msp->estack);
+
+	el = ls->elem;
+	te = NULL;
+	if (el) {
+		if (MD_TYPE(el) == MD_TYPE_TRACK)
+			MD_TRACK(el)->hasprogram = msp->hasprogram;
+		else if (MD_TYPE(el) == MD_TYPE_TEXT)
+			te = MD_TEXT(el);
+
+		if (iscontainer(el)) {
+
+			if (el->type == MD_TYPE_TRACK)
+				MD_TRACK(el)->program = msp->program;
+
+			msp->currtime = MD_ENDTIME(el);
+		}
+	}
+
+
+	if (ls->text) {
+		if (strcmp(name, "sysex") == 0) {
+			unsigned char *data;
+			struct sysexElement *se;
+			int  len;
+
+			data = get_hex_data(ls->text, &len);
+			if (data && len > 0) {
+				se = MD_SYSEX(ls->elem);
+				se->status = data[0];
+				se->data = g_memdup(data+1, len-1);
+				se->length = len - 1;
+			}
+			g_free(ls->text);
+
+		} else if (strcmp(name, "COPYRIGHT") == 0) {
+			msp->head->copyright = ls->text;
+
+		} else if (strcmp(name, "title") == 0) {
+			msp->head->title = ls->text;
+
+		} else if (strcmp(name, "author") == 0) {
+			msp->head->author = ls->text;
+
+		} else if (strcmp(name, "comment") == 0) {
+			msp->head->comment = ls->text;
+
+		} else if (strcmp(name, "text") == 0) {
+			te->type = MIDI_META_TEXT;
+			te->name = md_textname(MIDI_META_TEXT);
+			te->text = ls->text;
+			te->length = ls->textlen;
+
+		} else if (strcmp(name, "copyright") == 0) {
+			te->type = MIDI_META_COPYRIGHT;
+			te->name = md_textname(MIDI_META_COPYRIGHT);
+			te->text = ls->text;
+			te->length = ls->textlen;
+
+		} else if (strcmp(name, "trackname") == 0) {
+			te->type = MIDI_META_TRACKNAME;
+			te->name = md_textname(MIDI_META_TRACKNAME);
+			te->text = ls->text;
+			te->length = ls->textlen;
+
+		} else if (strcmp(name, "instrument") == 0) {
+			te->type = MIDI_META_INSTRUMENT;
+			te->name = md_textname(MIDI_META_INSTRUMENT);
+			te->text = ls->text;
+			te->length = ls->textlen;
+
+		} else if (strcmp(name, "lyric") == 0) {
+			te->type = MIDI_META_LYRIC;
+			te->name = md_textname(MIDI_META_LYRIC);
+			te->text = ls->text;
+			te->length = ls->textlen;
+
+		} else if (strcmp(name, "marker") == 0) {
+			te->type = MIDI_META_MARKER;
+			te->name = md_textname(MIDI_META_MARKER);
+			te->text = ls->text;
+			te->length = ls->textlen;
+
+		} else if (strcmp(name, "cuepoint") == 0) {
+			te->type = MIDI_META_CUE;
+			te->name = md_textname(MIDI_META_CUE);
+			te->text = ls->text;
+			te->length = ls->textlen;
+
+			
+		} else if (ls->text) {
+			g_free(ls->text);
+		}
+	}
+
+	gx_stack_pop(msp->estack, NULL);
+	if (el && iscontainer(el)) {
+		ls = gx_stack_top(msp->estack);
+		if (ls && ls->elem)
+			msp->starttime = MD_TIME(ls->elem);
+	}
+
+
+>>function getEntity
+static xmlEntityPtr
+void *data;
+const CHAR *name;
+>>code
+    return xmlGetPredefinedEntity(name);
+
+
+>>function characters
+static void
+void *data;
+const xmlChar *ch;
+int  len;
+
+>>code
+	struct levelstate *ls;
+	struct mdmlstate *msp = data;
+	struct element *el;
+	char *str;
+	int  type;
+
+	ls = gx_stack_top(msp->estack);
+	el = ls->elem;
+	if (el)
+		type = MD_TYPE(el);
+	else
+		type = -1;
+
+	switch (type) {
+	case MD_TYPE_NOTE:
+	case MD_TYPE_CONTROL:
+		/* if we know that there is no content then don't save */
+		ls->text = NULL;
+		ls->textlen = 0;
+		break;
+	default:
+		str = ls->text;
+		if (str == NULL) {
+			ls->text = g_memdup(ch, len+1);
+			ls->text[len] = '\0';
+			ls->textlen = len;
+		} else {
+			int  nlen = len + ls->textlen;
+			ls->text = g_realloc(ls->text, nlen+1);
+			memcpy(ls->text+ls->textlen, ch, len);
+			ls->textlen = nlen;
+			ls->text[nlen] = '\0';
+		}
+		break;
+	}
+
+>>function ourParseFile
+static int
+xmlSAXHandlerPtr sax;
+const char *filename;
+void *data;
+
+>>description
+A replacement for xmlSAXParseFile that allows us
+to hand in a user data pointer.
+Taken from James Henstridge's document.
+>>code
+	struct mdmlstate *msp = data;
+	xmlParserCtxtPtr ctxt;
+	int  ret;
+
+	ctxt = xmlCreateFileParserCtxt(filename);
+	if (ctxt == NULL) {
+		msp->error = 1;
+
+		file_set_error(msp->file, FILE_STATUS_OPEN_FAIL,
+			_("Could not open file"), filename);
+		return -1;
+	}
+
+	ctxt->sax = sax;
+	ctxt->userData = data;
+
+	ret = xmlParseDocument(ctxt);
+	if (sax != NULL)
+		ctxt->sax = NULL;
+	xmlFreeParserCtxt(ctxt);
+
+	return ret;
+
+
+>>function warning
+static void
+void *data;
+const char *msg;
+...
+
+>>code
+	va_list args;
+	char *str;
+	struct mdmlstate *msp = data;
+
+	msp->error = 1;
+
+	va_start(args, msg);
+	str = g_strdup_vprintf(msg, args);
+	va_end(args);
+
+	if (!msp->errmsg)
+		msp->errmsg = str;
+
+>>function error
+static void
+void *data;
+const char *msg;
+...
+
+>>code
+	va_list args;
+	char *str;
+	struct mdmlstate *msp = data;
+
+	msp->error = 1;
+
+	va_start(args, msg);
+	str = g_strdup_vprintf(msg, args);
+	va_end(args);
+
+	if (!msp->errmsg)
+		msp->errmsg = str;
+
+>>function fatalError
+static void
+void *data;
+const char *msg;
+...
+
+>>code
+	va_list args;
+	char *str;
+	struct mdmlstate *msp = data;
+
+	msp->error = 1;
+
+	va_start(args, msg);
+	str = g_strdup_vprintf(msg, args);
+	va_end(args);
+
+	if (!msp->errmsg)
+		msp->errmsg = str;
 
-#if 0
-    SAXhandler.resolveEntity = NULL;
-    SAXhandler.notationDecl = NULL;
-    SAXhandler.unparsedEntityDecl = NULL;
-    SAXhandler.setDocumentLocator = NULL;
-    SAXhandler.startDocument = NULL;
-    SAXhandler.endDocument = NULL;
-    SAXhandler.startElement = NULL;
-    SAXhandler.endElement = NULL;
-    SAXhandler.attribute = NULL;
-    SAXhandler.characters = NULL;
-    SAXhandler.ignorableWhitespace = NULL;
-    SAXhandler.processingInstruction = NULL;
-    SAXhandler.warning = NULL;
-    SAXhandler.error = NULL;
-    SAXhandler.fatalError = NULL;
-#endif
diff -rNu melys-0.0.14/files/mdmlwrite.c melys-0.0.15/files/mdmlwrite.c
--- melys-0.0.14/files/mdmlwrite.c	Tue Sep 28 16:09:33 1999
+++ melys-0.0.15/files/mdmlwrite.c	Sun Oct  3 12:54:31 1999
@@ -103,6 +103,9 @@
 		case MD_TYPE_HEAD:
 			{
 			struct headElement *headel;
+#ifdef NO_COMPAT
+			struct tempomapElement *tempomap;
+#endif
 
 			headel = MD_HEAD(el);
 
@@ -117,8 +120,11 @@
 
 			node = xmlNewChild(head, 0, "format", 0);
 			set_prop_int(node, "type", headel->format);
+#ifdef NO_COMPAT
 			node = xmlNewChild(head, 0, "timebase", 0);
-			set_prop_int(node, "division", headel->time_base);
+			tempomap = md_get_tempomap(root);
+			set_prop_int(node, "division", tempomap->timebase);
+#endif
 
 			if (headel->title)
 				node = xmlNewChild(head, 0, "title", headel->title);
@@ -144,6 +150,7 @@
 			break;
 		case MD_TYPE_TEMPOMAP:
 			xtrack = xmlNewChild(doc->root, 0, "tempomap", 0);
+			set_prop_int(xtrack, "ppq", MD_TEMPOMAP(el)->timebase);
 			mstate.starttime = 0;
 			build_section(&mstate, xtrack, MD_CONTAINER(el));
 			break;
diff -rNu melys-0.0.14/files/mdmlwrite.m melys-0.0.15/files/mdmlwrite.m
--- melys-0.0.14/files/mdmlwrite.m	Wed Sep 22 20:49:31 1999
+++ melys-0.0.15/files/mdmlwrite.m	Sat Oct  2 20:17:45 1999
@@ -85,6 +85,9 @@
 		case MD_TYPE_HEAD:
 			{
 			struct headElement *headel;
+#ifdef NO_COMPAT
+			struct tempomapElement *tempomap;
+#endif
 
 			headel = MD_HEAD(el);
 
@@ -99,8 +102,11 @@
 
 			node = xmlNewChild(head, 0, "format", 0);
 			set_prop_int(node, "type", headel->format);
+#ifdef NO_COMPAT
 			node = xmlNewChild(head, 0, "timebase", 0);
-			set_prop_int(node, "division", headel->time_base);
+			tempomap = md_get_tempomap(root);
+			set_prop_int(node, "division", tempomap->timebase);
+#endif
 
 			if (headel->title)
 				node = xmlNewChild(head, 0, "title", headel->title);
@@ -126,6 +132,7 @@
 			break;
 		case MD_TYPE_TEMPOMAP:
 			xtrack = xmlNewChild(doc->root, 0, "tempomap", 0);
+			set_prop_int(xtrack, "ppq", MD_TEMPOMAP(el)->timebase);
 			mstate.starttime = 0;
 			build_section(&mstate, xtrack, MD_CONTAINER(el));
 			break;
diff -rNu melys-0.0.14/files/midiread.c melys-0.0.15/files/midiread.c
--- melys-0.0.14/files/midiread.c	Tue Sep 28 16:09:33 1999
+++ melys-0.0.15/files/midiread.c	Sun Oct  3 12:54:31 1999
@@ -53,9 +53,10 @@
 	struct rootElement *root;	/* Pointer into the root */
 
 	char *trackname;	/* Saved track name */
-	char lsb_bank;		/* LSB of bank select */
-	char msb_bank;		/* MSB of bank select */
+	guchar lsb_bank;		/* LSB of bank select */
+	guchar msb_bank;		/* MSB of bank select */
 	int  program;		/* Track program applying to whole track */
+	int  hasprogram;	/* Has a program change on the track */
 	int  track_devchan;	/* Track device channel */
 
 	int  note_seen:1;   /* Note has been seen for this track */
@@ -77,6 +78,7 @@
 static struct element *save_note(struct midistate *msp, int note, int vel);
 static void finish_note(struct midistate *msp, int note, int offvel);
 static void skip_chunk(struct midistate *msp);
+static void bad_eof(struct midistate *msp, char *type);
 
 
 /*
@@ -117,6 +119,7 @@
 	if (root)
 		file_set_success(file);
 
+	file_check_root(root);
 	return root;
 }
 
@@ -229,7 +232,7 @@
 
 	head->format = read_int(msp, 2);
 	msp->num_chunks = read_int(msp, 2);
-	head->time_base = read_int(msp, 2);
+	msp->tempo_map->timebase = read_int(msp, 2);
 
 	/* Should skip any extra bytes, (may not be seekable) */
 	while (length > 6) {
@@ -277,6 +280,7 @@
 	msp->lsb_bank = 0;
 	msp->msb_bank = 0;
 	msp->program = 0;
+	msp->hasprogram = 0;
 	msp->note_seen = 0;
 	msp->track_devchan = -1;
 	msp->port = 0;
@@ -320,7 +324,10 @@
 	MD_ELEMENT(part)->device_channel = msp->track_devchan;
 
 	track->name = msp->trackname;
-	track->program = msp->program;
+	if (msp->hasprogram) {
+		track->program = msp->program;
+		track->hasprogram = TRUE;
+	}
 
 	MD_CONTAINER(track)->duration = msp->track_duration;
 	msp->track_duration = 0;
@@ -344,7 +351,8 @@
 	int  type;
 	int  device;
 	int  length;
-	short note, vel, control, val;
+	short note, vel, control;
+	int  val;
 	unsigned char *data;
 	struct element *el;
 
@@ -407,10 +415,10 @@
 		 */
 		switch (control) {
 		case 0:	/* MSB Bank */
-			msp->msb_bank = val;
+			msp->msb_bank = (val & 0x7f);
 			break;
 		case 32: /* LSB Bank */
-			msp->lsb_bank = val;
+			msp->lsb_bank = (val & 0x7f);
 			break;
 		default:
 			el = MD_ELEMENT(md_control_new(control, val));
@@ -421,11 +429,13 @@
 	
 	case MIDI_PATCH:
 		val = read_int(msp, 1);
-		val += msp->lsb_bank << 7;
-		val += msp->msb_bank << 14;
+		val &= 0x7f;
+		val |= msp->lsb_bank << 7;
+		val |= msp->msb_bank << 14;
 		el = MD_ELEMENT(md_program_new(val));
 		if (!msp->note_seen)
 			msp->program = val;
+		msp->hasprogram = TRUE;
 		break;
 
 	case MIDI_CHANNEL_AFTERTOUCH:
@@ -578,10 +588,10 @@
 	for (i = 0; i < n; i++) {
 		val <<= 8;
 		c = getc(msp->fp);
-		msp->chunk_count++;
 		if (c == -1)
-			ethrow(&msp->error, _("Unexpected end of file"));
+			bad_eof(msp, "int");
 
+		msp->chunk_count++;
 		val |= c;
 	}
 
@@ -602,12 +612,17 @@
 
 	unsigned char *data = g_malloc(length+1);
 
+	if (length == 0) {
+		data[0] = 0;
+		return data;
+	}
+
 	if (fread(data, length, 1, msp->fp) == 1) {
 		msp->chunk_count += length;
 		data[length] = '\0';
 		return data;
 	} else {
-		ethrow(&msp->error, _("Unexpected end of file"));
+		bad_eof(msp, "data");
 		/*NOTREACHED*/
 	}
 	return NULL;
@@ -630,9 +645,10 @@
 	val = 0;
 	do {
 		c = getc(msp->fp);
-		msp->chunk_count++;
 		if (c == -1)
-			ethrow(&msp->error, _("Unexpected end of file"));
+			bad_eof(msp, "variable");
+
+		msp->chunk_count++;
 		val <<= 7;
 		val |= (c & 0x7f);
 	} while ((c & 0x80) == 0x80);
@@ -733,4 +749,14 @@
 
 	while (msp->chunk_count < msp->chunk_size)
 		(void) read_int(msp, 1);
+}
+
+static void 
+bad_eof(struct midistate *msp, char *type)
+{
+
+	ethrow(&msp->error,
+		_("Unexpected end of file\n"
+		"  (offset %d/%d, type %s)\n"
+		), msp->chunk_count, msp->chunk_size, type);
 }
diff -rNu melys-0.0.14/files/midiread.m melys-0.0.15/files/midiread.m
--- melys-0.0.14/files/midiread.m	Sun Sep 26 21:29:04 1999
+++ melys-0.0.15/files/midiread.m	Sat Oct  2 20:17:45 1999
@@ -84,9 +84,10 @@
 	struct rootElement *root;	/* Pointer into the root */
 
 	char *trackname;	/* Saved track name */
-	char lsb_bank;		/* LSB of bank select */
-	char msb_bank;		/* MSB of bank select */
+	guchar lsb_bank;		/* LSB of bank select */
+	guchar msb_bank;		/* MSB of bank select */
 	int  program;		/* Track program applying to whole track */
+	int  hasprogram;	/* Has a program change on the track */
 	int  track_devchan;	/* Track device channel */
 
 	int  note_seen:1;   /* Note has been seen for this track */
@@ -133,6 +134,7 @@
 	if (root)
 		file_set_success(file);
 
+	file_check_root(root);
 	return root;
 
 >>function midi_read
@@ -245,7 +247,7 @@
 
 	head->format = read_int(msp, 2);
 	msp->num_chunks = read_int(msp, 2);
-	head->time_base = read_int(msp, 2);
+	msp->tempo_map->timebase = read_int(msp, 2);
 
 	/* Should skip any extra bytes, (may not be seekable) */
 	while (length > 6) {
@@ -292,6 +294,7 @@
 	msp->lsb_bank = 0;
 	msp->msb_bank = 0;
 	msp->program = 0;
+	msp->hasprogram = 0;
 	msp->note_seen = 0;
 	msp->track_devchan = -1;
 	msp->port = 0;
@@ -335,7 +338,10 @@
 	MD_ELEMENT(part)->device_channel = msp->track_devchan;
 
 	track->name = msp->trackname;
-	track->program = msp->program;
+	if (msp->hasprogram) {
+		track->program = msp->program;
+		track->hasprogram = TRUE;
+	}
 
 	MD_CONTAINER(track)->duration = msp->track_duration;
 	msp->track_duration = 0;
@@ -358,7 +364,8 @@
 	int  type;
 	int  device;
 	int  length;
-	short note, vel, control, val;
+	short note, vel, control;
+	int  val;
 	unsigned char *data;
 	struct element *el;
 
@@ -421,10 +428,10 @@
 		 */
 		switch (control) {
 		case 0:	/* MSB Bank */
-			msp->msb_bank = val;
+			msp->msb_bank = (val & 0x7f);
 			break;
 		case 32: /* LSB Bank */
-			msp->lsb_bank = val;
+			msp->lsb_bank = (val & 0x7f);
 			break;
 		default:
 			el = MD_ELEMENT(md_control_new(control, val));
@@ -435,11 +442,13 @@
 	
 	case MIDI_PATCH:
 		val = read_int(msp, 1);
-		val += msp->lsb_bank << 7;
-		val += msp->msb_bank << 14;
+		val &= 0x7f;
+		val |= msp->lsb_bank << 7;
+		val |= msp->msb_bank << 14;
 		el = MD_ELEMENT(md_program_new(val));
 		if (!msp->note_seen)
 			msp->program = val;
+		msp->hasprogram = TRUE;
 		break;
 
 	case MIDI_CHANNEL_AFTERTOUCH:
@@ -589,10 +598,10 @@
 	for (i = 0; i < n; i++) {
 		val <<= 8;
 		c = getc(msp->fp);
-		msp->chunk_count++;
 		if (c == -1)
-			ethrow(&msp->error, _("Unexpected end of file"));
+			bad_eof(msp, "int");
 
+		msp->chunk_count++;
 		val |= c;
 	}
 
@@ -611,12 +620,17 @@
 
 	unsigned char *data = g_malloc(length+1);
 
+	if (length == 0) {
+		data[0] = 0;
+		return data;
+	}
+
 	if (fread(data, length, 1, msp->fp) == 1) {
 		msp->chunk_count += length;
 		data[length] = '\0';
 		return data;
 	} else {
-		ethrow(&msp->error, _("Unexpected end of file"));
+		bad_eof(msp, "data");
 		/*NOTREACHED*/
 	}
 	return NULL;
@@ -636,9 +650,10 @@
 	val = 0;
 	do {
 		c = getc(msp->fp);
-		msp->chunk_count++;
 		if (c == -1)
-			ethrow(&msp->error, _("Unexpected end of file"));
+			bad_eof(msp, "variable");
+
+		msp->chunk_count++;
 		val <<= 7;
 		val |= (c & 0x7f);
 	} while ((c & 0x80) == 0x80);
@@ -733,3 +748,14 @@
 	while (msp->chunk_count < msp->chunk_size)
 		(void) read_int(msp, 1);
 
+>>function bad_eof
+static void
+struct midistate *msp;
+char *type;
+
+>>code
+
+	ethrow(&msp->error,
+		_("Unexpected end of file\n"
+		"  (offset %d/%d, type %s)\n"
+		), msp->chunk_count, msp->chunk_size, type);
diff -rNu melys-0.0.14/files/midiwrite.c melys-0.0.15/files/midiwrite.c
--- melys-0.0.14/files/midiwrite.c	Tue Sep 28 16:09:34 1999
+++ melys-0.0.15/files/midiwrite.c	Sun Oct  3 12:54:32 1999
@@ -141,6 +141,9 @@
 	case MD_TYPE_ROOT:
 		if (flags & MD_WALK_START) {
 			int  nchunks;
+			struct tempomapElement *tempomap;
+
+			tempomap = md_get_tempomap(msp->root);
 
 			put_int(msp, 4, MIDI_HEAD_MAGIC);
 			put_int(msp, 4, 6);	/* Header length, always 6 */
@@ -149,7 +152,7 @@
 			if (msp->root->head->format == 1)
 				nchunks++;
 			put_int(msp, 2, nchunks);
-			put_int(msp, 2, msp->root->head->time_base);
+			put_int(msp, 2, tempomap->timebase);
 		}
 		break;
 	case MD_TYPE_TRACK:
@@ -650,5 +653,7 @@
 
 	}
 
-	put_program(msp, MD_DEVCHAN(track), 0, track->program);
+	/* If there are no embeded program events */
+	if (!track->hasprogram)
+		put_program(msp, MD_DEVCHAN(track), 0, track->program);
 }
diff -rNu melys-0.0.14/files/midiwrite.m melys-0.0.15/files/midiwrite.m
--- melys-0.0.14/files/midiwrite.m	Sat Sep 25 17:49:18 1999
+++ melys-0.0.15/files/midiwrite.m	Sat Oct  2 20:17:45 1999
@@ -119,6 +119,9 @@
 	case MD_TYPE_ROOT:
 		if (flags & MD_WALK_START) {
 			int  nchunks;
+			struct tempomapElement *tempomap;
+
+			tempomap = md_get_tempomap(msp->root);
 
 			put_int(msp, 4, MIDI_HEAD_MAGIC);
 			put_int(msp, 4, 6);	/* Header length, always 6 */
@@ -127,7 +130,7 @@
 			if (msp->root->head->format == 1)
 				nchunks++;
 			put_int(msp, 2, nchunks);
-			put_int(msp, 2, msp->root->head->time_base);
+			put_int(msp, 2, tempomap->timebase);
 		}
 		break;
 	case MD_TYPE_TRACK:
@@ -616,4 +619,6 @@
 
 	}
 
-	put_program(msp, MD_DEVCHAN(track), 0, track->program);
+	/* If there are no embeded program events */
+	if (!track->hasprogram)
+		put_program(msp, MD_DEVCHAN(track), 0, track->program);
diff -rNu melys-0.0.14/gui/main.c melys-0.0.15/gui/main.c
--- melys-0.0.14/gui/main.c	Tue Sep 28 16:09:37 1999
+++ melys-0.0.15/gui/main.c	Sun Oct  3 12:54:34 1999
@@ -280,7 +280,8 @@
 	gnome_widget_add_help_with_uidata(GTK_WIDGET(minfo), _(trackinfohelp),
 		tracksmenu, mdi);
 
-	song->trackview = w;
+	song_set_trackview(song, w);
+
 	melys_track_set_song(MELYS_TRACK(w), song);
 	play_set_pos_adj(song->play, MELYS_TRACK(song->trackview)->posadj);
 }
diff -rNu melys-0.0.14/gui/main.m melys-0.0.15/gui/main.m
--- melys-0.0.14/gui/main.m	Sun Sep 26 20:52:13 1999
+++ melys-0.0.15/gui/main.m	Sat Oct  2 22:48:43 1999
@@ -299,9 +299,11 @@
 	gnome_widget_add_help_with_uidata(GTK_WIDGET(minfo), _(trackinfohelp),
 		tracksmenu, mdi);
 
-	song->trackview = w;
+	song_set_trackview(song, w);
+
 	melys_track_set_song(MELYS_TRACK(w), song);
 	play_set_pos_adj(song->play, MELYS_TRACK(song->trackview)->posadj);
+
 
 
 >>function mel_view_update
diff -rNu melys-0.0.14/gui/menus.c melys-0.0.15/gui/menus.c
--- melys-0.0.14/gui/menus.c	Tue Sep 28 16:09:38 1999
+++ melys-0.0.15/gui/menus.c	Sun Oct  3 12:54:35 1999
@@ -63,6 +63,7 @@
 static GtkWidget *get_open_dialog(GtkObject *mdi);
 static void set_open_dialog(GtkObject *mdi, GtkWidget *w);
 static void debug_cb(GtkWidget *w, gpointer data);
+static void track_prop_cb(GtkWidget *w, gpointer data);
 
 
 /* The file menu */
@@ -115,7 +116,12 @@
 	{GNOME_APP_UI_ITEM, N_("Delete empty"), N_("Delete all empty tracks"),
 		delete_empty_track_cb, (gpointer)0, (gpointer)0, /* Callback and data */
 		0, NULL, /* Pixmap */
-		GDK_Delete, (GdkModifierType)0,  /* Accel */
+		0, (GdkModifierType)0,  /* Accel */
+		(GtkWidget*)0 },
+	{GNOME_APP_UI_ITEM, N_("Properties..."), N_("The track properties box"),
+		track_prop_cb, (gpointer)0, (gpointer)0, /* Callback and data */
+		0, NULL, /* Pixmap */
+		0, (GdkModifierType)0,  /* Accel */
 		(GtkWidget*)0 },
 	GNOMEUIINFO_END
 };
@@ -679,4 +685,32 @@
 
 
 #endif
+}
+
+/*
+ * Show the properties box for the first selected track.
+ * 
+ *  Arguments:
+ *    w         - widget event received on
+ *    data      - the mdi object
+ */
+static void 
+track_prop_cb(GtkWidget *w, gpointer data)
+{
+	struct song *song;
+	struct trackElement *track;
+	int  tn;
+
+	song = get_song_from_mdi(GTK_OBJECT(data));
+
+	for (tn = 0; tn < song->mdroot->tracks; tn++) {
+		track = md_track_nth(song->mdroot, tn);
+		if (MD_SELECTED(track)) {
+			/* Show properties box of first selected track */
+			track_prop_box(track, song, 0);
+			return;
+		}
+	}
+
+	mel_song_error(song, (GtkObject*)song->trackview, _("No selected tracks"));
 }
diff -rNu melys-0.0.14/gui/menus.m melys-0.0.15/gui/menus.m
--- melys-0.0.14/gui/menus.m	Tue Sep 28 16:04:52 1999
+++ melys-0.0.15/gui/menus.m	Tue Sep 28 18:42:34 1999
@@ -85,7 +85,12 @@
 	{GNOME_APP_UI_ITEM, N_("Delete empty"), N_("Delete all empty tracks"),
 		delete_empty_track_cb, (gpointer)0, (gpointer)0, /* Callback and data */
 		0, NULL, /* Pixmap */
-		GDK_Delete, (GdkModifierType)0,  /* Accel */
+		0, (GdkModifierType)0,  /* Accel */
+		(GtkWidget*)0 },
+	{GNOME_APP_UI_ITEM, N_("Properties..."), N_("The track properties box"),
+		track_prop_cb, (gpointer)0, (gpointer)0, /* Callback and data */
+		0, NULL, /* Pixmap */
+		0, (GdkModifierType)0,  /* Accel */
 		(GtkWidget*)0 },
 	GNOMEUIINFO_END
 };
@@ -648,3 +653,30 @@
 
 
 #endif
+
+>>function track_prop_cb
+static void
+GtkWidget *w;   widget event received on
+gpointer data;  the mdi object
+
+>>description
+Show the properties box for the first selected track.
+
+>>code
+	struct song *song;
+	struct trackElement *track;
+	int  tn;
+
+	song = get_song_from_mdi(GTK_OBJECT(data));
+
+	for (tn = 0; tn < song->mdroot->tracks; tn++) {
+		track = md_track_nth(song->mdroot, tn);
+		if (MD_SELECTED(track)) {
+			/* Show properties box of first selected track */
+			track_prop_box(track, song, 0);
+			return;
+		}
+	}
+
+	mel_song_error(song, (GtkObject*)song->trackview, _("No selected tracks"));
+
diff -rNu melys-0.0.14/gui/trackprop.c melys-0.0.15/gui/trackprop.c
--- melys-0.0.14/gui/trackprop.c	Tue Sep 28 16:09:38 1999
+++ melys-0.0.15/gui/trackprop.c	Sun Oct  3 12:54:35 1999
@@ -392,6 +392,7 @@
 	program |= num << 14;
 	if (program != track->program) {
 		track->program = program;
+		md_set_program(track, program, FALSE);
 	}
 
 	MD_SET_MODIFIED(track, TRUE);
diff -rNu melys-0.0.14/gui/trackprop.m melys-0.0.15/gui/trackprop.m
--- melys-0.0.14/gui/trackprop.m	Thu Sep 23 16:17:26 1999
+++ melys-0.0.15/gui/trackprop.m	Sat Oct  2 22:50:00 1999
@@ -398,6 +398,7 @@
 	program |= num << 14;
 	if (program != track->program) {
 		track->program = program;
+		md_set_program(track, program, FALSE);
 	}
 
 	MD_SET_MODIFIED(track, TRUE);
diff -rNu melys-0.0.14/help/C/Makefile melys-0.0.15/help/C/Makefile
--- melys-0.0.14/help/C/Makefile	Wed Sep 15 19:06:09 1999
+++ melys-0.0.15/help/C/Makefile	Sun Oct  3 11:52:10 1999
@@ -26,6 +26,9 @@
 	mv melys html
 	cd html; mv melys.html index.html
 
+ps: $(SGMLFILES)
+	db2ps melys.sgml
+
 install: all
 	$(INSTALL) -d $(DIR)
 	$(INSTALL) topic.dat $(DIR)
diff -rNu melys-0.0.14/help/C/html/display-pane.html melys-0.0.15/help/C/html/display-pane.html
--- melys-0.0.14/help/C/html/display-pane.html	Thu Jan  1 00:00:00 1970
+++ melys-0.0.15/help/C/html/display-pane.html	Sun Oct  3 12:54:46 1999
@@ -0,0 +1,153 @@
+<HTML
+><HEAD
+><TITLE
+>The information pane</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+REL="HOME"
+TITLE="Melys User's Guide"
+HREF="melys.html"><LINK
+REL="UP"
+TITLE="Track view"
+HREF="track.html"><LINK
+REL="PREVIOUS"
+TITLE="Track view"
+HREF="track.html"><LINK
+REL="NEXT"
+TITLE="The track menu"
+HREF="track-menu.html"></HEAD
+><BODY
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>Melys User's Guide</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="track.html"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Chapter 2. Track view</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="track-menu.html"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="DISPLAY-PANE"
+>The information pane</A
+></H1
+><P
+>		This pane shows the recorded parts.
+		Each part is represented by a rectangle in the display.
+		A scale at the top displays the bar numbers.
+		As the piece plays or during recording a pointer moves
+		across the display to show the current position in the
+		song.
+	</P
+><P
+>		There are two kinds of parts.
+		Original parts, which are represented with a solid
+		border and reference parts which are represented with
+		a dotted border.
+		Reference parts are linked to some other part and
+		when the original part is changed all parts
+		that reference it will change as well.
+	</P
+><P
+>	<I
+CLASS="EMPHASIS"
+>		Not much implemented here yet
+		There will be slicing parts and rearranging them. 
+	</I
+>&#13;</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="track.html"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="melys.html"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="track-menu.html"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Track view</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="track.html"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>The track menu</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -rNu melys-0.0.14/help/C/html/index.html melys-0.0.15/help/C/html/index.html
--- melys-0.0.14/help/C/html/index.html	Tue Sep 28 16:09:55 1999
+++ melys-0.0.15/help/C/html/index.html	Sun Oct  3 12:54:46 1999
@@ -74,7 +74,7 @@
 ></DT
 ><DT
 ><A
-HREF="menus.html#AEN92"
+HREF="menus.html#AEN95"
 ><SPAN
 CLASS="GUIMENU"
 >Windows</SPAN
@@ -82,7 +82,7 @@
 ></DT
 ><DT
 ><A
-HREF="menus.html#AEN103"
+HREF="menus.html#AEN106"
 ><SPAN
 CLASS="GUIMENU"
 >Help</SPAN
@@ -108,7 +108,7 @@
 ><DL
 ><DT
 ><A
-HREF="track.html#AEN113"
+HREF="track.html#AEN116"
 >Columns</A
 ></DT
 ><DT
@@ -123,6 +123,16 @@
 ></DT
 ></DL
 ></DD
+><DT
+><A
+HREF="display-pane.html"
+>The information pane</A
+></DT
+><DT
+><A
+HREF="track-menu.html"
+>The track menu</A
+></DT
 ></DL
 ></DD
 ></DL
diff -rNu melys-0.0.14/help/C/html/menus.html melys-0.0.15/help/C/html/menus.html
--- melys-0.0.14/help/C/html/menus.html	Tue Sep 28 16:09:55 1999
+++ melys-0.0.15/help/C/html/menus.html	Sun Oct  3 12:54:45 1999
@@ -211,7 +211,7 @@
 ><TD
 ALIGN="LEFT"
 ><P
->There is currently no warning if files are not saved.
+>		There is currently no warning if files are not saved.
 	</P
 ></TD
 ></TR
@@ -280,20 +280,39 @@
 ></DT
 ><DD
 ><P
->	Recording starts.
-	If the file is not already playing, then it will start to play.
-	A new part will be created that contains all midi events received
-	until <SPAN
+>		Recording starts.
+		If the file is not already playing, then it will start to play.
+		Incoming events are recorded on each track that has the record
+		button pressed
+		until <SPAN
 CLASS="GUIMENUITEM"
 >Record stop</SPAN
 > or <SPAN
 CLASS="GUIMENUITEM"
 >Stop</SPAN
 > is selected.
+		Each track has an associated recording source and only events
+		from that source are recorded to that track.
 	</P
 ><P
->	Currently you can only record to a new track.
-	The new track can have several parts though.&#13;</P
+>		Events are merged into any existing track parts.
+		New parts are created as necessary to hold events that
+		occur outside of existing parts.
+	</P
+><P
+>		<DIV
+CLASS="NOTE"
+><BLOCKQUOTE
+CLASS="NOTE"
+><P
+><B
+>Note: </B
+>			In the future there will be other modes for storing
+			new events such as replace.
+		</P
+></BLOCKQUOTE
+></DIV
+>&#13;</P
 ></DD
 ><DT
 ><SPAN
@@ -317,7 +336,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN92"
+NAME="AEN95"
 ><SPAN
 CLASS="GUIMENU"
 >Windows</SPAN
@@ -354,7 +373,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN103"
+NAME="AEN106"
 ><SPAN
 CLASS="GUIMENU"
 >Help</SPAN
diff -rNu melys-0.0.14/help/C/html/track-menu.html melys-0.0.15/help/C/html/track-menu.html
--- melys-0.0.14/help/C/html/track-menu.html	Thu Jan  1 00:00:00 1970
+++ melys-0.0.15/help/C/html/track-menu.html	Sun Oct  3 12:54:46 1999
@@ -0,0 +1,177 @@
+<HTML
+><HEAD
+><TITLE
+>The track menu</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+REL="HOME"
+TITLE="Melys User's Guide"
+HREF="melys.html"><LINK
+REL="UP"
+TITLE="Track view"
+HREF="track.html"><LINK
+REL="PREVIOUS"
+TITLE="The information pane"
+HREF="display-pane.html"></HEAD
+><BODY
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>Melys User's Guide</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="display-pane.html"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Chapter 2. Track view</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+>&nbsp;</TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="TRACK-MENU"
+>The track menu</A
+></H1
+><P
+>		There is a menu that applies only to the track view and
+		will only be available when the track view is visible.
+		The following operations can be performed from this menu.
+
+<P
+></P
+><DL
+><DT
+><SPAN
+CLASS="GUIMENUITEM"
+>Add</SPAN
+></DT
+><DD
+><P
+>		This adds a new track.
+		The track is currently added at the end of the listing.&#13;</P
+></DD
+><DT
+><SPAN
+CLASS="GUIMENUITEM"
+>Delete</SPAN
+></DT
+><DD
+><P
+>		Delete all currently selected tracks.&#13;</P
+></DD
+><DT
+><SPAN
+CLASS="GUIMENUITEM"
+>Delete empty</SPAN
+></DT
+><DD
+><P
+>		Delete all the empty tracks.
+		Tracks are only considered empty if they have never been used
+		since they were created.</P
+></DD
+><DT
+><SPAN
+CLASS="GUIMENUITEM"
+>Properties</SPAN
+></DT
+><DD
+><P
+>		This brings up the track properties box for the first
+		selected track.
+		It is an alternative to simply clicking on the selected
+		track.
+		See <A
+HREF="track.html#TRACK-PROP-INFO"
+>the track properties</A
+>
+		section for more details.&#13;</P
+></DD
+></DL
+>&#13;</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="display-pane.html"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="melys.html"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>The information pane</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="track.html"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>&nbsp;</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -rNu melys-0.0.14/help/C/html/track.html melys-0.0.15/help/C/html/track.html
--- melys-0.0.14/help/C/html/track.html	Tue Sep 28 16:09:55 1999
+++ melys-0.0.15/help/C/html/track.html	Sun Oct  3 12:54:46 1999
@@ -10,7 +10,10 @@
 HREF="melys.html"><LINK
 REL="PREVIOUS"
 TITLE="Menus"
-HREF="menus.html"></HEAD
+HREF="menus.html"><LINK
+REL="NEXT"
+TITLE="The information pane"
+HREF="display-pane.html"></HEAD
 ><BODY
 ><DIV
 CLASS="NAVHEADER"
@@ -43,7 +46,10 @@
 WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
->&nbsp;</TD
+><A
+HREF="display-pane.html"
+>Next</A
+></TD
 ></TR
 ></TABLE
 ><HR
@@ -56,11 +62,34 @@
 NAME="TRACK"
 >Chapter 2. Track view</A
 ></H1
+><DIV
+CLASS="TOC"
+><DL
+><DT
+><B
+>Table of Contents</B
+></DT
+><DT
+><A
+HREF="track.html#INFO-PANE"
+>The information pane</A
+></DT
+><DT
+><A
+HREF="display-pane.html"
+>The information pane</A
+></DT
+><DT
+><A
+HREF="track-menu.html"
+>The track menu</A
+></DT
+></DL
+></DIV
 ><P
 >	This chapter deals with the track view of Melys.
 	It consists of two parts; a leftmost information pane and to the right
-	a pane showing the existing parts and current play position (not
-	yet implemented).
+	a pane showing the existing parts and current play position.
 	It is possible to drag the divider between these panes with the
 	button to display more or less of each pane.&#13;</P
 ><DIV
@@ -72,16 +101,16 @@
 >The information pane</A
 ></H1
 ><P
->	Each track of the song is represented by a line in the information
-	pane showing details of the track.
-	The items that are visible will be configurable, what follows
-	is all the possible columns, but they may not all be visible.&#13;</P
+>		Each track of the song is represented by a line in the information
+		pane showing details of the track.
+		The items that are visible will be configurable, what follows
+		is all the possible columns, but they may not all be visible.&#13;</P
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN113"
+NAME="AEN116"
 >Columns</A
 ></H2
 ><P
@@ -114,11 +143,7 @@
 ><I
 >N</I
 ></TT
-> is the track number.
-		--
-		Once it has been generated such a name will not change when
-		tracks are added and deleted.
-		--&#13;</P
+> is the track number.&#13;</P
 ></DD
 ><DT
 >Prog</DT
@@ -192,8 +217,7 @@
 	number that is already selected.
 	(Or double click, this is still being decided)
 	You can also use the track information context menu, right click
-	in the track information pane, or the item from the tracks menu.
-	(This may not yet be implemented - try it and see)</P
+	in the track information pane, or the item from the tracks menu.</P
 ><P
 >	The properties box has several pages and the appropriate
 	page will be displayed for the column you clicked in.
@@ -301,7 +325,10 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->&nbsp;</TD
+><A
+HREF="display-pane.html"
+>Next</A
+></TD
 ></TR
 ><TR
 ><TD
@@ -318,7 +345,7 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->&nbsp;</TD
+>The information pane</TD
 ></TR
 ></TABLE
 ></DIV
diff -rNu melys-0.0.14/help/C/menus.sgml melys-0.0.15/help/C/menus.sgml
--- melys-0.0.14/help/C/menus.sgml	Wed Aug 11 14:42:13 1999
+++ melys-0.0.15/help/C/menus.sgml	Sun Oct  3 11:52:10 1999
@@ -3,7 +3,7 @@
 
 <para>
 	This section deals with all the title bar menus
-	that can be used in Melys.
+	that can be used in &mel;.
 	Many of the features can also be driven by the keyboard
 	and in most cases this is the best way to work.
 	Keyboard short-cuts are shown to the right on each
@@ -69,7 +69,8 @@
 <listitem><para>
 	Exits &mel;.
 	<warning>
-	<para>There is currently no warning if files are not saved.
+	<para>
+		There is currently no warning if files are not saved.
 	</warning>
 
 </variablelist>
@@ -101,14 +102,25 @@
 
 <varlistentry>
 <term><GUImenuitem/Record/
-<listitem><para>
-	Recording starts.
-	If the file is not already playing, then it will start to play.
-	A new part will be created that contains all midi events received
-	until <GUImenuitem/Record stop/ or <GUImenuitem/Stop/ is selected.
+<listitem>
+	<para>
+		Recording starts.
+		If the file is not already playing, then it will start to play.
+		Incoming events are recorded on each track that has the record
+		button pressed
+		until <GUImenuitem/Record stop/ or <GUImenuitem/Stop/ is selected.
+		Each track has an associated recording source and only events
+		from that source are recorded to that track.
+	<para>
+		Events are merged into any existing track parts.
+		New parts are created as necessary to hold events that
+		occur outside of existing parts.
 	<para>
-	Currently you can only record to a new track.
-	The new track can have several parts though.
+		<note>
+		<para>
+			In the future there will be other modes for storing
+			new events such as replace.
+		</note>
 
 <varlistentry>
 <term><GUImenuitem/Record stop/
diff -rNu melys-0.0.14/help/C/track.sgml melys-0.0.15/help/C/track.sgml
--- melys-0.0.14/help/C/track.sgml	Wed Sep 22 21:38:40 1999
+++ melys-0.0.15/help/C/track.sgml	Sun Oct  3 11:52:10 1999
@@ -4,17 +4,16 @@
 <para>
 	This chapter deals with the track view of Melys.
 	It consists of two parts; a leftmost information pane and to the right
-	a pane showing the existing parts and current play position (not
-	yet implemented).
+	a pane showing the existing parts and current play position.
 	It is possible to drag the divider between these panes with the
 	button to display more or less of each pane.
 
 <sect1 id="info-pane"><title>The information pane</title>
-<para>
-	Each track of the song is represented by a line in the information
-	pane showing details of the track.
-	The items that are visible will be configurable, what follows
-	is all the possible columns, but they may not all be visible.
+	<para>
+		Each track of the song is represented by a line in the information
+		pane showing details of the track.
+		The items that are visible will be configurable, what follows
+		is all the possible columns, but they may not all be visible.
 
 <sect2><title>Columns
 <variablelist>
@@ -36,10 +35,6 @@
 		If the track has not been given a name then it will be given
 		the name of ``<literal>Track <replaceable>N</replaceable></literal>'',
 		where <replaceable>N</replaceable> is the track number.
-		--
-		Once it has been generated such a name will not change when
-		tracks are added and deleted.
-		--
 
 <varlistentry>
 	<term>
@@ -109,7 +104,6 @@
 	(Or double click, this is still being decided)
 	You can also use the track information context menu, right click
 	in the track information pane, or the item from the tracks menu.
-	(This may not yet be implemented - try it and see)
 <para>
 	The properties box has several pages and the appropriate
 	page will be displayed for the column you clicked in.
@@ -156,7 +150,8 @@
 
 </variablelist>
 
-<sect2 id="track-prop-instruments"><title>Instrument selection
+<sect2 id="track-prop-instruments">
+	<title>Instrument selection</title>
 	<para>
 		This is a temporary way of setting the program number.
 		There will be a much better interface in a later version.
@@ -164,5 +159,72 @@
 		You can type in a number between 0 and 127 or use the spin control
 		arrows on the right to adjust the value.
 		There are also bank MSB and LSB controls.
+
+<sect1 id="display-pane">
+	<title>The information pane</title>
+	<para>
+		This pane shows the recorded parts.
+		Each part is represented by a rectangle in the display.
+		A scale at the top displays the bar numbers.
+		As the piece plays or during recording a pointer moves
+		across the display to show the current position in the
+		song.
+	<para>
+		There are two kinds of parts.
+		Original parts, which are represented with a solid
+		border and reference parts which are represented with
+		a dotted border.
+		Reference parts are linked to some other part and
+		when the original part is changed all parts
+		that reference it will change as well.
+	<para>
+	<emphasis>
+		Not much implemented here yet
+		There will be slicing parts and rearranging them. 
+	</emphasis>
+
+<sect1 id="track-menu"><title>The track menu</title>
+	<para>
+		There is a menu that applies only to the track view and
+		will only be available when the track view is visible.
+		The following operations can be performed from this menu.
+
+<variablelist>
+<varlistentry>
+	<term>
+		<guimenuitem/Add/
+	<listitem>
+	<para>
+		This adds a new track.
+		The track is currently added at the end of the listing.
+
+<varlistentry>
+	<term>
+		<guimenuitem/Delete/
+	<listitem>
+	<para>
+		Delete all currently selected tracks.
+
+<varlistentry>
+	<term>
+		<guimenuitem/Delete empty/
+	<listitem>
+	<para>
+		Delete all the empty tracks.
+		Tracks are only considered empty if they have never been used
+		since they were created.
+<varlistentry>
+	<term>
+		<guimenuitem/Properties/
+	<listitem>
+	<para>
+		This brings up the track properties box for the first
+		selected track.
+		It is an alternative to simply clicking on the selected
+		track.
+		See <link linkend="track-prop-info">the track properties</link>
+		section for more details.
+
+</variablelist>
 
 </chapter>
diff -rNu melys-0.0.14/include/elements.h melys-0.0.15/include/elements.h
--- melys-0.0.14/include/elements.h	Tue Sep 28 16:09:12 1999
+++ melys-0.0.15/include/elements.h	Sun Oct  3 12:54:20 1999
@@ -67,7 +67,6 @@
 	short  ver_major;	/* Major part of version number */
 	short  ver_minor;	/* Minor part of version number */
 	short  format;		/* Midi format */
-	short  time_base;	/* Time base value */
 	char *copyright;	/* A copyright message */
 	char *author;		/* Author information */
 	char *title;		/* The title of the piece */
@@ -100,7 +99,8 @@
 	struct containerElement *newpart; /* Part being recorded */
 	GPtrArray *notes;	/* To save pending on notes */
 	unsigned char controllers[128];	/* Current controller values */
-	int   props;		/* Track property box */
+	int   props;		/* Track property box id */
+	int   hasprogram:1;	/* Has embeded program changes */
 };
 #define MD_TRACK(e) \
 	((struct trackElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_TRACK))
@@ -108,6 +108,7 @@
 
 struct tempomapElement {
 	struct tracklikeElement parent;
+	short  timebase;	/* Time base value */
 };
 #define MD_TEMPOMAP(e) \
 	((struct tempomapElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_TEMPOMAP))
@@ -303,6 +304,7 @@
 struct element *md_check_cast(struct element *el, int type);
 struct rootElement *md_root_inc_ref(struct rootElement *root);
 int md_part_id(void);
+char *md_textname(int type);
 
 
 /* Defines for types */
diff -rNu melys-0.0.14/include/md.h melys-0.0.15/include/md.h
--- melys-0.0.14/include/md.h	Tue Sep 28 16:09:12 1999
+++ melys-0.0.15/include/md.h	Sun Oct  3 12:54:20 1999
@@ -117,6 +117,10 @@
 #define MD_IS_DESTROYED(el) ( ((struct element *)el)->destroyed)
 #define iscontainer(el) ( (MD_TYPE(el) >= MD_CONTAINER_BEGIN)? TRUE: FALSE)
 
+#define MD_CONTAINER_LEN(c) ( ((struct containerElement *)c)->elements->len)
+#define MD_GET_INDEX(c, i) \
+	( (struct element *)((struct containerElement *)c)->elements->pdata[i])
+
 /* Defines for md_walk() */
 #define MD_WALK_ALL	1	/* Include all elements including deleted, hidden*/
 
@@ -135,9 +139,23 @@
 /* Typedef for md_walk callback function */
 typedef void (*walkFunc)(struct element *, void *, int);
 
+/* Structure for meter, beats and tick representation */
+struct mbt {
+	int  bars;
+	short beats;
+	short ticks;
+};
+
+
 void md_walk(struct containerElement *c, walkFunc fn, void *arg, int flags);
 struct rootElement *md_empty(void);
 struct rootElement *md_song_new(void);
 struct trackElement *md_track_nth(struct rootElement *root, int n);
 struct tempomapElement *md_get_tempomap(struct rootElement *root);
 void md_set_devchan(struct element *base, int dev, int chan);
+void md_set_program(struct trackElement *track, int program, gboolean clear);
+void md_shrink(struct rootElement *root);
+void md_tick_to_mbt(struct tempomapElement *tempomap, unsigned long tick, 
+        struct mbt *mbtp);
+unsigned long md_mbt_to_tick(struct tempomapElement *tempomap, 
+        struct mbt *inmbtp);
diff -rNu melys-0.0.14/include/mdrw.h melys-0.0.15/include/mdrw.h
--- melys-0.0.14/include/mdrw.h	Tue Sep 28 16:09:10 1999
+++ melys-0.0.15/include/mdrw.h	Sun Oct  3 12:54:19 1999
@@ -11,11 +11,9 @@
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  * 
- * TODO: libxml 1.1.0 now has a working SAX parser, so this could
- *       all be moved over to use that.
- * 
- * 	  Reading in files with this code is too slow mainly (I believe) because
- * 	  of the very large amount of memory that gets used.
+ * This is the new mdmlread using the SAX parser.
+ * It is about twice as fast as the old one and uses very
+ * much less memory.
  * 
  * 
  */
diff -rNu melys-0.0.14/include/melfile.h melys-0.0.15/include/melfile.h
--- melys-0.0.14/include/melfile.h	Tue Sep 28 16:09:10 1999
+++ melys-0.0.15/include/melfile.h	Sun Oct  3 12:54:19 1999
@@ -87,3 +87,4 @@
 void file_close(struct File *file);
 struct rootElement *file_read(struct File *file);
 void file_write(struct File *file, struct rootElement *root);
+void file_check_root(struct rootElement *root);
diff -rNu melys-0.0.14/include/melysrule.h melys-0.0.15/include/melysrule.h
--- melys-0.0.14/include/melysrule.h	Thu Jan  1 00:00:00 1970
+++ melys-0.0.15/include/melysrule.h	Sun Oct  3 12:54:22 1999
@@ -0,0 +1,48 @@
+/*
+ * 
+ * Copyright (C) 1999 Steve Ratcliffe
+ * 
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ * 
+ *  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.
+ * 
+ * 
+ * 
+ * 
+ */
+
+#define MELYS_RULE(obj) GTK_CHECK_CAST(obj, melys_rule_get_type(), MelysRule)
+#define MELYS_RULE_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, melys_rule_get_type(), MelysRuleClass)
+#define IS_MELYS_RULE(obj) GTK_CHECK_TYPE(obj, melys_rule_get_type())
+
+typedef struct _MelysRule   MelysRule;
+typedef struct _MelysRuleClass   MelysRuleClass;
+
+
+struct _MelysRule {
+	GtkDrawingArea drawing_area;
+
+	GtkAdjustment *hadj;	/* Horizontal adj for this rule */
+
+	int  hoffset;	/* Previous horizontal adjustment */
+	int  hscale;	/* The scale */
+	int  vtitle;	/* Vertical title area */
+
+	struct tempomapElement *tempomap;
+};
+
+struct _MelysRuleClass {
+	GtkDrawingAreaClass parent_class;
+};
+
+guint melys_rule_get_type(void);
+GtkWidget *melys_rule_new(GtkAdjustment *hadj);
+void melys_rule_set_adj(MelysRule *mrule, GtkAdjustment *hadj);
+void melys_rule_set_tempomap(MelysRule *mrule, 
+        struct tempomapElement *tempomap);
+void melys_rule_scale(MelysRule *mrule, int hscale);
diff -rNu melys-0.0.14/include/song.h melys-0.0.15/include/song.h
--- melys-0.0.14/include/song.h	Tue Sep 28 16:09:09 1999
+++ melys-0.0.15/include/song.h	Sun Oct  3 12:54:18 1999
@@ -55,6 +55,7 @@
 };
 
 
+void song_set_trackview(struct song *song, GtkWidget *view);
 void song_setup(struct song *song, char *filename, struct rootElement *root);
 void song_play_start(struct song *song);
 void song_play_pause(struct song *song);
diff -rNu melys-0.0.14/md/Makefile melys-0.0.15/md/Makefile
--- melys-0.0.14/md/Makefile	Tue Sep 28 16:09:23 1999
+++ melys-0.0.15/md/Makefile	Sun Oct  3 12:54:26 1999
@@ -58,5 +58,6 @@
 elements.o: ../include/except.h
 elements.o: ../include/elements.h
 mdutil.o: ../include/seqlib.h
+mdutil.o: ../include/melfile.h
 mdutil.o: ../include/md.h
 mdadd.o: ../include/md.h
diff -rNu melys-0.0.14/md/elements.c melys-0.0.15/md/elements.c
--- melys-0.0.14/md/elements.c	Tue Sep 28 16:09:34 1999
+++ melys-0.0.15/md/elements.c	Sun Oct  3 12:54:32 1999
@@ -558,25 +558,13 @@
 	e = g_malloc0(sizeof(*e));
 	MD_ELEMENT(e)->type = MD_TYPE_TEXT;
 	md_element_init(MD_ELEMENT(e));
-	{
-	static char *typenames[] = {
-		"",
-		"text",
-		"copyright",
-		"trackname",
-		"instrument",
-		"lyric",
-		"marker",
-		"cuepoint",
-	};
 	e->type = type;
-	e->name = typenames[type];
+	e->name = md_textname(type);
 	e->text = g_strdup(text);
 	if (text)
 		e->length = strlen(text);
 	else
 		e->length = 0;
-	}
 	return e;
 }
 
@@ -678,4 +666,24 @@
 md_part_id(void)
 {
 	return partid++;
+}
+
+/*
+ * Return the name of a text type given its number. Based on the
+ * midi numbers.
+ */
+char *
+md_textname(int type)
+{
+	static char *typenames[] = {
+		"",
+		"text",
+		"copyright",
+		"trackname",
+		"instrument",
+		"lyric",
+		"marker",
+		"cuepoint",
+	};
+	return typenames[type];
 }
diff -rNu melys-0.0.14/md/elements.m melys-0.0.15/md/elements.m
--- melys-0.0.14/md/elements.m	Tue Sep 28 16:04:55 1999
+++ melys-0.0.15/md/elements.m	Sat Oct  2 20:19:00 1999
@@ -88,7 +88,6 @@
 	short  ver_major;	/* Major part of version number */
 	short  ver_minor;	/* Minor part of version number */
 	short  format;		/* Midi format */
-	short  time_base;	/* Time base value */
 	char *copyright;	/* A copyright message */
 	char *author;		/* Author information */
 	char *title;		/* The title of the piece */
@@ -120,13 +119,15 @@
 	struct containerElement *newpart; /* Part being recorded */
 	GPtrArray *notes;	/* To save pending on notes */
 	unsigned char controllers[128];	/* Current controller values */
-	int   props;		/* Track property box */
+	int   props;		/* Track property box id */
+	int   hasprogram:1;	/* Has embeded program changes */
 init
 	e->name = NULL;
 	e->program = 0;
 
 >># For the tempomap, its a special kind of track.
 >>elementdef tempomap tracklike
+	short  timebase;	/* Time base value */
 init
 	MD_TRACKLIKE(e)->number = -1;
 
@@ -252,25 +253,13 @@
 	char *text; /* actual text */
 	int  length; /* length of the text (including a null?) */
 new  int type, char *text
-	{
-	static char *typenames[] = {
-		"",
-		"text",
-		"copyright",
-		"trackname",
-		"instrument",
-		"lyric",
-		"marker",
-		"cuepoint",
-	};
 	e->type = type;
-	e->name = typenames[type];
+	e->name = md_textname(type);
 	e->text = g_strdup(text);
 	if (text)
 		e->length = strlen(text);
 	else
 		e->length = 0;
-	}
 free
 	g_free(e->text);
 
@@ -362,3 +351,22 @@
 int
 >>code
 	return partid++;
+
+>>function md_textname
+char *
+int  type;
+>>description
+Return the name of a text type given its number.
+Based on the midi numbers.
+>>code
+	static char *typenames[] = {
+		"",
+		"text",
+		"copyright",
+		"trackname",
+		"instrument",
+		"lyric",
+		"marker",
+		"cuepoint",
+	};
+	return typenames[type];
diff -rNu melys-0.0.14/md/mdseq.c melys-0.0.15/md/mdseq.c
--- melys-0.0.14/md/mdseq.c	Tue Sep 28 16:09:35 1999
+++ melys-0.0.15/md/mdseq.c	Sun Oct  3 12:54:33 1999
@@ -226,8 +226,8 @@
 {
 	long  besttime;
 	struct element *el = NULL;
-	struct element *bestel = NULL;
-	struct trackinfo *bestti = NULL;
+	struct element *bestel;
+	struct trackinfo *bestti;
 	struct trackinfo *ti;
 	int  i;
 	long t;
@@ -255,6 +255,8 @@
 
   retry:
   	besttime = G_MAXLONG;
+	bestti = NULL;
+	bestel = NULL;
 	for (i = 0; i < seq->ntinfo; i++) {
 		GStack *stack;
 
@@ -292,6 +294,7 @@
 
 		if (bestti->istrack && MD_TRACK(bestti->ltrack)->mute) {
 			if (bestel->type == MD_TYPE_NOTE) {
+				bestti = NULL;
 				goto retry;
 			}
 		}
@@ -437,6 +440,9 @@
 	struct trackinfo *ti;
 	GStack *stack;
 	int  i;
+
+	if (seq == NULL)
+		return;
 
 	stack = NULL;
 	ti = NULL;
diff -rNu melys-0.0.14/md/mdseq.m melys-0.0.15/md/mdseq.m
--- melys-0.0.14/md/mdseq.m	Sun Sep 26 20:52:37 1999
+++ melys-0.0.15/md/mdseq.m	Thu Sep 30 16:02:25 1999
@@ -224,8 +224,8 @@
 >>code
 	long  besttime;
 	struct element *el = NULL;
-	struct element *bestel = NULL;
-	struct trackinfo *bestti = NULL;
+	struct element *bestel;
+	struct trackinfo *bestti;
 	struct trackinfo *ti;
 	int  i;
 	long t;
@@ -253,6 +253,8 @@
 
   retry:
   	besttime = G_MAXLONG;
+	bestti = NULL;
+	bestel = NULL;
 	for (i = 0; i < seq->ntinfo; i++) {
 		GStack *stack;
 
@@ -290,6 +292,7 @@
 
 		if (bestti->istrack && MD_TRACK(bestti->ltrack)->mute) {
 			if (bestel->type == MD_TYPE_NOTE) {
+				bestti = NULL;
 				goto retry;
 			}
 		}
@@ -441,6 +444,9 @@
 	struct trackinfo *ti;
 	GStack *stack;
 	int  i;
+
+	if (seq == NULL)
+		return;
 
 	stack = NULL;
 	ti = NULL;
diff -rNu melys-0.0.14/md/mdutil.c melys-0.0.15/md/mdutil.c
--- melys-0.0.14/md/mdutil.c	Tue Sep 28 16:09:35 1999
+++ melys-0.0.15/md/mdutil.c	Sun Oct  3 12:54:33 1999
@@ -22,11 +22,14 @@
 #include "elements.h"
 #include "seqlib.h"
 #include "stdlib.h"
+#include "melfile.h"
 #include "md.h"
 #include "intl.h"
 
 
 static void set_chan(struct element *el, gpointer data, int flags);
+static void mbtoffset(struct timesigElement *tsig, unsigned long tdiff, 
+        int timebase, struct mbt *mbtp);
 
 
 /*
@@ -89,11 +92,11 @@
 	head->ver_major = MDML_VERSION_MAJOR;
 	head->ver_major = MDML_VERSION_MINOR;
 	head->format = 1;
-	head->time_base = 192;
 
 	md_add_elem(MD_CONTAINER(root), MD_ELEMENT(head));
 
 	map = md_tempomap_new();
+	map->timebase = 192;
 
 	tempo = md_tempo_new(500000);
 	md_add_elem(MD_CONTAINER(map), MD_ELEMENT(tempo));
@@ -123,6 +126,7 @@
 		md_add_elem((struct containerElement *)root, (struct element *)track);
 	}
 
+	file_check_root(root);
 	return root;
 }
 
@@ -206,4 +210,195 @@
 	devchan = GPOINTER_TO_INT(data);
 
 	MD_DEVCHAN(el) = devchan;
+}
+
+/*
+ * Set the program number for this track. If clear is true, then
+ * all embedded program changes for the track events are
+ * removed.
+ * 
+ *  Arguments:
+ *    track     - The track to set program for
+ *    program   - Program number to set
+ *    clear     - Clear any embedded program changes
+ */
+void 
+md_set_program(struct trackElement *track, int program, gboolean clear)
+{
+
+	track->program = program;
+	if (clear) {
+		track->hasprogram = FALSE;
+		/* XXX not finished */
+	}
+}
+
+/*
+ * Shrink the root duration to just fit the track durations.
+ * This is needed because we artificially increase the root
+ * duration while recording.
+ * 
+ */
+void 
+md_shrink(struct rootElement *root)
+{
+	struct trackElement *track;
+	long dur, max_dur;
+	int  i;
+
+	max_dur = 0;
+
+	for (i = 0; i < root->tracks; i++) {
+		track = md_track_nth(root, i);
+
+		dur = MD_ENDTIME(track);
+		max_dur = MAX(max_dur, dur);
+	}
+
+	MD_SET_DURATION(root, max_dur);
+}
+
+/*
+ * Convert the specified time into a mbt representation.
+ * 
+ *  Arguments:
+ *    tempomap  - the tempomap
+ *    tick      - Input time
+ *    mbtp      - Meters, beats and ticks return value
+ */
+void 
+md_tick_to_mbt(struct tempomapElement *tempomap, unsigned long tick, 
+        struct mbt *mbtp)
+{
+	struct timesigElement *lasttsig;
+	struct timesigElement *tsig;
+	struct mapElement *map;
+	unsigned long t;
+	int  i;
+	int  count;
+
+	g_return_if_fail(mbtp != NULL);
+
+	lasttsig = NULL;
+	count = 0;
+	for (i = 0; i < MD_CONTAINER_LEN(tempomap); i++) {
+		map = (struct mapElement *) MD_GET_INDEX(tempomap, i);
+
+		if (MD_TYPE(map) != MD_TYPE_TIMESIG)
+			continue;
+
+		tsig = MD_TIMESIG(map);
+
+		if (MD_TIME(tsig) > tick)
+			break;
+
+		if (lasttsig) {
+			t = MD_TIME(tsig) - MD_TIME(lasttsig);
+
+			mbtoffset(lasttsig, t, tempomap->timebase, mbtp);
+			count += mbtp->bars;
+			g_assert(mbtp->beats == 0);
+			g_assert(mbtp->ticks == 0);
+		}
+
+		lasttsig = tsig;
+	}
+
+	/* There must always be one */
+	g_return_if_fail(lasttsig != NULL);
+
+	t = tick - MD_TIME(lasttsig);
+	mbtoffset(lasttsig, t, tempomap->timebase, mbtp);
+
+	mbtp->bars += count;
+}
+
+/*
+ * Convert the specified time into a mbt representation.
+ * 
+ *  Arguments:
+ *    tempomap  - the tempomap
+ *    inmbtp    - Meters, beats and ticks input value
+ */
+unsigned long 
+md_mbt_to_tick(struct tempomapElement *tempomap, struct mbt *inmbtp)
+{
+	struct timesigElement *lasttsig;
+	struct timesigElement *tsig;
+	struct mapElement *map;
+	struct mbt mbt;
+	unsigned long t;
+	unsigned long full;
+	int  i;
+	int  count;
+
+	g_return_val_if_fail(inmbtp != NULL, 0);
+
+	full = tempomap->timebase * 4;
+	lasttsig = NULL;
+	count = 0;
+	for (i = 0; i < MD_CONTAINER_LEN(tempomap); i++) {
+		map = (struct mapElement *) MD_GET_INDEX(tempomap, i);
+
+		if (MD_TYPE(map) != MD_TYPE_TIMESIG)
+			continue;
+
+		tsig = MD_TIMESIG(map);
+
+		if (lasttsig) {
+			t = MD_TIME(tsig) - MD_TIME(lasttsig);
+
+			mbtoffset(lasttsig, t, tempomap->timebase, &mbt);
+			count += mbt.bars;
+			g_assert(mbt.beats == 0);
+			g_assert(mbt.ticks == 0);
+		}
+
+		if (count > inmbtp->bars) {
+			count -= mbt.bars;
+			break;
+		}
+
+		lasttsig = tsig;
+	}
+
+	/* There must always be one */
+	g_return_val_if_fail(lasttsig != NULL, 0);
+
+	t = MD_TIME(lasttsig);
+	t += (inmbtp->bars - count) * (full * lasttsig->top) / lasttsig->bottom;
+	t += (inmbtp->beats * full) / lasttsig->bottom;
+	t += (inmbtp->ticks * 4) / lasttsig->bottom;
+
+	return t;
+}
+
+/*
+ * Internal routine to calculate the offset within a
+ * particualar timesignature region. When there are a number
+ * of timesignatures in a piece, we step through them all and
+ * calculate the offsets separately.
+ * 
+ *  Arguments:
+ *    tsig      - an individual time signature element
+ *    tdiff     - the time difference from begining of tsig in ticks
+ *    timebase  - Beats per quarter note
+ *    mbtp      - output as meters, beats and ticks
+ */
+static void 
+mbtoffset(struct timesigElement *tsig, unsigned long tdiff, int timebase, 
+        struct mbt *mbtp)
+{
+	int  full;
+	int  rem;
+
+	full = timebase * 4;
+	mbtp->bars = (tdiff * tsig->bottom) / (full * tsig->top);
+
+	rem = tdiff - ((mbtp->bars * full * tsig->top) / tsig->bottom);
+
+	mbtp->beats = (rem * tsig->bottom) / (full);
+
+	rem = rem - (mbtp->beats * full) / tsig->bottom;
+	mbtp->ticks = (rem * tsig->bottom) / 4;
 }
diff -rNu melys-0.0.14/md/mdutil.m melys-0.0.15/md/mdutil.m
--- melys-0.0.14/md/mdutil.m	Tue Sep 28 16:04:55 1999
+++ melys-0.0.15/md/mdutil.m	Sun Oct  3 00:18:28 1999
@@ -14,6 +14,7 @@
 
 >>header "seqlib.h"
 >>header "stdlib.h"
+>>header "melfile.h"
 >>headerdef --decl md.h
 
 /*
@@ -52,6 +53,10 @@
 #define MD_IS_DESTROYED(el) ( ((struct element *)el)->destroyed)
 #define iscontainer(el) ( (MD_TYPE(el) >= MD_CONTAINER_BEGIN)? TRUE: FALSE)
 
+#define MD_CONTAINER_LEN(c) ( ((struct containerElement *)c)->elements->len)
+#define MD_GET_INDEX(c, i) \
+	( (struct element *)((struct containerElement *)c)->elements->pdata[i])
+
 /* Defines for md_walk() */
 #define MD_WALK_ALL	1	/* Include all elements including deleted, hidden*/
 
@@ -70,6 +75,14 @@
 /* Typedef for md_walk callback function */
 typedef void (*walkFunc)(struct element *, void *, int);
 
+/* Structure for meter, beats and tick representation */
+struct mbt {
+	int  bars;
+	short beats;
+	short ticks;
+};
+
+
 >>function md_walk
 void
 struct containerElement *c;  Container to be walked
@@ -130,11 +143,11 @@
 	head->ver_major = MDML_VERSION_MAJOR;
 	head->ver_major = MDML_VERSION_MINOR;
 	head->format = 1;
-	head->time_base = 192;
 
 	md_add_elem(MD_CONTAINER(root), MD_ELEMENT(head));
 
 	map = md_tempomap_new();
+	map->timebase = 192;
 
 	tempo = md_tempo_new(500000);
 	md_add_elem(MD_CONTAINER(map), MD_ELEMENT(tempo));
@@ -164,6 +177,7 @@
 		md_add_elem((struct containerElement *)root, (struct element *)track);
 	}
 
+	file_check_root(root);
 	return root;
 
 
@@ -259,3 +273,188 @@
 	devchan = GPOINTER_TO_INT(data);
 
 	MD_DEVCHAN(el) = devchan;
+
+
+>>function md_set_program
+void
+struct trackElement *track;  The track to set program for
+int  program;		Program number to set
+gboolean clear;		Clear any embedded program changes
+
+>>description
+Set the program number for this track.
+If
+.A clear
+is true, then all embedded program changes for the track
+events are removed.
+
+>>code
+
+	track->program = program;
+	if (clear) {
+		track->hasprogram = FALSE;
+		/* XXX not finished */
+	}
+
+>>function md_shrink
+void
+struct rootElement *root;
+
+>>description
+Shrink the root duration to just fit the track durations.
+This is needed because we artificially increase the root
+duration while recording.
+
+>>code
+	struct trackElement *track;
+	long dur, max_dur;
+	int  i;
+
+	max_dur = 0;
+
+	for (i = 0; i < root->tracks; i++) {
+		track = md_track_nth(root, i);
+
+		dur = MD_ENDTIME(track);
+		max_dur = MAX(max_dur, dur);
+	}
+
+	MD_SET_DURATION(root, max_dur);
+
+>>function md_tick_to_mbt
+void
+struct tempomapElement *tempomap;  the tempomap
+unsigned long tick; Input time
+struct mbt *mbtp;  Meters, beats and ticks return value
+
+>>description
+Convert the specified time into a mbt representation.
+
+>>code
+	struct timesigElement *lasttsig;
+	struct timesigElement *tsig;
+	struct mapElement *map;
+	unsigned long t;
+	int  i;
+	int  count;
+
+	g_return_if_fail(mbtp != NULL);
+
+	lasttsig = NULL;
+	count = 0;
+	for (i = 0; i < MD_CONTAINER_LEN(tempomap); i++) {
+		map = (struct mapElement *) MD_GET_INDEX(tempomap, i);
+
+		if (MD_TYPE(map) != MD_TYPE_TIMESIG)
+			continue;
+
+		tsig = MD_TIMESIG(map);
+
+		if (MD_TIME(tsig) > tick)
+			break;
+
+		if (lasttsig) {
+			t = MD_TIME(tsig) - MD_TIME(lasttsig);
+
+			mbtoffset(lasttsig, t, tempomap->timebase, mbtp);
+			count += mbtp->bars;
+			g_assert(mbtp->beats == 0);
+			g_assert(mbtp->ticks == 0);
+		}
+
+		lasttsig = tsig;
+	}
+
+	/* There must always be one */
+	g_return_if_fail(lasttsig != NULL);
+
+	t = tick - MD_TIME(lasttsig);
+	mbtoffset(lasttsig, t, tempomap->timebase, mbtp);
+
+	mbtp->bars += count;
+
+
+>>function md_mbt_to_tick
+unsigned long
+struct tempomapElement *tempomap;  the tempomap
+struct mbt *inmbtp;  Meters, beats and ticks input value
+
+>>description
+Convert the specified time into a mbt representation.
+
+>>code
+	struct timesigElement *lasttsig;
+	struct timesigElement *tsig;
+	struct mapElement *map;
+	struct mbt mbt;
+	unsigned long t;
+	unsigned long full;
+	int  i;
+	int  count;
+
+	g_return_val_if_fail(inmbtp != NULL, 0);
+
+	full = tempomap->timebase * 4;
+	lasttsig = NULL;
+	count = 0;
+	for (i = 0; i < MD_CONTAINER_LEN(tempomap); i++) {
+		map = (struct mapElement *) MD_GET_INDEX(tempomap, i);
+
+		if (MD_TYPE(map) != MD_TYPE_TIMESIG)
+			continue;
+
+		tsig = MD_TIMESIG(map);
+
+		if (lasttsig) {
+			t = MD_TIME(tsig) - MD_TIME(lasttsig);
+
+			mbtoffset(lasttsig, t, tempomap->timebase, &mbt);
+			count += mbt.bars;
+			g_assert(mbt.beats == 0);
+			g_assert(mbt.ticks == 0);
+		}
+
+		if (count > inmbtp->bars) {
+			count -= mbt.bars;
+			break;
+		}
+
+		lasttsig = tsig;
+	}
+
+	/* There must always be one */
+	g_return_val_if_fail(lasttsig != NULL, 0);
+
+	t = MD_TIME(lasttsig);
+	t += (inmbtp->bars - count) * (full * lasttsig->top) / lasttsig->bottom;
+	t += (inmbtp->beats * full) / lasttsig->bottom;
+	t += (inmbtp->ticks * 4) / lasttsig->bottom;
+
+	return t;
+
+>>function mbtoffset
+static void
+struct timesigElement *tsig;  an individual time signature element
+unsigned long tdiff;    the time difference from begining of tsig in ticks
+int  timebase;          Beats per quarter note
+struct mbt *mbtp;       output as meters, beats and ticks
+
+>>description
+Internal routine to calculate the offset within a particualar
+timesignature region.
+When there are a number of timesignatures in a piece, we
+step through them all and calculate the offsets separately.
+
+>>code
+	int  full;
+	int  rem;
+
+	full = timebase * 4;
+	mbtp->bars = (tdiff * tsig->bottom) / (full * tsig->top);
+
+	rem = tdiff - ((mbtp->bars * full * tsig->top) / tsig->bottom);
+
+	mbtp->beats = (rem * tsig->bottom) / (full);
+
+	rem = rem - (mbtp->beats * full) / tsig->bottom;
+	mbtp->ticks = (rem * tsig->bottom) / 4;
diff -rNu melys-0.0.14/midi/play.c melys-0.0.15/midi/play.c
--- melys-0.0.14/midi/play.c	Tue Sep 28 16:09:43 1999
+++ melys-0.0.15/midi/play.c	Sun Oct  3 12:54:38 1999
@@ -218,15 +218,6 @@
 	/* Timeout is in ms */
 	if (play->to_id == 0)
 		play->to_id = gtk_timeout_add(40, play_pos_cb, play);
-
-	/*
-	 * ALSA bug 19 Jul 1999, select does not return write possible
-	 * until after at least one write has been done.
-	 * Therefore kick it off with an echo.
-	 *
-	 * Remove this code in about 6 months, when all have the fix.
-	 */
-	seq_midi_send_echo(ctxp, 0, ECHO_NOOP);
 }
 
 /*
@@ -250,6 +241,11 @@
 	play->isplaying = FALSE;
 	play->ispaused  = TRUE;
 
+	if (play->to_id) {
+		gtk_timeout_remove(play->to_id);
+		play->to_id = 0;
+	}
+
 	remove_io_cb(play, INPUT_ALL);
 
 	ctxp = play->ctxp;
@@ -520,8 +516,8 @@
 run_events(struct play *play)
 {
 	struct element *el = NULL;
-	unsigned long end;
 	int  status = 0;
+	unsigned long end;
 
 	debug_pool(play);
 
@@ -543,25 +539,29 @@
 
 	/* Try and push out next items in the sequence */
 	while ((el = md_seq_next(play->seq)) != NULL) {
+
+
 		dprintf2("Sending type %d for %d at %ld", el->type, el->device_channel, el->element_time);
 		status = send_element(play->ctxp, el);
 		if (status < 0) {
 			play->pend_element = el;
 			break;
 		}
-	}
 
-	/* Detect the end of the sequence */
-	if (el == NULL && play->isended == FALSE) {
-
-		end = MD_ENDTIME(play->mdroot);
-
-		/* MMM this could fail */
-		seq_midi_send_echo(play->ctxp, end, ECHO_END_SONG);
+		if (el->type == MD_TYPE_HEAD) {
+			end = MD_ENDTIME(play->mdroot);
+			seq_midi_send_echo(play->ctxp, end, ECHO_END_SONG);
+		}
 	}
 
+
 	status = snd_seq_flush_output(seq_handle(play->ctxp));
-	if (status == 0 && play->isended)
+	/*
+	 * There could be an empty queue here because all
+	 * channels have been muted.  This means that we
+	 * will need to be restarted when a channel is unmuted.
+	 */
+	if (status == 0)
 		remove_io_cb(play, GDK_INPUT_WRITE);
 
 	return;
@@ -617,29 +617,28 @@
 
 	switch (type) {
 	case ECHO_NOOP:
+		dprintf1("NOOP");
 		break;
 
 	case ECHO_END_SONG:
 
+		play->isended = TRUE;
 		if (!play->isrecording) {
-			play_pause(play);
+			play_stop(play);
 
 			play->isplaying = FALSE;
 			play->ispaused  = FALSE;
 		}
 
-		play->isended = TRUE;
-		if (play->seq) {
-			md_seq_end(play->seq);
-			play->seq = NULL;
-		}
+		dprintf1("ENDSONG");
 		break;
 
 	case ECHO_END_PROLOGUE:
 		/* Reset the timer */
 		seq_timer_stop(play->ctxp);
 		play->isplaying = TRUE;
-		add_io_cb(play, GDK_INPUT_WRITE);
+		add_io_cb(play, INPUT_ALL);
+		dprintf1("END PROLOG");
 		break;
 
 	default:
@@ -684,15 +683,17 @@
 static void 
 conv_event(struct seq_context *ctxp, struct element *el, snd_seq_event_t *ep)
 {
+	struct tempomapElement *tmap;
 
 	seq_midi_event_init(ctxp, ep, el->element_time, el->device_channel);
 
 	switch (el->type) {
 	case MD_TYPE_ROOT:
+		tmap = md_get_tempomap(MD_ROOT(el));
+		seq_init_tempo(ctxp, tmap->timebase, 120, 1);
+		seq_timer_start(ctxp);
 		break;
 	case MD_TYPE_HEAD:
-		seq_init_tempo(ctxp, MD_HEAD(el)->time_base, 120, 1);
-		seq_timer_start(ctxp);
 		break;
 	case MD_TYPE_NOTE:
 		seq_midi_note(ctxp, ep, MD_NOTE(el)->note, MD_NOTE(el)->vel,
@@ -770,11 +771,11 @@
 add_io_cb(struct play *play, int which)
 {
 	/* Set up callbacks for IO activity */
-
+	
 	if ((which & GDK_INPUT_WRITE) && !play->write_id)
 		play->write_id = gdk_input_add(seq_descriptor(play->ctxp),
 			GDK_INPUT_WRITE, run_events_cb, play);
-	
+
 	if ((which & GDK_INPUT_READ) && !play->read_id)
 		play->read_id = gdk_input_add(seq_descriptor(play->ctxp),
 			GDK_INPUT_READ, get_events, play);
@@ -798,6 +799,7 @@
 		play->write_id = 0;
 	}
 	if ((which & GDK_INPUT_READ) && play->read_id) {
+		dprintf2("Removing read cb");
 		gdk_input_remove(play->read_id);
 		play->read_id = 0;
 	}
diff -rNu melys-0.0.14/midi/play.m melys-0.0.15/midi/play.m
--- melys-0.0.14/midi/play.m	Sat Sep 25 21:15:11 1999
+++ melys-0.0.15/midi/play.m	Sun Oct  3 12:24:46 1999
@@ -207,14 +207,6 @@
 	if (play->to_id == 0)
 		play->to_id = gtk_timeout_add(40, play_pos_cb, play);
 
-	/*
-	 * ALSA bug 19 Jul 1999, select does not return write possible
-	 * until after at least one write has been done.
-	 * Therefore kick it off with an echo.
-	 *
-	 * Remove this code in about 6 months, when all have the fix.
-	 */
-	seq_midi_send_echo(ctxp, 0, ECHO_NOOP);
 
 
 >>function play_pause
@@ -240,6 +232,11 @@
 	play->isplaying = FALSE;
 	play->ispaused  = TRUE;
 
+	if (play->to_id) {
+		gtk_timeout_remove(play->to_id);
+		play->to_id = 0;
+	}
+
 	remove_io_cb(play, INPUT_ALL);
 
 	ctxp = play->ctxp;
@@ -516,8 +513,8 @@
 
 >>code
 	struct element *el = NULL;
-	unsigned long end;
 	int  status = 0;
+	unsigned long end;
 
 	debug_pool(play);
 
@@ -539,25 +536,29 @@
 
 	/* Try and push out next items in the sequence */
 	while ((el = md_seq_next(play->seq)) != NULL) {
+
+
 		dprintf2("Sending type %d for %d at %ld", el->type, el->device_channel, el->element_time);
 		status = send_element(play->ctxp, el);
 		if (status < 0) {
 			play->pend_element = el;
 			break;
 		}
-	}
-
-	/* Detect the end of the sequence */
-	if (el == NULL && play->isended == FALSE) {
 
-		end = MD_ENDTIME(play->mdroot);
-
-		/* MMM this could fail */
-		seq_midi_send_echo(play->ctxp, end, ECHO_END_SONG);
+		if (el->type == MD_TYPE_HEAD) {
+			end = MD_ENDTIME(play->mdroot);
+			seq_midi_send_echo(play->ctxp, end, ECHO_END_SONG);
+		}
 	}
 
+
 	status = snd_seq_flush_output(seq_handle(play->ctxp));
-	if (status == 0 && play->isended)
+	/*
+	 * There could be an empty queue here because all
+	 * channels have been muted.  This means that we
+	 * will need to be restarted when a channel is unmuted.
+	 */
+	if (status == 0)
 		remove_io_cb(play, GDK_INPUT_WRITE);
 
 	return;
@@ -610,29 +611,28 @@
 
 	switch (type) {
 	case ECHO_NOOP:
+		dprintf1("NOOP");
 		break;
 
 	case ECHO_END_SONG:
 
+		play->isended = TRUE;
 		if (!play->isrecording) {
-			play_pause(play);
+			play_stop(play);
 
 			play->isplaying = FALSE;
 			play->ispaused  = FALSE;
 		}
 
-		play->isended = TRUE;
-		if (play->seq) {
-			md_seq_end(play->seq);
-			play->seq = NULL;
-		}
+		dprintf1("ENDSONG");
 		break;
 
 	case ECHO_END_PROLOGUE:
 		/* Reset the timer */
 		seq_timer_stop(play->ctxp);
 		play->isplaying = TRUE;
-		add_io_cb(play, GDK_INPUT_WRITE);
+		add_io_cb(play, INPUT_ALL);
+		dprintf1("END PROLOG");
 		break;
 
 	default:
@@ -675,15 +675,17 @@
 Pass in the address of an event to be completed.
 
 >>code
+	struct tempomapElement *tmap;
 
 	seq_midi_event_init(ctxp, ep, el->element_time, el->device_channel);
 
 	switch (el->type) {
 	case MD_TYPE_ROOT:
+		tmap = md_get_tempomap(MD_ROOT(el));
+		seq_init_tempo(ctxp, tmap->timebase, 120, 1);
+		seq_timer_start(ctxp);
 		break;
 	case MD_TYPE_HEAD:
-		seq_init_tempo(ctxp, MD_HEAD(el)->time_base, 120, 1);
-		seq_timer_start(ctxp);
 		break;
 	case MD_TYPE_NOTE:
 		seq_midi_note(ctxp, ep, MD_NOTE(el)->note, MD_NOTE(el)->vel,
@@ -761,11 +763,11 @@
 
 >>code
 	/* Set up callbacks for IO activity */
-
+	
 	if ((which & GDK_INPUT_WRITE) && !play->write_id)
 		play->write_id = gdk_input_add(seq_descriptor(play->ctxp),
 			GDK_INPUT_WRITE, run_events_cb, play);
-	
+
 	if ((which & GDK_INPUT_READ) && !play->read_id)
 		play->read_id = gdk_input_add(seq_descriptor(play->ctxp),
 			GDK_INPUT_READ, get_events, play);
@@ -788,6 +790,7 @@
 		play->write_id = 0;
 	}
 	if ((which & GDK_INPUT_READ) && play->read_id) {
+		dprintf2("Removing read cb");
 		gdk_input_remove(play->read_id);
 		play->read_id = 0;
 	}
diff -rNu melys-0.0.14/midi/record.c melys-0.0.15/midi/record.c
--- melys-0.0.14/midi/record.c	Tue Sep 28 16:09:43 1999
+++ melys-0.0.15/midi/record.c	Sun Oct  3 12:54:38 1999
@@ -48,8 +48,6 @@
 #define EPTR struct element *
 
 static void run_events(gpointer vrecord, gint fd, GdkInputCondition cond);
-static int get_dev_from_addr(struct record *record, snd_seq_addr_t *addr, 
-        int inout);
 static void save_event(struct trackElement *track, snd_seq_event_t *ep);
 static void push_events(gpointer vrecord, gint fd, GdkInputCondition cond);
 static void add_io_cb(struct record *record, int which);
@@ -288,41 +286,6 @@
 		}
 
 	}
-}
-
-/*
- * Return the device number that corresponds to the given
- * address.
- * 
- * Sould be in seqlib?
- * 
- *  Arguments:
- *    record    - The recording structure
- *    addr      - Address to convert to device number
- *    inout     - Is this an input or output device
- */
-static int 
-get_dev_from_addr(struct record *record, snd_seq_addr_t *addr, int inout)
-{
-	int  dev;
-	snd_seq_addr_t *daddr;
-
-	for (dev = 0; ; dev++) {
-		daddr = seq_dev_addr(record->ctxp, dev, inout);
-		if (daddr == NULL)
-			break;
-
-		/*
-		 * Sometimes we will want to distinguish between input from
-		 * different channels and sometime we don't.  At present there
-		 * is no configuration for this: input from any channel
-		 * is accepted.
-		 */
-		if (daddr->client == addr->client && daddr->port == addr->port)
-			return dev;
-	}
-
-	return -1;
 }
 
 /*
diff -rNu melys-0.0.14/midi/record.m melys-0.0.15/midi/record.m
--- melys-0.0.14/midi/record.m	Thu Sep 23 16:16:55 1999
+++ melys-0.0.15/midi/record.m	Sun Oct  3 12:24:46 1999
@@ -268,39 +268,6 @@
 >>extern
 #define EPTR struct element *
 
->>function get_dev_from_addr
-static int
-struct record *record; The recording structure
-snd_seq_addr_t *addr;  Address to convert to device number
-int  inout;	Is this an input or output device
-
->>description
-Return the device number that corresponds to the given address.
-
-Sould be in seqlib?
-
->>code
-	int  dev;
-	snd_seq_addr_t *daddr;
-
-	for (dev = 0; ; dev++) {
-		daddr = seq_dev_addr(record->ctxp, dev, inout);
-		if (daddr == NULL)
-			break;
-
-		/*
-		 * Sometimes we will want to distinguish between input from
-		 * different channels and sometime we don't.  At present there
-		 * is no configuration for this: input from any channel
-		 * is accepted.
-		 */
-		if (daddr->client == addr->client && daddr->port == addr->port)
-			return dev;
-	}
-
-	return -1;
-
-
 >>function save_event
 static void
 struct trackElement *track;
diff -rNu melys-0.0.14/programs/Makefile melys-0.0.15/programs/Makefile
--- melys-0.0.14/programs/Makefile	Tue Sep 28 16:09:28 1999
+++ melys-0.0.15/programs/Makefile	Sun Oct  3 12:54:28 1999
@@ -20,8 +20,9 @@
 MDMLCONVOBJS =  \
 	mdmlconv.o \
 	../files/midiread.o ../files/midiwrite.o ../files/mdmlread.o \
-	../files/mdmlwrite.o ../files/file.o ../md/elements.o \
-	../md/mdutil.o ../util/except.o ../util/util.o \
+	../files/mdmlwrite.o ../files/file.o \
+	../md/elements.o ../md/mdutil.o \
+	../util/except.o ../util/util.o ../util/gxstack.o \
 	../md/mdadd.o ../md/mdlist.o ../md/mdundo.o
 
 MELPLAYOBJS =  \
@@ -52,6 +53,7 @@
 	../config/ports.o \
 	../widgets/melystrack.o ../widgets/melystrackinfo.o \
 	../widgets/melystrackdisplay.o ../widgets/melyspartitem.o \
+	../widgets/melysrule.o \
 	../pixmaps/balls.o ../pixmaps/menu_icons.o
 
 SHOWSEQOBJS =  \
diff -rNu melys-0.0.14/programs/mdmlconv.m melys-0.0.15/programs/mdmlconv.m
--- melys-0.0.14/programs/mdmlconv.m	Wed Sep 22 20:50:30 1999
+++ melys-0.0.15/programs/mdmlconv.m	Wed Sep 29 12:08:07 1999
@@ -17,8 +17,9 @@
 >>target mdmlconv
 >>make --objects mdmlconv.o
 >>make --objects ../files/midiread.o ../files/midiwrite.o ../files/mdmlread.o
->>make --objects ../files/mdmlwrite.o ../files/file.o ../md/elements.o
->>make --objects ../md/mdutil.o ../util/except.o ../util/util.o
+>>make --objects ../files/mdmlwrite.o ../files/file.o
+>>make --objects ../md/elements.o ../md/mdutil.o
+>>make --objects ../util/except.o ../util/util.o ../util/gxstack.o
 >>make --objects ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o
 
 >>extern
diff -rNu melys-0.0.14/programs/melplay.c melys-0.0.15/programs/melplay.c
--- melys-0.0.14/programs/melplay.c	Tue Sep 28 16:09:45 1999
+++ melys-0.0.15/programs/melplay.c	Sun Oct  3 12:54:39 1999
@@ -368,13 +368,15 @@
 static void 
 play(void *arg, struct element *el)
 {
+	struct tempomapElement *tmap;
 	seq_context_t *ctxp = arg;
 	snd_seq_event_t ev;
 	
 	seq_midi_event_init(ctxp, &ev, el->element_time, el->device_channel);
 	switch (el->type) {
-	case MD_TYPE_HEAD:
-		seq_init_tempo(ctxp, MD_HEAD(el)->time_base, 120, 1);
+	case MD_TYPE_ROOT:
+		tmap = md_get_tempomap(MD_ROOT(el));
+		seq_init_tempo(ctxp, tmap->timebase, 120, 1);
 		seq_timer_start(ctxp);
 		return;
 	case MD_TYPE_NOTE:
@@ -406,7 +408,7 @@
 			MD_SYSEX(el)->length);
 		break;
 
-	case MD_TYPE_ROOT:
+	case MD_TYPE_HEAD:
 	case MD_TYPE_TEXT:
 	case MD_TYPE_KEYSIG:
 	case MD_TYPE_TIMESIG:
diff -rNu melys-0.0.14/programs/melplay.m melys-0.0.15/programs/melplay.m
--- melys-0.0.14/programs/melplay.m	Sat Sep 25 17:56:46 1999
+++ melys-0.0.15/programs/melplay.m	Sat Oct  2 20:20:05 1999
@@ -365,13 +365,15 @@
 struct element *el;
 
 >>code
+	struct tempomapElement *tmap;
 	seq_context_t *ctxp = arg;
 	snd_seq_event_t ev;
 	
 	seq_midi_event_init(ctxp, &ev, el->element_time, el->device_channel);
 	switch (el->type) {
-	case MD_TYPE_HEAD:
-		seq_init_tempo(ctxp, MD_HEAD(el)->time_base, 120, 1);
+	case MD_TYPE_ROOT:
+		tmap = md_get_tempomap(MD_ROOT(el));
+		seq_init_tempo(ctxp, tmap->timebase, 120, 1);
 		seq_timer_start(ctxp);
 		return;
 	case MD_TYPE_NOTE:
@@ -403,7 +405,7 @@
 			MD_SYSEX(el)->length);
 		break;
 
-	case MD_TYPE_ROOT:
+	case MD_TYPE_HEAD:
 	case MD_TYPE_TEXT:
 	case MD_TYPE_KEYSIG:
 	case MD_TYPE_TIMESIG:
diff -rNu melys-0.0.14/programs/melys.c melys-0.0.15/programs/melys.c
--- melys-0.0.14/programs/melys.c	Tue Sep 28 16:09:46 1999
+++ melys-0.0.15/programs/melys.c	Sun Oct  3 12:54:39 1999
@@ -82,7 +82,9 @@
 
 		switch(c) {
 		case 'x':
+#ifdef DEBUG
 			DBlevel = atoi(optarg);
+#endif
 			break;
 		case '?':
 			showusage();
diff -rNu melys-0.0.14/programs/melys.m melys-0.0.15/programs/melys.m
--- melys-0.0.14/programs/melys.m	Sun Sep 26 20:53:58 1999
+++ melys-0.0.15/programs/melys.m	Sat Oct  2 20:19:45 1999
@@ -28,6 +28,7 @@
 >>make --objects ../config/ports.o
 >>make --objects ../widgets/melystrack.o ../widgets/melystrackinfo.o
 >>make --objects ../widgets/melystrackdisplay.o ../widgets/melyspartitem.o
+>>make --objects ../widgets/melysrule.o
 >>make --objects ../pixmaps/balls.o ../pixmaps/menu_icons.o
 
 >>header <stdio.h>
@@ -94,7 +95,9 @@
 
 		switch(c) {
 		case 'x':
+#ifdef DEBUG
 			DBlevel = atoi(optarg);
+#endif
 			break;
 		case '?':
 			showusage();
diff -rNu melys-0.0.14/seq/seqmidi.c melys-0.0.15/seq/seqmidi.c
--- melys-0.0.14/seq/seqmidi.c	Tue Sep 28 16:09:31 1999
+++ melys-0.0.15/seq/seqmidi.c	Sun Oct  3 12:54:30 1999
@@ -58,8 +58,10 @@
 
 	/* If there is no device available send it elsewhere */
 	/* Other ideas welcome... */
-	if (!addr)
+	if (!addr) {
 		addr = &zeroaddr;
+		addr->queue = ctxp->queue;
+	}
 
 	memset(ep, '\0', sizeof(*ep));
 	ep->flags = SND_SEQ_TIME_STAMP_TICK | SND_SEQ_TIME_MODE_ABS;
diff -rNu melys-0.0.14/seq/seqmidi.m melys-0.0.15/seq/seqmidi.m
--- melys-0.0.14/seq/seqmidi.m	Thu Sep 23 16:15:13 1999
+++ melys-0.0.15/seq/seqmidi.m	Sat Oct  2 22:49:38 1999
@@ -46,8 +46,10 @@
 
 	/* If there is no device available send it elsewhere */
 	/* Other ideas welcome... */
-	if (!addr)
+	if (!addr) {
 		addr = &zeroaddr;
+		addr->queue = ctxp->queue;
+	}
 
 	memset(ep, '\0', sizeof(*ep));
 	ep->flags = SND_SEQ_TIME_STAMP_TICK | SND_SEQ_TIME_MODE_ABS;
diff -rNu melys-0.0.14/song/song.c melys-0.0.15/song/song.c
--- melys-0.0.14/song/song.c	Tue Sep 28 16:09:30 1999
+++ melys-0.0.15/song/song.c	Sun Oct  3 12:54:29 1999
@@ -39,6 +39,18 @@
         struct song *song);
 
 
+void 
+song_set_trackview(struct song *song, GtkWidget *view)
+{
+
+	song->trackview = view;
+
+	gtk_signal_connect((GtkObject *)((MelysTrack *)view)->info, 
+		"mute_track", song_mute_track, song);
+	gtk_signal_connect((GtkObject *)((MelysTrack*)view)->info, 
+		"unmute_track", song_unmute_track, song);
+}
+
 /*
  * Open the file specified by filename and read it into the song
  * structure as an MD tree. If filename is NULL, then an empty
@@ -94,12 +106,6 @@
 		return;
 	}
 
-	/* XXX not the correct place for this !! */
-	gtk_signal_connect((GtkObject *)((MelysTrack *)song->trackview)->info, 
-		"mute_track", song_mute_track, song);
-	gtk_signal_connect((GtkObject *)((MelysTrack*)song->trackview)->info, 
-		"unmute_track", song_unmute_track, song);
-
 	play_start(song->play);
 }
 
@@ -128,8 +134,9 @@
 		return;
 
 	record_stop(song->record);
+	md_shrink(song->mdroot);
 
-	play_set_record(song->play, 0);
+	play_set_record(song->play, FALSE);
 	play_stop(song->play);
 
 	/*
@@ -172,7 +179,7 @@
 
 	/* Depends on what kind of track we have selected audio/midi */
 	/* Only midi exists at present... */
-	play_set_record(song->play, 1);
+	play_set_record(song->play, TRUE);
 	play_start(song->play);
 
 	record_set_track(song->record, song->newtrack, song->tracknum);
diff -rNu melys-0.0.14/song/song.m melys-0.0.15/song/song.m
--- melys-0.0.14/song/song.m	Mon Sep 27 14:05:13 1999
+++ melys-0.0.15/song/song.m	Sat Oct  2 22:50:32 1999
@@ -69,6 +69,21 @@
 
 >>header melgui.h
 
+>>function song_set_trackview
+void
+struct song *song;
+GtkWidget *view;
+
+>>code
+
+	song->trackview = view;
+
+	gtk_signal_connect((GtkObject *)((MelysTrack *)view)->info, 
+		"mute_track", song_mute_track, song);
+	gtk_signal_connect((GtkObject *)((MelysTrack*)view)->info, 
+		"unmute_track", song_unmute_track, song);
+
+
 >>function song_setup
 void
 struct song *song;
@@ -128,12 +143,6 @@
 		return;
 	}
 
-	/* XXX not the correct place for this !! */
-	gtk_signal_connect((GtkObject *)((MelysTrack *)song->trackview)->info, 
-		"mute_track", song_mute_track, song);
-	gtk_signal_connect((GtkObject *)((MelysTrack*)song->trackview)->info, 
-		"unmute_track", song_unmute_track, song);
-
 	play_start(song->play);
 
 
@@ -162,8 +171,9 @@
 		return;
 
 	record_stop(song->record);
+	md_shrink(song->mdroot);
 
-	play_set_record(song->play, 0);
+	play_set_record(song->play, FALSE);
 	play_stop(song->play);
 
 	/*
@@ -207,7 +217,7 @@
 
 	/* Depends on what kind of track we have selected audio/midi */
 	/* Only midi exists at present... */
-	play_set_record(song->play, 1);
+	play_set_record(song->play, TRUE);
 	play_start(song->play);
 
 	record_set_track(song->record, song->newtrack, song->tracknum);
diff -rNu melys-0.0.14/util/except.c melys-0.0.15/util/except.c
--- melys-0.0.14/util/except.c	Tue Sep 28 16:09:36 1999
+++ melys-0.0.15/util/except.c	Sun Oct  3 12:54:34 1999
@@ -21,6 +21,7 @@
 #include "except.h"
 #include "util.h"
 #include <stdarg.h>
+#include <string.h>
 #include "stdio.h"
 #include "intl.h"
 
diff -rNu melys-0.0.14/util/except.m melys-0.0.15/util/except.m
--- melys-0.0.14/util/except.m	Mon Sep 27 14:01:03 1999
+++ melys-0.0.15/util/except.m	Sun Oct  3 12:24:46 1999
@@ -15,6 +15,7 @@
 
 >>extern
 >>header <stdarg.h>
+>>header <string.h>
 >>header stdio.h
 
 >>headerdef --decls except.h
diff -rNu melys-0.0.14/version melys-0.0.15/version
--- melys-0.0.14/version	Tue Sep 28 16:06:04 1999
+++ melys-0.0.15/version	Sun Oct  3 12:19:47 1999
@@ -1 +1 @@
-#define MELYS_VERSION_STRING "0.0.14"
+#define MELYS_VERSION_STRING "0.0.15"
diff -rNu melys-0.0.14/widgets/.cvsignore melys-0.0.15/widgets/.cvsignore
--- melys-0.0.14/widgets/.cvsignore	Tue Sep 28 16:09:27 1999
+++ melys-0.0.15/widgets/.cvsignore	Sun Oct  3 12:54:27 1999
@@ -1,4 +1,5 @@
 melyspartitem.c
+melysrule.c
 melystrack.c
 melystrackdisplay.c
 melystrackinfo.c
diff -rNu melys-0.0.14/widgets/Makefile melys-0.0.15/widgets/Makefile
--- melys-0.0.14/widgets/Makefile	Tue Sep 28 16:09:27 1999
+++ melys-0.0.15/widgets/Makefile	Sun Oct  3 12:54:27 1999
@@ -5,6 +5,7 @@
 
 TARGETS = 
 OBJS =	melyspartitem.o \
+	melysrule.o \
 	melystrack.o \
 	melystrackdisplay.o \
 	melystrackinfo.o \
@@ -12,6 +13,7 @@
 	misc.o \
 	register.o
 GENCFILES = melyspartitem.c \
+	melysrule.c \
 	melystrack.c \
 	melystrackdisplay.c \
 	melystrackinfo.c \
@@ -19,6 +21,7 @@
 	misc.c \
 	register.c
 GENHFILES = ../include/melyspartitem.h \
+	../include/melysrule.h \
 	../include/melystrack.h \
 	../include/melystrackdisplay.h \
 	../include/melystrackinfo.h \
@@ -56,12 +59,17 @@
 .m.c:
 	mcode $(MCODEFLAGS) -o $@ $<
 
+melysrule.o: ../include/elements.h
+melysrule.o: ../include/melystrack.h
+melysrule.o: ../include/md.h
+melysrule.o: ../include/melysrule.h
 melyspartitem.o: ../include/elements.h
 melyspartitem.o: ../include/md.h
 melyspartitem.o: ../include/melyspartitem.h
 melystrackdisplay.o: ../include/melystrack.h
 melystrackdisplay.o: ../include/melyspartitem.h
 melystrackdisplay.o: ../include/melwidgets.h
+melystrackdisplay.o: ../include/melysrule.h
 melystrackdisplay.o: ../include/elements.h
 melystrackdisplay.o: ../include/md.h
 melystrackdisplay.o: ../include/melystrackdisplay.h
diff -rNu melys-0.0.14/widgets/melysrule.c melys-0.0.15/widgets/melysrule.c
--- melys-0.0.14/widgets/melysrule.c	Thu Jan  1 00:00:00 1970
+++ melys-0.0.15/widgets/melysrule.c	Sun Oct  3 12:54:36 1999
@@ -0,0 +1,333 @@
+/*
+ * 
+ * Copyright (C) 1999 Steve Ratcliffe
+ * 
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ * 
+ *  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.
+ * 
+ * 
+ * 
+ * 
+ */
+
+
+#include "glib.h"
+#include "except.h"
+#include "util.h"
+#include "gtk/gtkwidget.h"
+#include "gtk/gtkvbox.h"
+#include "gtk/gtkdrawingarea.h"
+#include "gtk/gtksignal.h"
+#include "elements.h"
+#include "melystrack.h"
+#include "md.h"
+#include "melysrule.h"
+#include "intl.h"
+
+
+/* The list of signal id's that are being added for MelysRule. */
+enum {
+	LAST_SIGNAL
+};
+
+/* Argument numbers */
+enum {
+	ARG_0,
+};
+
+static void melys_rule_init(MelysRule *mrule);
+static void melys_rule_class_init(MelysRuleClass *klass);
+static void rule_draw(GtkWidget *widget, GdkRectangle *ap);
+static int rule_expose(GtkWidget *widget, GdkEventExpose *event);
+static void rule_scroll(GtkAdjustment *adj, gpointer data);
+static void rule_destroy(GtkObject *obj);
+static int tick_to_x(MelysRule *mrule, int tick);
+static int x_to_tick(MelysRule *mrule, int xpix);
+
+
+static gint melys_rule_signals[LAST_SIGNAL];
+
+static GtkDrawingAreaClass *parent_class = NULL;
+
+/*
+ * Return a unique integer that represents the object type.
+ */
+guint 
+melys_rule_get_type(void)
+{
+	static guint mtype = 0;
+
+	if (!mtype) {
+		GtkTypeInfo minfo = {
+			"MelysRule",
+			sizeof(MelysRule),
+			sizeof(MelysRuleClass),
+			(GtkClassInitFunc) melys_rule_class_init,
+			(GtkObjectInitFunc) melys_rule_init,
+			(GtkArgSetFunc) NULL,
+			(GtkArgGetFunc) NULL,
+			(GtkClassInitFunc) NULL,
+		};
+
+		mtype = gtk_type_unique(gtk_drawing_area_get_type(), &minfo);
+	}
+
+	return mtype;
+}
+
+/*
+ * Create a new MelysRule object.
+ */
+GtkWidget *
+melys_rule_new(GtkAdjustment *hadj)
+{
+	GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_rule_get_type()));
+	MelysRule *mrule = MELYS_RULE(w);
+
+	if (hadj)
+		gtk_object_ref((GtkObject *)hadj);
+	mrule->hadj = hadj;
+
+	return w;
+}
+
+/*
+ * Initialise the MelysRule.
+ *  Arguments:
+ *    mrule     - The MelysRule to init
+ */
+static void 
+melys_rule_init(MelysRule *mrule)
+{
+
+	mrule->hoffset = 0;
+	mrule->hscale = TRACK_DEF_HSCALE;
+	mrule->vtitle = 0;
+}
+
+/*
+ * Initialize the class.
+ * 
+ *  Arguments:
+ *    klass     - The class to initialise
+ */
+static void 
+melys_rule_class_init(MelysRuleClass *klass)
+{
+	GtkObjectClass *object_class;
+	GtkWidgetClass *widget_class;
+	GtkDrawingAreaClass *drawing_area_class;
+
+	object_class = (GtkObjectClass *)klass;
+	widget_class = (GtkWidgetClass *)klass;
+	drawing_area_class = (GtkDrawingAreaClass *)klass;
+
+	parent_class = gtk_type_class(gtk_drawing_area_get_type());
+
+	// XXX Add args
+
+	// XXX Create signals
+
+	gtk_object_class_add_signals(object_class, melys_rule_signals, LAST_SIGNAL);
+
+	widget_class->draw = rule_draw;
+	widget_class->expose_event = rule_expose;
+	object_class->destroy = rule_destroy;
+
+	// XXX Our functions
+}
+
+/*
+ * Set the horizontal adjustment control for this widget.
+ */
+void 
+melys_rule_set_adj(MelysRule *mrule, GtkAdjustment *hadj)
+{
+
+	if (hadj) {
+		if (mrule->hadj)
+			gtk_object_unref((GtkObject *) mrule->hadj);
+		mrule->hadj = hadj;
+		gtk_object_ref((GtkObject *) hadj);
+
+		gtk_signal_connect((GtkObject *)hadj, "value-changed",
+			GTK_SIGNAL_FUNC(rule_scroll), mrule);
+	}
+}
+
+void 
+melys_rule_set_tempomap(MelysRule *mrule, struct tempomapElement *tempomap)
+{
+	if (mrule->tempomap)
+		md_free((struct element *)mrule->tempomap);
+
+	MD_REF(tempomap);
+	mrule->tempomap = tempomap;
+	gtk_widget_queue_draw((GtkWidget *) mrule);
+}
+
+void 
+melys_rule_scale(MelysRule *mrule, int hscale)
+{
+	mrule->hscale = hscale;
+	gtk_widget_queue_draw((GtkWidget *) mrule);
+}
+
+/*
+ * TEMPORARY code. This does not do anything very useful.
+ */
+static void 
+rule_draw(GtkWidget *widget, GdkRectangle *ap)
+{
+	MelysRule *mrule;
+	struct tempomapElement *tempomap;
+	char numbuf[20];
+	struct mbt mbt;
+	int  x;
+	int  tick;
+	int  yoff;
+
+	dprintf1("rule_draw");
+
+	if (!GTK_WIDGET_DRAWABLE(widget))
+		return;
+
+	mrule = MELYS_RULE(widget);
+	tempomap = mrule->tempomap;
+	
+	if (mrule->vtitle == 0)
+		mrule->vtitle = widget->allocation.height;
+
+	x = ap->x;
+
+	/* Start on the first visible bar boundry */
+	tick = mrule->hoffset + x_to_tick(mrule, x);
+	md_tick_to_mbt(tempomap, tick, &mbt);
+	/* Step to next if begin part way through */
+	if (mbt.beats > 0 || mbt.ticks > 0)
+		mbt.bars++;
+	mbt.beats = 0;
+	mbt.ticks = 0;
+
+	tick = md_mbt_to_tick(tempomap, &mbt);
+	x = tick_to_x(mrule, tick - mrule->hoffset);
+
+	gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], ap);
+
+	for (; x < ap->x + ap->width; ) {
+		if ((mbt.bars % 4) == 0) {
+			yoff = 10;
+			g_snprintf(numbuf, 20, "%d", mbt.bars+1);
+			gdk_draw_string(widget->window,
+				widget->style->font,
+				widget->style->fg_gc[widget->state],
+				x+2, yoff, numbuf);
+		} else
+			yoff = 18;
+
+		gdk_draw_line(widget->window, widget->style->fg_gc[widget->state],
+			x, yoff, x, mrule->vtitle - TRACK_TITLE_RULE);
+
+		/* Increment to the next one */
+		mbt.bars++;
+		tick = md_mbt_to_tick(tempomap, &mbt);
+		x = tick_to_x(mrule, tick - mrule->hoffset);
+	}
+
+	gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], NULL);
+
+	gdk_draw_line(widget->window, widget->style->fg_gc[widget->state],
+		0, mrule->vtitle - TRACK_TITLE_RULE,
+		widget->allocation.width, mrule->vtitle - TRACK_TITLE_RULE);
+
+	return;
+}
+
+static int 
+rule_expose(GtkWidget *widget, GdkEventExpose *event)
+{
+	MelysRule *mrule;
+
+	if (!GTK_WIDGET_DRAWABLE(widget))
+		return FALSE;
+
+	mrule = MELYS_RULE(widget);
+
+	gtk_widget_queue_draw_area(widget, event->area.x, event->area.y,
+		event->area.width, event->area.height);
+
+	return FALSE;
+}
+
+/*
+ * A scrollbar has been moved. So we have to set our current
+ * position and redraw.
+ * 
+ */
+static void 
+rule_scroll(GtkAdjustment *adj, gpointer data)
+{
+	MelysRule *mrule = data;
+	GtkWidget *widget = data;
+	int  xchanged = 0;
+
+	if (adj == mrule->hadj) {
+		if ((int)adj->value != mrule->hoffset) {
+			if (adj->value >= 0) {
+				xchanged = 1;
+				mrule->hoffset = (int)adj->value;
+			}
+		}
+	}
+
+	if (xchanged) {
+
+		/* At present just clear the whole lot so it will be re-drawn
+		 * this is not as efficient as it could be of course
+		 */
+		gtk_widget_queue_clear(widget);
+		gdk_window_clear_area_e(widget->window,
+			0, 0,
+			widget->allocation.width,
+			widget->allocation.height);
+	}
+}
+
+static void 
+rule_destroy(GtkObject *obj)
+{
+	MelysRule *mrule = MELYS_RULE(obj);
+
+	dprintf1("rule_destroy");
+	if (mrule->hadj)
+		gtk_object_unref((GtkObject *) mrule->hadj);
+	if (mrule->tempomap)
+		md_free((struct element *) mrule->tempomap);
+}
+
+static int 
+tick_to_x(MelysRule *mrule, int tick)
+{
+	int  x;
+
+	g_return_val_if_fail(mrule->hscale != 0, 0);
+
+	x = (tick + mrule->hscale/2) / mrule->hscale;
+
+	return x;
+}
+
+static int 
+x_to_tick(MelysRule *mrule, int xpix)
+{
+	int  tick;
+
+	tick = xpix * mrule->hscale;
+	return tick;
+}
diff -rNu melys-0.0.14/widgets/melysrule.m melys-0.0.15/widgets/melysrule.m
--- melys-0.0.14/widgets/melysrule.m	Thu Jan  1 00:00:00 1970
+++ melys-0.0.15/widgets/melysrule.m	Sat Oct  2 20:21:56 1999
@@ -0,0 +1,315 @@
+>>name melysrule.m - a ruler that displays bars/beats/markers etc.
+
+Copyright (C) 1999 Steve Ratcliffe
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ 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.
+
+>>header gtk/gtkwidget.h
+>>header gtk/gtkvbox.h
+>>header gtk/gtkdrawingarea.h
+>>header gtk/gtksignal.h
+
+>>header elements.h
+>>header melystrack.h
+>>header md.h
+
+>>gtkobject melys_rule gtk_drawing_area
+
+>>headerdef @header
+
+struct _MelysRule {
+	GtkDrawingArea drawing_area;
+
+	GtkAdjustment *hadj;	/* Horizontal adj for this rule */
+
+	int  hoffset;	/* Previous horizontal adjustment */
+	int  hscale;	/* The scale */
+	int  vtitle;	/* Vertical title area */
+
+	struct tempomapElement *tempomap;
+};
+
+struct _MelysRuleClass {
+	GtkDrawingAreaClass parent_class;
+};
+
+>>extern
+
+/* The list of signal id's that are being added for MelysRule. */
+enum {
+	LAST_SIGNAL
+};
+
+/* Argument numbers */
+enum {
+	ARG_0,
+};
+
+
+>>function melys_rule_new
+GtkWidget *
+GtkAdjustment *hadj;
+>>description
+Create a new MelysRule object.
+>>code
+	GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_rule_get_type()));
+	MelysRule *mrule = MELYS_RULE(w);
+
+	if (hadj)
+		gtk_object_ref((GtkObject *)hadj);
+	mrule->hadj = hadj;
+
+	return w;
+
+>>function melys_rule_init
+static void
+MelysRule *mrule;   The MelysRule to init
+>>description
+Initialise the MelysRule.
+>>code
+
+	mrule->hoffset = 0;
+	mrule->hscale = TRACK_DEF_HSCALE;
+	mrule->vtitle = 0;
+
+>>function melys_rule_class_init
+static void
+MelysRuleClass *klass;   The class to initialise
+
+>>description
+Initialize the class.
+
+>>code
+	GtkObjectClass *object_class;
+	GtkWidgetClass *widget_class;
+	GtkDrawingAreaClass *drawing_area_class;
+
+	object_class = (GtkObjectClass *)klass;
+	widget_class = (GtkWidgetClass *)klass;
+	drawing_area_class = (GtkDrawingAreaClass *)klass;
+
+	parent_class = gtk_type_class(gtk_drawing_area_get_type());
+
+	// XXX Add args
+
+	// XXX Create signals
+
+	gtk_object_class_add_signals(object_class, melys_rule_signals, LAST_SIGNAL);
+
+	widget_class->draw = rule_draw;
+	widget_class->expose_event = rule_expose;
+	object_class->destroy = rule_destroy;
+
+	// XXX Our functions
+
+
+>>function melys_rule_set_adj
+void
+MelysRule *mrule;
+GtkAdjustment *hadj;
+>>description
+Set the horizontal adjustment control for this widget.
+>>code
+
+	if (hadj) {
+		if (mrule->hadj)
+			gtk_object_unref((GtkObject *) mrule->hadj);
+		mrule->hadj = hadj;
+		gtk_object_ref((GtkObject *) hadj);
+
+		gtk_signal_connect((GtkObject *)hadj, "value-changed",
+			GTK_SIGNAL_FUNC(rule_scroll), mrule);
+	}
+
+
+>>function melys_rule_set_tempomap
+void
+MelysRule *mrule;
+struct tempomapElement *tempomap;
+>>code
+	if (mrule->tempomap)
+		md_free((struct element *)mrule->tempomap);
+
+	MD_REF(tempomap);
+	mrule->tempomap = tempomap;
+	gtk_widget_queue_draw((GtkWidget *) mrule);
+
+
+>>function melys_rule_scale
+void
+MelysRule *mrule;
+int  hscale;
+>>code
+	mrule->hscale = hscale;
+	gtk_widget_queue_draw((GtkWidget *) mrule);
+
+
+>>function rule_draw
+static void
+GtkWidget *widget;
+GdkRectangle *ap;
+
+>>description
+TEMPORARY code.
+This does not do anything very useful.
+>>code
+	MelysRule *mrule;
+	struct tempomapElement *tempomap;
+	char numbuf[20];
+	struct mbt mbt;
+	int  x;
+	int  tick;
+	int  yoff;
+
+	dprintf1("@func_name");
+
+	if (!GTK_WIDGET_DRAWABLE(widget))
+		return;
+
+	mrule = MELYS_RULE(widget);
+	tempomap = mrule->tempomap;
+	
+	if (mrule->vtitle == 0)
+		mrule->vtitle = widget->allocation.height;
+
+	x = ap->x;
+
+	/* Start on the first visible bar boundry */
+	tick = mrule->hoffset + x_to_tick(mrule, x);
+	md_tick_to_mbt(tempomap, tick, &mbt);
+	/* Step to next if begin part way through */
+	if (mbt.beats > 0 || mbt.ticks > 0)
+		mbt.bars++;
+	mbt.beats = 0;
+	mbt.ticks = 0;
+
+	tick = md_mbt_to_tick(tempomap, &mbt);
+	x = tick_to_x(mrule, tick - mrule->hoffset);
+
+	gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], ap);
+
+	for (; x < ap->x + ap->width; ) {
+		if ((mbt.bars % 4) == 0) {
+			yoff = 10;
+			g_snprintf(numbuf, 20, "%d", mbt.bars+1);
+			gdk_draw_string(widget->window,
+				widget->style->font,
+				widget->style->fg_gc[widget->state],
+				x+2, yoff, numbuf);
+		} else
+			yoff = 18;
+
+		gdk_draw_line(widget->window, widget->style->fg_gc[widget->state],
+			x, yoff, x, mrule->vtitle - TRACK_TITLE_RULE);
+
+		/* Increment to the next one */
+		mbt.bars++;
+		tick = md_mbt_to_tick(tempomap, &mbt);
+		x = tick_to_x(mrule, tick - mrule->hoffset);
+	}
+
+	gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], NULL);
+
+	gdk_draw_line(widget->window, widget->style->fg_gc[widget->state],
+		0, mrule->vtitle - TRACK_TITLE_RULE,
+		widget->allocation.width, mrule->vtitle - TRACK_TITLE_RULE);
+
+	return;
+
+
+>>function rule_expose
+static int
+GtkWidget *widget;
+GdkEventExpose *event;
+>>code
+	MelysRule *mrule;
+
+	if (!GTK_WIDGET_DRAWABLE(widget))
+		return FALSE;
+
+	mrule = MELYS_RULE(widget);
+
+	gtk_widget_queue_draw_area(widget, event->area.x, event->area.y,
+		event->area.width, event->area.height);
+
+	return FALSE;
+
+
+>>function rule_scroll
+static void
+GtkAdjustment *adj;
+gpointer data;
+>>description
+A scrollbar has been moved.
+So we have to set our current position and redraw.
+
+>>code
+	MelysRule *mrule = data;
+	GtkWidget *widget = data;
+	int  xchanged = 0;
+
+	if (adj == mrule->hadj) {
+		if ((int)adj->value != mrule->hoffset) {
+			if (adj->value >= 0) {
+				xchanged = 1;
+				mrule->hoffset = (int)adj->value;
+			}
+		}
+	}
+
+	if (xchanged) {
+
+		/* At present just clear the whole lot so it will be re-drawn
+		 * this is not as efficient as it could be of course
+		 */
+		gtk_widget_queue_clear(widget);
+		gdk_window_clear_area_e(widget->window,
+			0, 0,
+			widget->allocation.width,
+			widget->allocation.height);
+	}
+
+>>function rule_destroy
+static void
+GtkObject *obj;
+
+>>code
+	MelysRule *mrule = MELYS_RULE(obj);
+
+	dprintf1("@func_name");
+	if (mrule->hadj)
+		gtk_object_unref((GtkObject *) mrule->hadj);
+	if (mrule->tempomap)
+		md_free((struct element *) mrule->tempomap);
+
+>>function tick_to_x
+static int
+MelysRule *mrule;
+int  tick;
+
+>>code
+	int  x;
+
+	g_return_val_if_fail(mrule->hscale != 0, 0);
+
+	x = (tick + mrule->hscale/2) / mrule->hscale;
+
+	return x;
+
+>>function x_to_tick
+static int
+MelysRule *mrule;
+int  xpix;
+
+>>code
+	int  tick;
+
+	tick = xpix * mrule->hscale;
+	return tick;
diff -rNu melys-0.0.14/widgets/melystrackdisplay.c melys-0.0.15/widgets/melystrackdisplay.c
--- melys-0.0.14/widgets/melystrackdisplay.c	Tue Sep 28 16:09:40 1999
+++ melys-0.0.15/widgets/melystrackdisplay.c	Sun Oct  3 12:54:36 1999
@@ -30,6 +30,7 @@
 #include "melystrack.h"
 #include "melyspartitem.h"
 #include "melwidgets.h"
+#include "melysrule.h"
 #include "elements.h"
 #include "md.h"
 #include "melystrackdisplay.h"
@@ -63,8 +64,6 @@
 static void disp_size_allocate(GtkWidget *widget, GtkAllocation *allocation);
 static void set_scroll_region(MelysTrackDisplay *mdisp);
 static void set_hscroll(MelysTrackDisplay *mdisp);
-static gboolean title_expose(GtkWidget *widget, GdkEventExpose *event, 
-        gpointer data);
 static int track_to_y(MelysTrackDisplay *mdisp, int n);
 static int x_to_tick(MelysTrackDisplay *mdisp, int xpix);
 static int tick_to_x(MelysTrackDisplay *mdisp, int tick);
@@ -132,6 +131,8 @@
 	gtk_object_ref((GtkObject*)vadj);
 	gtk_object_ref((GtkObject*)posadj);
 
+	melys_rule_set_adj(MELYS_RULE(mdisp->title), hadj);
+
 	return GTK_WIDGET(mdisp);
 }
 
@@ -144,7 +145,7 @@
 melys_track_display_init(MelysTrackDisplay *mdisp)
 {
 	GnomeCanvas *canvas;
-	GtkDrawingArea *title;
+	GtkWidget *title;
 	GtkWidget *box;
 
 	mdisp->height = TRACK_DEF_HEIGHT;
@@ -159,10 +160,7 @@
 	mdisp->song = NULL;
 
 	box = gtk_vbox_new(0, 0);
-
-	title = (GtkDrawingArea *)gtk_drawing_area_new();
-	gtk_signal_connect(GTK_OBJECT(title), "expose-event",
-		GTK_SIGNAL_FUNC(title_expose), mdisp);
+	title = (GtkWidget *)melys_rule_new(NULL);
 
 #if 0
 #define AA
@@ -250,6 +248,7 @@
 	mdisp->hadj->value = 0.0;
 	set_hscroll(mdisp);
 
+	melys_rule_set_tempomap((MelysRule *)mdisp->title, md_get_tempomap(root));
 	melys_track_display_update(mdisp);
 }
 
@@ -285,12 +284,14 @@
 
 	if (xchanged || ychanged) {
 
+#if 0
 		/* Clear title area so it will be redrawn (could be optimised) */
 		if (xchanged)
 			gdk_window_clear_area_e(mdisp->title->window,
 				0, 0,
 				mdisp->title->allocation.width,
 				mdisp->title->allocation.height);
+#endif
 
 		gnome_canvas_scroll_to(canvas,
 			tick_to_x(mdisp, mdisp->hoffset), mdisp->voffset * mdisp->vspace);
@@ -355,6 +356,14 @@
 			set_scroll_region(mdisp);
 		}
 
+		/*
+		 * This is a temporary way to ensure that we return to the
+		 * beginning when starting playing.
+		 */
+		if (x < 5) {/*XXX*/
+			hadj->value = 0;
+			set_scroll_region(mdisp);
+		}
 	}
 }
 
@@ -380,7 +389,7 @@
 			part = MD_CONTAINER(track)->elements->pdata[p];
 
 			if (MD_IS_DESTROYED(part))
-				printf("destroyed!\n");
+				dprintf2("part is destroyed!\n");
 
 			switch (MD_TYPE(part)) {
 			case MD_TYPE_PART:
@@ -700,65 +709,6 @@
 		adj->value = adj->upper - adj->page_size;
 
 	gtk_adjustment_value_changed(adj);
-}
-
-/*
- * Temporary ruler routine. Obviously this needs to look at
- * the tempo map and find the time signature records and do
- * proper bar lines.
- * 
- */
-static gboolean 
-title_expose(GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
-	MelysTrackDisplay *mdisp;
-	char numbuf[20];
-	int  qn;
-	int  x;
-	int  tick;
-	int  yoff;
-
-	if (!GTK_WIDGET_DRAWABLE(widget))
-		return FALSE;
-
-	mdisp = MELYS_TRACK_DISPLAY(data);
-	
-	x = event->area.x;
-	tick = mdisp->hoffset + x_to_tick(mdisp, x);
-	qn = tick/192;
-
-	gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state],
-		&event->area);
-
-	/* Adjust x to the first tick-line that needs drawing */
-	x = tick_to_x(mdisp, qn*192 - mdisp->hoffset);
-
-	for (; x < event->area.x + event->area.width; ) {
-		if ((qn % 4) == 0) {
-			yoff = 10;
-			g_snprintf(numbuf, 20, "%d", qn/4);
-			gdk_draw_string(widget->window,
-				widget->style->font,
-				widget->style->fg_gc[widget->state],
-				x+2, yoff, numbuf);
-		} else
-			yoff = 18;
-
-		gdk_draw_line(widget->window, widget->style->fg_gc[widget->state],
-			x, yoff, x, mdisp->vtitle - TRACK_TITLE_RULE);
-
-		/* Increment to the next one */
-		qn++;
-		x = tick_to_x(mdisp, qn * 192 - mdisp->hoffset);
-	}
-
-	gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], NULL);
-
-	gdk_draw_line(widget->window, widget->style->fg_gc[widget->state],
-		0, mdisp->vtitle - TRACK_TITLE_RULE,
-		widget->allocation.width, mdisp->vtitle - TRACK_TITLE_RULE);
-
-	return TRUE;
 }
 
 void 
diff -rNu melys-0.0.14/widgets/melystrackdisplay.m melys-0.0.15/widgets/melystrackdisplay.m
--- melys-0.0.14/widgets/melystrackdisplay.m	Tue Sep 28 16:04:55 1999
+++ melys-0.0.15/widgets/melystrackdisplay.m	Sun Oct  3 00:17:18 1999
@@ -27,6 +27,7 @@
 >>header melystrack.h
 >>header melyspartitem.h
 >>header melwidgets.h
+>>header melysrule.h
 
 >>header elements.h
 >>header md.h
@@ -128,6 +129,8 @@
 	gtk_object_ref((GtkObject*)vadj);
 	gtk_object_ref((GtkObject*)posadj);
 
+	melys_rule_set_adj(MELYS_RULE(mdisp->title), hadj);
+
 	return GTK_WIDGET(mdisp);
 
 
@@ -138,7 +141,7 @@
 Initialise the MelysTrackDisplay.
 >>code
 	GnomeCanvas *canvas;
-	GtkDrawingArea *title;
+	GtkWidget *title;
 	GtkWidget *box;
 
 	mdisp->height = TRACK_DEF_HEIGHT;
@@ -153,10 +156,7 @@
 	mdisp->song = NULL;
 
 	box = gtk_vbox_new(0, 0);
-
-	title = (GtkDrawingArea *)gtk_drawing_area_new();
-	gtk_signal_connect(GTK_OBJECT(title), "expose-event",
-		GTK_SIGNAL_FUNC(title_expose), mdisp);
+	title = (GtkWidget *)melys_rule_new(NULL);
 
 #if 0
 #define AA
@@ -245,6 +245,7 @@
 	mdisp->hadj->value = 0.0;
 	set_hscroll(mdisp);
 
+	melys_rule_set_tempomap((MelysRule *)mdisp->title, md_get_tempomap(root));
 	melys_track_display_update(mdisp);
 
 
@@ -281,12 +282,14 @@
 
 	if (xchanged || ychanged) {
 
+#if 0
 		/* Clear title area so it will be redrawn (could be optimised) */
 		if (xchanged)
 			gdk_window_clear_area_e(mdisp->title->window,
 				0, 0,
 				mdisp->title->allocation.width,
 				mdisp->title->allocation.height);
+#endif
 
 		gnome_canvas_scroll_to(canvas,
 			tick_to_x(mdisp, mdisp->hoffset), mdisp->voffset * mdisp->vspace);
@@ -352,6 +355,14 @@
 			set_scroll_region(mdisp);
 		}
 
+		/*
+		 * This is a temporary way to ensure that we return to the
+		 * beginning when starting playing.
+		 */
+		if (x < 5) {/*XXX*/
+			hadj->value = 0;
+			set_scroll_region(mdisp);
+		}
 	}
 
 
@@ -378,7 +389,7 @@
 			part = MD_CONTAINER(track)->elements->pdata[p];
 
 			if (MD_IS_DESTROYED(part))
-				printf("destroyed!\n");
+				dprintf2("part is destroyed!\n");
 
 			switch (MD_TYPE(part)) {
 			case MD_TYPE_PART:
@@ -718,68 +729,6 @@
 
 	gtk_adjustment_value_changed(adj);
 
-
-
->>function title_expose
-static gboolean
-GtkWidget *widget;
-GdkEventExpose *event;
-gpointer data;
-
->>description
-Temporary ruler routine.
-Obviously this needs to look at the tempo map and
-find the time signature records and do proper bar lines.
-
->>code
-	MelysTrackDisplay *mdisp;
-	char numbuf[20];
-	int  qn;
-	int  x;
-	int  tick;
-	int  yoff;
-
-	if (!GTK_WIDGET_DRAWABLE(widget))
-		return FALSE;
-
-	mdisp = MELYS_TRACK_DISPLAY(data);
-	
-	x = event->area.x;
-	tick = mdisp->hoffset + x_to_tick(mdisp, x);
-	qn = tick/192;
-
-	gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state],
-		&event->area);
-
-	/* Adjust x to the first tick-line that needs drawing */
-	x = tick_to_x(mdisp, qn*192 - mdisp->hoffset);
-
-	for (; x < event->area.x + event->area.width; ) {
-		if ((qn % 4) == 0) {
-			yoff = 10;
-			g_snprintf(numbuf, 20, "%d", qn/4);
-			gdk_draw_string(widget->window,
-				widget->style->font,
-				widget->style->fg_gc[widget->state],
-				x+2, yoff, numbuf);
-		} else
-			yoff = 18;
-
-		gdk_draw_line(widget->window, widget->style->fg_gc[widget->state],
-			x, yoff, x, mdisp->vtitle - TRACK_TITLE_RULE);
-
-		/* Increment to the next one */
-		qn++;
-		x = tick_to_x(mdisp, qn * 192 - mdisp->hoffset);
-	}
-
-	gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], NULL);
-
-	gdk_draw_line(widget->window, widget->style->fg_gc[widget->state],
-		0, mdisp->vtitle - TRACK_TITLE_RULE,
-		widget->allocation.width, mdisp->vtitle - TRACK_TITLE_RULE);
-
-	return TRUE;
 
 
 >>function display_data_free
diff -rNu melys-0.0.14/widgets/melystrackinfo.c melys-0.0.15/widgets/melystrackinfo.c
--- melys-0.0.14/widgets/melystrackinfo.c	Tue Sep 28 16:09:41 1999
+++ melys-0.0.15/widgets/melystrackinfo.c	Sun Oct  3 12:54:37 1999
@@ -927,7 +927,7 @@
 	gtk_widget_queue_draw_area(widget, event->area.x, event->area.y,
 		event->area.width, event->area.height);
 
-	return FALSE; /* XXX what does this mean */
+	return TRUE;
 }
 
 static gint 
diff -rNu melys-0.0.14/widgets/melystrackinfo.m melys-0.0.15/widgets/melystrackinfo.m
--- melys-0.0.14/widgets/melystrackinfo.m	Mon Sep 27 14:05:13 1999
+++ melys-0.0.15/widgets/melystrackinfo.m	Sat Oct  2 20:22:48 1999
@@ -924,7 +924,7 @@
 	gtk_widget_queue_draw_area(widget, event->area.x, event->area.y,
 		event->area.width, event->area.height);
 
-	return FALSE; /* XXX what does this mean */
+	return TRUE;
 
 >>function track_info_enter
 static gint