diff -rNu melys-0.0.10/ChangeLog melys-0.0.11/ChangeLog --- melys-0.0.10/ChangeLog Wed Sep 15 13:49:19 1999 +++ melys-0.0.11/ChangeLog Sun Sep 19 23:02:58 1999 @@ -1,4 +1,148 @@ +1999-09-19 Steve Ratcliffe + + * REL-0-0-11 + + * song/song.m: add similar message for record and no seq + + * seq/seqlib.m: Fix for crash when no sequencer present. + + * midi/play.m, midi/record.m: + Fixes so that when no sequencer is present, melys will still + start up and display the song allowing it to be edited. + + * song/song.m: Put in an error message for when the sequencer couldn't + be opened. + + * seq/seqmidi.m, md/mdutil.m: + Events should now play to the correct output device. + + * widgets/melystrackinfo.m: + Improvements to mostly eliminate the flicker that used to + be seen during scrolling. + +1999-09-18 Steve Ratcliffe + + * programs/melplay.m: + Add code to play a prologue to set up the midi channels + prior to playing the song. + + * midi/play.m, midi/record.m: + Now we can send a program change from the keyboard and + it will show up in the display. It will also now not be saved + as an element but only as a track property. Playback now + sets up each channel prior to playing. + + * widgets/melystrackinfo.m: + Optimise track-pane redrawing - this has problems when there + are multiple views open. Probably need to keep a list of + elements that have the modified bit set and only unset them at + the end of all updates. + + * seq/seqplay.m: added + + * song/song.m: moved a header file + + * seq/seqmidi.m: routine to just init an echo event + + * seq/seqlib.m: removed extra flush calls + + * files/mdmlread.m, files/mdmlwrite.m, files/midiread.m, files/midiwrite.m: + Changes to save the program number on the track element. + And to save it from there. + + * md/mdutil.m: + There is no need for track_delete as md_remove takes care + of it now + + * gui/main.m: Add a routine that will update the current view without + the caller knowing what it is. + + * gui/menus.m: Add delete empty track + + * gui/trackprop.m: Instrument page now implemented. + + * Makefile: Improve makefile action after make clobber + +1999-09-17 Steve Ratcliffe + + * seq/seqlib.m: Update the timer control for the corrected ALSA api. + + * md/mdadd.m: Add an element remove function md_remove() + +1999-09-16 Steve Ratcliffe + + * programs/melys.m: Added to make objects. + + * gui/menus.m, gui/trackprop.m: + Add connection to the help button on the property box. + + * help/C/melys.sgml, help/C/track.sgml: + Added help for the track property box. + + * widgets/melystrackinfo.m: + Now a click on a selected track brings up a property box. + May want to use double click haven't decided.. + + * gui/help.m: added help function + + * gui/main.m, gui/menus.m: + Remove the direct reference to the track widget, go through + the song module for redraw. + + * gui/trackprop.m: Add a temporary instrument selection. + + * md/elements.m, md/mdadd.m: reference count and free/memory leak fixes + + * md/mdutil.m: Channel setting functions + + * gui/mlib.conf: removed + + * programs/mdmlconv.m, programs/melplay.m: close/memory leak fixes + + * programs/melys.m: added make information + + * widgets/melystrack.m: Add routine to set the relevant song. + + * widgets/register.m: Add routine to allow unregistering. + Added because of a problem that turned out to be something + else. Not really clear if it is really needed. + + * widgets/misc.m: Miscellaneous widgets or widget utils. + + * song/song.m: Add a routine to update all views. + + * files/mdmlread.m: Add a comment + + * gui/trackprop.m: First working track properties with basic fields. + 1999-09-15 Steve Ratcliffe + + * files/mdmlread.m, files/mdmlwrite.m, files/midiread.m: + Dealt with some memory leaks + + * Makefile, help/C/Makefile, help/Makefile, po/Makefile: + install changes to makefiles + + * widgets/melystrackinfo.m: + Improve display by preventing some clearing of surounding shadow. + + * help/C/Makefile: add install + + * help/Makefile: add makefile for help + + * widgets/melystrackinfo.m, po/FILES, po/melys.pot, po/zz.po: + Fixes to i18n + + * help/C/Makefile, help/C/topic.dat, help/C/track.sgml, Makefile, make.conf: + Started on installation + + * help/C/.cvsignore, help/C/Makefile: + Use the html directory now instead of melys + + * programs/.cvsignore, programs/melplay.m: + The initial portion of the file had been chopped off. Replaced. + + * version: Version file added * REL-0-0-10 diff -rNu melys-0.0.10/INSTALL melys-0.0.11/INSTALL --- melys-0.0.10/INSTALL Wed Sep 15 13:49:19 1999 +++ melys-0.0.11/INSTALL Sun Sep 19 23:02:58 1999 @@ -8,8 +8,21 @@ make -This should build everything. Nothing is installed anywhere yet. -Installation will be fixed in 0.0.11 +This should build everything. + +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. + + make install + +This should install the binary, 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. Run --- diff -rNu melys-0.0.10/Makefile melys-0.0.11/Makefile --- melys-0.0.10/Makefile Wed Sep 15 13:49:19 1999 +++ melys-0.0.11/Makefile Sun Sep 19 23:09:27 1999 @@ -1,28 +1,40 @@ DIRS=config song seq files md util gui po widgets midi pixmaps \ - programs + help \ + programs # should be last -all: build +MAKEFILE = programs/Makefile +CFILE = programs/melys.c +HEADER = include/elements.h +PREREQ = $(HEADER) $(MAKEFILE) $(CFILE) -rebuild: makefile clean headers build +all: $(PREREQ) build -makefile: +rebuild: cfiles build + +$(MAKEFILE): for i in $(DIRS); \ do (cd $$i; pwd;\ l="$$(echo *.m)"; \ if [ ! -f Makefile -a "$$l" != "*.m" ]; \ then mcode -o Makefile -fmake *.m ; fi) || exit 1;\ done -headers: - for i in $(DIRS); do (cd $$i; $(MAKE) headers) || exit 1; done -cfiles: makefile headers + +$(HEADER): + for i in $(DIRS); do \ + (cd $$i; mcode -f header *.m >/dev/null) || exit 1; done + +$(CFILE) cfiles: for i in $(DIRS); do (cd $$i; $(MAKE) cfiles) || exit 1; done - $(MAKE) makefile + build: for i in $(DIRS); do (cd $$i; $(MAKE) ) || exit 1; done +install: + for i in $(DIRS); do (cd $$i; $(MAKE) install ) || exit 1; done clean: for i in $(DIRS); do (cd $$i; $(MAKE) clean) || exit 1; done clobber: for i in $(DIRS); do (cd $$i; $(MAKE) clobber) || exit 1; done -fordist: cfiles +fordist: $(PREREQ) find mlib -name '*.pyo' | xargs rm -f + cd help/C ; make diff -rNu melys-0.0.10/README melys-0.0.11/README --- melys-0.0.10/README Wed Sep 15 13:49:19 1999 +++ melys-0.0.11/README Sun Sep 19 23:02:58 1999 @@ -1,9 +1,9 @@ This is Melys, a MIDI sequencer for ALSA. -Written by Steve Ratcliffe -Project home page http://www.parabola.demon.co.uk/melys/ -Project mail melys@parabola.demon.co.uk + Written by Steve Ratcliffe + Project home page http://www.parabola.demon.co.uk/melys/ + Project mail melys@parabola.demon.co.uk See the file COPYING for licence details. @@ -62,6 +62,14 @@ Melplay is a command line player. It reads all formats that Melys can read. + +Bug reporting +------------- + +My attitude to bugs is that they are not allowed, even in software +under heavy development as this is. So if you find any mail them +to melys@parabola.demon.co.uk if you have a fix all the better, but +the main thing is get the bug submitted. Authors ------- diff -rNu melys-0.0.10/config/Makefile melys-0.0.11/config/Makefile --- melys-0.0.10/config/Makefile Wed Sep 15 14:03:48 1999 +++ melys-0.0.11/config/Makefile Sun Sep 19 23:10:04 1999 @@ -16,6 +16,9 @@ +install: all + + # Remove all object files and exectutables # clean: @@ -35,3 +38,5 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< +ports.o: ../include/seqlib.h +ports.o: ../include/config.h diff -rNu melys-0.0.10/files/Makefile melys-0.0.11/files/Makefile --- melys-0.0.10/files/Makefile Wed Sep 15 14:03:50 1999 +++ melys-0.0.11/files/Makefile Sun Sep 19 23:10:05 1999 @@ -26,6 +26,9 @@ +install: all + + # Remove all object files and exectutables # clean: @@ -45,3 +48,19 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< +mdmlwrite.o: ../include/melfile.h +mdmlwrite.o: ../include/mdrw.h +midiwrite.o: ../include/melfile.h +midiwrite.o: ../include/md.h +midiwrite.o: ../include/midi.h +file.o: ../include/md.h +file.o: ../include/melfile.h +file.o: ../include/mdrw.h +file.o: ../include/midi.h +midiread.o: ../include/md.h +midiread.o: ../include/melfile.h +midiread.o: ../include/midi.h +mdmlread.o: ../include/melfile.h +mdmlread.o: ../include/md.h +mdmlread.o: ../include/mdrw.h +mdmlread.o: ../include/midi.h diff -rNu melys-0.0.10/files/mdmlread.c melys-0.0.11/files/mdmlread.c --- melys-0.0.10/files/mdmlread.c Wed Sep 15 14:03:59 1999 +++ melys-0.0.11/files/mdmlread.c Sun Sep 19 23:10:10 1999 @@ -14,6 +14,9 @@ * 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. + * * */ @@ -111,6 +114,7 @@ struct element *retel = NULL; xmlNodePtr child; const char *name; + char *tmp; unsigned long ostart = 0; if (node->type != XML_ELEMENT_NODE) @@ -118,6 +122,8 @@ name = node->name; + tmp = NULL; + /* * Its slightly important to have the most likely * matches appear at the top. @@ -160,7 +166,7 @@ unsigned char *data; int len; - data = get_hex_data(xmlNodeGetContent(node->childs), &len); + data = get_hex_data(tmp=xmlNodeGetContent(node->childs), &len); sep = md_sysex_new(data[0], data+1, len - 1); retel = MD_ELEMENT(sep); @@ -200,6 +206,8 @@ } else if (strcmp(name, "track") == 0) { struct trackElement *tp; + int res; + msp->currtime = 0; msp->maxtime = 0; msp->devchan = 0; @@ -208,6 +216,9 @@ tp = md_track_new(); tp->name = xmlGetProp(node, "name"); + res = get_int(node, "program"); + if (res >= 0) + msp->program = res; retel = MD_ELEMENT(tp); } else if (strcmp(name, "tempomap") == 0) { @@ -299,36 +310,39 @@ } else if (strcmp(name, "text") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_TEXT, - xmlNodeGetContent(node))); + tmp = xmlNodeGetContent(node))); } else if (strcmp(name, "copyright") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_COPYRIGHT, - xmlNodeGetContent(node))); + tmp = xmlNodeGetContent(node))); } else if (strcmp(name, "trackname") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_TRACKNAME, - xmlNodeGetContent(node))); + tmp = xmlNodeGetContent(node))); } else if (strcmp(name, "instrument") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_INSTRUMENT, - xmlNodeGetContent(node))); + tmp = xmlNodeGetContent(node))); } else if (strcmp(name, "lyric") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_LYRIC, - xmlNodeGetContent(node))); + tmp = xmlNodeGetContent(node))); } else if (strcmp(name, "marker") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_MARKER, - xmlNodeGetContent(node))); + tmp = xmlNodeGetContent(node))); } else if (strcmp(name, "cuepoint") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_CUE, - xmlNodeGetContent(node))); + tmp = xmlNodeGetContent(node))); } else { printf("Unknown node name %s\n", name); return NULL; } + + if (tmp) + free(tmp); /* Set common attributes like time */ common_atts(msp, node, retel); diff -rNu melys-0.0.10/files/mdmlread.m melys-0.0.11/files/mdmlread.m --- melys-0.0.10/files/mdmlread.m Tue Sep 14 14:56:48 1999 +++ melys-0.0.11/files/mdmlread.m Sat Sep 18 17:02:30 1999 @@ -14,6 +14,9 @@ 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. + >>extern >>header >>header @@ -92,6 +95,7 @@ struct element *retel = NULL; xmlNodePtr child; const char *name; + char *tmp; unsigned long ostart = 0; if (node->type != XML_ELEMENT_NODE) @@ -99,6 +103,8 @@ name = node->name; + tmp = NULL; + /* * Its slightly important to have the most likely * matches appear at the top. @@ -141,7 +147,7 @@ unsigned char *data; int len; - data = get_hex_data(xmlNodeGetContent(node->childs), &len); + data = get_hex_data(tmp=xmlNodeGetContent(node->childs), &len); sep = md_sysex_new(data[0], data+1, len - 1); retel = MD_ELEMENT(sep); @@ -181,6 +187,8 @@ } else if (strcmp(name, "track") == 0) { struct trackElement *tp; + int res; + msp->currtime = 0; msp->maxtime = 0; msp->devchan = 0; @@ -189,6 +197,9 @@ tp = md_track_new(); tp->name = xmlGetProp(node, "name"); + res = get_int(node, "program"); + if (res >= 0) + msp->program = res; retel = MD_ELEMENT(tp); } else if (strcmp(name, "tempomap") == 0) { @@ -280,36 +291,39 @@ } else if (strcmp(name, "text") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_TEXT, - xmlNodeGetContent(node))); + tmp = xmlNodeGetContent(node))); } else if (strcmp(name, "copyright") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_COPYRIGHT, - xmlNodeGetContent(node))); + tmp = xmlNodeGetContent(node))); } else if (strcmp(name, "trackname") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_TRACKNAME, - xmlNodeGetContent(node))); + tmp = xmlNodeGetContent(node))); } else if (strcmp(name, "instrument") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_INSTRUMENT, - xmlNodeGetContent(node))); + tmp = xmlNodeGetContent(node))); } else if (strcmp(name, "lyric") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_LYRIC, - xmlNodeGetContent(node))); + tmp = xmlNodeGetContent(node))); } else if (strcmp(name, "marker") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_MARKER, - xmlNodeGetContent(node))); + tmp = xmlNodeGetContent(node))); } else if (strcmp(name, "cuepoint") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_CUE, - xmlNodeGetContent(node))); + tmp = xmlNodeGetContent(node))); } else { printf("Unknown node name %s\n", name); return NULL; } + + if (tmp) + free(tmp); /* Set common attributes like time */ common_atts(msp, node, retel); diff -rNu melys-0.0.10/files/mdmlwrite.c melys-0.0.11/files/mdmlwrite.c --- melys-0.0.10/files/mdmlwrite.c Wed Sep 15 14:03:59 1999 +++ melys-0.0.11/files/mdmlwrite.c Sun Sep 19 23:10:11 1999 @@ -134,6 +134,7 @@ mstate.devchan = -1; xtrack = xmlNewChild(doc->root, 0, "track", 0); set_prop_int(xtrack, "duration", MD_CONTAINER(el)->duration); + set_prop_int(xtrack, "program", MD_TRACK(el)->program); if (MD_TRACK(el)->name) xmlSetProp(xtrack, "name", MD_TRACK(el)->name); mstate.starttime = 0; @@ -279,7 +280,7 @@ g_free(stmp); } node = xmlNewChild(base, 0, "sysex", s->str); - g_string_free(s, 0); + g_string_free(s, 1); } break; case MD_TYPE_PART: diff -rNu melys-0.0.10/files/mdmlwrite.m melys-0.0.11/files/mdmlwrite.m --- melys-0.0.10/files/mdmlwrite.m Tue Sep 14 14:56:48 1999 +++ melys-0.0.11/files/mdmlwrite.m Sat Sep 18 17:02:30 1999 @@ -116,6 +116,7 @@ mstate.devchan = -1; xtrack = xmlNewChild(doc->root, 0, "track", 0); set_prop_int(xtrack, "duration", MD_CONTAINER(el)->duration); + set_prop_int(xtrack, "program", MD_TRACK(el)->program); if (MD_TRACK(el)->name) xmlSetProp(xtrack, "name", MD_TRACK(el)->name); mstate.starttime = 0; @@ -259,7 +260,7 @@ g_free(stmp); } node = xmlNewChild(base, 0, "sysex", s->str); - g_string_free(s, 0); + g_string_free(s, 1); } break; case MD_TYPE_PART: diff -rNu melys-0.0.10/files/midiread.c melys-0.0.11/files/midiread.c --- melys-0.0.10/files/midiread.c Wed Sep 15 14:03:59 1999 +++ melys-0.0.11/files/midiread.c Sun Sep 19 23:10:11 1999 @@ -395,7 +395,7 @@ el = MD_ELEMENT(md_keytouch_new(note, vel)); break; - case MIDI_CONTROLER: + case MIDI_CONTROLLER: control = read_int(msp, 1); val = read_int(msp, 1); el = MD_ELEMENT(md_control_new(control, val)); @@ -496,20 +496,16 @@ micro_tempo = ((data[0]<<16) & 0xff0000) + ((data[1]<<8) & 0xff00) + (data[2] & 0xff); map = MD_MAP(md_tempo_new(micro_tempo)); - g_free(data); break; case MIDI_META_TIME: map = MD_MAP(md_timesig_new(data[0], 1<port = data[0]; - g_free(data); break; case MIDI_META_TEXT: case MIDI_META_COPYRIGHT: @@ -542,6 +538,8 @@ MD_ELEMENT(map)->element_time = msp->current_time; md_add_elem(MD_CONTAINER(msp->tempo_map), MD_ELEMENT(map)); } + + g_free(data); return el; } diff -rNu melys-0.0.10/files/midiread.m melys-0.0.11/files/midiread.m --- melys-0.0.10/files/midiread.m Tue Sep 14 14:56:48 1999 +++ melys-0.0.11/files/midiread.m Sat Sep 18 17:02:30 1999 @@ -27,7 +27,7 @@ #define MIDI_NOTE_OFF 0x80 #define MIDI_NOTE_ON 0x90 #define MIDI_KEY_AFTERTOUCH 0xa0 -#define MIDI_CONTROLER 0xb0 +#define MIDI_CONTROLLER 0xb0 #define MIDI_PATCH 0xc0 #define MIDI_CHANNEL_AFTERTOUCH 0xd0 #define MIDI_PITCH_WHEEL 0xe0 @@ -409,7 +409,7 @@ el = MD_ELEMENT(md_keytouch_new(note, vel)); break; - case MIDI_CONTROLER: + case MIDI_CONTROLLER: control = read_int(msp, 1); val = read_int(msp, 1); el = MD_ELEMENT(md_control_new(control, val)); @@ -508,20 +508,16 @@ micro_tempo = ((data[0]<<16) & 0xff0000) + ((data[1]<<8) & 0xff00) + (data[2] & 0xff); map = MD_MAP(md_tempo_new(micro_tempo)); - g_free(data); break; case MIDI_META_TIME: map = MD_MAP(md_timesig_new(data[0], 1<port = data[0]; - g_free(data); break; case MIDI_META_TEXT: case MIDI_META_COPYRIGHT: @@ -554,6 +550,8 @@ MD_ELEMENT(map)->element_time = msp->current_time; md_add_elem(MD_CONTAINER(msp->tempo_map), MD_ELEMENT(map)); } + + g_free(data); return el; diff -rNu melys-0.0.10/files/midiwrite.c melys-0.0.11/files/midiwrite.c --- melys-0.0.10/files/midiwrite.c Wed Sep 15 14:03:59 1999 +++ melys-0.0.11/files/midiwrite.c Sun Sep 19 23:10:11 1999 @@ -22,6 +22,7 @@ #include "util.h" #include "elements.h" #include +#include "sys/asoundlib.h" #include "melfile.h" #include "md.h" #include "midi.h" @@ -55,6 +56,8 @@ static void put_data(struct midiwstate *msp, guint8 *data, int length); static gint noteoff_cmp(gconstpointer item1, gconstpointer item2); static void run_queue(struct midiwstate *msp, unsigned long time); +static void put_program(struct midiwstate *msp, int chan, unsigned long time, + int program); /* @@ -203,7 +206,7 @@ break; case MD_TYPE_CONTROL: put_time(msp, el->element_time); - put_status(msp, MIDI_CONTROLER, el->device_channel); + put_status(msp, MIDI_CONTROLLER, el->device_channel); put_int(msp, 1, MD_CONTROL(el)->control); put_int(msp, 1, MD_CONTROL(el)->value); break; @@ -232,10 +235,7 @@ put_int(msp, 1, MD_PRESSURE(el)->velocity); break; case MD_TYPE_PROGRAM: - put_time(msp, el->element_time); - put_status(msp, MIDI_PATCH, el->device_channel); - /* XXX TODO: modify for bank/program combinations */ - put_int(msp, 1, MD_PROGRAM(el)->program); + put_program(msp, MD_DEV(el), MD_TIME(el), MD_PROGRAM(el)->program); break; case MD_TYPE_SYSEX: @@ -571,4 +571,36 @@ } msp->notes = litem; msp->inQ = 0; +} + +/* + * Put out the program. This consists of possible bank select + * controls as well as the patch number. + * + * Arguments: + * msp - Midi write state + * chan - Channel for this change + * time - Time for change + * program - The MD program number + */ +static void +put_program(struct midiwstate *msp, int chan, unsigned long time, int program) +{ + + if (program > 127) { + /* XXX Everything is put out at the same time, this is very wrong */ + put_time(msp, time); + put_status(msp, MIDI_CONTROLLER, chan); + put_int(msp, 1, SND_MCTL_MSB_BANK); + put_int(msp, 1, program>>14); + + put_time(msp, time); + put_status(msp, MIDI_CONTROLLER, chan); + put_int(msp, 1, SND_MCTL_MSB_BANK); + put_int(msp, 1, program>>7); + } + put_time(msp, time); + put_status(msp, MIDI_PATCH, chan); + put_int(msp, 1, SND_MCTL_MSB_BANK); + put_int(msp, 1, program); } diff -rNu melys-0.0.10/files/midiwrite.m melys-0.0.11/files/midiwrite.m --- melys-0.0.10/files/midiwrite.m Sun Sep 12 23:39:36 1999 +++ melys-0.0.11/files/midiwrite.m Sat Sep 18 17:02:30 1999 @@ -13,6 +13,7 @@ GNU General Public License for more details. >>header +>>header sys/asoundlib.h >>header melfile.h >>header md.h @@ -184,7 +185,7 @@ break; case MD_TYPE_CONTROL: put_time(msp, el->element_time); - put_status(msp, MIDI_CONTROLER, el->device_channel); + put_status(msp, MIDI_CONTROLLER, el->device_channel); put_int(msp, 1, MD_CONTROL(el)->control); put_int(msp, 1, MD_CONTROL(el)->value); break; @@ -213,10 +214,7 @@ put_int(msp, 1, MD_PRESSURE(el)->velocity); break; case MD_TYPE_PROGRAM: - put_time(msp, el->element_time); - put_status(msp, MIDI_PATCH, el->device_channel); - /* XXX TODO: modify for bank/program combinations */ - put_int(msp, 1, MD_PROGRAM(el)->program); + put_program(msp, MD_DEV(el), MD_TIME(el), MD_PROGRAM(el)->program); break; case MD_TYPE_SYSEX: @@ -541,3 +539,36 @@ } msp->notes = litem; msp->inQ = 0; + + +>>function put_program +static void +struct midiwstate *msp; Midi write state +int chan; Channel for this change +unsigned long time; Time for change +int program; The MD program number + +>>description +Put out the program. +This consists of possible bank select controls as well as +the patch number. + +>>code + + if (program > 127) { + /* XXX Everything is put out at the same time, this is very wrong */ + put_time(msp, time); + put_status(msp, MIDI_CONTROLLER, chan); + put_int(msp, 1, SND_MCTL_MSB_BANK); + put_int(msp, 1, program>>14); + + put_time(msp, time); + put_status(msp, MIDI_CONTROLLER, chan); + put_int(msp, 1, SND_MCTL_MSB_BANK); + put_int(msp, 1, program>>7); + } + put_time(msp, time); + put_status(msp, MIDI_PATCH, chan); + put_int(msp, 1, SND_MCTL_MSB_BANK); + put_int(msp, 1, program); + diff -rNu melys-0.0.10/gui/.cvsignore melys-0.0.11/gui/.cvsignore --- melys-0.0.10/gui/.cvsignore Wed Sep 15 14:03:51 1999 +++ melys-0.0.11/gui/.cvsignore Sun Sep 19 23:10:07 1999 @@ -1,5 +1,7 @@ +help.c main.c menus.c +trackprop.c Makefile *.mdml *.mdml.gz *.mid .cvsignore diff -rNu melys-0.0.10/gui/Makefile melys-0.0.11/gui/Makefile --- melys-0.0.10/gui/Makefile Wed Sep 15 14:03:51 1999 +++ melys-0.0.11/gui/Makefile Sun Sep 19 23:10:07 1999 @@ -4,10 +4,14 @@ include $(TOP)/make.conf TARGETS = -OBJS = main.o \ - menus.o -GENCFILES = main.c \ - menus.c +OBJS = help.o \ + main.o \ + menus.o \ + trackprop.o +GENCFILES = help.c \ + main.c \ + menus.c \ + trackprop.c GENHFILES = ../include/melgui.h \ ../include/melmsg.h \ ../include/menus.h @@ -20,6 +24,9 @@ +install: all + + # Remove all object files and exectutables # clean: @@ -39,3 +46,36 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< +trackprop.o: ../include/melreg.h +trackprop.o: ../include/song.h +trackprop.o: ../include/elements.h +trackprop.o: ../include/melfile.h +trackprop.o: ../include/melwidgets.h +trackprop.o: ../include/md.h +trackprop.o: ../include/melgui.h +menus.o: ../include/melreg.h +menus.o: ../include/seqlib.h +menus.o: ../include/elements.h +menus.o: ../include/song.h +menus.o: ../include/melys.h +menus.o: ../include/melfile.h +menus.o: ../include/melmidi.h +menus.o: ../include/melgui.h +menus.o: ../include/pixmaps.h +menus.o: ../include/md.h +menus.o: ../include/melystrack.h +menus.o: ../include/menus.h +help.o: ../include/melgui.h +main.o: ../include/menus.h +main.o: ../include/elements.h +main.o: ../include/melreg.h +main.o: ../include/melfile.h +main.o: ../include/melmidi.h +main.o: ../include/song.h +main.o: ../include/melys.h +main.o: ../include/melystrackinfo.h +main.o: ../include/melystrackdisplay.h +main.o: ../include/melystrack.h +main.o: ../include/md.h +main.o: ../include/melgui.h +main.o: ../include/melmsg.h diff -rNu melys-0.0.10/gui/help.c melys-0.0.11/gui/help.c --- melys-0.0.10/gui/help.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.11/gui/help.c Sun Sep 19 23:10:13 1999 @@ -0,0 +1,59 @@ +/* + * + * 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. + * + * This replaces the completely sucky gnome help stuff with some + * only moderately sucky routines. + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include +#include "gtk/gtk.h" +#include "libgnome/gnome-help.h" +#include "melgui.h" +#include "intl.h" + + + + +void +mel_prop_help(GtkWidget *ignored, gint page_num, struct help_entry *ref) +{ + struct help_page_entry *hpe; + gchar *file; + gchar *url; + + if (page_num >= ref->npages) { + g_warning("Not enough help page entries"); + return; + } + + hpe = &ref->refs[page_num]; + + file = gnome_help_file_path(hpe->name, hpe->path); + if (!file) + return; + + url = g_strdup_printf("file:%s#%s", file, hpe->section); + + /* db2html uppercases the name... */ + file = strchr(url, '#'); + g_strup(file); + + gnome_help_goto(ignored, url); + g_free(url); +} diff -rNu melys-0.0.10/gui/help.m melys-0.0.11/gui/help.m --- melys-0.0.10/gui/help.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.11/gui/help.m Thu Sep 16 15:32:09 1999 @@ -0,0 +1,63 @@ +>>name help.m - routines for help + +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. + +This replaces the completely sucky gnome help stuff with some +only moderately sucky routines. + +>>header +>>header gtk/gtk.h +>>header libgnome/gnome-help.h +>>headerdef --decl melgui.h + +/* + * Structure to keep references to help locations for property + * boxes with multiple pages. + */ +struct help_entry { + int npages; /* The number of page references */ + struct help_page_entry { + char *name; /* Application name */ + char *path; /* Path to help file */ + char *section; /* Section within help file */ + } *refs; /* The actual page references */ +}; + +>>function mel_prop_help +void +GtkWidget *ignored; A widget that is not used +gint page_num; The page number to display help for +struct help_entry *ref; The help entries reference +>>code + struct help_page_entry *hpe; + gchar *file; + gchar *url; + + if (page_num >= ref->npages) { + g_warning("Not enough help page entries"); + return; + } + + hpe = &ref->refs[page_num]; + + file = gnome_help_file_path(hpe->name, hpe->path); + if (!file) + return; + + url = g_strdup_printf("file:%s#%s", file, hpe->section); + + /* db2html uppercases the name... */ + file = strchr(url, '#'); + g_strup(file); + + gnome_help_goto(ignored, url); + g_free(url); diff -rNu melys-0.0.10/gui/main.c melys-0.0.11/gui/main.c --- melys-0.0.10/gui/main.c Wed Sep 15 14:04:01 1999 +++ melys-0.0.11/gui/main.c Sun Sep 19 23:10:14 1999 @@ -19,8 +19,8 @@ #include "glib.h" #include "except.h" #include "util.h" -#include "gnome.h" #include +#include "gnome.h" #include "menus.h" #include "elements.h" #include "melreg.h" @@ -45,6 +45,8 @@ " You can also add and delete tracks from this menu" ); +static GnomeMDI *MainMDI; + static GtkWidget *create_view(GnomeMDIChild *child, gpointer data); static int add_view_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data); static void view_changed_cb(GtkObject *mdi, GtkWidget *widget, @@ -69,6 +71,7 @@ gnome_init("melys", MELYS_VERSION_STRING, argc, argv); mdi = GNOME_MDI(gnome_mdi_new("melys", _("The Melys sequencer"))); + MainMDI = mdi; mel_init_menus(mdi); @@ -293,6 +296,7 @@ mel_add_view(mdi, child, w, toplevel); + /* A bug with notbook drawing (may be fixed in gtk now) */ while (gtk_events_pending()) gtk_main_iteration(); @@ -306,6 +310,7 @@ tracksmenu, mdi); song->trackview = w; + melys_track_set_song(MELYS_TRACK(w), song); } /* @@ -362,6 +367,19 @@ } return TRUE; /* True, there is an error */ +} + +/* + * Update the current view. + * + */ +void +mel_view_update(void) +{ + struct song *song; + + song = get_song_from_mdi((GtkObject *)MainMDI); + song_view_update(song); } /* diff -rNu melys-0.0.10/gui/main.m melys-0.0.11/gui/main.m --- melys-0.0.10/gui/main.m Tue Sep 14 14:57:50 1999 +++ melys-0.0.11/gui/main.m Sat Sep 18 17:00:01 1999 @@ -12,6 +12,7 @@ GNU General Public License for more details. >>header +>>header gnome.h >>header menus.h >>header elements.h >>header melreg.h @@ -26,6 +27,10 @@ >>headerdef --decl melgui.h +struct File; +struct rootElement; +struct trackElement; + >># This header is written to be independent of gnome >>headerdef melmsg.h @@ -57,6 +62,8 @@ extern void mel_song_display(struct song *sd, struct _GtkObject *parent, int _type, char *fmt, ...); +extern void mel_view_update(void); + >>extern /* * Help text for the context menu on the info pane @@ -67,6 +74,8 @@ " You can also add and delete tracks from this menu" ); +static GnomeMDI *MainMDI; + >>function melys_app int int argc; The program argument count @@ -84,6 +93,7 @@ gnome_init("melys", MELYS_VERSION_STRING, argc, argv); mdi = GNOME_MDI(gnome_mdi_new("melys", _("The Melys sequencer"))); + MainMDI = mdi; mel_init_menus(mdi); @@ -308,6 +318,7 @@ mel_add_view(mdi, child, w, toplevel); + /* A bug with notbook drawing (may be fixed in gtk now) */ while (gtk_events_pending()) gtk_main_iteration(); @@ -321,6 +332,7 @@ tracksmenu, mdi); song->trackview = w; + melys_track_set_song(MELYS_TRACK(w), song); >>function create_view static GtkWidget * @@ -382,6 +394,19 @@ } return TRUE; /* True, there is an error */ + +>>function mel_view_update +void + +>>description +Update the current view. + +>>code + struct song *song; + + song = get_song_from_mdi((GtkObject *)MainMDI); + song_view_update(song); + >>function add_view_cb static int diff -rNu melys-0.0.10/gui/menus.c melys-0.0.11/gui/menus.c --- melys-0.0.10/gui/menus.c Wed Sep 15 14:04:02 1999 +++ melys-0.0.11/gui/menus.c Sun Sep 19 23:10:14 1999 @@ -19,7 +19,12 @@ #include "glib.h" #include "except.h" #include "util.h" -#include "gnome.h" +#include "gtk/gtk.h" +#include "gdk/gdkkeysyms.h" +#include "libgnomeui/gnome-app.h" +#include "libgnomeui/gnome-mdi.h" +#include "libgnomeui/gnome-mdi-generic-child.h" +#include "libgnomeui/gnome-about.h" #include "melreg.h" #include "seqlib.h" #include "elements.h" @@ -52,6 +57,7 @@ static void about_cb(GtkWidget *w, gpointer data); static void add_track_cb(GtkWidget *w, gpointer data); static void delete_track_cb(GtkWidget *w, gpointer data); +static void delete_empty_track_cb(GtkWidget *w, gpointer data); /* The file menu */ @@ -94,6 +100,11 @@ 0, NULL, /* Pixmap */ GDK_Delete, (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, + {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 */ + (GtkWidget*)0 }, GNOMEUIINFO_END }; @@ -291,7 +302,6 @@ open_id = sd->open_dialog; sel = (GtkFileSelection*)reg_get(open_id); if (sel == NULL) { - printf("NO sel\n"); return; } filename = gtk_file_selection_get_filename(sel); @@ -395,7 +405,6 @@ save_id = sd->save_dialog; sel = (GtkFileSelection*)reg_get(save_id); if (sel == NULL) { - printf("NO sel\n"); return; } filename = gtk_file_selection_get_filename(sel); @@ -600,7 +609,7 @@ md_add_elem(MD_CONTAINER(sd->mdroot), MD_ELEMENT(track)); } - melys_track_redraw(MELYS_TRACK(sd->trackview)); + song_view_update(sd); } /* @@ -625,11 +634,44 @@ for (tn = 0; tn < sd->mdroot->tracks; tn++) { track = md_track_nth(sd->mdroot, tn); if (track->selected) { - md_track_delete(sd->mdroot, track); + md_remove(MD_CONTAINER(sd->mdroot), MD_ELEMENT(track)); + goto rescan; + } + } + } + + song_view_update(sd); +} + +/* + * Delete all selected tracks. + * + * Arguments: + * w - Widget event received on + * data - The mdi object + */ +static void +delete_empty_track_cb(GtkWidget *w, gpointer data) +{ + struct song *sd; + struct trackElement *track; + GtkObject *mdi = data; + int tn; + + sd = get_song_from_mdi(mdi); + + if (sd->mdroot) { +rescan: + for (tn = 0; tn < sd->mdroot->tracks; tn++) { + track = md_track_nth(sd->mdroot, tn); + + /* simple method - only deletes tracks never used */ + if (MD_CONTAINER(track)->elements->len == 0) { + md_remove(MD_CONTAINER(sd->mdroot), MD_ELEMENT(track)); goto rescan; } } } - melys_track_redraw(MELYS_TRACK(sd->trackview)); + song_view_update(sd); } diff -rNu melys-0.0.10/gui/menus.m melys-0.0.11/gui/menus.m --- melys-0.0.10/gui/menus.m Tue Sep 14 14:57:50 1999 +++ melys-0.0.11/gui/menus.m Sat Sep 18 16:59:28 1999 @@ -11,6 +11,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +>>header gtk/gtk.h +>>header gdk/gdkkeysyms.h +>>header libgnomeui/gnome-app.h +>>header libgnomeui/gnome-mdi.h +>>header libgnomeui/gnome-mdi-generic-child.h +>>header libgnomeui/gnome-about.h >>header melreg.h >>header seqlib.h >>header elements.h @@ -67,6 +73,11 @@ 0, NULL, /* Pixmap */ GDK_Delete, (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, + {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 */ + (GtkWidget*)0 }, GNOMEUIINFO_END }; @@ -268,7 +279,6 @@ open_id = sd->open_dialog; sel = (GtkFileSelection*)reg_get(open_id); if (sel == NULL) { - printf("NO sel\n"); return; } filename = gtk_file_selection_get_filename(sel); @@ -373,7 +383,6 @@ save_id = sd->save_dialog; sel = (GtkFileSelection*)reg_get(save_id); if (sel == NULL) { - printf("NO sel\n"); return; } filename = gtk_file_selection_get_filename(sel); @@ -579,7 +588,7 @@ md_add_elem(MD_CONTAINER(sd->mdroot), MD_ELEMENT(track)); } - melys_track_redraw(MELYS_TRACK(sd->trackview)); + song_view_update(sd); >>function delete_track_cb @@ -603,11 +612,43 @@ for (tn = 0; tn < sd->mdroot->tracks; tn++) { track = md_track_nth(sd->mdroot, tn); if (track->selected) { - md_track_delete(sd->mdroot, track); + md_remove(MD_CONTAINER(sd->mdroot), MD_ELEMENT(track)); + goto rescan; + } + } + } + + song_view_update(sd); + + +>>function delete_empty_track_cb +static void +GtkWidget *w; Widget event received on +gpointer data; The mdi object + +>>description +Delete all selected tracks. + +>>code + struct song *sd; + struct trackElement *track; + GtkObject *mdi = data; + int tn; + + sd = get_song_from_mdi(mdi); + + if (sd->mdroot) { +rescan: + for (tn = 0; tn < sd->mdroot->tracks; tn++) { + track = md_track_nth(sd->mdroot, tn); + + /* simple method - only deletes tracks never used */ + if (MD_CONTAINER(track)->elements->len == 0) { + md_remove(MD_CONTAINER(sd->mdroot), MD_ELEMENT(track)); goto rescan; } } } - melys_track_redraw(MELYS_TRACK(sd->trackview)); + song_view_update(sd); diff -rNu melys-0.0.10/gui/mlib.conf melys-0.0.11/gui/mlib.conf --- melys-0.0.10/gui/mlib.conf Wed Jul 14 17:26:12 1999 +++ melys-0.0.11/gui/mlib.conf Thu Jan 1 00:00:00 1970 @@ -1,2 +0,0 @@ - -COMM_HEADERS = gnome.h diff -rNu melys-0.0.10/gui/trackprop.c melys-0.0.11/gui/trackprop.c --- melys-0.0.10/gui/trackprop.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.11/gui/trackprop.c Sun Sep 19 23:10:14 1999 @@ -0,0 +1,415 @@ +/* + * + * 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/gtk.h" +#include "libgnomeui/gnome-propertybox.h" +#include "libgnome/gnome-help.h" +#include "melreg.h" +#include "song.h" +#include "elements.h" +#include "melfile.h" +#include "melwidgets.h" +#include "md.h" +#include "melgui.h" +#include "intl.h" + + +/* + * Structure to hold the state of the track property + * change. + */ +struct track_prop { + + regid_t box; /* The property box */ + + struct song *song; /* All the song information */ + struct trackElement *track; /* The track to be modified */ + + /* Signals set up that need disconnecting */ + guint destroy; + + /* Page numbers */ + int basic_page; + int instrument_page; + + /* This is where we can collect the values that were set */ + GtkEntry *trackname; /* The track name */ + GtkSpinButton *devname; /* Device name will probably change */ + GtkSpinButton *channel; /* The channel number */ + GtkSpinButton *instr; /* The instrument number (TEMP) */ + GtkSpinButton *bankmsb; /* The instrument number high bank */ + GtkSpinButton *banklsb; /* The instrument number low bank */ +}; + +static GtkWidget *prop_track_info(struct track_prop *prop); +static GtkWidget *prop_track_instruments(struct track_prop *prop); +static void attach_at(GtkTable *tab, GtkWidget *w, int row, int col, + int xopts, int yopts); +static GtkWidget *new_lab_align(char *str); +static void prop_change(GtkWidget *w, gpointer data); +static void prop_apply(GtkWidget *w, gint page, struct track_prop *prop); +static void prop_destroy(GtkWidget *w, gpointer data); + + +/* + * Bring up a property box for the specified track. When the + * user clicks apply/ok then the track properties are set. + * + * Arguments: + * track - The track to set the properties for + * song - Song information + * which - Which page to present first + */ +void +track_prop_box(struct trackElement *track, struct song *song, int which) +{ + GtkWidget *gpb; + GtkWidget *basic; + GtkWidget *basiclab; + GtkWidget *instr; + GtkWidget *instrlab; + struct track_prop *prop; + + /* + * First check to see if one is open already. + */ + gpb = reg_get_widget(track->props); + if (gpb) { + gdk_window_show(gpb->window); + gdk_window_raise(gpb->window); + + goto out; + } + + prop = g_new0(struct track_prop, 1); + + prop->track = track; + prop->song = song; + + gpb = gnome_property_box_new(); + prop->box = reg_object((GtkObject*)gpb, (GtkObject*)song->child); + track->props = prop->box; + + basic = prop_track_info(prop); + basiclab = gtk_label_new(_("Basic")); + prop->basic_page = gnome_property_box_append_page( + GNOME_PROPERTY_BOX(gpb), basic, basiclab); + + instr = prop_track_instruments(prop); + instrlab = gtk_label_new(_("Instruments")); + prop->instrument_page = gnome_property_box_append_page( + GNOME_PROPERTY_BOX(gpb), instr, instrlab); + + //gtk_notebook_set_page(gpb->notebook, prop->basic_page); + + prop->destroy = gtk_signal_connect(GTK_OBJECT(gpb), "destroy", + GTK_SIGNAL_FUNC(prop_destroy), prop); + gtk_signal_connect(GTK_OBJECT(gpb), "apply", + GTK_SIGNAL_FUNC(prop_apply), prop); + gtk_signal_connect(GTK_OBJECT(gpb), "apply", + GTK_SIGNAL_FUNC(prop_apply), prop); + + { + /* + * Set up the help system. The standard gnome help system + * for property boxes does not work well for me. So I am + * using a system that allows the help to be in different + * places and can be different sections in the same document. + */ + static struct help_page_entry pages[] = { + {"melys", "track.html", "track-prop-info"}, + {"melys", "track.html", "track-prop-instruments"}, + }; + static struct help_entry help_entry = { + NELEM(pages), pages + }; + + gtk_signal_connect(GTK_OBJECT(gpb), "help", + GTK_SIGNAL_FUNC(mel_prop_help), &help_entry); + } + + out: + gtk_notebook_set_page((GtkNotebook*)GNOME_PROPERTY_BOX(gpb)->notebook, which); + gtk_widget_show(gpb); +} + +/* + * Create the actual widget that makes up the basic track + * properties page. A long routine, but straightforward. The + * property box is built up piece by piece. + * + */ +static GtkWidget * +prop_track_info(struct track_prop *prop) +{ + struct trackElement *track; + GtkFrame *frame; + GtkBox *mainbox; + GtkTable *tab; + /* Track name */ + GtkWidget *namelab; + GtkEntry *trackname; + GtkWidget *tnbox; + /* Device name */ + GtkWidget *devlab; + GtkWidget *devlist; + GtkWidget *devbox; + GList *devnames = NULL; + /* Channel number */ + GtkWidget *chanbox; + GtkWidget *chanlab; + GtkWidget *chan; + + track = prop->track; + + frame = (GtkFrame *)gtk_frame_new(_("Track properties")); + + /* + * Create the boxes that some of the widgets are packed into. + * The mainbox may not be needed. + */ + tab = (GtkTable *)gtk_table_new(3, 3, 0); + mainbox = (GtkBox *)gtk_vbox_new(0, 0/*spacing*/); + devbox = gtk_hbox_new(0, 0); + chanbox = gtk_hbox_new(0, 0); + tnbox = gtk_hbox_new(0, 0); + + /* Create the labels */ + namelab = new_lab_align(_("Track name")); + devlab = new_lab_align(_("Output device")); + chanlab = new_lab_align(_("Channel")); + + /* Entry box for the track name */ + trackname = (GtkEntry *)gtk_entry_new(); + if (track->name) + gtk_entry_set_text(trackname, track->name); + gtk_box_pack_start((GtkBox *)tnbox, (GtkWidget *)trackname, 0, 0, 0); + + /* Channel spinner */ + chan = mel_int_spinner(1, 16, MD_CHAN(track)+1); + gtk_box_pack_start((GtkBox *)chanbox, chan, 0, 0, 0); + + + /* The combo box for devices */ +#if 0 + devnames = g_list_append(devnames, "A: not operational"); + devnames = g_list_append(devnames, "B: another test"); + devnames = g_list_append(devnames, "C: yet another test"); + devlist = gtk_combo_new(); + gtk_combo_set_popdown_strings((GtkCombo *)devlist, devnames); + gtk_entry_set_editable((GtkEntry*)GTK_COMBO(devlist)->entry, 0); +#endif + devlist = mel_int_spinner(1, 4, MD_DEV(track)+1); /* Very temporary */ + gtk_box_pack_start((GtkBox *)devbox, (GtkWidget *)devlist, 0, 0, 0); + + + gtk_container_add((GtkContainer *)frame, (GtkWidget*)mainbox); + gtk_box_pack_start(mainbox, (GtkWidget *)tab, 0, 0, 0); + /* ..., expand, fill, padding */ + + /* Attach all the labels */ + attach_at(tab, namelab, 0, 0, GTK_FILL, 0); + attach_at(tab, devlab, 1, 0, GTK_FILL, 0); + attach_at(tab, chanlab, 2, 0, GTK_FILL, 0); + + /* Now attach the form boxes */ + attach_at(tab, tnbox, 0, 1, GTK_FILL, 0); + attach_at(tab, devbox, 1, 1, GTK_FILL, 0); + attach_at(tab, chanbox, 2, 1, GTK_FILL, 0); + + /* + * Connect to all the changed signals. All this does is allow + * us to get the apply and OK button activated. Nothing is + * changed in the real track until the apply signal is received. + */ + gtk_signal_connect((GtkObject *)trackname, "changed", prop_change, prop); + gtk_signal_connect((GtkObject *)devlist, "changed", prop_change, prop); + gtk_signal_connect((GtkObject *)chan, "changed", prop_change, prop); + + prop->trackname = trackname; + prop->channel = GTK_SPIN_BUTTON(chan); + prop->devname = GTK_SPIN_BUTTON(devlist); + + gtk_widget_show_all((GtkWidget*)frame); + return (GtkWidget *)frame; +} + +/* + * Build up the instrument definition page. + * + */ +static GtkWidget * +prop_track_instruments(struct track_prop *prop) +{ + struct trackElement *track; + GtkWidget *frame; + GtkWidget *constructionlab; + GtkWidget *tmpbox; + + /* Instrument number */ + GtkWidget *instr; + GtkWidget *instrbox; + GtkWidget *instrlab; + /* Bank MSB */ + GtkWidget *bankmsb; + GtkWidget *bankmsblab; + /* Bank LSB */ + GtkWidget *banklsb; + GtkWidget *banklsblab; + + track = prop->track; + + frame = gtk_frame_new(_("Instruments")); + tmpbox = gtk_vbox_new(0, 0); + instrbox = gtk_hbox_new(0, 0); + instrlab = new_lab_align(_("Instrument")); + bankmsblab = new_lab_align(_("Bank MSB")); + banklsblab = new_lab_align(_("Bank LSB")); + + constructionlab = gtk_label_new( + _("This page will be a comprehensive instrument selection page\n" + "At present you can just select from program\n" + "and bank MSB/LSB numbers\n" + )); + + gtk_box_pack_start((GtkBox*)tmpbox, constructionlab, 0, 0, 10); + + /* Instrument spinner */ + instr = mel_int_spinner(0, 127, track->program & 0x7f); + gtk_box_pack_start((GtkBox *)instrbox, instrlab, 0, 0, 10); + gtk_box_pack_start((GtkBox *)instrbox, instr, 0, 0, 10); + + banklsb = mel_int_spinner(0, 127, (track->program >> 7) & 0x7f); + bankmsb = mel_int_spinner(0, 127, (track->program >> 14) & 0x7f); + gtk_box_pack_start((GtkBox *)instrbox, bankmsblab, 0, 0, 5); + gtk_box_pack_start((GtkBox *)instrbox, bankmsb, 0, 0, 0); + gtk_box_pack_start((GtkBox *)instrbox, banklsblab, 0, 0, 5); + gtk_box_pack_start((GtkBox *)instrbox, banklsb, 0, 0, 0); + + gtk_box_pack_start((GtkBox*)tmpbox, instrbox, 0, 0, 10); + + gtk_container_add((GtkContainer *)frame, tmpbox); + gtk_widget_show_all(frame); + + gtk_signal_connect((GtkObject *)instr, "changed", prop_change, prop); + gtk_signal_connect((GtkObject *)bankmsb, "changed", prop_change, prop); + gtk_signal_connect((GtkObject *)banklsb, "changed", prop_change, prop); + + prop->instr = GTK_SPIN_BUTTON(instr); + prop->bankmsb = GTK_SPIN_BUTTON(bankmsb); + prop->banklsb = GTK_SPIN_BUTTON(banklsb); + + return frame; +} + +static void +attach_at(GtkTable *tab, GtkWidget *w, int row, int col, int xopts, int yopts) +{ + + gtk_table_attach(tab, w, col, col+1, row, row+1, xopts, yopts, 10, 4); +} + +/* + * Create a label and set its justification. + * + */ +static GtkWidget * +new_lab_align(char *str) +{ + GtkWidget *lab; + + lab = gtk_label_new(str); + gtk_misc_set_alignment((GtkMisc *)lab, 0.0, 0.5); + return lab; +} + +static void +prop_change(GtkWidget *w, gpointer data) +{ + struct track_prop *prop = data; + GtkWidget *gpb; + + gpb = reg_get_widget(prop->box); + if (gpb) { + gnome_property_box_changed((GnomePropertyBox *)gpb); + } +} + +static void +prop_apply(GtkWidget *w, gint page, struct track_prop *prop) +{ + struct trackElement *track; + char *str; + int num; + int program; + + track = prop->track; + if (!track) + return; + + if (page != -1) + return; + + str = gtk_entry_get_text(prop->trackname); + if (str) { + if (track->name) + g_free(track->name); + track->name = g_strdup(str); + } + + num = gtk_spin_button_get_value_as_int(prop->channel); + num--; /* Really starts at 0 */ + if (num != MD_CHAN(track)) + md_set_devchan(MD_ELEMENT(track), MD_DEV(track), num); + num = gtk_spin_button_get_value_as_int(prop->devname); + num--; /* Really starts at 0 */ + if (num != MD_DEV(track)) + md_set_devchan(MD_ELEMENT(track), num, MD_CHAN(track)); + + num = gtk_spin_button_get_value_as_int(prop->instr); + program = num; + + num = gtk_spin_button_get_value_as_int(prop->banklsb); + program |= num << 7; + num = gtk_spin_button_get_value_as_int(prop->bankmsb); + program |= num << 14; + if (program != track->program) { + track->program = program; + } + + MD_SET_MODIFIED(track, TRUE); + song_view_update(prop->song); +} + +static void +prop_destroy(GtkWidget *w, gpointer data) +{ + struct track_prop *prop = data; + GtkObject *obj; + + obj = reg_get(prop->box); + if (obj) { + gtk_signal_disconnect(obj, prop->destroy); + gtk_object_destroy(obj); + } + + reg_unreg(prop->box); +} diff -rNu melys-0.0.10/gui/trackprop.m melys-0.0.11/gui/trackprop.m --- melys-0.0.10/gui/trackprop.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.11/gui/trackprop.m Sat Sep 18 16:59:01 1999 @@ -0,0 +1,422 @@ +>>name trackprop.m - track properties box + +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/gtk.h +>>header libgnomeui/gnome-propertybox.h +>>header libgnome/gnome-help.h +>>header melreg.h +>>header song.h +>>header elements.h +>>header melfile.h +>>header melwidgets.h +>>header md.h + +>>headerdef --decl melgui.h + +/* + * The different pages for the track properties. + */ +#define TRACK_PROP_BASIC 0 +#define TRACK_PROP_INSTR 1 + +>>extern + +/* + * Structure to hold the state of the track property + * change. + */ +struct track_prop { + + regid_t box; /* The property box */ + + struct song *song; /* All the song information */ + struct trackElement *track; /* The track to be modified */ + + /* Signals set up that need disconnecting */ + guint destroy; + + /* Page numbers */ + int basic_page; + int instrument_page; + + /* This is where we can collect the values that were set */ + GtkEntry *trackname; /* The track name */ + GtkSpinButton *devname; /* Device name will probably change */ + GtkSpinButton *channel; /* The channel number */ + GtkSpinButton *instr; /* The instrument number (TEMP) */ + GtkSpinButton *bankmsb; /* The instrument number high bank */ + GtkSpinButton *banklsb; /* The instrument number low bank */ +}; + +>>function track_prop_box +void +struct trackElement *track; The track to set the properties for +struct song *song; Song information +int which; Which page to present first + +>>description +Bring up a property box for the specified track. +When the user clicks apply/ok then the track properties are set. + +>>code + GtkWidget *gpb; + GtkWidget *basic; + GtkWidget *basiclab; + GtkWidget *instr; + GtkWidget *instrlab; + struct track_prop *prop; + + /* + * First check to see if one is open already. + */ + gpb = reg_get_widget(track->props); + if (gpb) { + gdk_window_show(gpb->window); + gdk_window_raise(gpb->window); + + goto out; + } + + prop = g_new0(struct track_prop, 1); + + prop->track = track; + prop->song = song; + + gpb = gnome_property_box_new(); + prop->box = reg_object((GtkObject*)gpb, (GtkObject*)song->child); + track->props = prop->box; + + basic = prop_track_info(prop); + basiclab = gtk_label_new(_("Basic")); + prop->basic_page = gnome_property_box_append_page( + GNOME_PROPERTY_BOX(gpb), basic, basiclab); + + instr = prop_track_instruments(prop); + instrlab = gtk_label_new(_("Instruments")); + prop->instrument_page = gnome_property_box_append_page( + GNOME_PROPERTY_BOX(gpb), instr, instrlab); + + //gtk_notebook_set_page(gpb->notebook, prop->basic_page); + + prop->destroy = gtk_signal_connect(GTK_OBJECT(gpb), "destroy", + GTK_SIGNAL_FUNC(prop_destroy), prop); + gtk_signal_connect(GTK_OBJECT(gpb), "apply", + GTK_SIGNAL_FUNC(prop_apply), prop); + gtk_signal_connect(GTK_OBJECT(gpb), "apply", + GTK_SIGNAL_FUNC(prop_apply), prop); + + { + /* + * Set up the help system. The standard gnome help system + * for property boxes does not work well for me. So I am + * using a system that allows the help to be in different + * places and can be different sections in the same document. + */ + static struct help_page_entry pages[] = { + {"melys", "track.html", "track-prop-info"}, + {"melys", "track.html", "track-prop-instruments"}, + }; + static struct help_entry help_entry = { + NELEM(pages), pages + }; + + gtk_signal_connect(GTK_OBJECT(gpb), "help", + GTK_SIGNAL_FUNC(mel_prop_help), &help_entry); + } + + out: + gtk_notebook_set_page((GtkNotebook*)GNOME_PROPERTY_BOX(gpb)->notebook, which); + gtk_widget_show(gpb); + + +>>function prop_track_info +static GtkWidget * +struct track_prop *prop; + +>>description +Create the actual widget that makes up the basic track properties +page. +A long routine, but straightforward. +The property box is built up piece by piece. + +>>code + struct trackElement *track; + GtkFrame *frame; + GtkBox *mainbox; + GtkTable *tab; + /* Track name */ + GtkWidget *namelab; + GtkEntry *trackname; + GtkWidget *tnbox; + /* Device name */ + GtkWidget *devlab; + GtkWidget *devlist; + GtkWidget *devbox; + GList *devnames = NULL; + /* Channel number */ + GtkWidget *chanbox; + GtkWidget *chanlab; + GtkWidget *chan; + + track = prop->track; + + frame = (GtkFrame *)gtk_frame_new(_("Track properties")); + + /* + * Create the boxes that some of the widgets are packed into. + * The mainbox may not be needed. + */ + tab = (GtkTable *)gtk_table_new(3, 3, 0); + mainbox = (GtkBox *)gtk_vbox_new(0, 0/*spacing*/); + devbox = gtk_hbox_new(0, 0); + chanbox = gtk_hbox_new(0, 0); + tnbox = gtk_hbox_new(0, 0); + + /* Create the labels */ + namelab = new_lab_align(_("Track name")); + devlab = new_lab_align(_("Output device")); + chanlab = new_lab_align(_("Channel")); + + /* Entry box for the track name */ + trackname = (GtkEntry *)gtk_entry_new(); + if (track->name) + gtk_entry_set_text(trackname, track->name); + gtk_box_pack_start((GtkBox *)tnbox, (GtkWidget *)trackname, 0, 0, 0); + + /* Channel spinner */ + chan = mel_int_spinner(1, 16, MD_CHAN(track)+1); + gtk_box_pack_start((GtkBox *)chanbox, chan, 0, 0, 0); + + + /* The combo box for devices */ +#if 0 + devnames = g_list_append(devnames, "A: not operational"); + devnames = g_list_append(devnames, "B: another test"); + devnames = g_list_append(devnames, "C: yet another test"); + devlist = gtk_combo_new(); + gtk_combo_set_popdown_strings((GtkCombo *)devlist, devnames); + gtk_entry_set_editable((GtkEntry*)GTK_COMBO(devlist)->entry, 0); +#endif + devlist = mel_int_spinner(1, 4, MD_DEV(track)+1); /* Very temporary */ + gtk_box_pack_start((GtkBox *)devbox, (GtkWidget *)devlist, 0, 0, 0); + + + gtk_container_add((GtkContainer *)frame, (GtkWidget*)mainbox); + gtk_box_pack_start(mainbox, (GtkWidget *)tab, 0, 0, 0); + /* ..., expand, fill, padding */ + + /* Attach all the labels */ + attach_at(tab, namelab, 0, 0, GTK_FILL, 0); + attach_at(tab, devlab, 1, 0, GTK_FILL, 0); + attach_at(tab, chanlab, 2, 0, GTK_FILL, 0); + + /* Now attach the form boxes */ + attach_at(tab, tnbox, 0, 1, GTK_FILL, 0); + attach_at(tab, devbox, 1, 1, GTK_FILL, 0); + attach_at(tab, chanbox, 2, 1, GTK_FILL, 0); + + /* + * Connect to all the changed signals. All this does is allow + * us to get the apply and OK button activated. Nothing is + * changed in the real track until the apply signal is received. + */ + gtk_signal_connect((GtkObject *)trackname, "changed", prop_change, prop); + gtk_signal_connect((GtkObject *)devlist, "changed", prop_change, prop); + gtk_signal_connect((GtkObject *)chan, "changed", prop_change, prop); + + prop->trackname = trackname; + prop->channel = GTK_SPIN_BUTTON(chan); + prop->devname = GTK_SPIN_BUTTON(devlist); + + gtk_widget_show_all((GtkWidget*)frame); + return (GtkWidget *)frame; + + +>>function prop_track_instruments +static GtkWidget * +struct track_prop *prop; +>>description +Build up the instrument definition page. + +>>code + struct trackElement *track; + GtkWidget *frame; + GtkWidget *constructionlab; + GtkWidget *tmpbox; + + /* Instrument number */ + GtkWidget *instr; + GtkWidget *instrbox; + GtkWidget *instrlab; + /* Bank MSB */ + GtkWidget *bankmsb; + GtkWidget *bankmsblab; + /* Bank LSB */ + GtkWidget *banklsb; + GtkWidget *banklsblab; + + track = prop->track; + + frame = gtk_frame_new(_("Instruments")); + tmpbox = gtk_vbox_new(0, 0); + instrbox = gtk_hbox_new(0, 0); + instrlab = new_lab_align(_("Instrument")); + bankmsblab = new_lab_align(_("Bank MSB")); + banklsblab = new_lab_align(_("Bank LSB")); + + constructionlab = gtk_label_new( + _("This page will be a comprehensive instrument selection page\n" + "At present you can just select from program\n" + "and bank MSB/LSB numbers\n" + )); + + gtk_box_pack_start((GtkBox*)tmpbox, constructionlab, 0, 0, 10); + + /* Instrument spinner */ + instr = mel_int_spinner(0, 127, track->program & 0x7f); + gtk_box_pack_start((GtkBox *)instrbox, instrlab, 0, 0, 10); + gtk_box_pack_start((GtkBox *)instrbox, instr, 0, 0, 10); + + banklsb = mel_int_spinner(0, 127, (track->program >> 7) & 0x7f); + bankmsb = mel_int_spinner(0, 127, (track->program >> 14) & 0x7f); + gtk_box_pack_start((GtkBox *)instrbox, bankmsblab, 0, 0, 5); + gtk_box_pack_start((GtkBox *)instrbox, bankmsb, 0, 0, 0); + gtk_box_pack_start((GtkBox *)instrbox, banklsblab, 0, 0, 5); + gtk_box_pack_start((GtkBox *)instrbox, banklsb, 0, 0, 0); + + gtk_box_pack_start((GtkBox*)tmpbox, instrbox, 0, 0, 10); + + gtk_container_add((GtkContainer *)frame, tmpbox); + gtk_widget_show_all(frame); + + gtk_signal_connect((GtkObject *)instr, "changed", prop_change, prop); + gtk_signal_connect((GtkObject *)bankmsb, "changed", prop_change, prop); + gtk_signal_connect((GtkObject *)banklsb, "changed", prop_change, prop); + + prop->instr = GTK_SPIN_BUTTON(instr); + prop->bankmsb = GTK_SPIN_BUTTON(bankmsb); + prop->banklsb = GTK_SPIN_BUTTON(banklsb); + + return frame; + + +>>function attach_at +static void +GtkTable *tab; +GtkWidget *w; +int row; +int col; +int xopts; +int yopts; + +>>code + + gtk_table_attach(tab, w, col, col+1, row, row+1, xopts, yopts, 10, 4); + + + +>>function new_lab_align +static GtkWidget * +char *str; + +>>description +Create a label and set its justification. + +>>code + GtkWidget *lab; + + lab = gtk_label_new(str); + gtk_misc_set_alignment((GtkMisc *)lab, 0.0, 0.5); + return lab; + + +>>function prop_change +static void +GtkWidget *w; +gpointer data; + +>>code + struct track_prop *prop = data; + GtkWidget *gpb; + + gpb = reg_get_widget(prop->box); + if (gpb) { + gnome_property_box_changed((GnomePropertyBox *)gpb); + } + + +>>function prop_apply +static void +GtkWidget *w; +gint page; +struct track_prop *prop; + +>>code + struct trackElement *track; + char *str; + int num; + int program; + + track = prop->track; + if (!track) + return; + + if (page != -1) + return; + + str = gtk_entry_get_text(prop->trackname); + if (str) { + if (track->name) + g_free(track->name); + track->name = g_strdup(str); + } + + num = gtk_spin_button_get_value_as_int(prop->channel); + num--; /* Really starts at 0 */ + if (num != MD_CHAN(track)) + md_set_devchan(MD_ELEMENT(track), MD_DEV(track), num); + num = gtk_spin_button_get_value_as_int(prop->devname); + num--; /* Really starts at 0 */ + if (num != MD_DEV(track)) + md_set_devchan(MD_ELEMENT(track), num, MD_CHAN(track)); + + num = gtk_spin_button_get_value_as_int(prop->instr); + program = num; + + num = gtk_spin_button_get_value_as_int(prop->banklsb); + program |= num << 7; + num = gtk_spin_button_get_value_as_int(prop->bankmsb); + program |= num << 14; + if (program != track->program) { + track->program = program; + } + + MD_SET_MODIFIED(track, TRUE); + song_view_update(prop->song); + +>>function prop_destroy +static void +GtkWidget *w; +gpointer data; + +>>code + struct track_prop *prop = data; + GtkObject *obj; + + obj = reg_get(prop->box); + if (obj) { + gtk_signal_disconnect(obj, prop->destroy); + gtk_object_destroy(obj); + } + + reg_unreg(prop->box); diff -rNu melys-0.0.10/help/C/.cvsignore melys-0.0.11/help/C/.cvsignore --- melys-0.0.10/help/C/.cvsignore Wed Aug 11 14:42:13 1999 +++ melys-0.0.11/help/C/.cvsignore Wed Sep 15 15:54:21 1999 @@ -1 +1,2 @@ -melys.junk melys.ps melys +melys.junk melys.ps +html diff -rNu melys-0.0.10/help/C/Makefile melys-0.0.11/help/C/Makefile --- melys-0.0.10/help/C/Makefile Sun Aug 29 23:08:04 1999 +++ melys-0.0.11/help/C/Makefile Wed Sep 15 19:06:09 1999 @@ -1,14 +1,39 @@ +include ../../make.conf + +# The locale that this directory is for +# +LOCALEDIR = C + +# The installation directory +# +DIR = $(HELPINSTDIR)/$(LOCALEDIR) + +# The source files +SGMLFILES = melys.sgml menus.sgml track.sgml + + # Stuff that gets created and needs removing. # JUNKFILES = melys.tex melys.junk melys.log melys.aux melys.dvi -all: + +all: html + +html: $(SGMLFILES) db2html melys.sgml + rm -rf html + mv melys html + cd html; mv melys.html index.html + +install: all + $(INSTALL) -d $(DIR) + $(INSTALL) topic.dat $(DIR) + $(INSTALL) html/*.html $(DIR) clean: rm -rf $(JUNKFILES) core rm -rf DBTO* clobber: clean - rm -rf melys melys.ps melys.html + rm -rf html melys melys.ps melys.html diff -rNu melys-0.0.10/help/C/html/docbook.css melys-0.0.11/help/C/html/docbook.css --- melys-0.0.10/help/C/html/docbook.css Thu Jan 1 00:00:00 1970 +++ melys-0.0.11/help/C/html/docbook.css Sun Sep 19 23:10:24 1999 @@ -0,0 +1,20 @@ +.BOOK .TITLE { text-align: center } +.BOOK .SUBTITLE { text-align: center } +.BOOK .CORPAUTHOR { text-align: center } +.BOOK .AUTHOR { text-align: center } +.BOOK .AFFILIATION { text-align: center } +.BOOK .EDITEDBY { text-align: center } +.BOOK .EDITOR { text-align: center } +.BOOK .GRAPHIC { text-align: center } + +.ARTICLE .TITLE { text-align: center } +.ARTICLE .SUBTITLE { text-align: center } +.ARTICLE .CORPAUTHOR { text-align: center } +.ARTICLE .AUTHOR { text-align: center } +.ARTICLE .AFFILIATION { text-align: center } +.ARTICLE .EDITEDBY { text-align: center } +.ARTICLE .EDITOR { text-align: center } +.ARTICLE .GRAPHIC { text-align: center } +.ARTICLE .ABSTRACT { margin-left: 0.5in; + margin-right: 0.5in; + font-style: italic } diff -rNu melys-0.0.10/help/C/html/index.html melys-0.0.11/help/C/html/index.html --- melys-0.0.10/help/C/html/index.html Thu Jan 1 00:00:00 1970 +++ melys-0.0.11/help/C/html/index.html Sun Sep 19 23:10:24 1999 @@ -0,0 +1,181 @@ +Melys User's Guide
  Next
  Menus
\ No newline at end of file diff -rNu melys-0.0.10/help/C/html/ln8.html melys-0.0.11/help/C/html/ln8.html --- melys-0.0.10/help/C/html/ln8.html Thu Jan 1 00:00:00 1970 +++ melys-0.0.11/help/C/html/ln8.html Sun Sep 19 23:10:23 1999 @@ -0,0 +1,77 @@ +
Melys User's Guide

This document and its associated software + can be freely redistributed according to the + terms of the GNU General Public License. + See the file COPYING in the distribution for more + details +

 Home 
\ No newline at end of file diff -rNu melys-0.0.10/help/C/html/menus.html melys-0.0.11/help/C/html/menus.html --- melys-0.0.10/help/C/html/menus.html Thu Jan 1 00:00:00 1970 +++ melys-0.0.11/help/C/html/menus.html Sun Sep 19 23:10:23 1999 @@ -0,0 +1,424 @@ +Menus
Melys User's Guide
PrevNext

Chapter 1. Menus

This section deals with all the title bar menus + that can be used in Melys. + 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 + menu entry.

Title bar menus

File

This is the standard file menu that allows you to open and + save files and exit the application. + +

Open

This will bring up a dialog box that will allow you to + select a file to read. + You may select any file type that Melys knows how to read. + At the current time this includes MIDI files ending + in .mid or .smf and MDML files + ending in .mdml. + It will also read compressed MDML, files that are compressed + with gzip and have a .mdml.gz ending. + +

You can have several files open at once. + The limit is the number of queues that the sequencer is configured + with (currently 8). + They appear in a notebook format and you can select the current + file by clicking on the notebook tabs. + It is also possible to drag the notebook tabs off the + the application window, this will create a new top level + window containing that file.

Close

This will close the current file. + If the file is playing it will stop.

Warning

There are currently no warnings if it has not been saved.

Save as...

Save the current file with a specified filename. + A dialog box is brought up to allow the name to be specified.

Exit

Exits Melys. +

Warning

There is currently no warning if files are not saved. +

Actions

Play

Starts the current file playing. + Has no effect if the file is already playing. + It is (currently) possible to start another file at the same + time that another is playing. + This will probably be disallowed or modified in future.

Pause

The playing file is stopped temporarily. + If play is later selected the song + will continue from the same point that it stopped at.

Stop

The playing file is stopped. + If the file is re started it will begin playing from the beginning.

Record

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 Record stop or Stop is selected. +

Currently you can only record to a new track. + The new track can have several parts though.

Record stop

Recording is stopped. + The song will continue playing if it has not already + finished and recording will be restarted by selecting + Record again.

Windows

This menu contains an entry for each open file. + Any file can be selected from this menu and it will be brought + to the front. + This will work even if the file is in another window. + +

In addition there are the following entries. + +

Close all

This will close all open windows. + Not currently useful - next operation will exit the sequencer.

Help

This menu contains the usual useless information.

PrevHomeNext
Melys User's Guide Track view
\ No newline at end of file Binary files melys-0.0.10/help/C/html/stylesheet-images/caution.gif and melys-0.0.11/help/C/html/stylesheet-images/caution.gif differ Binary files melys-0.0.10/help/C/html/stylesheet-images/home.gif and melys-0.0.11/help/C/html/stylesheet-images/home.gif differ Binary files melys-0.0.10/help/C/html/stylesheet-images/important.gif and melys-0.0.11/help/C/html/stylesheet-images/important.gif differ Binary files melys-0.0.10/help/C/html/stylesheet-images/next.gif and melys-0.0.11/help/C/html/stylesheet-images/next.gif differ Binary files melys-0.0.10/help/C/html/stylesheet-images/note.gif and melys-0.0.11/help/C/html/stylesheet-images/note.gif differ Binary files melys-0.0.10/help/C/html/stylesheet-images/prev.gif and melys-0.0.11/help/C/html/stylesheet-images/prev.gif differ Binary files melys-0.0.10/help/C/html/stylesheet-images/tip.gif and melys-0.0.11/help/C/html/stylesheet-images/tip.gif differ Binary files melys-0.0.10/help/C/html/stylesheet-images/toc-blank.gif and melys-0.0.11/help/C/html/stylesheet-images/toc-blank.gif differ Binary files melys-0.0.10/help/C/html/stylesheet-images/toc-minus.gif and melys-0.0.11/help/C/html/stylesheet-images/toc-minus.gif differ Binary files melys-0.0.10/help/C/html/stylesheet-images/toc-plus.gif and melys-0.0.11/help/C/html/stylesheet-images/toc-plus.gif differ Binary files melys-0.0.10/help/C/html/stylesheet-images/up.gif and melys-0.0.11/help/C/html/stylesheet-images/up.gif differ Binary files melys-0.0.10/help/C/html/stylesheet-images/warning.gif and melys-0.0.11/help/C/html/stylesheet-images/warning.gif differ diff -rNu melys-0.0.10/help/C/html/track.html melys-0.0.11/help/C/html/track.html --- melys-0.0.10/help/C/html/track.html Thu Jan 1 00:00:00 1970 +++ melys-0.0.11/help/C/html/track.html Sun Sep 19 23:10:24 1999 @@ -0,0 +1,307 @@ +Track view
Melys User's Guide
Prev 

Chapter 2. Track view

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). + It is possible to drag the divider between these panes with the + button to display more or less of each pane.

The information pane

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.

Columns

Track

This is the track number. The track number always starts + at one and carries on in increasing order down the page.

Name

This is the name of the track. + If the track has not been given a name then it will be given + the name of ``Track N'', + where N is the track number. + -- + Once it has been generated such a name will not change when + tracks are added and deleted. + --

Prog

The program number for the track.

C

The channel number for the track. + A number from 0 to 15 that is the midi channel number. + It is possible to have more than one midi device to obtain + more than 16 channels of Midi.

Mute

Clicking on a button for a particular track mutes that track. + It should light up yellow when active. + Clicking again will un-mute the track.

Solo

Clicking on this button for a track will mute all other + tracks, leaving the one track playing. +

Further tracks can be unmuted by clicking on the relavent + mute button. + In this way you can have a selection of tracks playing. + These unmuted tracks are remembered so that if you toggle + the solo button that set of tracks will be toggled.

Rec

Clicking this enables record for this track. + When recording is active, then all Midi events arriving on the + input channel that has been selected for this track will be + recorded and saved in this track. +

Normally only one track is active for recording at a time, but + by control-clicking on the button, more than one track can be + selected for record. + Clicking on an active button will deactivate it.

Track properties

Track properties means information associated with a particular + track of the composition. + For example each track has a name, a recording source, output device + and channel.

To access the track property dialogue, click on a track name or + 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)

The properties box has several pages and the appropriate + page will be displayed for the column you clicked in. + Of course you can always select another page by clicking + on the tabs at the top.

There are several things that can be modified. + +

Track name

You can type in any name for the track.

Output device

This currently does nothing. + It will + allow you to set the destination MIDI device for this track.

Channel

This sets the channel number that the MIDI events are sent + to. + You can type in the number directly or use the spin control + arrows on the right to adjust the value. +

Instrument selection

This is a temporary way of setting the program number. + There will be a much better interface in a later version. +

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.

PrevHome 
Menus  
\ No newline at end of file diff -rNu melys-0.0.10/help/C/melys.sgml melys-0.0.11/help/C/melys.sgml --- melys-0.0.10/help/C/melys.sgml Sun Aug 29 23:08:04 1999 +++ melys-0.0.11/help/C/melys.sgml Thu Sep 16 16:04:51 1999 @@ -7,6 +7,7 @@ --> + ] > @@ -18,25 +19,29 @@ - - SteveRatcliffe - + + SteveRatcliffe + - This document can be freely redistributed according to the - terms of the GNU General Public License. + This document and its associated software + can be freely redistributed according to the + terms of the GNU General Public License. + See the file COPYING in the distribution for more + details + -1999 -Steve Ratcliffe + 1999 + Steve Ratcliffe
-London -steve@parabola.demon.co.uk + London + steve@parabola.demon.co.uk
diff -rNu melys-0.0.10/help/C/topic.dat melys-0.0.11/help/C/topic.dat --- melys-0.0.10/help/C/topic.dat Thu Sep 9 00:22:41 1999 +++ melys-0.0.11/help/C/topic.dat Wed Sep 15 17:01:39 1999 @@ -1 +1 @@ -melys.html Manual +index.html Manual diff -rNu melys-0.0.10/help/C/track.sgml melys-0.0.11/help/C/track.sgml --- melys-0.0.10/help/C/track.sgml Wed Sep 15 13:49:23 1999 +++ melys-0.0.11/help/C/track.sgml Sun Sep 19 23:02:58 1999 @@ -7,13 +7,15 @@ a pane showing the existing parts and current play position (not yet implemented). It is possible to drag the divider between these panes with the - button on the divider to display more or less of each pane. + button to display more or less of each pane. -The information pane +The information pane 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. + The items that are visible will be configurable, what follows + is all the possible columns, but they may not all be visible. + Columns <variablelist> @@ -83,8 +85,7 @@ <term> Rec <listitem> - <para> - Clicking this enables record for this track. + <para> Clicking this enables record for this track. When recording is active, then all Midi events arriving on the input channel that has been selected for this track will be recorded and saved in this track. @@ -95,5 +96,65 @@ Clicking on an active button will deactivate it. </variablelist> + +<sect2 id="track-prop-info"><title>Track properties +<para> + Track properties means information associated with a particular + track of the composition. + For example each track has a name, a recording source, output device + and channel. +<para> + To access the track property dialogue, click on a track name or + 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) +<para> + The properties box has several pages and the appropriate + page will be displayed for the column you clicked in. + Of course you can always select another page by clicking + on the tabs at the top. +<para> + There are several things that can be modified. + +<variablelist> +<varlistentry> + <term> + Track name + <listitem> + <para> + You can type in any name for the track. + +<varlistentry> + <term> + Output device + <listitem> + <para> + This currently does nothing. + It will + allow you to set the destination MIDI device for this track. + +<varlistentry> + <term> + Channel + <listitem> + <para> + This sets the channel number that the MIDI events are sent + to. + You can type in the number directly or use the spin control + arrows on the right to adjust the value. + + +</variablelist> + +<sect2 id="track-prop-instruments"><title>Instrument selection + <para> + This is a temporary way of setting the program number. + There will be a much better interface in a later version. + <para> + 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. </chapter> diff -rNu melys-0.0.10/help/Makefile melys-0.0.11/help/Makefile --- melys-0.0.10/help/Makefile Thu Jan 1 00:00:00 1970 +++ melys-0.0.11/help/Makefile Wed Sep 15 19:06:09 1999 @@ -0,0 +1,17 @@ + +LOCS = C # zz + +all: + for dir in $(LOCS); do (cd $$dir; $(MAKE) all || exit 1); done + +install: + for dir in $(LOCS); do (cd $$dir; $(MAKE) install || exit 1); done + +clean: + for dir in $(LOCS); do (cd $$dir; $(MAKE) clean || exit 1); done + +clobber: + for dir in $(LOCS); do (cd $$dir; $(MAKE) clobber || exit 1); done + +headers: +cfiles: diff -rNu melys-0.0.10/include/elements.h melys-0.0.11/include/elements.h --- melys-0.0.10/include/elements.h Wed Sep 15 14:03:54 1999 +++ melys-0.0.11/include/elements.h Sun Sep 19 23:10:01 1999 @@ -36,6 +36,8 @@ char type; /* Element type */ char tag; /* Element tag */ int refcount:8; /* Reference count */ + int floating:1; /* Not added to anything yet */ + int modified:1; /* Element was modified */ }; #define MD_ELEMENT(e) \ ((struct element *)md_check_cast((struct element *)(e), MD_TYPE_ELEMENT)) @@ -91,6 +93,8 @@ /* Fields below this will not ever be saved out */ 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 */ }; #define MD_TRACK(e) \ ((struct trackElement *)md_check_cast((struct element *)(e), MD_TYPE_TRACK)) diff -rNu melys-0.0.10/include/md.h melys-0.0.11/include/md.h --- melys-0.0.10/include/md.h Wed Sep 15 14:03:54 1999 +++ melys-0.0.11/include/md.h Sun Sep 19 23:10:01 1999 @@ -12,8 +12,8 @@ * GNU General Public License for more details. * * Some operations to modify a MD tree. This only covers general purpose - * operations. Specialized tools like quantize or whatever are likely - * to be implmented in tools directory. + * operations. Specialized tranformation are likely + * to be implmented in a tools directory. * * */ @@ -32,6 +32,7 @@ #define md_add_elem_sort(c, el) _md_add_elem(c, el, 1) void _md_add_elem(struct containerElement *c, struct element *el, int sort); +void md_remove(struct containerElement *c, struct element *el); void md_free(struct element *el); void md_merge_in(struct trackElement *track, struct containerElement *list, enum merge_mode mode); @@ -75,8 +76,16 @@ #define MD_ENDTIME(el) \ (MD_TIME(el) + ((struct containerElement *)(el))->duration) #define MD_DEVCHAN(el) (((struct element *)(el))->device_channel) -#define MD_DEV(el) ( (((struct element *)(el))->device_channel & 0xf0) >> 8) +#define MD_DEV(el) ( (((struct element *)(el))->device_channel & ~0x0f) >> 4) #define MD_CHAN(el) ( (((struct element *)(el))->device_channel & 0x0f)) +#define MD_REF(el) (((struct element *)(el))->refcount++) +#define MD_UNREF(el) md_free((struct element *)(el)) +#define MD_MK_DEVCHAN(dev, chan) \ + ((dev)<<4 | ((chan) & 0xf)) +#define MD_SET_DEVCHAN(el, dev, chan) \ + (((struct element *)el)->device_channel = (dev)<<4 | ((chan) & 0xf)) +#define MD_MODIFIED(el) ( ((struct element *)el)->modified ) +#define MD_SET_MODIFIED(el, v) ( ((struct element *)el)->modified = v) /* Defines for md_walk() */ #define MD_WALK_ALL 1 /* Include all elements including deleted, hidden*/ @@ -115,4 +124,4 @@ struct rootElement *md_empty(void); struct rootElement *md_song_new(void); struct trackElement *md_track_nth(struct rootElement *root, int n); -void md_track_delete(struct rootElement *root, struct trackElement *track); +void md_set_devchan(struct element *base, int dev, int chan); diff -rNu melys-0.0.10/include/mdrw.h melys-0.0.11/include/mdrw.h --- melys-0.0.10/include/mdrw.h Wed Sep 15 14:03:54 1999 +++ melys-0.0.11/include/mdrw.h Sun Sep 19 23:10:00 1999 @@ -14,6 +14,9 @@ * 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. + * * */ diff -rNu melys-0.0.10/include/melgui.h melys-0.0.11/include/melgui.h --- melys-0.0.10/include/melgui.h Wed Sep 15 14:03:55 1999 +++ melys-0.0.11/include/melgui.h Sun Sep 19 23:10:02 1999 @@ -11,10 +11,31 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * + * This replaces the completely sucky gnome help stuff with some + * only moderately sucky routines. * * */ +/* + * Structure to keep references to help locations for property + * boxes with multiple pages. + */ +struct help_entry { + int npages; /* The number of page references */ + struct help_page_entry { + char *name; /* Application name */ + char *path; /* Path to help file */ + char *section; /* Section within help file */ + } *refs; /* The actual page references */ +}; + +void mel_prop_help(GtkWidget *ignored, gint page_num, struct help_entry *ref); + +struct File; +struct rootElement; +struct trackElement; + int melys_app(int argc, char **argv); struct song *get_song_from_mdi(GtkObject *mdi); int get_child_count(GtkObject *mdi); @@ -28,4 +49,13 @@ struct rootElement *root, gboolean toplevel); gboolean mel_file_error(struct song *song, struct File *file, GtkObject *parent); +void mel_view_update(void); void mel_debug_print_type(char *msg, GtkObject *o); + +/* + * The different pages for the track properties. + */ +#define TRACK_PROP_BASIC 0 +#define TRACK_PROP_INSTR 1 + +void track_prop_box(struct trackElement *track, struct song *song, int which); diff -rNu melys-0.0.10/include/melmidi.h melys-0.0.11/include/melmidi.h --- melys-0.0.10/include/melmidi.h Wed Sep 15 14:03:56 1999 +++ melys-0.0.11/include/melmidi.h Sun Sep 19 23:10:03 1999 @@ -19,6 +19,10 @@ struct play; struct seq_context; +#define ECHO_NOOP 0 +#define ECHO_END_SONG 1 +#define ECHO_END_PROLOGUE 2 + struct play *play_new(void); void play_free(struct play *play); void play_set_mdroot(struct play *play, struct rootElement *root); diff -rNu melys-0.0.10/include/melmsg.h melys-0.0.11/include/melmsg.h --- melys-0.0.10/include/melmsg.h Wed Sep 15 14:03:55 1999 +++ melys-0.0.11/include/melmsg.h Sun Sep 19 23:10:01 1999 @@ -43,3 +43,5 @@ extern void mel_song_display(struct song *sd, struct _GtkObject *parent, int _type, char *fmt, ...); +extern void mel_view_update(void); + diff -rNu melys-0.0.10/include/melreg.h melys-0.0.11/include/melreg.h --- melys-0.0.10/include/melreg.h Wed Sep 15 14:03:56 1999 +++ melys-0.0.11/include/melreg.h Sun Sep 19 23:10:02 1999 @@ -19,4 +19,5 @@ int reg_object(GtkObject *obj, GtkObject *parent); GtkObject *reg_get(int id); GtkWidget *reg_get_widget(int id); +void reg_unreg(regid_t id); void reg_destroy(int id); diff -rNu melys-0.0.10/include/melwidgets.h melys-0.0.11/include/melwidgets.h --- melys-0.0.10/include/melwidgets.h Thu Jan 1 00:00:00 1970 +++ melys-0.0.11/include/melwidgets.h Sun Sep 19 23:10:02 1999 @@ -0,0 +1,18 @@ +/* + * + * 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. + * + * + * + */ + +GtkWidget *mel_int_spinner(int lower, int upper, int val); diff -rNu melys-0.0.10/include/melystrack.h melys-0.0.11/include/melystrack.h --- melys-0.0.10/include/melystrack.h Wed Sep 15 14:03:55 1999 +++ melys-0.0.11/include/melystrack.h Sun Sep 19 23:10:02 1999 @@ -33,6 +33,7 @@ struct _MelysTrackDisplay *display; struct rootElement *mdroot; + struct song *song; }; struct _MelysTrackClass { @@ -51,4 +52,5 @@ guint melys_track_get_type(void); GtkWidget *melys_track_new(struct rootElement *root); void melys_track_set_md_root(MelysTrack *mtrack, struct rootElement *root); -void melys_track_redraw(MelysTrack *mtrack); +void melys_track_set_song(MelysTrack *mtrack, struct song *song); +void melys_track_update(MelysTrack *mtrack); diff -rNu melys-0.0.10/include/melystrackinfo.h melys-0.0.11/include/melystrackinfo.h --- melys-0.0.10/include/melystrackinfo.h Wed Sep 15 14:03:56 1999 +++ melys-0.0.11/include/melystrackinfo.h Sun Sep 19 23:10:02 1999 @@ -15,11 +15,9 @@ * The columns that can be seen will be configurable. * * Now that I know about the gnome canvas widget and am going to - * use it for the trackdisplay pane, I suspect that some people will - * be wondering why it isn't used here as it looks ideal. I quite - * possibly would have used it if I had known about it then. Anyway - * there would have still have been pretty much the same amount of - * code in the end I think. + * use it for the trackdisplay pane, it may well have been a good + * idea to use it for this widget as well. + * * * */ @@ -73,6 +71,8 @@ /* The actual composition that is being displayed */ struct rootElement *mdroot; + struct song *song; + /* Labels and masks for the various buttons */ GdkPixmap *rec_label; GdkBitmap *rec_mask; @@ -97,6 +97,6 @@ int htitle); void melys_track_info_set_md_root(MelysTrackInfo *minfo, struct rootElement *root); -void melys_track_info_redraw(MelysTrackInfo *minfo); +void melys_track_info_update(MelysTrackInfo *minfo); int y_to_track(MelysTrackInfo *minfo, int ypix); char *get_info_string(MelysTrackInfo *minfo, int itype, int ntrack); diff -rNu melys-0.0.10/include/midi.h melys-0.0.11/include/midi.h --- melys-0.0.10/include/midi.h Wed Sep 15 14:03:54 1999 +++ melys-0.0.11/include/midi.h Sun Sep 19 23:10:00 1999 @@ -21,7 +21,7 @@ #define MIDI_NOTE_OFF 0x80 #define MIDI_NOTE_ON 0x90 #define MIDI_KEY_AFTERTOUCH 0xa0 -#define MIDI_CONTROLER 0xb0 +#define MIDI_CONTROLLER 0xb0 #define MIDI_PATCH 0xc0 #define MIDI_CHANNEL_AFTERTOUCH 0xd0 #define MIDI_PITCH_WHEEL 0xe0 diff -rNu melys-0.0.10/include/seqlib.h melys-0.0.11/include/seqlib.h --- melys-0.0.10/include/seqlib.h Wed Sep 15 14:03:53 1999 +++ melys-0.0.11/include/seqlib.h Sun Sep 19 23:10:00 1999 @@ -107,6 +107,7 @@ void seq_midi_tempo(seq_context_t *ctxp, snd_seq_event_t *ep, int tempo); void seq_midi_sysex(seq_context_t *ctxp, snd_seq_event_t *ep, int status, unsigned char *data, int length); +void seq_midi_echo(seq_context_t *ctxp, snd_seq_event_t *ep, int val); void seq_midi_send_echo(seq_context_t *ctxp, unsigned long time, int type); struct rootElement; diff -rNu melys-0.0.10/include/song.h melys-0.0.11/include/song.h --- melys-0.0.10/include/song.h Wed Sep 15 14:03:53 1999 +++ melys-0.0.11/include/song.h Sun Sep 19 23:09:59 1999 @@ -63,3 +63,4 @@ struct song *song_get_data(GtkObject *child); struct song *song_new(GtkObject *mdi, GtkObject *child); void song_destroy(gpointer data); +void song_view_update(struct song *song); diff -rNu melys-0.0.10/make.conf melys-0.0.11/make.conf --- melys-0.0.10/make.conf Wed Sep 15 13:49:19 1999 +++ melys-0.0.11/make.conf Wed Sep 15 17:01:38 1999 @@ -3,7 +3,7 @@ VERSION = 0.0.10 # Options required by the C compiler -COPTS = -g -O -Wall +COPTS = -g -O2 -Wall # Defines DEFINES = -DENABLE_NLS @@ -45,3 +45,22 @@ CFLAGS = $(COPTS) $(DEFINES) $(GNOMEFLAGS) $(INCLUDES) LIBS = $(GNOMELIBS) -lxml -lz -lasound $(DBMALLOC) + +# The gnome data directory +GNOME_DATA_DIR = `gnome-config --datadir gnomeui` + +# Prefix for installation of our own files +INSTPREFIX = /usr/local + +# Where the binaries are installed +INSTDIR = $(INSTPREFIX)/bin + +# Where the help files are installed +HELPINSTDIR = $(GNOME_DATA_DIR)/gnome/help/melys + +# Where the internationalisation files are installed +I18NINSTDIR = $(INSTPREFIX)/share/locale + +# The install program +INSTALL = install + diff -rNu melys-0.0.10/md/Makefile melys-0.0.11/md/Makefile --- melys-0.0.10/md/Makefile Wed Sep 15 14:03:50 1999 +++ melys-0.0.11/md/Makefile Sun Sep 19 23:10:06 1999 @@ -25,6 +25,9 @@ +install: all + + # Remove all object files and exectutables # clean: @@ -44,3 +47,12 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< +mdlist.o: ../include/melmsg.h +mdlist.o: ../include/md.h +mdundo.o: ../include/md.h +elements.o: ../include/md.h +elements.o: ../include/except.h +elements.o: ../include/elements.h +mdutil.o: ../include/seqlib.h +mdutil.o: ../include/md.h +mdadd.o: ../include/md.h diff -rNu melys-0.0.10/md/elements.c melys-0.0.11/md/elements.c --- melys-0.0.10/md/elements.c Wed Sep 15 14:04:00 1999 +++ melys-0.0.11/md/elements.c Sun Sep 19 23:10:12 1999 @@ -64,6 +64,8 @@ { e->refcount = 1; + e->floating = 1; + e->modified = 1; } /* diff -rNu melys-0.0.10/md/elements.m melys-0.0.11/md/elements.m --- melys-0.0.10/md/elements.m Wed Sep 15 10:38:43 1999 +++ melys-0.0.11/md/elements.m Sat Sep 18 17:01:25 1999 @@ -38,8 +38,12 @@ char type; /* Element type */ char tag; /* Element tag */ int refcount:8; /* Reference count */ + int floating:1; /* Not added to anything yet */ + int modified:1; /* Element was modified */ init e->refcount = 1; + e->floating = 1; + e->modified = 1; /* * An element that holds others. This includes tracks, parts and the @@ -99,6 +103,8 @@ /* Fields below this will not ever be saved out */ 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 */ init e->name = NULL; e->program = 0; diff -rNu melys-0.0.10/md/mdadd.c melys-0.0.11/md/mdadd.c --- melys-0.0.10/md/mdadd.c Wed Sep 15 14:04:00 1999 +++ melys-0.0.11/md/mdadd.c Sun Sep 19 23:10:12 1999 @@ -12,8 +12,8 @@ * GNU General Public License for more details. * * Some operations to modify a MD tree. This only covers general purpose - * operations. Specialized tools like quantize or whatever are likely - * to be implmented in tools directory. + * operations. Specialized tranformation are likely + * to be implmented in a tools directory. * * */ @@ -28,7 +28,7 @@ /* Short cut for cast */ -#define CONTAINER struct containerElement * +#define CPTR struct containerElement * static void merge_events(struct trackElement *track, struct containerElement *list); @@ -48,6 +48,11 @@ unsigned long endtime; unsigned long t; + if (el->floating) + el->floating = 0; + else + el->refcount++; + endtime = el->element_time; if (iscontainer(el)) { endtime += ((struct containerElement *)el)->duration; @@ -73,10 +78,43 @@ md_list_add_sort(c, el); else g_ptr_array_add(c->elements, el); + + MD_SET_MODIFIED(c, TRUE); +} + +/* + * This is the correct way to remove events from a song. his + * keeps track of all the integrety constraints and allows the + * operation to be undone if undo is enabled. The element that + * is being removed will have its reference count decremented + * and will be freed if there are no other references. + * + */ +void +md_remove(struct containerElement *c, struct element *el) +{ + gboolean res; + + switch (el->type) { + case MD_TYPE_TRACK: + g_assert(((struct rootElement *)c)->tracks > 0); + MD_ROOT(c)->tracks--; + break; + } + + res = g_ptr_array_remove(c->elements, el); + g_return_if_fail(res != FALSE); + + /* Dec reference count and possible free */ + md_free(el); + + MD_SET_MODIFIED(c, TRUE); } /* - * Free a complete element tree. + * Decrement the reference count on el and, if it is now zero, + * free the element. If the element is freed then the process is + * applied recursively. * * Arguments: * el - Element tree to free @@ -89,6 +127,7 @@ if (--el->refcount > 0) return; + if (el->refcount < 0) { ethrow(debugError, _("Freed an mdroot %d with bad reference count"), MD_ELEMENT(el)->refcount); @@ -111,6 +150,14 @@ case MD_TYPE_SYSEX: g_free(MD_SYSEX(el)->data); break; + case MD_TYPE_TRACK: + if (MD_TRACK(el)->name) + g_free(MD_TRACK(el)->name); + break; + case MD_TYPE_PART: + if (MD_PART(el)->name) + g_free(MD_PART(el)->name); + break; default: break; } @@ -257,6 +304,7 @@ */ con = (struct containerElement *)md_part_new(); MD_TIME(con) = begin; + MD_DEVCHAN(con) = MD_DEVCHAN(ctrk); md_list_add_sort(ctrk, MD_ELEMENT(con)); @@ -265,7 +313,7 @@ * of the current part so that it does not overlap the * next part. */ - cnext = (CONTAINER)md_list_next(ctrk, MD_ELEMENT(con)); + cnext = (CPTR)md_list_next(ctrk, MD_ELEMENT(con)); if (cnext) end2 = MIN(MD_TIME(cnext), end); else diff -rNu melys-0.0.10/md/mdadd.m melys-0.0.11/md/mdadd.m --- melys-0.0.10/md/mdadd.m Wed Sep 15 13:49:23 1999 +++ melys-0.0.11/md/mdadd.m Sat Sep 18 17:01:25 1999 @@ -12,8 +12,8 @@ GNU General Public License for more details. Some operations to modify a MD tree. This only covers general purpose -operations. Specialized tools like quantize or whatever are likely -to be implmented in tools directory. +operations. Specialized tranformation are likely +to be implmented in a tools directory. >>headerdef --decl md.h /* @@ -33,7 +33,7 @@ >>extern /* Short cut for cast */ -#define CONTAINER struct containerElement * +#define CPTR struct containerElement * >>function _md_add_elem void @@ -49,6 +49,11 @@ unsigned long endtime; unsigned long t; + if (el->floating) + el->floating = 0; + else + el->refcount++; + endtime = el->element_time; if (iscontainer(el)) { endtime += ((struct containerElement *)el)->duration; @@ -75,13 +80,48 @@ else g_ptr_array_add(c->elements, el); + MD_SET_MODIFIED(c, TRUE); + +>>function md_remove +void +struct containerElement *c; +struct element *el; + +>>description +This is the correct way to remove events from a song. +his keeps track of all the integrety constraints and +allows the operation to be undone if undo is enabled. +The element that is being removed will have its reference +count decremented and will be freed if there are no other references. + +>>code + gboolean res; + + switch (el->type) { + case MD_TYPE_TRACK: + g_assert(((struct rootElement *)c)->tracks > 0); + MD_ROOT(c)->tracks--; + break; + } + + res = g_ptr_array_remove(c->elements, el); + g_return_if_fail(res != FALSE); + + /* Dec reference count and possible free */ + md_free(el); + + MD_SET_MODIFIED(c, TRUE); + >>function md_free void struct element *el; // Element tree to free >>description -Free a complete element tree. +Decrement the reference count on +.A el +and, if it is now zero, free the element. +If the element is freed then the process is applied recursively. >>code struct containerElement *c; @@ -89,6 +129,7 @@ if (--el->refcount > 0) return; + if (el->refcount < 0) { ethrow(debugError, _("Freed an mdroot %d with bad reference count"), MD_ELEMENT(el)->refcount); @@ -111,6 +152,14 @@ case MD_TYPE_SYSEX: g_free(MD_SYSEX(el)->data); break; + case MD_TYPE_TRACK: + if (MD_TRACK(el)->name) + g_free(MD_TRACK(el)->name); + break; + case MD_TYPE_PART: + if (MD_PART(el)->name) + g_free(MD_PART(el)->name); + break; default: break; } @@ -265,6 +314,7 @@ */ con = (struct containerElement *)md_part_new(); MD_TIME(con) = begin; + MD_DEVCHAN(con) = MD_DEVCHAN(ctrk); md_list_add_sort(ctrk, MD_ELEMENT(con)); @@ -273,7 +323,7 @@ * of the current part so that it does not overlap the * next part. */ - cnext = (CONTAINER)md_list_next(ctrk, MD_ELEMENT(con)); + cnext = (CPTR)md_list_next(ctrk, MD_ELEMENT(con)); if (cnext) end2 = MIN(MD_TIME(cnext), end); else diff -rNu melys-0.0.10/md/mdutil.c melys-0.0.11/md/mdutil.c --- melys-0.0.10/md/mdutil.c Wed Sep 15 14:04:01 1999 +++ melys-0.0.11/md/mdutil.c Sun Sep 19 23:10:13 1999 @@ -32,6 +32,7 @@ static void seqinit(struct element *el, void *arg, int flags); static struct element *get_curr_elem(struct containerElement *c); static gboolean inc_elem(struct containerElement *c); +static void set_chan(struct element *el, gpointer data, int flags); /* @@ -497,24 +498,30 @@ } /* - * Deletes the specified track. XXX Still a major decision to - * make regarding undo actions. I want to be able to undo - * arbitary actions to any depth if possible. + * Sets the channel on given element and all its children. You + * would normally call this with a track argument. * - * Arguments: - * root - Root to delete from - * track - Track to delete. */ void -md_track_delete(struct rootElement *root, struct trackElement *track) +md_set_devchan(struct element *base, int dev, int chan) { - gboolean t; - - if (root->tracks > 0) { - t = g_ptr_array_remove(MD_CONTAINER(root)->elements, (gpointer)track); - if (t) { - root->tracks--; - md_free(MD_ELEMENT(track)); - } + int devchan; + + if (!iscontainer(base)) { + MD_SET_DEVCHAN(base, dev, chan); + return; } + + devchan = MD_MK_DEVCHAN(dev, chan); + md_walk(MD_CONTAINER(base), set_chan, GINT_TO_POINTER(devchan), 0); +} + +static void +set_chan(struct element *el, gpointer data, int flags) +{ + int devchan; + + devchan = GPOINTER_TO_INT(data); + + MD_DEVCHAN(el) = devchan; } diff -rNu melys-0.0.10/md/mdutil.m melys-0.0.11/md/mdutil.m --- melys-0.0.10/md/mdutil.m Wed Sep 15 13:49:23 1999 +++ melys-0.0.11/md/mdutil.m Sun Sep 19 21:50:28 1999 @@ -24,8 +24,16 @@ #define MD_ENDTIME(el) \ (MD_TIME(el) + ((struct containerElement *)(el))->duration) #define MD_DEVCHAN(el) (((struct element *)(el))->device_channel) -#define MD_DEV(el) ( (((struct element *)(el))->device_channel & 0xf0) >> 8) +#define MD_DEV(el) ( (((struct element *)(el))->device_channel & ~0x0f) >> 4) #define MD_CHAN(el) ( (((struct element *)(el))->device_channel & 0x0f)) +#define MD_REF(el) (((struct element *)(el))->refcount++) +#define MD_UNREF(el) md_free((struct element *)(el)) +#define MD_MK_DEVCHAN(dev, chan) \ + ((dev)<<4 | ((chan) & 0xf)) +#define MD_SET_DEVCHAN(el, dev, chan) \ + (((struct element *)el)->device_channel = (dev)<<4 | ((chan) & 0xf)) +#define MD_MODIFIED(el) ( ((struct element *)el)->modified ) +#define MD_SET_MODIFIED(el, v) ( ((struct element *)el)->modified = v) /* Defines for md_walk() */ #define MD_WALK_ALL 1 /* Include all elements including deleted, hidden*/ @@ -519,26 +527,37 @@ return track; ->>function md_track_delete +>>function md_set_devchan void -struct rootElement *root; Root to delete from -struct trackElement *track; Track to delete. +struct element *base; +int dev; +int chan; >>description -Deletes the specified track. -XXX Still a major decision to make regarding undo actions. -I want to be able to undo arbitary actions to any depth if possible. +Sets the channel on given element and all its children. +You would normally call this with a track argument. >>code - gboolean t; - - if (root->tracks > 0) { - t = g_ptr_array_remove(MD_CONTAINER(root)->elements, (gpointer)track); - if (t) { - root->tracks--; - md_free(MD_ELEMENT(track)); - } + int devchan; + + if (!iscontainer(base)) { + MD_SET_DEVCHAN(base, dev, chan); + return; } + devchan = MD_MK_DEVCHAN(dev, chan); + md_walk(MD_CONTAINER(base), set_chan, GINT_TO_POINTER(devchan), 0); + + +>>function set_chan +static void +struct element *el; +gpointer data; +int flags; + +>>code + int devchan; + + devchan = GPOINTER_TO_INT(data); ->># ### Static functions #### + MD_DEVCHAN(el) = devchan; diff -rNu melys-0.0.10/midi/Makefile melys-0.0.11/midi/Makefile --- melys-0.0.10/midi/Makefile Wed Sep 15 14:03:52 1999 +++ melys-0.0.11/midi/Makefile Sun Sep 19 23:10:08 1999 @@ -18,6 +18,9 @@ +install: all + + # Remove all object files and exectutables # clean: @@ -37,3 +40,15 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< +play.o: ../include/seqlib.h +play.o: ../include/elements.h +play.o: ../include/md.h +play.o: ../include/config.h +play.o: ../include/melmsg.h +play.o: ../include/melmidi.h +record.o: ../include/seqlib.h +record.o: ../include/elements.h +record.o: ../include/config.h +record.o: ../include/md.h +record.o: ../include/melmsg.h +record.o: ../include/melmidi.h diff -rNu melys-0.0.10/midi/play.c melys-0.0.11/midi/play.c --- melys-0.0.10/midi/play.c Wed Sep 15 14:04:04 1999 +++ melys-0.0.11/midi/play.c Sun Sep 19 23:10:16 1999 @@ -34,9 +34,6 @@ #include "intl.h" -#define ECHO_NOOP 0 -#define ECHO_ENDSONG 1 - #define INPUT_ALL (GDK_INPUT_READ | GDK_INPUT_WRITE) struct play { @@ -91,11 +88,6 @@ play->mdroot = NULL; play->pend_element = NULL; play->ctxp = seq_context_new("Melys sequencer"); - if (play->ctxp == NULL) { - mel_error(_("Could not open ALSA sequencer\n" - "Perhaps modules are not loaded\n")); - return NULL; - } snd_seq_block_mode(seq_handle(play->ctxp), 0); play->seq = NULL; play->write_id = 0; @@ -154,6 +146,9 @@ int n; snd_seq_addr_t *addrs; + if (!play->ctxp) + return; + n = conf_get_input_ports(&addrs); seq_set_addresses(play->ctxp, SEQ_ADDR_INPUT, addrs, n); @@ -171,37 +166,34 @@ void play_start(struct play *play) { - snd_seq_event_t ev; + seq_context_t *ctxp; if (!play || play->isplaying || play->mdroot == NULL) return; + ctxp = play->ctxp; + if (ctxp == NULL) + return; + /* Init the sequence */ if (play->ispaused) { - seq_timer_continue(play->ctxp); + seq_timer_continue(ctxp); + /* set playing */ + play->isplaying = TRUE; } else { play->isended = FALSE; + play->isplaying = FALSE; play->seq = md_sequence_init(play->mdroot); play->pend_element = NULL; - seq_drain_output(play->ctxp); - seq_connect_addresses(play->ctxp, SEQ_ADDR_OUTPUT); + seq_drain_output(ctxp); + seq_connect_addresses(ctxp, SEQ_ADDR_OUTPUT); /* Reset timer */ - seq_timer_start(play->ctxp); - seq_timer_stop(play->ctxp); - - /* Reset all controllers */ - /* NB: This should very probably be done in another way - * you don't necessarily want to always do this... - */ - seq_midi_event_init(play->ctxp, &ev, 0, 0); - seq_midi_control(play->ctxp, &ev, SND_MCTL_RESET_CONTROLLERS, 0); - seq_send_to_all(play->ctxp, &ev); + seq_timer_stop(ctxp); + midi_play_prologue(ctxp, play->mdroot); } - /* set playing */ - play->isplaying = TRUE; add_io_cb(play, INPUT_ALL); @@ -212,7 +204,7 @@ * * Remove this code in about 6 months, when all have the fix. */ - seq_midi_send_echo(play->ctxp, 0, ECHO_NOOP); + seq_midi_send_echo(ctxp, 0, ECHO_NOOP); } /* @@ -382,8 +374,8 @@ if (!warned) { warned = 1; - mel_warning(_("Melys should be built with ALSA version 0.4.0\n" - "patch. The muting function will hardly work at all") + mel_warning(_("Melys should be built with ALSA version of\n" + "at least 0.4.1. The muting function will hardly work at all") ); } } @@ -505,13 +497,11 @@ static void run_events(struct play *play) { - struct element *el; + struct element *el = NULL; unsigned long end; - int status; + int status = 0; debug_pool(play); - if (play->isplaying == FALSE) - ethrow(debugError, "Not playing in run_events"); /* Push out any pending element */ if (play->pend_element) { @@ -524,9 +514,14 @@ play->pend_element = NULL; } + if (status == 0 && !play->isplaying) { + remove_io_cb(play, GDK_INPUT_WRITE); + return; + } + /* Try and push out next items in the sequence */ while ((el = md_sequence_next(play->seq)) != NULL) { - //dprintf2("Sending type %d for %d at %ld", el->type, el->device_channel, el->element_time); + 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; @@ -540,7 +535,7 @@ end = md_sequence_duration(play->seq); /* MMM this could fail */ - seq_midi_send_echo(play->ctxp, end, ECHO_ENDSONG); /* XXX */ + seq_midi_send_echo(play->ctxp, end, ECHO_END_SONG); } status = snd_seq_flush_output(seq_handle(play->ctxp)); @@ -602,7 +597,7 @@ case ECHO_NOOP: break; - case ECHO_ENDSONG: + case ECHO_END_SONG: if (!play->isrecording) { play_pause(play); @@ -616,6 +611,13 @@ md_sequence_end(play->seq); play->seq = NULL; } + break; + + case ECHO_END_PROLOGUE: + /* Reset the timer */ + seq_timer_stop(play->ctxp); + play->isplaying = TRUE; + add_io_cb(play, GDK_INPUT_WRITE); break; default: diff -rNu melys-0.0.10/midi/play.m melys-0.0.11/midi/play.m --- melys-0.0.10/midi/play.m Tue Sep 14 14:58:08 1999 +++ melys-0.0.11/midi/play.m Sun Sep 19 22:38:55 1999 @@ -29,10 +29,11 @@ struct play; struct seq_context; ->>extern - #define ECHO_NOOP 0 -#define ECHO_ENDSONG 1 +#define ECHO_END_SONG 1 +#define ECHO_END_PROLOGUE 2 + +>>extern #define INPUT_ALL (GDK_INPUT_READ | GDK_INPUT_WRITE) @@ -75,11 +76,6 @@ play->mdroot = NULL; play->pend_element = NULL; play->ctxp = seq_context_new("Melys sequencer"); - if (play->ctxp == NULL) { - mel_error(_("Could not open ALSA sequencer\n" - "Perhaps modules are not loaded\n")); - return NULL; - } snd_seq_block_mode(seq_handle(play->ctxp), 0); play->seq = NULL; play->write_id = 0; @@ -134,6 +130,9 @@ int n; snd_seq_addr_t *addrs; + if (!play->ctxp) + return; + n = conf_get_input_ports(&addrs); seq_set_addresses(play->ctxp, SEQ_ADDR_INPUT, addrs, n); @@ -151,37 +150,34 @@ XXX some warning/error? >>code - snd_seq_event_t ev; + seq_context_t *ctxp; if (!play || play->isplaying || play->mdroot == NULL) return; + ctxp = play->ctxp; + if (ctxp == NULL) + return; + /* Init the sequence */ if (play->ispaused) { - seq_timer_continue(play->ctxp); + seq_timer_continue(ctxp); + /* set playing */ + play->isplaying = TRUE; } else { play->isended = FALSE; + play->isplaying = FALSE; play->seq = md_sequence_init(play->mdroot); play->pend_element = NULL; - seq_drain_output(play->ctxp); - seq_connect_addresses(play->ctxp, SEQ_ADDR_OUTPUT); + seq_drain_output(ctxp); + seq_connect_addresses(ctxp, SEQ_ADDR_OUTPUT); /* Reset timer */ - seq_timer_start(play->ctxp); - seq_timer_stop(play->ctxp); - - /* Reset all controllers */ - /* NB: This should very probably be done in another way - * you don't necessarily want to always do this... - */ - seq_midi_event_init(play->ctxp, &ev, 0, 0); - seq_midi_control(play->ctxp, &ev, SND_MCTL_RESET_CONTROLLERS, 0); - seq_send_to_all(play->ctxp, &ev); + seq_timer_stop(ctxp); + midi_play_prologue(ctxp, play->mdroot); } - /* set playing */ - play->isplaying = TRUE; add_io_cb(play, INPUT_ALL); @@ -192,7 +188,7 @@ * * Remove this code in about 6 months, when all have the fix. */ - seq_midi_send_echo(play->ctxp, 0, ECHO_NOOP); + seq_midi_send_echo(ctxp, 0, ECHO_NOOP); >>function play_pause void @@ -363,8 +359,8 @@ if (!warned) { warned = 1; - mel_warning(_("Melys should be built with ALSA version 0.4.0\n" - "patch. The muting function will hardly work at all") + mel_warning(_("Melys should be built with ALSA version of\n" + "at least 0.4.1. The muting function will hardly work at all") ); } } @@ -492,13 +488,11 @@ and this is it. >>code - struct element *el; + struct element *el = NULL; unsigned long end; - int status; + int status = 0; debug_pool(play); - if (play->isplaying == FALSE) - ethrow(debugError, "Not playing in @func_name"); /* Push out any pending element */ if (play->pend_element) { @@ -511,9 +505,14 @@ play->pend_element = NULL; } + if (status == 0 && !play->isplaying) { + remove_io_cb(play, GDK_INPUT_WRITE); + return; + } + /* Try and push out next items in the sequence */ while ((el = md_sequence_next(play->seq)) != NULL) { - //dprintf2("Sending type %d for %d at %ld", el->type, el->device_channel, el->element_time); + 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; @@ -527,7 +526,7 @@ end = md_sequence_duration(play->seq); /* MMM this could fail */ - seq_midi_send_echo(play->ctxp, end, ECHO_ENDSONG); /* XXX */ + seq_midi_send_echo(play->ctxp, end, ECHO_END_SONG); } status = snd_seq_flush_output(seq_handle(play->ctxp)); @@ -586,7 +585,7 @@ case ECHO_NOOP: break; - case ECHO_ENDSONG: + case ECHO_END_SONG: if (!play->isrecording) { play_pause(play); @@ -600,6 +599,13 @@ md_sequence_end(play->seq); play->seq = NULL; } + break; + + case ECHO_END_PROLOGUE: + /* Reset the timer */ + seq_timer_stop(play->ctxp); + play->isplaying = TRUE; + add_io_cb(play, GDK_INPUT_WRITE); break; default: diff -rNu melys-0.0.10/midi/record.c melys-0.0.11/midi/record.c --- melys-0.0.10/midi/record.c Wed Sep 15 14:04:04 1999 +++ melys-0.0.11/midi/record.c Sun Sep 19 23:10:16 1999 @@ -24,6 +24,7 @@ #include "config.h" #include "md.h" #include "gdk/gdk.h" +#include "melmsg.h" #include "melmidi.h" #include "intl.h" @@ -57,6 +58,9 @@ unsigned long time, snd_seq_event_t *ep); static void finish_note(struct trackElement *track, unsigned long time, snd_seq_event_t *ep); +static struct element *save_controller(struct trackElement *track, + int control, int value); +static struct element *save_program(struct trackElement *track, int val); /* @@ -106,7 +110,8 @@ record_set_mdroot(struct record *record, struct rootElement *root) { - record->mdroot = md_root_inc_ref(root); + if (record) + record->mdroot = md_root_inc_ref(root); } /* @@ -119,6 +124,9 @@ int n; snd_seq_addr_t *addrs; + if (record == NULL || record->ctxp == NULL) + return; + n = conf_get_input_ports(&addrs); seq_set_addresses(record->ctxp, SEQ_ADDR_INPUT, addrs, n); @@ -140,7 +148,8 @@ int devchan) { - record->curtrack = track; + if (record) + record->curtrack = track; } /* @@ -157,6 +166,9 @@ unsigned long t; struct trackElement *track; + if (record == NULL || record->ctxp == NULL) + return; + record->isrecording = TRUE; t = seq_get_time(record->ctxp); @@ -168,8 +180,7 @@ track->newpart = md_container_new(); track->notes = g_ptr_array_new(); MD_TIME(track->newpart) = t; - MD_ELEMENT(track->newpart)->device_channel - = MD_ELEMENT(track)->device_channel; + MD_DEVCHAN(track->newpart) = MD_DEVCHAN(track); } } } @@ -245,8 +256,11 @@ int n; int tn; - //if (ep->type != 50) g_message("Got event %d", ep->type); - //g_message("Got event %d", ep->type); + dprintf2("Got event %d time %ld", ep->type, ep->time.tick); + + /* This is an ALSA bug (reported) keyboard events have the REL bit + * set but they are not relative + */ ep->flags &= ~SND_SEQ_TIME_MODE_REL; for (tn = 0; tn < record->mdroot->tracks; tn++) { @@ -257,8 +271,8 @@ save_event(track, ep); n = seq_sendto_now(record->ctxp, ep, - DEV(MD_ELEMENT(track)->device_channel), - CHAN(MD_ELEMENT(track)->device_channel)); + MD_DEV(track), + MD_CHAN(track)); if (n != 0) { g_message("Mmm n is %d", n); @@ -347,11 +361,11 @@ ep->data.control.value); break; case SND_SEQ_EVENT_CONTROLLER: - el = (EPTR) md_control_new(ep->data.control.param, + el = save_controller(track, ep->data.control.param, ep->data.control.value); break; case SND_SEQ_EVENT_PGMCHANGE: - el = (EPTR) md_program_new(ep->data.control.value); + el = save_program(track, ep->data.control.value); break; case SND_SEQ_EVENT_CHANPRESS: el = (EPTR) md_pressure_new(ep->data.control.value); @@ -392,10 +406,13 @@ if (el) { el->element_time = time; - el->device_channel = MD_ELEMENT(track)->device_channel; + el->device_channel = MD_DEVCHAN(track); md_save_elem(track->newpart, el); } + + if (MD_MODIFIED(track)) + mel_view_update(); } /* @@ -503,7 +520,6 @@ for (i = notes->len-1; i >= 0; i--) { n = g_ptr_array_index(notes, i); if (n->note == ep->data.note.note) { - //&& MD_ELEMENT(n)->device_channel == track->inputdev) { len = time - MD_ELEMENT(n)->element_time; n->offvel = ep->data.note.velocity; @@ -515,4 +531,70 @@ break; } } +} + +/* + * Save the controller state for the track device. Note that of + * course tracks can share devices. + * + */ +static struct element * +save_controller(struct trackElement *track, int control, int value) +{ + struct element *el; + int alloc; + + control = control & 0x7f; + value = value & 0x7f; + track->controllers[control] = value; + + /* + * Some events are not saved as separate events but are combined + * into larger units. + * + * This should probably depend on what mode the song is in (GM etc) + * but currently doesn't. + */ + switch (control) { + case SND_MCTL_MSB_BANK: + case SND_MCTL_LSB_BANK: + MD_SET_MODIFIED(track, TRUE); + alloc = FALSE; + break; + default: + alloc = TRUE; + break; + } + + el = NULL; + if (alloc) + el = (EPTR) md_control_new(control, value); + + return el; +} + +/* + * Save the program number. We save the program as a single + * integer that includes in the default case the bank change + * commands. There are various ways of representing banks of + * instruments and we are using the controllers 0 and 32 method + * at present. + */ +static struct element * +save_program(struct trackElement *track, int val) +{ + int program; + struct element *el; + + /* Currently never save a program change event */ + el = NULL; + + program = track->controllers[SND_MCTL_MSB_BANK] << 14; + program |= track->controllers[SND_MCTL_LSB_BANK] << 7; + program |= val; + + track->program = program; + MD_SET_MODIFIED(track, TRUE); + + return el; } diff -rNu melys-0.0.10/midi/record.m melys-0.0.11/midi/record.m --- melys-0.0.10/midi/record.m Wed Sep 15 13:26:04 1999 +++ melys-0.0.11/midi/record.m Sun Sep 19 22:38:55 1999 @@ -16,6 +16,7 @@ >>header config.h >>header md.h >>header gdk/gdk.h +>>header melmsg.h >>headerdef --decl melmidi.h @@ -90,7 +91,8 @@ >>code - record->mdroot = md_root_inc_ref(root); + if (record) + record->mdroot = md_root_inc_ref(root); >>function record_set_ports @@ -103,6 +105,9 @@ int n; snd_seq_addr_t *addrs; + if (record == NULL || record->ctxp == NULL) + return; + n = conf_get_input_ports(&addrs); seq_set_addresses(record->ctxp, SEQ_ADDR_INPUT, addrs, n); @@ -123,7 +128,8 @@ >>code - record->curtrack = track; + if (record) + record->curtrack = track; >>function record_start @@ -139,6 +145,9 @@ unsigned long t; struct trackElement *track; + if (record == NULL || record->ctxp == NULL) + return; + record->isrecording = TRUE; t = seq_get_time(record->ctxp); @@ -150,8 +159,7 @@ track->newpart = md_container_new(); track->notes = g_ptr_array_new(); MD_TIME(track->newpart) = t; - MD_ELEMENT(track->newpart)->device_channel - = MD_ELEMENT(track)->device_channel; + MD_DEVCHAN(track->newpart) = MD_DEVCHAN(track); } } @@ -223,8 +231,11 @@ int n; int tn; - //if (ep->type != 50) g_message("Got event %d", ep->type); - //g_message("Got event %d", ep->type); + dprintf2("Got event %d time %ld", ep->type, ep->time.tick); + + /* This is an ALSA bug (reported) keyboard events have the REL bit + * set but they are not relative + */ ep->flags &= ~SND_SEQ_TIME_MODE_REL; for (tn = 0; tn < record->mdroot->tracks; tn++) { @@ -235,8 +246,8 @@ save_event(track, ep); n = seq_sendto_now(record->ctxp, ep, - DEV(MD_ELEMENT(track)->device_channel), - CHAN(MD_ELEMENT(track)->device_channel)); + MD_DEV(track), + MD_CHAN(track)); if (n != 0) { g_message("Mmm n is %d", n); @@ -325,11 +336,11 @@ ep->data.control.value); break; case SND_SEQ_EVENT_CONTROLLER: - el = (EPTR) md_control_new(ep->data.control.param, + el = save_controller(track, ep->data.control.param, ep->data.control.value); break; case SND_SEQ_EVENT_PGMCHANGE: - el = (EPTR) md_program_new(ep->data.control.value); + el = save_program(track, ep->data.control.value); break; case SND_SEQ_EVENT_CHANPRESS: el = (EPTR) md_pressure_new(ep->data.control.value); @@ -370,11 +381,14 @@ if (el) { el->element_time = time; - el->device_channel = MD_ELEMENT(track)->device_channel; + el->device_channel = MD_DEVCHAN(track); md_save_elem(track->newpart, el); } + if (MD_MODIFIED(track)) + mel_view_update(); + >>function push_events static void @@ -477,7 +491,6 @@ for (i = notes->len-1; i >= 0; i--) { n = g_ptr_array_index(notes, i); if (n->note == ep->data.note.note) { - //&& MD_ELEMENT(n)->device_channel == track->inputdev) { len = time - MD_ELEMENT(n)->element_time; n->offvel = ep->data.note.velocity; @@ -489,3 +502,74 @@ break; } } + + +>>function save_controller +static struct element * +struct trackElement *track; +int control; +int value; + +>>description +Save the controller state for the track device. +Note that of course tracks can share devices. + +>>code + struct element *el; + int alloc; + + control = control & 0x7f; + value = value & 0x7f; + track->controllers[control] = value; + + /* + * Some events are not saved as separate events but are combined + * into larger units. + * + * This should probably depend on what mode the song is in (GM etc) + * but currently doesn't. + */ + switch (control) { + case SND_MCTL_MSB_BANK: + case SND_MCTL_LSB_BANK: + MD_SET_MODIFIED(track, TRUE); + alloc = FALSE; + break; + default: + alloc = TRUE; + break; + } + + el = NULL; + if (alloc) + el = (EPTR) md_control_new(control, value); + + return el; + + +>>function save_program +static struct element * +struct trackElement *track; +int val; + +>>description +Save the program number. +We save the program as a single integer that includes in the default +case the bank change commands. +There are various ways of representing banks of instruments and +we are using the controllers 0 and 32 method at present. +>>code + int program; + struct element *el; + + /* Currently never save a program change event */ + el = NULL; + + program = track->controllers[SND_MCTL_MSB_BANK] << 14; + program |= track->controllers[SND_MCTL_LSB_BANK] << 7; + program |= val; + + track->program = program; + MD_SET_MODIFIED(track, TRUE); + + return el; diff -rNu melys-0.0.10/pixmaps/Makefile melys-0.0.11/pixmaps/Makefile --- melys-0.0.10/pixmaps/Makefile Wed Sep 15 14:03:52 1999 +++ melys-0.0.11/pixmaps/Makefile Sun Sep 19 23:10:08 1999 @@ -18,6 +18,9 @@ +install: all + + # Remove all object files and exectutables # clean: @@ -37,3 +40,5 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< +balls.o: ../include/pixmaps.h +menu_icons.o: ../include/pixmaps.h diff -rNu melys-0.0.10/po/FILES melys-0.0.11/po/FILES --- melys-0.0.10/po/FILES Thu Aug 19 13:06:35 1999 +++ melys-0.0.11/po/FILES Wed Sep 15 17:01:56 1999 @@ -8,6 +8,9 @@ gui/menus.c md/elements.c md/mdutil.c +md/mdadd.c +md/mdlist.c +md/mdundo.c midi/play.c midi/record.c programs/mdmlconv.c diff -rNu melys-0.0.10/po/Makefile melys-0.0.11/po/Makefile --- melys-0.0.10/po/Makefile Fri Jul 16 14:22:51 1999 +++ melys-0.0.11/po/Makefile Wed Sep 15 19:06:09 1999 @@ -31,6 +31,9 @@ fi; \ done +install: + -echo The po Makefile install is TO DO + .po.mo: $(MSGFMT) -o $@ $< diff -rNu melys-0.0.10/po/melys.pot melys-0.0.11/po/melys.pot --- melys-0.0.10/po/melys.pot Tue Sep 14 15:00:25 1999 +++ melys-0.0.11/po/melys.pot Sun Sep 19 23:02:58 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-09-12 23:45+0100\n" +"POT-Creation-Date: 1999-09-19 22:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -34,7 +34,7 @@ "This is probably a bug" msgstr "" -#: mdmlread.m:68 +#: mdmlread.m:71 msgid "Failed to read file" msgstr "" @@ -42,7 +42,7 @@ msgid "Could not open file" msgstr "" -#: midiread.m:116 +#: midiread.m:117 #, c-format msgid "" "Could not open file\n" @@ -50,7 +50,7 @@ "%s" msgstr "" -#: midiread.m:166 +#: midiread.m:167 #, c-format msgid "" "Could not read file\n" @@ -58,194 +58,196 @@ "%s" msgstr "" -#: midiread.m:228 +#: midiread.m:229 #, c-format msgid "Bad header (%x), probably not a real midi file" msgstr "" -#: midiread.m:239 +#: midiread.m:240 msgid "Bad header length, probably not a real midi file" msgstr "" -#: midiread.m:280 +#: midiread.m:281 #, c-format msgid "Bad track header (%x), probably not a midi file" msgstr "" -#: midiread.m:478 +#: midiread.m:479 #, c-format msgid "Bad status type 0x%x" msgstr "" -#: midiread.m:547 +#: midiread.m:544 #, c-format msgid "Meta event %d not implemented\n" msgstr "" -#: midiread.m:581 midiread.m:606 midiread.m:628 +#: midiread.m:580 midiread.m:605 midiread.m:627 msgid "Unexpected end of file" msgstr "" -#: midiwrite.m:58 +#: midiwrite.m:59 msgid "Can not open file" msgstr "" -#: midiwrite.m:393 +#: midiwrite.m:391 #, c-format msgid "Negative time difference (%d) writing midi file" msgstr "" -#: midiwrite.m:395 +#: midiwrite.m:393 msgid " difference set to zero" msgstr "" -#: main.m:65 +#: main.m:72 msgid "" "Here you can view the tracks and modify properties of the track such as " "instrument and midi channel. You can also add and delete tracks from this " "menu" msgstr "" -#: main.m:86 +#: main.m:95 msgid "The Melys sequencer" msgstr "" #. Create the first child -#: main.m:100 menus.m:169 +#: main.m:110 menus.m:180 msgid "Untitled" msgstr "" -#: menus.m:32 +#: menus.m:38 msgid "New" msgstr "" -#: menus.m:48 +#: menus.m:54 msgid "_Close all" msgstr "" -#: menus.m:48 +#: menus.m:54 msgid "Close all open windows" msgstr "" -#: menus.m:60 +#: menus.m:66 msgid "_Add" msgstr "" -#: menus.m:60 +#: menus.m:66 msgid "Add a new track" msgstr "" -#: menus.m:65 +#: menus.m:71 msgid "_Delete" msgstr "" -#: menus.m:65 +#: menus.m:71 msgid "Delete selected tracks" msgstr "" #: menus.m:76 -msgid "_Start" +msgid "Delete empty" msgstr "" #: menus.m:76 +msgid "Delete all empty tracks" +msgstr "" + +#: menus.m:87 +msgid "_Start" +msgstr "" + +#: menus.m:87 msgid "Start playing" msgstr "" -#: menus.m:82 +#: menus.m:93 msgid "_Pause" msgstr "" -#: menus.m:82 +#: menus.m:93 msgid "Pause playing" msgstr "" -#: menus.m:88 +#: menus.m:99 msgid "S_top" msgstr "" -#: menus.m:88 +#: menus.m:99 msgid "Stop and return to beginning" msgstr "" -#: menus.m:94 +#: menus.m:105 msgid "_Record" msgstr "" -#: menus.m:94 +#: menus.m:105 msgid "Start recording" msgstr "" -#: menus.m:100 +#: menus.m:111 msgid "Record stop" msgstr "" -#: menus.m:100 +#: menus.m:111 msgid "Stop recording" msgstr "" -#: menus.m:119 +#: menus.m:130 msgid "_Tracks" msgstr "" -#: menus.m:120 +#: menus.m:131 msgid "_Actions" msgstr "" -#: menus.m:227 +#: menus.m:238 msgid "Select the file to read in..." msgstr "" -#: menus.m:334 +#: menus.m:344 msgid "Select the file name to write to..." msgstr "" -#: menus.m:551 +#: menus.m:560 msgid "Copyright Steve Ratcliffe (C) 1999" msgstr "" -#: menus.m:553 +#: menus.m:562 msgid "Melys is a sequencer application for ALSA" msgstr "" -#: elements.m:294 +#: mdadd.m:134 #, c-format msgid "Freed an mdroot %d with bad reference count" msgstr "" -#: play.m:79 -msgid "" -"Could not open ALSA sequencer\n" -"Perhaps modules are not loaded\n" -msgstr "" - -#: play.m:338 +#: play.m:333 msgid "" "Melys was not built with the ALSA remove_events\n" "patch. The muting function will not work very well\n" "You will get hanging notes, for example" msgstr "" -#: play.m:367 +#: play.m:362 msgid "" -"Melys should be built with ALSA version 0.4.0\n" -"patch. The muting function will hardly work at all" +"Melys should be built with ALSA version of\n" +"at least 0.4.1. The muting function will hardly work at all" msgstr "" -#: play.m:450 +#: play.m:445 #, c-format msgid "BUG: play_unmute: t2=%ld, ahead time=%ld\n" msgstr "" -#: record.m:61 +#: record.m:62 msgid "Melys sequencer (record)" msgstr "" -#: mdmlconv.m:140 mdmlconv.m:149 +#: mdmlconv.m:148 mdmlconv.m:157 #, c-format msgid "Reading %s: %s\n" msgstr "" -#: melys.m:110 +#: melys.m:113 #, c-format msgid "" "A debugging error occurred\n" @@ -255,70 +257,70 @@ "MESSAGE: %s" msgstr "" -#: melys.m:142 +#: melys.m:145 msgid "Usage: melys [-x level]" msgstr "" -#: melys.m:144 +#: melys.m:147 msgid " -x, --debug=LEVEL Set debuging level" msgstr "" -#: melplay.m:23 +#: melplay.m:49 msgid "port" msgstr "" -#: melplay.m:24 +#: melplay.m:50 msgid "list" msgstr "" -#: melplay.m:25 +#: melplay.m:51 msgid "delay" msgstr "" -#: melplay.m:26 +#: melplay.m:52 msgid "begin" msgstr "" -#: melplay.m:268 showseq.m:98 +#: melplay.m:305 showseq.m:98 #, c-format msgid "Could not open sequencer %s" msgstr "" -#: melplay.m:274 showseq.m:104 +#: melplay.m:311 showseq.m:104 #, c-format msgid "Could not get sequencer information %s" msgstr "" -#: melplay.m:279 +#: melplay.m:316 #, c-format msgid " Port %-30.30s %s\n" msgstr "" -#: melplay.m:279 +#: melplay.m:316 msgid "Client name" msgstr "" -#: melplay.m:279 +#: melplay.m:316 msgid "Port name" msgstr "" -#: melplay.m:308 +#: melplay.m:346 msgid "Usage: melplay [-p client:port ...] [-l] [-d delay] file ..." msgstr "" -#: melplay.m:310 +#: melplay.m:348 msgid " -p client:port - A alsa client and port number to send midi to" msgstr "" -#: melplay.m:311 +#: melplay.m:349 msgid " -l - List possible output ports that could be used" msgstr "" -#: melplay.m:312 +#: melplay.m:350 msgid " -d delay - Delay after song ends (default 2 sec)" msgstr "" -#: melplay.m:313 +#: melplay.m:351 msgid " -b time - Begin time" msgstr "" @@ -336,7 +338,7 @@ msgid "Error (%s) creating sequencer port\n" msgstr "" -#: song.m:104 +#: song.m:105 msgid "" "You have selected a type 0 midi file\n" "Unfortunately this will not work very well\n" @@ -344,6 +346,12 @@ "It is easy enough to fix given the right encouragement...\n" msgstr "" +#: song.m:121 song.m:192 +msgid "" +"Could not open ALSA sequencer\n" +"Perhaps modules are not loaded\n" +msgstr "" + #: except.m:93 msgid "ethrow called without being set up" msgstr "" @@ -352,31 +360,36 @@ msgid "ethrow_setup called when allready set up" msgstr "" -#: melystrackinfo.m:138 +#: melystrackinfo.m:146 msgid "Name" msgstr "" -#: melystrackinfo.m:139 +#: melystrackinfo.m:147 msgid "Prog" msgstr "" -#: melystrackinfo.m:140 +#: melystrackinfo.m:148 msgid "C" msgstr "" -#: melystrackinfo.m:141 +#: melystrackinfo.m:149 msgid "Mute" msgstr "" -#: melystrackinfo.m:142 +#: melystrackinfo.m:150 msgid "Solo" msgstr "" -#: melystrackinfo.m:143 +#: melystrackinfo.m:151 msgid "Rec" msgstr "" -#: melystrackinfo.m:850 +#: melystrackinfo.m:813 +#, c-format +msgid "Track %d" +msgstr "" + +#: melystrackinfo.m:884 #, c-format msgid "" "Internal error.\n" diff -rNu melys-0.0.10/po/zz.po melys-0.0.11/po/zz.po --- melys-0.0.10/po/zz.po Tue Sep 14 15:00:25 1999 +++ melys-0.0.11/po/zz.po Sun Sep 19 23:02:58 1999 @@ -2,7 +2,6 @@ # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # -#, fuzzy msgid "" msgstr "" @@ -15,7 +14,6 @@ msgstr "N.O. I.N.F.O.R.M.A.T.I.O.N. A.V.A.I.L.A.B.L.E., S.O.R.R.Y." #: file.m:343 -#, fuzzy msgid "" "Could not read file\n" "This is probably a bug" @@ -31,8 +29,7 @@ "C.O.U.L.D. N.O.T. W.R.I.T.E. F.I.L.E.\n" "T.H.I.S. I.S. P.R.O.B.A.B.L.Y. A. B.U.G." -#: mdmlread.m:68 -#, fuzzy +#: mdmlread.m:71 msgid "Failed to read file" msgstr "F.A.I.L.E.D. T.O. R.E.A.D. F.I.L.E." @@ -40,8 +37,8 @@ msgid "Could not open file" msgstr "C.O.U.L.D. N.O.T. O.P.E.N. F.I.L.E." -#: midiread.m:116 -#, fuzzy, c-format +#: midiread.m:117 +#, c-format msgid "" "Could not open file\n" "\n" @@ -51,8 +48,8 @@ "\n" "%s" -#: midiread.m:166 -#, fuzzy, c-format +#: midiread.m:167 +#, c-format msgid "" "Could not read file\n" "\n" @@ -62,49 +59,48 @@ "\n" "%s" -#: midiread.m:228 +#: midiread.m:229 #, c-format msgid "Bad header (%x), probably not a real midi file" msgstr "B.A.D. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. N.O.T. A. R.E.A.L. M.I.D.I. F.I.L.E." -#: midiread.m:239 +#: midiread.m:240 msgid "Bad header length, probably not a real midi file" msgstr "B.A.D. H.E.A.D.E.R. L.E.N.G.T.H., P.R.O.B.A.B.L.Y. N.O.T. A. R.E.A.L. M.I.D.I. F.I.L.E." -#: midiread.m:280 +#: midiread.m:281 #, c-format msgid "Bad track header (%x), probably not a midi file" msgstr "B.A.D. T.R.A.C.K. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. N.O.T. A. M.I.D.I. F.I.L.E." -#: midiread.m:478 +#: midiread.m:479 #, c-format msgid "Bad status type 0x%x" msgstr "B.A.D. S.T.A.T.U.S. T.Y.P.E. 0X.%x" -#: midiread.m:547 +#: midiread.m:544 #, c-format msgid "Meta event %d not implemented\n" msgstr "M.E.T.A. E.V.E.N.T. %d N.O.T. I.M.P.L.E.M.E.N.T.E.D.\n" -#: midiread.m:581 midiread.m:606 midiread.m:628 +#: midiread.m:580 midiread.m:605 midiread.m:627 msgid "Unexpected end of file" msgstr "U.N.E.X.P.E.C.T.E.D. E.N.D. O.F. F.I.L.E." -#: midiwrite.m:58 -#, fuzzy +#: midiwrite.m:59 msgid "Can not open file" msgstr "C.A.N. N.O.T. O.P.E.N. F.I.L.E." -#: midiwrite.m:393 +#: midiwrite.m:391 #, c-format msgid "Negative time difference (%d) writing midi file" msgstr "N.E.G.A.T.I.V.E. T.I.M.E. D.I.F.F.E.R.E.N.C.E. (%d) W.R.I.T.I.N.G. M.I.D.I. F.I.L.E." -#: midiwrite.m:395 +#: midiwrite.m:393 msgid " difference set to zero" msgstr " D.I.F.F.E.R.E.N.C.E. S.E.T. T.O. Z.E.R.O." -#: main.m:65 +#: main.m:72 msgid "" "Here you can view the tracks and modify properties of the track such as " "instrument and midi channel. You can also add and delete tracks from this " @@ -114,122 +110,121 @@ "I.N.S.T.R.U.M.E.N.T. A.N.D. M.I.D.I. C.H.A.N.N.E.L.. Y.O.U. C.A.N. A.L.S.O. A.D.D. A.N.D. D.E.L.E.T.E. T.R.A.C.K.S. F.R.O.M. T.H.I.S. " "M.E.N.U." -#: main.m:86 +#: main.m:95 msgid "The Melys sequencer" msgstr "T.H.E. M.E.L.Y.S. S.E.Q.U.E.N.C.E.R." #. Create the first child -#: main.m:100 menus.m:169 +#: main.m:110 menus.m:180 msgid "Untitled" msgstr "U.N.T.I.T.L.E.D." -#: menus.m:32 +#: menus.m:38 msgid "New" msgstr "N.E.W." -#: menus.m:48 +#: menus.m:54 msgid "_Close all" msgstr "_C.L.O.S.E. A.L.L." -#: menus.m:48 +#: menus.m:54 msgid "Close all open windows" msgstr "C.L.O.S.E. A.L.L. O.P.E.N. W.I.N.D.O.W.S." -#: menus.m:60 +#: menus.m:66 msgid "_Add" msgstr "_A.D.D." -#: menus.m:60 +#: menus.m:66 msgid "Add a new track" msgstr "A.D.D. A. N.E.W. T.R.A.C.K." -#: menus.m:65 +#: menus.m:71 msgid "_Delete" msgstr "_D.E.L.E.T.E." -#: menus.m:65 +#: menus.m:71 msgid "Delete selected tracks" msgstr "D.E.L.E.T.E. S.E.L.E.C.T.E.D. T.R.A.C.K.S." #: menus.m:76 +msgid "Delete empty" +msgstr "D.E.L.E.T.E. E.M.P.T.Y." + +#: menus.m:76 +msgid "Delete all empty tracks" +msgstr "D.E.L.E.T.E. A.L.L. E.M.P.T.Y. T.R.A.C.K.S." + +#: menus.m:87 msgid "_Start" msgstr "_S.T.A.R.T." -#: menus.m:76 +#: menus.m:87 msgid "Start playing" msgstr "S.T.A.R.T. P.L.A.Y.I.N.G." -#: menus.m:82 +#: menus.m:93 msgid "_Pause" msgstr "_P.A.U.S.E." -#: menus.m:82 +#: menus.m:93 msgid "Pause playing" msgstr "P.A.U.S.E. P.L.A.Y.I.N.G." -#: menus.m:88 +#: menus.m:99 msgid "S_top" msgstr "S._T.O.P." -#: menus.m:88 +#: menus.m:99 msgid "Stop and return to beginning" msgstr "S.T.O.P. A.N.D. R.E.T.U.R.N. T.O. B.E.G.I.N.N.I.N.G." -#: menus.m:94 +#: menus.m:105 msgid "_Record" msgstr "_R.E.C.O.R.D." -#: menus.m:94 +#: menus.m:105 msgid "Start recording" msgstr "S.T.A.R.T. R.E.C.O.R.D.I.N.G." -#: menus.m:100 +#: menus.m:111 msgid "Record stop" msgstr "R.E.C.O.R.D. S.T.O.P." -#: menus.m:100 +#: menus.m:111 msgid "Stop recording" msgstr "S.T.O.P. R.E.C.O.R.D.I.N.G." -#: menus.m:119 +#: menus.m:130 msgid "_Tracks" msgstr "_T.R.A.C.K.S." -#: menus.m:120 +#: menus.m:131 msgid "_Actions" msgstr "_A.C.T.I.O.N.S." -#: menus.m:227 +#: menus.m:238 msgid "Select the file to read in..." msgstr "S.E.L.E.C.T. T.H.E. F.I.L.E. T.O. R.E.A.D. I.N...." -#: menus.m:334 -#, fuzzy +#: menus.m:344 msgid "Select the file name to write to..." msgstr "S.E.L.E.C.T. T.H.E. F.I.L.E. N.A.M.E. T.O. W.R.I.T.E. T.O...." -#: menus.m:551 +#: menus.m:560 msgid "Copyright Steve Ratcliffe (C) 1999" msgstr "C.O.P.Y.R.I.G.H.T. S.T.E.V.E. R.A.T.C.L.I.F.F.E. (C.) 1999" -#: menus.m:553 +#: menus.m:562 msgid "Melys is a sequencer application for ALSA" msgstr "M.E.L.Y.S. I.S. A. S.E.Q.U.E.N.C.E.R. A.P.P.L.I.C.A.T.I.O.N. F.O.R. A.L.S.A." -#: elements.m:294 +#: mdadd.m:134 #, c-format msgid "Freed an mdroot %d with bad reference count" msgstr "F.R.E.E.D. A.N. M.D.R.O.O.T. %d W.I.T.H. B.A.D. R.E.F.E.R.E.N.C.E. C.O.U.N.T." -#: play.m:79 -msgid "" -"Could not open ALSA sequencer\n" -"Perhaps modules are not loaded\n" -msgstr "" -"C.O.U.L.D. N.O.T. O.P.E.N. A.L.S.A. S.E.Q.U.E.N.C.E.R.\n" -"P.E.R.H.A.P.S. M.O.D.U.L.E.S. A.R.E. N.O.T. L.O.A.D.E.D.\n" - -#: play.m:338 +#: play.m:333 msgid "" "Melys was not built with the ALSA remove_events\n" "patch. The muting function will not work very well\n" @@ -239,30 +234,29 @@ "P.A.T.C.H.. T.H.E. M.U.T.I.N.G. F.U.N.C.T.I.O.N. W.I.L.L. N.O.T. W.O.R.K. V.E.R.Y. W.E.L.L.\n" "Y.O.U. W.I.L.L. G.E.T. H.A.N.G.I.N.G. N.O.T.E.S., F.O.R. E.X.A.M.P.L.E." -#: play.m:367 +#: play.m:362 msgid "" -"Melys should be built with ALSA version 0.4.0\n" -"patch. The muting function will hardly work at all" +"Melys should be built with ALSA version of\n" +"at least 0.4.1. The muting function will hardly work at all" msgstr "" -"M.E.L.Y.S. S.H.O.U.L.D. B.E. B.U.I.L.T. W.I.T.H. A.L.S.A. V.E.R.S.I.O.N. 0.4.0\n" -"P.A.T.C.H.. T.H.E. M.U.T.I.N.G. F.U.N.C.T.I.O.N. W.I.L.L. H.A.R.D.L.Y. W.O.R.K. A.T. A.L.L." +"M.E.L.Y.S. S.H.O.U.L.D. B.E. B.U.I.L.T. W.I.T.H. A.L.S.A. V.E.R.S.I.O.N. O.F.\n" +"A.T. L.E.A.S.T. 0.4.1. T.H.E. M.U.T.I.N.G. F.U.N.C.T.I.O.N. W.I.L.L. H.A.R.D.L.Y. W.O.R.K. A.T. A.L.L." -#: play.m:450 +#: play.m:445 #, c-format msgid "BUG: play_unmute: t2=%ld, ahead time=%ld\n" msgstr "B.U.G.: P.L.A.Y._U.N.M.U.T.E.: T.2=%lD., A.H.E.A.D. T.I.M.E.=%lD.\n" -#: record.m:61 -#, fuzzy +#: record.m:62 msgid "Melys sequencer (record)" msgstr "M.E.L.Y.S. S.E.Q.U.E.N.C.E.R. (R.E.C.O.R.D.)" -#: mdmlconv.m:140 mdmlconv.m:149 +#: mdmlconv.m:148 mdmlconv.m:157 #, c-format msgid "Reading %s: %s\n" msgstr "R.E.A.D.I.N.G. %s: %s\n" -#: melys.m:110 +#: melys.m:113 #, c-format msgid "" "A debugging error occurred\n" @@ -277,72 +271,70 @@ "T.H.E. A.P.P.L.I.C.A.T.I.O.N. A.S. S.O.O.N. A.S. P.O.S.S.I.B.L.E.\n" "M.E.S.S.A.G.E.: %s" -#: melys.m:142 +#: melys.m:145 msgid "Usage: melys [-x level]" msgstr "U.S.A.G.E.: M.E.L.Y.S. [-X. L.E.V.E.L.]" -#: melys.m:144 +#: melys.m:147 msgid " -x, --debug=LEVEL Set debuging level" msgstr " -X., --D.E.B.U.G.=L.E.V.E.L. S.E.T. D.E.B.U.G.I.N.G. L.E.V.E.L." -#: melplay.m:23 -#, fuzzy +#: melplay.m:49 msgid "port" msgstr "P.O.R.T." -#: melplay.m:24 +#: melplay.m:50 msgid "list" msgstr "L.I.S.T." -#: melplay.m:25 +#: melplay.m:51 msgid "delay" msgstr "D.E.L.A.Y." -#: melplay.m:26 +#: melplay.m:52 msgid "begin" msgstr "B.E.G.I.N." -#: melplay.m:268 showseq.m:98 -#, fuzzy, c-format +#: melplay.m:305 showseq.m:98 +#, c-format msgid "Could not open sequencer %s" msgstr "C.O.U.L.D. N.O.T. O.P.E.N. S.E.Q.U.E.N.C.E.R. %s" -#: melplay.m:274 showseq.m:104 -#, fuzzy, c-format +#: melplay.m:311 showseq.m:104 +#, c-format msgid "Could not get sequencer information %s" msgstr "C.O.U.L.D. N.O.T. G.E.T. S.E.Q.U.E.N.C.E.R. I.N.F.O.R.M.A.T.I.O.N. %s" -#: melplay.m:279 +#: melplay.m:316 #, c-format msgid " Port %-30.30s %s\n" msgstr " P.O.R.T. %-30.30S. %s\n" -#: melplay.m:279 +#: melplay.m:316 msgid "Client name" msgstr "C.L.I.E.N.T. N.A.M.E." -#: melplay.m:279 +#: melplay.m:316 msgid "Port name" msgstr "P.O.R.T. N.A.M.E." -#: melplay.m:308 -#, fuzzy +#: melplay.m:346 msgid "Usage: melplay [-p client:port ...] [-l] [-d delay] file ..." msgstr "U.S.A.G.E.: M.E.L.P.L.A.Y. [-P. C.L.I.E.N.T.:P.O.R.T. ...] [-L.] [-D. D.E.L.A.Y.] F.I.L.E. ..." -#: melplay.m:310 +#: melplay.m:348 msgid " -p client:port - A alsa client and port number to send midi to" msgstr " -P. C.L.I.E.N.T.:P.O.R.T. - A. A.L.S.A. C.L.I.E.N.T. A.N.D. P.O.R.T. N.U.M.B.E.R. T.O. S.E.N.D. M.I.D.I. T.O." -#: melplay.m:311 +#: melplay.m:349 msgid " -l - List possible output ports that could be used" msgstr " -L. - L.I.S.T. P.O.S.S.I.B.L.E. O.U.T.P.U.T. P.O.R.T.S. T.H.A.T. C.O.U.L.D. B.E. U.S.E.D." -#: melplay.m:312 +#: melplay.m:350 msgid " -d delay - Delay after song ends (default 2 sec)" msgstr " -D. D.E.L.A.Y. - D.E.L.A.Y. A.F.T.E.R. S.O.N.G. E.N.D.S. (D.E.F.A.U.L.T. 2 S.E.C.)" -#: melplay.m:313 +#: melplay.m:351 msgid " -b time - Begin time" msgstr " -B. T.I.M.E. - B.E.G.I.N. T.I.M.E." @@ -360,7 +352,7 @@ msgid "Error (%s) creating sequencer port\n" msgstr "E.R.R.O.R. (%s) C.R.E.A.T.I.N.G. S.E.Q.U.E.N.C.E.R. P.O.R.T.\n" -#: song.m:104 +#: song.m:105 msgid "" "You have selected a type 0 midi file\n" "Unfortunately this will not work very well\n" @@ -372,6 +364,14 @@ "A.T. T.H.E. C.U.R.R.E.N.T. T.I.M.E., B.U.T. S.H.O.U.L.D. P.L.A.Y..\n" "I.T. I.S. E.A.S.Y. E.N.O.U.G.H. T.O. F.I.X. G.I.V.E.N. T.H.E. R.I.G.H.T. E.N.C.O.U.R.A.G.E.M.E.N.T....\n" +#: song.m:121 song.m:192 +msgid "" +"Could not open ALSA sequencer\n" +"Perhaps modules are not loaded\n" +msgstr "" +"C.O.U.L.D. N.O.T. O.P.E.N. A.L.S.A. S.E.Q.U.E.N.C.E.R.\n" +"P.E.R.H.A.P.S. M.O.D.U.L.E.S. A.R.E. N.O.T. L.O.A.D.E.D.\n" + #: except.m:93 msgid "ethrow called without being set up" msgstr "E.T.H.R.O.W. C.A.L.L.E.D. W.I.T.H.O.U.T. B.E.I.N.G. S.E.T. U.P." @@ -380,32 +380,36 @@ msgid "ethrow_setup called when allready set up" msgstr "E.T.H.R.O.W._S.E.T.U.P. C.A.L.L.E.D. W.H.E.N. A.L.L.R.E.A.D.Y. S.E.T. U.P." -#: melystrackinfo.m:138 +#: melystrackinfo.m:146 msgid "Name" msgstr "N.A.M.E." -#: melystrackinfo.m:139 +#: melystrackinfo.m:147 msgid "Prog" msgstr "P.R.O.G." -#: melystrackinfo.m:140 +#: melystrackinfo.m:148 msgid "C" msgstr "C." -#: melystrackinfo.m:141 +#: melystrackinfo.m:149 msgid "Mute" msgstr "M.U.T.E." -#: melystrackinfo.m:142 +#: melystrackinfo.m:150 msgid "Solo" msgstr "S.O.L.O." -#: melystrackinfo.m:143 -#, fuzzy +#: melystrackinfo.m:151 msgid "Rec" msgstr "R.E.C." -#: melystrackinfo.m:850 +#: melystrackinfo.m:813 +#, c-format +msgid "Track %d" +msgstr "T.R.A.C.K. %d" + +#: melystrackinfo.m:884 #, c-format msgid "" "Internal error.\n" @@ -415,31 +419,3 @@ "I.N.T.E.R.N.A.L. E.R.R.O.R..\n" "T.H.E.R.E. I.S. A. M.I.S.S.I.N.G. C.A.S.E. I.N. D.R.A.W._C.O.L._B.U.T.T.O.N.\n" "V.A.L.U.E. W.A.S. %d\n" - -#~ msgid " %4s %-30.30s\n" -#~ msgstr " %4S. %-30.30S.\n" - -#~ msgid "Unrecognised file type" -#~ msgstr "U.N.R.E.C.O.G.N.I.S.E.D. F.I.L.E. T.Y.P.E." - -#~ msgid "" -#~ "The file %s\n" -#~ "does not have a known extension.\n" -#~ "Please select a file with an\n" -#~ "extension of .mid or .mdml" -#~ msgstr "" -#~ "T.H.E. F.I.L.E. %s\n" -#~ "D.O.E.S. N.O.T. H.A.V.E. A. K.N.O.W.N. E.X.T.E.N.S.I.O.N..\n" -#~ "P.L.E.A.S.E. S.E.L.E.C.T. A. F.I.L.E. W.I.T.H. A.N.\n" -#~ "E.X.T.E.N.S.I.O.N. O.F. .M.I.D. O.R. .M.D.M.L." - -#~ msgid "Could not connect to port %d:%d\n" -#~ msgstr "C.O.U.L.D. N.O.T. C.O.N.N.E.C.T. T.O. P.O.R.T. %d:%d\n" - -#, fuzzy -#~ msgid "" -#~ "Could not read file %s\n" -#~ "%s\n" -#~ msgstr "" -#~ "C.O.U.L.D. N.O.T. R.E.A.D. F.I.L.E. %s\n" -#~ "%s\n" diff -rNu melys-0.0.10/programs/.cvsignore melys-0.0.11/programs/.cvsignore --- melys-0.0.10/programs/.cvsignore Wed Sep 15 14:03:52 1999 +++ melys-0.0.11/programs/.cvsignore Sun Sep 19 23:10:08 1999 @@ -1,5 +1,5 @@ mdmlconv.c -mdmlconv.c +melplay.c melys.c showseq.c mdmlconv diff -rNu melys-0.0.10/programs/Makefile melys-0.0.11/programs/Makefile --- melys-0.0.10/programs/Makefile Wed Sep 15 14:03:52 1999 +++ melys-0.0.11/programs/Makefile Sun Sep 19 23:10:08 1999 @@ -8,11 +8,11 @@ melys \ showseq OBJS = mdmlconv.o \ - mdmlconv.o \ + melplay.o \ melys.o \ showseq.o GENCFILES = mdmlconv.c \ - mdmlconv.c \ + melplay.c \ melys.c \ showseq.c GENHFILES = ../include/melys.h @@ -30,7 +30,8 @@ ../files/mdmlwrite.o ../files/file.o ../md/elements.o \ ../md/mdutil.o ../util/except.o ../util/util.o \ ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o \ - ../seq/seqlib.o ../seq/seqmidi.o + ../seq/seqlib.o ../seq/seqmidi.o \ + ../seq/seqplay.o MELYSOBJS = \ melys.o \ @@ -38,11 +39,13 @@ ../files/mdmlread.o ../files/mdmlwrite.o \ ../files/file.o \ ../seq/seqlib.o ../seq/seqmidi.o ../seq/sequtil.o \ + ../seq/seqplay.o \ ../util/except.o ../util/util.o \ ../md/elements.o ../md/mdutil.o \ ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o \ - ../gui/main.o ../gui/menus.o \ - ../widgets/register.o \ + ../gui/main.o ../gui/menus.o ../gui/trackprop.o \ + ../gui/help.o \ + ../widgets/register.o ../widgets/misc.o \ ../midi/play.o ../midi/record.o \ ../song/song.o \ ../config/ports.o \ @@ -75,6 +78,12 @@ $(CC) $(CFLAGS) -o showseq $(SHOWSEQOBJS) $(LIBS) +install: all + $(INSTALL) mdmlconv $(INSTDIR) + $(INSTALL) melplay $(INSTDIR) + $(INSTALL) melys $(INSTDIR) + $(INSTALL) showseq $(INSTDIR) + # Remove all object files and exectutables # clean: @@ -94,3 +103,16 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< +mdmlconv.o: ../include/util.h +mdmlconv.o: ../include/melfile.h +mdmlconv.o: ../include/elements.h +mdmlconv.o: ../include/md.h +melplay.o: ../include/seqlib.h +melplay.o: ../include/elements.h +melplay.o: ../include/melfile.h +melplay.o: ../include/melmidi.h +melplay.o: ../include/midi.h +melplay.o: ../include/md.h +showseq.o: ../include/seqlib.h +melys.o: ../include/melmsg.h +melys.o: ../include/melys.h diff -rNu melys-0.0.10/programs/mdmlconv.c melys-0.0.11/programs/mdmlconv.c --- melys-0.0.10/programs/mdmlconv.c Wed Sep 15 14:04:04 1999 +++ melys-0.0.11/programs/mdmlconv.c Sun Sep 19 23:10:17 1999 @@ -168,6 +168,11 @@ md_free(MD_ELEMENT(root)); + if (fin) + file_close(fin); + if (fout) + file_close(fout); + UNCATCH(debugError); return 0; diff -rNu melys-0.0.10/programs/mdmlconv.m melys-0.0.11/programs/mdmlconv.m --- melys-0.0.10/programs/mdmlconv.m Tue Sep 14 14:58:35 1999 +++ melys-0.0.11/programs/mdmlconv.m Thu Sep 16 12:35:07 1999 @@ -161,6 +161,11 @@ md_free(MD_ELEMENT(root)); + if (fin) + file_close(fin); + if (fout) + file_close(fout); + UNCATCH(debugError); return 0; diff -rNu melys-0.0.10/programs/melplay.c melys-0.0.11/programs/melplay.c --- melys-0.0.10/programs/melplay.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.11/programs/melplay.c Sun Sep 19 23:10:17 1999 @@ -0,0 +1,422 @@ +/* + * + * 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 <stdlib.h> +#include <stdio.h> +#include <unistd.h> +#include <getopt.h> +#include <sys/asoundlib.h> +#include "seqlib.h" +#include "elements.h" +#include "melfile.h" +#include "melmidi.h" +#include "midi.h" +#include "md.h" +#include <string.h> +#include <errno.h> +#include "intl.h" + +/* + * Play a melys file (midi, mdml, whatever melys supports). + * melplay [-p client:port,... ] [-l] [-d delay] file ... + * + * -p client:port - A alsa client and port number to send midi to + * -l - List possible output ports that could be used + * -d delay - Delay after song ends (default 2 sec) + * -b time - Time to begin playing + */ + + +/* Options for the command */ +#define HAS_ARG 1 +static struct option long_opts[] = { + {N_("port"), HAS_ARG, NULL, 'p'}, + {N_("list"), 0, NULL, 'l'}, + {N_("delay"), HAS_ARG, NULL, 'd'}, + {N_("begin"), HAS_ARG, NULL, 'b'}, + {0, 0, 0, 0}, +}; + +/* Delay at the end of a song */ +static int delay = 2; +static long beginat = 0; + +#define ADDR_PARTS 4 /* Number of part in a port description addr 1:2:3:4 */ +#define SEP ", \t" /* Separators for port description */ + +static seq_context_t *openports(char *portdesc); +static void playfile(seq_context_t *ctxp, char *filename); +static void showlist(void); +static void showusage(void); +static void play(void *arg, struct element *el); + + +/* + * Play a midi file + * melplay [-p client:port ...] [-l] [-d delay] file ... + + * -p, --port=client:port - An ALSA client and port number to use + * -l, --list - List possible output ports that could be used + * -d, --delay=SECS - Delay after song ends (default 2 sec) + * -b, --begin=TIME - Begin time to start at + * Arguments: + * argc - arg count + * argv - arg vector + */ +int +main(int argc, char **argv) +{ + char opts[NELEM(long_opts) * 2 + 1]; + seq_context_t *ctxp; + char *portdesc; + char *cp; + int c; + struct option *op; + + /* Build up the short option string */ + cp = opts; + for (op = long_opts; op < &long_opts[NELEM(long_opts)]; op++) { + *cp++ = op->val; + if (op->has_arg) + *cp++ = ':'; + } + + if (CATCH(debugError)) { + fprintf(stderr, "A fatal debugging error occurred\n"); + fprintf(stderr, "The message was: %s\n", debugError->message); + return 1; + } + + portdesc = NULL; + + /* Deal with the options */ + for (;;) { + c = getopt_long(argc, argv, opts, long_opts, NULL); + if (c == -1) + break; + + switch(c) { + case 'p': + portdesc = optarg; + break; + case 'd': + delay = atoi(optarg); + break; + case 'b': + beginat = atol(optarg); + break; + case 'l': + showlist(); + exit(0); + break; + case '?': + showusage(); + exit(1); + } + } + + + if (portdesc == NULL) { + portdesc = getenv("ALSA_OUTPUT_PORTS"); + if (portdesc == NULL) { + fprintf(stderr, "No client/port specified.\n" + "You must supply one with the -p option or with the\n" + "environment variable ALSA_OUTPUT_PORTS\n" + ); + exit(1); + } + } + + ctxp = openports(portdesc); + if (ctxp == NULL) + return 1; + + /* Now play all the files */ + for (; optind < argc; optind++) + playfile(ctxp, argv[optind]); + + seq_context_free(ctxp); + + UNCATCH(debugError); + + return 0; +} + +/* + * Read a list of client/port specifications and return an + * array of snd_seq_addr_t that describes them. + * + */ +static seq_context_t * +openports(char *portdesc) +{ + char *astr; + char *cp; + seq_context_t *ctxp; + snd_seq_addr_t *addr; + snd_seq_addr_t *ap; + int a[ADDR_PARTS]; + int count, naddr; + + if (portdesc == NULL) + return NULL; + + ctxp = seq_context_new("melplay"); + + addr = g_new(snd_seq_addr_t, strlen(portdesc)); + + naddr = 0; + ap = addr; + + for (astr = strtok(portdesc, SEP); astr; astr = strtok(NULL, SEP)) { + for (cp = astr, count = 0; cp && *cp; cp++) { + if (count < ADDR_PARTS) + a[count++] = atoi(cp); + cp = strchr(cp, ':'); + if (cp == NULL) + break; + } + + switch (count) { + case 2: + ap->client = a[0]; + ap->port = a[1]; + break; + default: + printf("Addresses in %d parts not supported yet\n", count); + break; + } + ap++; + naddr++; + } + + seq_set_addresses(ctxp, SEQ_ADDR_OUTPUT, addr, naddr); + seq_connect_addresses(ctxp, SEQ_ADDR_OUTPUT); + + g_free(addr); + + if (naddr == 0) { + fprintf(stderr, "Could not set up any output sequencer ports\n"); + seq_context_free(ctxp); + return NULL; + } + + return ctxp; +} + +/* + * Play a single file. + */ +static void +playfile(seq_context_t *ctxp, char *filename) +{ + struct rootElement *root; + struct sequenceState *seq; + struct element *el; + unsigned long end; + snd_seq_event_t *ep; + struct File *file; + + file = file_new(filename); + root = file_read(file); + if (file_get_status(file) != FILE_SUCCESS) { + fprintf(stderr, "%s\n", file_get_message(file)); + return; + } + if (!root) + return; + + midi_play_prologue(ctxp, root); + for (;;) { + ep = seq_read(ctxp); + if (ep->type == SND_SEQ_EVENT_ECHO) + if (ep->data.raw32.d[0] == ECHO_END_PROLOGUE) + break; + } + seq_timer_stop(ctxp); + + /* Loop through all the elements in the song and play them */ + seq = md_sequence_init(root); + +#ifdef notyet /* Completly non-working */ + if (beginat) { + for (tr = 0; ; tr++) { + track = md_track_nth(root, tr); + if (track == NULL) + break; + md_elem_seek(MD_CONTAINER(track), beginat); + } + } +#endif + + while ((el = md_sequence_next(seq)) != NULL) { + play(ctxp, el); + } + + /* Get the end time for the tracks and echo an event to + * wake us up at that time + */ + end = md_sequence_duration(seq); + seq_midi_send_echo(ctxp, end, 0); + + /* Wait for all the events to be played */ + snd_seq_event_input(seq_handle(ctxp), &ep); + snd_seq_free_event(ep); + + /* Wait some extra time to allow for note to decay etc */ + sleep(delay); + seq_timer_stop(ctxp); + + md_sequence_end(seq); + + md_free(MD_ELEMENT(root)); + file_close(file); +} + +/* + * Show a list of possible output ports that midi could be sent + * to. + * + */ +static void +showlist(void) +{ + snd_seq_client_info_t cinfo; + snd_seq_port_info_t pinfo; + snd_seq_system_info_t sysinfo; + int client; + int port; + int err; + snd_seq_t *handle; + + err = snd_seq_open(&handle, SND_SEQ_OPEN); + if (err < 0) { + fprintf(stderr, _("Could not open sequencer %s"), snd_strerror(errno)); + exit(1); + } + + err = snd_seq_system_info(handle, &sysinfo); + if (err < 0) { + fprintf(stderr, _("Could not get sequencer information %s"), + snd_strerror(err)); + exit(1); + } + + printf(_(" Port %-30.30s %s\n"), _("Client name"), _("Port name")); + for (client = 0; client < sysinfo.clients; client++) { + err = snd_seq_get_any_client_info(handle, client, &cinfo); + if (err < 0) + continue; + + for (port = 0; port < sysinfo.ports; port++) { + int cap; + + err = snd_seq_get_any_port_info(handle, client, port, &pinfo); + if (err < 0) + continue; + + cap = (SND_SEQ_PORT_CAP_SUBSCRIPTION|SND_SEQ_PORT_CAP_OUT); + if ((pinfo.capability & cap) == cap) { + printf("%3d:%-3d %-30.30s %s\n", + pinfo.client, pinfo.port, cinfo.name, pinfo.name); + } + } + } + + snd_seq_close(handle); +} + +/* + * Show a usage message + */ +static void +showusage(void) +{ +char **cpp; +static char *msg[] = { +N_("Usage: melplay [-p client:port ...] [-l] [-d delay] file ..."), +"", +N_(" -p client:port - A alsa client and port number to send midi to"), +N_(" -l - List possible output ports that could be used"), +N_(" -d delay - Delay after song ends (default 2 sec)"), +N_(" -b time - Begin time"), +}; + + for (cpp = msg; cpp < msg+NELEM(msg); cpp++) { + fprintf(stderr, "%s\n", _(*cpp)); + } +} + +static void +play(void *arg, struct element *el) +{ + 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); + seq_timer_start(ctxp); + return; + case MD_TYPE_NOTE: + seq_midi_note(ctxp, &ev, MD_NOTE(el)->note, MD_NOTE(el)->vel, + MD_NOTE(el)->length); + break; + case MD_TYPE_CONTROL: + seq_midi_control(ctxp, &ev, MD_CONTROL(el)->control, + MD_CONTROL(el)->value); + break; + case MD_TYPE_PROGRAM: + seq_midi_program(ctxp, &ev, MD_PROGRAM(el)->program); + break; + case MD_TYPE_TEMPO: + seq_midi_tempo(ctxp, &ev, MD_TEMPO(el)->micro_tempo); + break; + case MD_TYPE_PITCH: + seq_midi_pitchbend(ctxp, &ev, MD_PITCH(el)->pitch); + break; + case MD_TYPE_PRESSURE: + seq_midi_chanpress(ctxp, &ev, MD_PRESSURE(el)->velocity); + break; + case MD_TYPE_KEYTOUCH: + seq_midi_keypress(ctxp, &ev, MD_KEYTOUCH(el)->note, + MD_KEYTOUCH(el)->velocity); + break; + case MD_TYPE_SYSEX: + seq_midi_sysex(ctxp, &ev, MD_SYSEX(el)->status, MD_SYSEX(el)->data, + MD_SYSEX(el)->length); + break; + + case MD_TYPE_ROOT: + case MD_TYPE_TEXT: + case MD_TYPE_KEYSIG: + case MD_TYPE_TIMESIG: + case MD_TYPE_SMPTEOFFSET: + case MD_TYPE_PART: + /* Ones that have no sequencer action */ + return; + default: + printf("WARNING: play: not implemented yet %d\n", el->type); + return; + } + + seq_write(ctxp, &ev); +} diff -rNu melys-0.0.10/programs/melplay.m melys-0.0.11/programs/melplay.m --- melys-0.0.10/programs/melplay.m Tue Sep 14 15:03:46 1999 +++ melys-0.0.11/programs/melplay.m Sat Sep 18 17:10:35 1999 @@ -1,4 +1,20 @@ --d delay] file ... +>>name melplay.m A play midi program + +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. + +>>extern +/* + * Play a melys file (midi, mdml, whatever melys supports). + * melplay [-p client:port,... ] [-l] [-d delay] file ... * * -p client:port - A alsa client and port number to send midi to * -l - List possible output ports that could be used @@ -13,6 +29,7 @@ >>header seqlib.h >>header elements.h >>header melfile.h +>>header melmidi.h >>header midi.h >>header md.h @@ -23,6 +40,7 @@ >>make --objects ../md/mdutil.o ../util/except.o ../util/util.o >>make --objects ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o >>make --objects ../seq/seqlib.o ../seq/seqmidi.o +>>make --objects ../seq/seqplay.o >>extern /* Options for the command */ @@ -208,8 +226,6 @@ unsigned long end; snd_seq_event_t *ep; struct File *file; - int tr; - struct trackElement *track; file = file_new(filename); root = file_read(file); @@ -220,6 +236,15 @@ if (!root) return; + midi_play_prologue(ctxp, root); + for (;;) { + ep = seq_read(ctxp); + if (ep->type == SND_SEQ_EVENT_ECHO) + if (ep->data.raw32.d[0] == ECHO_END_PROLOGUE) + break; + } + seq_timer_stop(ctxp); + /* Loop through all the elements in the song and play them */ seq = md_sequence_init(root); @@ -246,12 +271,16 @@ /* Wait for all the events to be played */ snd_seq_event_input(seq_handle(ctxp), &ep); + snd_seq_free_event(ep); /* Wait some extra time to allow for note to decay etc */ sleep(delay); seq_timer_stop(ctxp); + md_sequence_end(seq); + md_free(MD_ELEMENT(root)); + file_close(file); >>function showlist @@ -305,6 +334,7 @@ } } + snd_seq_close(handle); >>function showusage static void diff -rNu melys-0.0.10/programs/melys.m melys-0.0.11/programs/melys.m --- melys-0.0.10/programs/melys.m Tue Sep 14 14:58:35 1999 +++ melys-0.0.11/programs/melys.m Sat Sep 18 17:11:02 1999 @@ -16,11 +16,13 @@ >>make --objects ../files/mdmlread.o ../files/mdmlwrite.o >>make --objects ../files/file.o >>make --objects ../seq/seqlib.o ../seq/seqmidi.o ../seq/sequtil.o +>>make --objects ../seq/seqplay.o >>make --objects ../util/except.o ../util/util.o >>make --objects ../md/elements.o ../md/mdutil.o >>make --objects ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o ->>make --objects ../gui/main.o ../gui/menus.o ->>make --objects ../widgets/register.o +>>make --objects ../gui/main.o ../gui/menus.o ../gui/trackprop.o +>>make --objects ../gui/help.o +>>make --objects ../widgets/register.o ../widgets/misc.o >>make --objects ../midi/play.o ../midi/record.o >>make --objects ../song/song.o >>make --objects ../config/ports.o diff -rNu melys-0.0.10/seq/.cvsignore melys-0.0.11/seq/.cvsignore --- melys-0.0.10/seq/.cvsignore Wed Sep 15 14:03:49 1999 +++ melys-0.0.11/seq/.cvsignore Sun Sep 19 23:10:05 1999 @@ -1,5 +1,6 @@ seqlib.c seqmidi.c +seqplay.c sequtil.c Makefile *.mdml *.mdml.gz *.mid diff -rNu melys-0.0.10/seq/Makefile melys-0.0.11/seq/Makefile --- melys-0.0.10/seq/Makefile Wed Sep 15 14:03:49 1999 +++ melys-0.0.11/seq/Makefile Sun Sep 19 23:10:05 1999 @@ -6,12 +6,15 @@ TARGETS = OBJS = seqlib.o \ seqmidi.o \ + seqplay.o \ sequtil.o GENCFILES = seqlib.c \ seqmidi.c \ + seqplay.c \ sequtil.c GENHFILES = ../include/seqlib.h \ - seqpriv.h + seqpriv.h \ + ../include/melmidi.h @@ -21,6 +24,9 @@ +install: all + + # Remove all object files and exectutables # clean: @@ -40,3 +46,13 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< +seqplay.o: ../include/seqlib.h +seqplay.o: ../include/elements.h +seqplay.o: ../include/md.h +seqplay.o: ../include/melmidi.h +seqmidi.o: ../include/seqlib.h +seqmidi.o: ./seqpriv.h +seqlib.o: ../include/seqlib.h +seqlib.o: ./seqpriv.h +sequtil.o: ../include/elements.h +sequtil.o: ../include/seqlib.h diff -rNu melys-0.0.10/seq/seqlib.c melys-0.0.11/seq/seqlib.c --- melys-0.0.10/seq/seqlib.c Wed Sep 15 14:03:58 1999 +++ melys-0.0.11/seq/seqlib.c Sun Sep 19 23:10:09 1999 @@ -595,6 +595,8 @@ ev.dest.port = SND_SEQ_PORT_SYSTEM_TIMER; /* timer */ ev.dest.channel = 0; /* don't care */ + ev.data.queue.addr.queue = ctxp->queue; + ev.flags = SND_SEQ_TIME_STAMP_REAL | SND_SEQ_TIME_MODE_REL; ev.time.real.tv_sec = 0; ev.time.real.tv_nsec = 0; @@ -636,10 +638,6 @@ return seq_control_write(ctxp, ep); n = snd_seq_event_output(ctxp->handle, ep); - if (n < 0) - return n; - - n = snd_seq_flush_output(ctxp->handle); return n; } @@ -765,7 +763,7 @@ seq_handle(seq_context_t *ctxp) { - return ctxp->handle; + return ctxp? ctxp->handle: NULL; } /* diff -rNu melys-0.0.10/seq/seqlib.m melys-0.0.11/seq/seqlib.m --- melys-0.0.10/seq/seqlib.m Sun Sep 12 23:43:16 1999 +++ melys-0.0.11/seq/seqlib.m Sun Sep 19 22:39:35 1999 @@ -638,6 +638,8 @@ ev.dest.port = SND_SEQ_PORT_SYSTEM_TIMER; /* timer */ ev.dest.channel = 0; /* don't care */ + ev.data.queue.addr.queue = ctxp->queue; + ev.flags = SND_SEQ_TIME_STAMP_REAL | SND_SEQ_TIME_MODE_REL; ev.time.real.tv_sec = 0; ev.time.real.tv_nsec = 0; @@ -679,10 +681,6 @@ return seq_control_write(ctxp, ep); n = snd_seq_event_output(ctxp->handle, ep); - if (n < 0) - return n; - - n = snd_seq_flush_output(ctxp->handle); return n; @@ -809,7 +807,7 @@ >>code - return ctxp->handle; + return ctxp? ctxp->handle: NULL; >>function seq_descriptor int diff -rNu melys-0.0.10/seq/seqmidi.c melys-0.0.11/seq/seqmidi.c --- melys-0.0.10/seq/seqmidi.c Wed Sep 15 14:03:58 1999 +++ melys-0.0.11/seq/seqmidi.c Sun Sep 19 23:10:09 1999 @@ -48,29 +48,26 @@ { int dev; int channel; + snd_seq_addr_t *addr; - dev = devchan >> 4; - channel = devchan & 0xf; + dev = DEV(devchan); + channel = CHAN(devchan); + + addr = seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); + if (!addr) + addr = seq_dev_addr(ctxp, 0, SEQ_ADDR_OUTPUT); - /* - * If insufficient output devices have been registered, then we - * just scale the device back to fit in the correct range. This - * is not necessarily what you want. - */ - if (ctxp->destlist && ctxp->destlist->len && dev >= ctxp->destlist->len) - dev = dev % ctxp->destlist->len; - memset(ep, '\0', sizeof(*ep)); ep->flags = SND_SEQ_TIME_STAMP_TICK | SND_SEQ_TIME_MODE_ABS; ep->time.tick = time; ep->source = ctxp->source; - if (ctxp->destlist->len > 0) - ep->dest = g_array_index(ctxp->destlist, snd_seq_addr_t, dev); + if (addr) + ep->dest = *addr; ep->dest.channel = channel; } /* - * Send a note event. + * Initialize a note event. * Arguments: * ctxp - Client context * ep - Event template @@ -88,7 +85,7 @@ } /* - * Send a note on event. + * Initialize a note on event. * Arguments: * ctxp - Client context * ep - Event template @@ -106,7 +103,7 @@ } /* - * Send a note off event. + * Initialize a note off event. * Arguments: * ctxp - Client context * ep - Event template @@ -123,7 +120,7 @@ } /* - * Send a key pressure event. + * Initialize a key pressure event. * Arguments: * ctxp - Application context * ep - Event template @@ -142,7 +139,7 @@ } /* - * Send a control event. + * Initialize a control event. * Arguments: * ctxp - Application context * ep - Event template @@ -161,7 +158,7 @@ } /* - * Send a program change event. + * Initialize a program change event. * Arguments: * ctxp - Application context * ep - Event template @@ -173,11 +170,12 @@ ep->type = SND_SEQ_EVENT_PGMCHANGE; - ep->data.control.value = program; + ep->data.queue.addr.queue = ctxp->queue; + ep->data.queue.value = program; } /* - * Send a channel pressure event. + * Initialize a channel pressure event. * Arguments: * ctxp - Application context * ep - Event template @@ -193,8 +191,8 @@ } /* - * Send a pitchbend message. The bend parameter is centered on - * zero, negative values mean a lower pitch. + * Initialize a pitchbend message. The bend parameter is + * centered on zero, negative values mean a lower pitch. * Arguments: * ctxp - Application context * ep - Event template @@ -210,8 +208,8 @@ } /* - * Send a tempo event. The tempo parameter is in microseconds - * per beat. + * Initialize a tempo event. The tempo parameter is in + * microseconds per beat. * Arguments: * ctxp - Application context * ep - Event template @@ -223,7 +221,8 @@ ep->type = SND_SEQ_EVENT_TEMPO; - ep->data.control.value = tempo; + ep->data.queue.addr.queue = ctxp->queue; + ep->data.queue.value = tempo; ep->dest.client = SND_SEQ_PORT_SYSTEM_TIMER; } @@ -256,6 +255,23 @@ ep->data.ext.ptr = ndata; ep->data.ext.len = nlen; +} + +/* + * Initialise an echo event. + * Arguments: + * ctxp - Application context + * ep - Event template + * val - Echo event type + */ +void +seq_midi_echo(seq_context_t *ctxp, snd_seq_event_t *ep, int val) +{ + + ep->type = SND_SEQ_EVENT_ECHO; + + ep->dest = ctxp->source; + ep->data.raw32.d[0] = val; } /* diff -rNu melys-0.0.10/seq/seqmidi.m melys-0.0.11/seq/seqmidi.m --- melys-0.0.10/seq/seqmidi.m Wed Aug 11 15:30:31 1999 +++ melys-0.0.11/seq/seqmidi.m Sun Sep 19 21:50:32 1999 @@ -36,24 +36,21 @@ >>code int dev; int channel; + snd_seq_addr_t *addr; - dev = devchan >> 4; - channel = devchan & 0xf; + dev = DEV(devchan); + channel = CHAN(devchan); + + addr = seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); + if (!addr) + addr = seq_dev_addr(ctxp, 0, SEQ_ADDR_OUTPUT); - /* - * If insufficient output devices have been registered, then we - * just scale the device back to fit in the correct range. This - * is not necessarily what you want. - */ - if (ctxp->destlist && ctxp->destlist->len && dev >= ctxp->destlist->len) - dev = dev % ctxp->destlist->len; - memset(ep, '\0', sizeof(*ep)); ep->flags = SND_SEQ_TIME_STAMP_TICK | SND_SEQ_TIME_MODE_ABS; ep->time.tick = time; ep->source = ctxp->source; - if (ctxp->destlist->len > 0) - ep->dest = g_array_index(ctxp->destlist, snd_seq_addr_t, dev); + if (addr) + ep->dest = *addr; ep->dest.channel = channel; >>function seq_midi_note @@ -64,7 +61,7 @@ int vel; int length; >>description -Send a note event. +Initialize a note event. >>code ep->type = SND_SEQ_EVENT_NOTE; @@ -82,7 +79,7 @@ int vel; int length; >>description -Send a note on event. +Initialize a note on event. >>code ep->type = SND_SEQ_EVENT_NOTEON; @@ -101,7 +98,7 @@ int vel; int length; >>description -Send a note off event. +Initialize a note off event. >>code ep->type = SND_SEQ_EVENT_NOTEOFF; @@ -117,7 +114,7 @@ int note; Note to be altered int value; Pressure value >>description -Send a key pressure event. +Initialize a key pressure event. >>code ep->type = SND_SEQ_EVENT_KEYPRESS; @@ -133,7 +130,7 @@ int control; Controller to change int value; Value to set it to >>description -Send a control event. +Initialize a control event. >>code ep->type = SND_SEQ_EVENT_CONTROLLER; @@ -148,12 +145,13 @@ snd_seq_event_t *ep; Event template int program; Program to set >>description -Send a program change event. +Initialize a program change event. >>code ep->type = SND_SEQ_EVENT_PGMCHANGE; - ep->data.control.value = program; + ep->data.queue.addr.queue = ctxp->queue; + ep->data.queue.value = program; >>function seq_midi_chanpress @@ -162,7 +160,7 @@ snd_seq_event_t *ep; Event template int pressure; Pressure value >>description -Send a channel pressure event. +Initialize a channel pressure event. >>code ep->type = SND_SEQ_EVENT_CHANPRESS; @@ -176,7 +174,7 @@ snd_seq_event_t *ep; Event template int bend; Bend value, centered on zero. >>description -Send a pitchbend message. The +Initialize a pitchbend message. The .A bend parameter is centered on zero, negative values mean a lower pitch. >>code @@ -192,13 +190,14 @@ snd_seq_event_t *ep; Event template int tempo; New tempo in usec per beat >>description -Send a tempo event. +Initialize a tempo event. The tempo parameter is in microseconds per beat. >>code ep->type = SND_SEQ_EVENT_TEMPO; - ep->data.control.value = tempo; + ep->data.queue.addr.queue = ctxp->queue; + ep->data.queue.value = tempo; ep->dest.client = SND_SEQ_PORT_SYSTEM_TIMER; @@ -229,6 +228,20 @@ ep->data.ext.ptr = ndata; ep->data.ext.len = nlen; + +>>function seq_midi_echo +void +seq_context_t *ctxp; Application context +snd_seq_event_t *ep; Event template +int val; Echo event type +>>description +Initialise an echo event. +>>code + + ep->type = SND_SEQ_EVENT_ECHO; + + ep->dest = ctxp->source; + ep->data.raw32.d[0] = val; >>function seq_midi_send_echo void diff -rNu melys-0.0.10/seq/seqplay.c melys-0.0.11/seq/seqplay.c --- melys-0.0.10/seq/seqplay.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.11/seq/seqplay.c Sun Sep 19 23:10:10 1999 @@ -0,0 +1,113 @@ +/* + * + * 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 "seqlib.h" +#include "elements.h" +#include "md.h" +#include "melmidi.h" +#include "intl.h" + + +static snd_seq_real_time_t set_time(snd_seq_event_t *ep, + snd_seq_real_time_t time); + + +/* + * Send all events to setup the midi state for this root. This + * could include sysex commands controller setup and nprn's + * etc. + * + * After calling this routine you should read an event and wait + * for the ECHO_END_PROLOGUE event. Then stop the timer and + * restart it and play the reset of the song. + * + */ +void +midi_play_prologue(struct seq_context *ctxp, struct rootElement *root) +{ + struct trackElement *track; + snd_seq_real_time_t time = {0}; + snd_seq_event_t ev; + int n; + + seq_timer_start(ctxp); + + for (n = 0; n < root->tracks; n++) { + track = md_track_nth(root, n); + + /* Reset all controllers */ + seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); + seq_midi_control(ctxp, &ev, SND_MCTL_RESET_CONTROLLERS, 0); + time = set_time(&ev, time); + seq_write(ctxp, &ev); + + /* Send the patch */ + if (track->program > 127) { + seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); + seq_midi_control(ctxp, &ev, SND_MCTL_MSB_BANK, track->program>>14); + time = set_time(&ev, time); + seq_write(ctxp, &ev); + + seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); + seq_midi_control(ctxp, &ev, SND_MCTL_LSB_BANK, track->program>>7); + time = set_time(&ev, time); + seq_write(ctxp, &ev); + } + seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); + seq_midi_program(ctxp, &ev, track->program); + time = set_time(&ev, time); + seq_write(ctxp, &ev); + } + + seq_midi_event_init(ctxp, &ev, 0, 0); + seq_midi_echo(ctxp, &ev, ECHO_END_PROLOGUE); + time = set_time(&ev, time); + seq_write(ctxp, &ev); + + snd_seq_flush_output(seq_handle(ctxp)); +} + +/* + * Return the new time, based on the event just sent. + * + * Arguments: + * ep - Event that was sent + * time - Current time + */ +static snd_seq_real_time_t +set_time(snd_seq_event_t *ep, snd_seq_real_time_t time) +{ + + /* Simple for now */ + ep->flags &= ~SND_SEQ_TIME_STAMP_MASK; + ep->flags |= SND_SEQ_TIME_STAMP_REAL; + ep->flags &= ~SND_SEQ_TIME_MODE_MASK; + ep->flags |= SND_SEQ_TIME_MODE_ABS; + + ep->time.real = time; + + time.tv_nsec += 1000000; + while (time.tv_nsec > 1000000000) { + time.tv_nsec -= 1000000000; + time.tv_sec++; + } + + return time; +} diff -rNu melys-0.0.10/seq/seqplay.m melys-0.0.11/seq/seqplay.m --- melys-0.0.10/seq/seqplay.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.11/seq/seqplay.m Sat Sep 18 17:05:24 1999 @@ -0,0 +1,99 @@ +>>name seqplay.m - routines for playing + +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 seqlib.h +>>header elements.h +>>header md.h +>>headerdef --decl melmidi.h + +>>function midi_play_prologue +void +struct seq_context *ctxp; +struct rootElement *root; + +>>description +Send all events to setup the midi state for this root. +This could include sysex commands controller setup and nprn's etc. + +After calling this routine you should read an event and wait +for the ECHO_END_PROLOGUE event. +Then stop the timer and restart it and play the reset of the song. + +>>code + struct trackElement *track; + snd_seq_real_time_t time = {0}; + snd_seq_event_t ev; + int n; + + seq_timer_start(ctxp); + + for (n = 0; n < root->tracks; n++) { + track = md_track_nth(root, n); + + /* Reset all controllers */ + seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); + seq_midi_control(ctxp, &ev, SND_MCTL_RESET_CONTROLLERS, 0); + time = set_time(&ev, time); + seq_write(ctxp, &ev); + + /* Send the patch */ + if (track->program > 127) { + seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); + seq_midi_control(ctxp, &ev, SND_MCTL_MSB_BANK, track->program>>14); + time = set_time(&ev, time); + seq_write(ctxp, &ev); + + seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); + seq_midi_control(ctxp, &ev, SND_MCTL_LSB_BANK, track->program>>7); + time = set_time(&ev, time); + seq_write(ctxp, &ev); + } + seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); + seq_midi_program(ctxp, &ev, track->program); + time = set_time(&ev, time); + seq_write(ctxp, &ev); + } + + seq_midi_event_init(ctxp, &ev, 0, 0); + seq_midi_echo(ctxp, &ev, ECHO_END_PROLOGUE); + time = set_time(&ev, time); + seq_write(ctxp, &ev); + + snd_seq_flush_output(seq_handle(ctxp)); + + +>>function set_time +static snd_seq_real_time_t +snd_seq_event_t *ep; Event that was sent +snd_seq_real_time_t time; Current time + +>>description +Return the new time, based on the event just sent. + +>>code + + /* Simple for now */ + ep->flags &= ~SND_SEQ_TIME_STAMP_MASK; + ep->flags |= SND_SEQ_TIME_STAMP_REAL; + ep->flags &= ~SND_SEQ_TIME_MODE_MASK; + ep->flags |= SND_SEQ_TIME_MODE_ABS; + + ep->time.real = time; + + time.tv_nsec += 1000000; + while (time.tv_nsec > 1000000000) { + time.tv_nsec -= 1000000000; + time.tv_sec++; + } + + return time; diff -rNu melys-0.0.10/song/Makefile melys-0.0.11/song/Makefile --- melys-0.0.10/song/Makefile Wed Sep 15 14:03:49 1999 +++ melys-0.0.11/song/Makefile Sun Sep 19 23:10:04 1999 @@ -16,6 +16,9 @@ +install: all + + # Remove all object files and exectutables # clean: @@ -35,3 +38,13 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< +song.o: ../include/elements.h +song.o: ../include/md.h +song.o: ../include/melreg.h +song.o: ../include/melystrack.h +song.o: ../include/melfile.h +song.o: ../include/mdrw.h +song.o: ../include/melmidi.h +song.o: ../include/melmsg.h +song.o: ../include/song.h +song.o: ../include/melgui.h diff -rNu melys-0.0.10/song/song.c melys-0.0.11/song/song.c --- melys-0.0.10/song/song.c Wed Sep 15 14:03:57 1999 +++ melys-0.0.11/song/song.c Sun Sep 19 23:10:09 1999 @@ -20,12 +20,13 @@ #include "gtk/gtk.h" #include "elements.h" #include "md.h" -#include "melmidi.h" #include "melreg.h" #include "melystrack.h" #include <stdio.h> #include "melfile.h" #include "mdrw.h" +#include "melmidi.h" +#include "melmsg.h" #include "song.h" #include "melgui.h" #include "intl.h" @@ -82,6 +83,15 @@ song_play_start(struct song *song) { + if (play_get_context(song->play) == NULL) { + mel_song_error(song, NULL, + _("Could not open ALSA sequencer\n" + "Perhaps modules are not loaded\n" + )); + 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, @@ -143,6 +153,13 @@ song_record_start(struct song *song) { + if (song->record == NULL) { + mel_song_error(song, NULL, + _("Could not open ALSA sequencer\n" + "Perhaps modules are not loaded\n" + )); + } + /* Depends on what kind of track we have selected audio/midi */ /* Only midi exists at present... */ play_set_record(song->play, 1); @@ -255,6 +272,19 @@ /* Free the data itself */ g_free(sd); +} + +/* + * Update all views. This is called after a change has been made + * to the mdroot and you want to redisplay every thing. The view + * widgets could optimise and check what has changed. + * + */ +void +song_view_update(struct song *song) +{ + + melys_track_update(MELYS_TRACK(song->trackview)); } static void diff -rNu melys-0.0.10/song/song.m melys-0.0.11/song/song.m --- melys-0.0.10/song/song.m Tue Sep 14 15:00:38 1999 +++ melys-0.0.11/song/song.m Sun Sep 19 22:43:12 1999 @@ -15,13 +15,14 @@ >>header gtk/gtk.h >>header elements.h >>header md.h ->>header melmidi.h >>header melreg.h >>header melystrack.h >>header <stdio.h> >>header melfile.h >>header mdrw.h +>>header melmidi.h +>>header melmsg.h >>headerdef --decl song.h @@ -115,6 +116,15 @@ Start up audio and midi streams to start playing. >>code + if (play_get_context(song->play) == NULL) { + mel_song_error(song, NULL, + _("Could not open ALSA sequencer\n" + "Perhaps modules are not loaded\n" + )); + 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, @@ -177,6 +187,13 @@ >>code + if (song->record == NULL) { + mel_song_error(song, NULL, + _("Could not open ALSA sequencer\n" + "Perhaps modules are not loaded\n" + )); + } + /* Depends on what kind of track we have selected audio/midi */ /* Only midi exists at present... */ play_set_record(song->play, 1); @@ -288,6 +305,21 @@ /* Free the data itself */ g_free(sd); + + +>>function song_view_update +void +struct song *song; + +>>description +Update all views. +This is called after a change has been made to the mdroot +and you want to redisplay every thing. +The view widgets could optimise and check what has changed. + +>>code + + melys_track_update(MELYS_TRACK(song->trackview)); >>function song_mute_track diff -rNu melys-0.0.10/util/Makefile melys-0.0.11/util/Makefile --- melys-0.0.10/util/Makefile Wed Sep 15 14:03:50 1999 +++ melys-0.0.11/util/Makefile Sun Sep 19 23:10:06 1999 @@ -19,6 +19,9 @@ +install: all + + # Remove all object files and exectutables # clean: @@ -38,3 +41,5 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< +util.o: ../include/util.h +except.o: ../include/except.h diff -rNu melys-0.0.10/version melys-0.0.11/version --- melys-0.0.10/version Wed Sep 15 13:40:09 1999 +++ melys-0.0.11/version Sun Sep 19 23:02:58 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.0.10" +#define MELYS_VERSION_STRING "0.0.11" diff -rNu melys-0.0.10/widgets/.cvsignore melys-0.0.11/widgets/.cvsignore --- melys-0.0.10/widgets/.cvsignore Wed Sep 15 14:03:51 1999 +++ melys-0.0.11/widgets/.cvsignore Sun Sep 19 23:10:07 1999 @@ -2,6 +2,7 @@ melystrackdisplay.c melystrackinfo.c melystransport.c +misc.c register.c Makefile *.mdml *.mdml.gz *.mid diff -rNu melys-0.0.10/widgets/Makefile melys-0.0.11/widgets/Makefile --- melys-0.0.10/widgets/Makefile Wed Sep 15 14:03:51 1999 +++ melys-0.0.11/widgets/Makefile Sun Sep 19 23:10:07 1999 @@ -8,16 +8,19 @@ melystrackdisplay.o \ melystrackinfo.o \ melystransport.o \ + misc.o \ register.o GENCFILES = melystrack.c \ melystrackdisplay.c \ melystrackinfo.c \ melystransport.c \ + misc.c \ register.c GENHFILES = ../include/melystrack.h \ ../include/melystrackdisplay.h \ ../include/melystrackinfo.h \ ../include/melystransport.h \ + ../include/melwidgets.h \ ../include/melreg.h @@ -28,6 +31,9 @@ +install: all + + # Remove all object files and exectutables # clean: @@ -47,3 +53,21 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< +melystransport.o: ../include/melystransport.h +melystrack.o: ../include/song.h +melystrack.o: ../include/elements.h +melystrack.o: ../include/md.h +melystrack.o: ../include/melystrackinfo.h +melystrack.o: ../include/melystrackdisplay.h +melystrack.o: ../include/melystrack.h +melystrackdisplay.o: ../include/melystrackdisplay.h +register.o: ../include/melreg.h +misc.o: ../include/melwidgets.h +melystrackinfo.o: ../include/melmsg.h +melystrackinfo.o: ../include/melgui.h +melystrackinfo.o: ../include/pixmaps.h +melystrackinfo.o: ../include/elements.h +melystrackinfo.o: ../include/md.h +melystrackinfo.o: ../include/song.h +melystrackinfo.o: ../include/melystrackinfo.h +melystrackinfo.o: ../include/melystrack.h diff -rNu melys-0.0.10/widgets/melystrack.c melys-0.0.11/widgets/melystrack.c --- melys-0.0.10/widgets/melystrack.c Wed Sep 15 14:04:02 1999 +++ melys-0.0.11/widgets/melystrack.c Sun Sep 19 23:10:14 1999 @@ -20,6 +20,7 @@ #include "except.h" #include "util.h" #include "gtk/gtk.h" +#include "song.h" #include "elements.h" #include "md.h" #include "melystrackinfo.h" @@ -214,6 +215,17 @@ //melys_track_display_set_md_root(mtrack->display, root); } +void +melys_track_set_song(MelysTrack *mtrack, struct song *song) +{ + + mtrack->song = song; + mtrack->info->song = song; + //mtrack->display->song = song; + //melys_track_info_set_song(mtrack->info, song); + //melys_track_display_set_song(mtrack->info, song); +} + /* * This is called when a track is added or removed or some other * change is made to the song. Everything is re-calculated and @@ -222,14 +234,14 @@ * */ void -melys_track_redraw(MelysTrack *mtrack) +melys_track_update(MelysTrack *mtrack) { /* Re-set the vertical scrollbar limits */ mtrack->vadj->lower = 0.0; mtrack->vadj->upper = (double)mtrack->mdroot->tracks; - melys_track_info_redraw(mtrack->info); + melys_track_info_update(mtrack->info); /* No signal yet */ } diff -rNu melys-0.0.10/widgets/melystrack.m melys-0.0.11/widgets/melystrack.m --- melys-0.0.10/widgets/melystrack.m Wed Sep 15 13:49:24 1999 +++ melys-0.0.11/widgets/melystrack.m Thu Sep 16 12:39:59 1999 @@ -12,6 +12,7 @@ GNU General Public License for more details. >>header gtk/gtk.h +>>header song.h >>header elements.h >>header md.h >>header melystrackinfo.h @@ -33,6 +34,7 @@ struct _MelysTrackDisplay *display; struct rootElement *mdroot; + struct song *song; }; struct _MelysTrackClass { @@ -67,6 +69,7 @@ return mtrack; + >>function melys_track_init static void MelysTrack *mtp; The MelysTrack to init @@ -197,7 +200,20 @@ //melys_track_display_set_md_root(mtrack->display, root); ->>function melys_track_redraw +>>function melys_track_set_song +void +MelysTrack *mtrack; +struct song *song; + +>>code + + mtrack->song = song; + mtrack->info->song = song; + //mtrack->display->song = song; + //melys_track_info_set_song(mtrack->info, song); + //melys_track_display_set_song(mtrack->info, song); + +>>function melys_track_update void MelysTrack *mtrack; >>description @@ -212,7 +228,7 @@ mtrack->vadj->lower = 0.0; mtrack->vadj->upper = (double)mtrack->mdroot->tracks; - melys_track_info_redraw(mtrack->info); + melys_track_info_update(mtrack->info); /* No signal yet */ diff -rNu melys-0.0.10/widgets/melystrackinfo.c melys-0.0.11/widgets/melystrackinfo.c --- melys-0.0.10/widgets/melystrackinfo.c Wed Sep 15 14:04:03 1999 +++ melys-0.0.11/widgets/melystrackinfo.c Sun Sep 19 23:10:15 1999 @@ -15,11 +15,9 @@ * The columns that can be seen will be configurable. * * Now that I know about the gnome canvas widget and am going to - * use it for the trackdisplay pane, I suspect that some people will - * be wondering why it isn't used here as it looks ideal. I quite - * possibly would have used it if I had known about it then. Anyway - * there would have still have been pretty much the same amount of - * code in the end I think. + * use it for the trackdisplay pane, it may well have been a good + * idea to use it for this widget as well. + * * * */ @@ -33,9 +31,11 @@ #include "gtk/gtksignal.h" #include "gtk/gtkvbox.h" #include "melmsg.h" +#include "melgui.h" #include "pixmaps.h" #include "elements.h" #include "md.h" +#include "song.h" #include "melystrackinfo.h" #include "melystrack.h" #include "intl.h" @@ -134,7 +134,8 @@ static void unset_solo(MelysTrackInfo *minfo, struct trackElement *track); static void set_record(MelysTrackInfo *minfo, struct trackElement *track, int modifiers); -static void select_track(MelysTrackInfo *minfo, struct trackElement *track); +static void select_track(MelysTrackInfo *minfo, struct trackElement *track, + int coltype); static void unselect_track(MelysTrackInfo *minfo, struct trackElement *track); static void mute_track(MelysTrackInfo *minfo, struct trackElement *track); static void unmute_track(MelysTrackInfo *minfo, struct trackElement *track); @@ -368,10 +369,25 @@ * */ void -melys_track_info_redraw(MelysTrackInfo *minfo) +melys_track_info_update(MelysTrackInfo *minfo) { + struct rootElement *root; + struct trackElement *track; + int all; + int n; - gtk_widget_queue_draw(GTK_WIDGET(minfo)); + root = minfo->mdroot; + all = MD_MODIFIED(root); + MD_SET_MODIFIED(root, FALSE); + if (all) { + gtk_widget_queue_draw(GTK_WIDGET(minfo)); + } else { + for (n = 0; n < root->tracks; n++) { + track = md_track_nth(root, n); + if (MD_MODIFIED(track)) + one_track_redraw(minfo, -1, track); + } + } /* * We have to do this because even though the page size has @@ -531,6 +547,7 @@ } tot += widget->style->klass->xthickness; + tot += PAN_PADDING; req->width = tot; } @@ -612,14 +629,41 @@ ap->width, ap->height); minfo = (MelysTrackInfo*)widget; + g_return_if_fail(minfo->mdroot != NULL); style = widget->style; fg_gc = style->fg_gc[GTK_STATE_NORMAL]; - /* Needed for scrolling... may be removed in future */ - gdk_window_clear_area(widget->window, ap->x, ap->y, - ap->width, ap->height); + /* The clear is needed for scrolling... may be removed in future */ + if (ap->x == 0) + ap->x = style->klass->xthickness; + if (ap->y == 0) + ap->y = style->klass->xthickness; + + start = y_to_track(minfo, ap->y); + end = y_to_track(minfo, ap->y + ap->height) + 1; + if (start < 0) + start = 0; + + if (end > minfo->mdroot->tracks) { + GdkRectangle endarea; + + /* + * If there is some space after the valid tracks then we + * clear this part of the display. + */ + endarea.x = ap->x; + endarea.y = track_to_y(minfo, minfo->mdroot->tracks); + endarea.width = ap->width; + endarea.height = track_to_y(minfo, end) - endarea.y; + gdk_window_clear_area(widget->window, endarea.x, endarea.y, + endarea.width, endarea.height); + + end = minfo->mdroot->tracks; + } + if (end < 0) + end = minfo->mdroot->tracks; /* This draws in the title row */ draw_row(minfo, -1); @@ -628,17 +672,6 @@ gdk_draw_line(widget->window, fg_gc, 0, minfo->vtitle-1, minfo->track_area.width, minfo->vtitle-1); - /* Ideally this should not be allowed anyway... */ - if (minfo->mdroot == NULL) - return; /* Nothing more to do */ - - start = y_to_track(minfo, ap->y); - end = y_to_track(minfo, ap->y + ap->height) + 1; - if (start < 0) - start = 0; - if (end < 0 || end > minfo->mdroot->tracks) - end = minfo->mdroot->tracks; - dprintf2("start %d end %d, tracks %d", start, end, minfo->mdroot->tracks); for (ntrack = start; ntrack < end; ntrack++) draw_row(minfo, ntrack); @@ -677,7 +710,9 @@ xpos = style->klass->xthickness; for (i = 0; i < minfo->col_used; i++) { - if (ntrack >= 0 && track && track->selected) { + cip = minfo->col_infos+i; + + if (ntrack >= 0 && track && track->selected && cip->kind == COL_TEXT) { fg_gc = widget->style->fg_gc[GTK_STATE_SELECTED]; bg_gc = widget->style->bg_gc[GTK_STATE_SELECTED]; } else { @@ -685,15 +720,13 @@ bg_gc = widget->style->bg_gc[GTK_STATE_NORMAL]; } - cip = minfo->col_infos+i; - area.x = xpos; area.y = track_to_y(minfo, ntrack); area.width = cip->width + 2*COL_PADDING; area.height = minfo->vspace; /* Check not scribbling on our shadow */ - wid = minfo->track_area.width - style->klass->xthickness; + wid = minfo->track_area.width - 2*style->klass->xthickness; if (area.x + area.width > wid && area.x < wid) area.width = wid - area.x; @@ -773,7 +806,7 @@ str = "N/YET"; /* A default to catch unimplemented columns */ if (ntrack == -1) { - str = cip->title; + str = _(cip->title); /* Have to draw the vertical lines */ gtk_draw_vline(widget->style, widget->window, GTK_STATE_NORMAL, @@ -789,7 +822,7 @@ if (track && track->name) { str = track->name; } else { - g_snprintf(buf, TMP_BUF_SIZE, "Track %d", ntrack+1); + g_snprintf(buf, TMP_BUF_SIZE, _("Track %d"), ntrack+1); str = buf; if (track) track->name = g_strdup(buf); @@ -1000,6 +1033,14 @@ int i; struct trackElement *otrack; + /* + * The multi-click events just confuse things so we just return if + * we get one. + * At least for select... + */ + if (event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) + return; + masks = event->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK); if (masks == 0) { @@ -1014,16 +1055,16 @@ unselect_track(minfo, otrack); } - if (!track->selected) - select_track(minfo, track); - else + //if (!track->selected) + select_track(minfo, track, cip->type); + //else ;/* column action */ } else if (masks == GDK_CONTROL_MASK) { if (track->selected) unselect_track(minfo, track); else - select_track(minfo, track); + select_track(minfo, track, cip->type); } else if (masks == GDK_SHIFT_MASK) { /* TODO */ @@ -1184,9 +1225,27 @@ melys_track_info_signals[RECORD_TRACK], track, 1); } +/* + * If the track is already selected then we bring up a property + * box for it. Otherwise just select it. + * + */ static void -select_track(MelysTrackInfo *minfo, struct trackElement *track) +select_track(MelysTrackInfo *minfo, struct trackElement *track, int coltype) { + int page; + + if (track->selected) { + switch (coltype) { + case PROGRAM: + page = TRACK_PROP_INSTR; + break; + default: + page = TRACK_PROP_BASIC; + break; + } + track_prop_box(track, minfo->song, page); + } track->selected = 1; } @@ -1403,4 +1462,6 @@ gtk_widget_queue_draw_area(GTK_WIDGET(minfo), x, y, width, height); } + + MD_SET_MODIFIED(track, 0); } diff -rNu melys-0.0.10/widgets/melystrackinfo.m melys-0.0.11/widgets/melystrackinfo.m --- melys-0.0.10/widgets/melystrackinfo.m Wed Sep 15 13:49:24 1999 +++ melys-0.0.11/widgets/melystrackinfo.m Sun Sep 19 21:26:17 1999 @@ -15,20 +15,20 @@ The columns that can be seen will be configurable. Now that I know about the gnome canvas widget and am going to -use it for the trackdisplay pane, I suspect that some people will -be wondering why it isn't used here as it looks ideal. I quite -possibly would have used it if I had known about it then. Anyway -there would have still have been pretty much the same amount of -code in the end I think. +use it for the trackdisplay pane, it may well have been a good +idea to use it for this widget as well. >>header gtk/gtkwidget.h >>header gtk/gtkadjustment.h >>header gtk/gtksignal.h >>header gtk/gtkvbox.h >>header melmsg.h +>>header melgui.h >>header pixmaps.h >>header elements.h >>header md.h +>>header song.h + >>gtkobject melys_track_info gtk_widget >>headerdef @header @@ -74,6 +74,8 @@ /* The actual composition that is being displayed */ struct rootElement *mdroot; + struct song *song; + /* Labels and masks for the various buttons */ GdkPixmap *rec_label; GdkBitmap *rec_mask; @@ -335,7 +337,7 @@ gtk_widget_queue_draw(GTK_WIDGET(minfo)); ->>function melys_track_info_redraw +>>function melys_track_info_update void MelysTrackInfo *minfo; @@ -346,8 +348,23 @@ in this widget. >>code + struct rootElement *root; + struct trackElement *track; + int all; + int n; - gtk_widget_queue_draw(GTK_WIDGET(minfo)); + root = minfo->mdroot; + all = MD_MODIFIED(root); + MD_SET_MODIFIED(root, FALSE); + if (all) { + gtk_widget_queue_draw(GTK_WIDGET(minfo)); + } else { + for (n = 0; n < root->tracks; n++) { + track = md_track_nth(root, n); + if (MD_MODIFIED(track)) + one_track_redraw(minfo, -1, track); + } + } /* * We have to do this because even though the page size has @@ -358,6 +375,7 @@ */ track_vscroll_calc(minfo); + >>function track_info_realise static void GtkWidget *widget; @@ -508,6 +526,7 @@ } tot += widget->style->klass->xthickness; + tot += PAN_PADDING; req->width = tot; @@ -595,14 +614,41 @@ ap->width, ap->height); minfo = (MelysTrackInfo*)widget; + g_return_if_fail(minfo->mdroot != NULL); style = widget->style; fg_gc = style->fg_gc[GTK_STATE_NORMAL]; - /* Needed for scrolling... may be removed in future */ - gdk_window_clear_area(widget->window, ap->x, ap->y, - ap->width, ap->height); + /* The clear is needed for scrolling... may be removed in future */ + if (ap->x == 0) + ap->x = style->klass->xthickness; + if (ap->y == 0) + ap->y = style->klass->xthickness; + + start = y_to_track(minfo, ap->y); + end = y_to_track(minfo, ap->y + ap->height) + 1; + if (start < 0) + start = 0; + + if (end > minfo->mdroot->tracks) { + GdkRectangle endarea; + + /* + * If there is some space after the valid tracks then we + * clear this part of the display. + */ + endarea.x = ap->x; + endarea.y = track_to_y(minfo, minfo->mdroot->tracks); + endarea.width = ap->width; + endarea.height = track_to_y(minfo, end) - endarea.y; + gdk_window_clear_area(widget->window, endarea.x, endarea.y, + endarea.width, endarea.height); + + end = minfo->mdroot->tracks; + } + if (end < 0) + end = minfo->mdroot->tracks; /* This draws in the title row */ draw_row(minfo, -1); @@ -611,17 +657,6 @@ gdk_draw_line(widget->window, fg_gc, 0, minfo->vtitle-1, minfo->track_area.width, minfo->vtitle-1); - /* Ideally this should not be allowed anyway... */ - if (minfo->mdroot == NULL) - return; /* Nothing more to do */ - - start = y_to_track(minfo, ap->y); - end = y_to_track(minfo, ap->y + ap->height) + 1; - if (start < 0) - start = 0; - if (end < 0 || end > minfo->mdroot->tracks) - end = minfo->mdroot->tracks; - dprintf2("start %d end %d, tracks %d", start, end, minfo->mdroot->tracks); for (ntrack = start; ntrack < end; ntrack++) draw_row(minfo, ntrack); @@ -660,7 +695,9 @@ xpos = style->klass->xthickness; for (i = 0; i < minfo->col_used; i++) { - if (ntrack >= 0 && track && track->selected) { + cip = minfo->col_infos+i; + + if (ntrack >= 0 && track && track->selected && cip->kind == COL_TEXT) { fg_gc = widget->style->fg_gc[GTK_STATE_SELECTED]; bg_gc = widget->style->bg_gc[GTK_STATE_SELECTED]; } else { @@ -668,15 +705,13 @@ bg_gc = widget->style->bg_gc[GTK_STATE_NORMAL]; } - cip = minfo->col_infos+i; - area.x = xpos; area.y = track_to_y(minfo, ntrack); area.width = cip->width + 2*COL_PADDING; area.height = minfo->vspace; /* Check not scribbling on our shadow */ - wid = minfo->track_area.width - style->klass->xthickness; + wid = minfo->track_area.width - 2*style->klass->xthickness; if (area.x + area.width > wid && area.x < wid) area.width = wid - area.x; @@ -759,7 +794,7 @@ str = "N/YET"; /* A default to catch unimplemented columns */ if (ntrack == -1) { - str = cip->title; + str = _(cip->title); /* Have to draw the vertical lines */ gtk_draw_vline(widget->style, widget->window, GTK_STATE_NORMAL, @@ -775,7 +810,7 @@ if (track && track->name) { str = track->name; } else { - g_snprintf(buf, TMP_BUF_SIZE, "Track %d", ntrack+1); + g_snprintf(buf, TMP_BUF_SIZE, _("Track %d"), ntrack+1); str = buf; if (track) track->name = g_strdup(buf); @@ -1015,6 +1050,14 @@ int i; struct trackElement *otrack; + /* + * The multi-click events just confuse things so we just return if + * we get one. + * At least for select... + */ + if (event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) + return; + masks = event->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK); if (masks == 0) { @@ -1029,16 +1072,16 @@ unselect_track(minfo, otrack); } - if (!track->selected) - select_track(minfo, track); - else + //if (!track->selected) + select_track(minfo, track, cip->type); + //else ;/* column action */ } else if (masks == GDK_CONTROL_MASK) { if (track->selected) unselect_track(minfo, track); else - select_track(minfo, track); + select_track(minfo, track, cip->type); } else if (masks == GDK_SHIFT_MASK) { /* TODO */ @@ -1212,8 +1255,27 @@ static void MelysTrackInfo *minfo; struct trackElement *track; +int coltype; + +>>description +If the track is already selected then we bring up a property +box for it. +Otherwise just select it. >>code + int page; + + if (track->selected) { + switch (coltype) { + case PROGRAM: + page = TRACK_PROP_INSTR; + break; + default: + page = TRACK_PROP_BASIC; + break; + } + track_prop_box(track, minfo->song, page); + } track->selected = 1; @@ -1450,4 +1512,6 @@ gtk_widget_queue_draw_area(GTK_WIDGET(minfo), x, y, width, height); } + + MD_SET_MODIFIED(track, 0); diff -rNu melys-0.0.10/widgets/misc.c melys-0.0.11/widgets/misc.c --- melys-0.0.10/widgets/misc.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.11/widgets/misc.c Sun Sep 19 23:10:15 1999 @@ -0,0 +1,43 @@ +/* + * + * 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/gtk.h" +#include "melwidgets.h" +#include "intl.h" + + + + +GtkWidget * +mel_int_spinner(int lower, int upper, int val) +{ + GtkObject *adj; + GtkWidget *spin; + + adj = gtk_adjustment_new(val, (gfloat)lower, (gfloat)upper, 1.0, 1.0, 1.0); + + spin = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1.0, 0); + + gtk_spin_button_set_shadow_type((GtkSpinButton *)spin, GTK_SHADOW_IN); + gtk_spin_button_set_wrap((GtkSpinButton *)spin, 1); + + return spin; +} diff -rNu melys-0.0.10/widgets/misc.m melys-0.0.11/widgets/misc.m --- melys-0.0.10/widgets/misc.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.11/widgets/misc.m Thu Sep 16 12:32:11 1999 @@ -0,0 +1,36 @@ +>>name misc.m - misc helper widgets + +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/gtk.h + +>>headerdef --decl melwidgets.h + +>>function mel_int_spinner +GtkWidget * +int lower; Lower value +int upper; Upper value +int val; Initial value + + +>>code + GtkObject *adj; + GtkWidget *spin; + + adj = gtk_adjustment_new(val, (gfloat)lower, (gfloat)upper, 1.0, 1.0, 1.0); + + spin = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1.0, 0); + + gtk_spin_button_set_shadow_type((GtkSpinButton *)spin, GTK_SHADOW_IN); + gtk_spin_button_set_wrap((GtkSpinButton *)spin, 1); + + return spin; diff -rNu melys-0.0.10/widgets/register.c melys-0.0.11/widgets/register.c --- melys-0.0.10/widgets/register.c Wed Sep 15 14:04:03 1999 +++ melys-0.0.11/widgets/register.c Sun Sep 19 23:10:16 1999 @@ -33,6 +33,8 @@ struct regid { int id; GtkObject *obj; + GtkObject *parent; + gint objsig; }; /* The id generator, start at 1 as 0 is the invalid value */ @@ -65,12 +67,13 @@ id = nextId++; /* Get a save struct for the data */ - idp = g_new(struct regid, 1); + idp = g_new0(struct regid, 1); idp->id = id; idp->obj = obj; /* connect signals to unsave when destroyed */ - gtk_signal_connect(obj, "destroy", destroy_cb, GINT_TO_POINTER(idp->id)); + idp->objsig = gtk_signal_connect + (obj, "destroy", destroy_cb, GINT_TO_POINTER(idp->id)); /* Save it */ regobjs = g_slist_append(regobjs, (gpointer)idp); @@ -128,6 +131,28 @@ return NULL; } +void +reg_unreg(regid_t id) +{ + GtkObject *obj; + GSList *lp; + struct regid *idp; + + obj = NULL; + + for (lp = regobjs; lp; lp = lp->next) { + idp = (struct regid *)lp->data; + if (idp->id == id) { + break; + } + } + + if (lp) { + if (idp->objsig) + gtk_signal_disconnect(idp->obj, idp->objsig); + } +} + /* * The object corresponding to the specified id is destroyed * if it hasn't already been. @@ -163,6 +188,8 @@ idp = (struct regid *)lp->data; if (idp->id == GPOINTER_TO_INT(data)) { regobjs = g_slist_remove_link(regobjs, lp); + if (idp->objsig) + gtk_signal_disconnect(idp->obj, idp->objsig); return; } } diff -rNu melys-0.0.10/widgets/register.m melys-0.0.11/widgets/register.m --- melys-0.0.10/widgets/register.m Tue Jul 27 10:01:42 1999 +++ melys-0.0.11/widgets/register.m Thu Sep 16 12:33:36 1999 @@ -28,6 +28,8 @@ struct regid { int id; GtkObject *obj; + GtkObject *parent; + gint objsig; }; /* The id generator, start at 1 as 0 is the invalid value */ @@ -60,12 +62,13 @@ id = nextId++; /* Get a save struct for the data */ - idp = g_new(struct regid, 1); + idp = g_new0(struct regid, 1); idp->id = id; idp->obj = obj; /* connect signals to unsave when destroyed */ - gtk_signal_connect(obj, "destroy", destroy_cb, GINT_TO_POINTER(idp->id)); + idp->objsig = gtk_signal_connect + (obj, "destroy", destroy_cb, GINT_TO_POINTER(idp->id)); /* Save it */ regobjs = g_slist_append(regobjs, (gpointer)idp); @@ -120,6 +123,30 @@ else return NULL; +>>function reg_unreg +void +regid_t id; + +>>code + GtkObject *obj; + GSList *lp; + struct regid *idp; + + obj = NULL; + + for (lp = regobjs; lp; lp = lp->next) { + idp = (struct regid *)lp->data; + if (idp->id == id) { + break; + } + } + + if (lp) { + if (idp->objsig) + gtk_signal_disconnect(idp->obj, idp->objsig); + } + + >>function reg_destroy void int id; Register id of widget to destroy @@ -153,6 +180,8 @@ idp = (struct regid *)lp->data; if (idp->id == GPOINTER_TO_INT(data)) { regobjs = g_slist_remove_link(regobjs, lp); + if (idp->objsig) + gtk_signal_disconnect(idp->obj, idp->objsig); return; } }