diff -rNu melys-0.1.3/ChangeLog melys-0.1.4/ChangeLog --- melys-0.1.3/ChangeLog Mon Nov 15 23:56:56 1999 +++ melys-0.1.4/ChangeLog Wed Nov 24 00:15:22 1999 @@ -1,4 +1,41 @@ +1999-11-23 Steve Ratcliffe + + * doc/mdml.dtd: Add the new midi tag. + + * files/file.m, files/mdmlread.m, files/mdmlwrite.m, files/midiread.m, + files/midiwrite.m, gui/main.m, md/elements.m, md/mdadd.m, + md/mdconv.m, md/mdutil.m, midi/play.m, midi/record.m, + programs/mdmlconv.m, programs/melplay.m, programs/showseq.m, + seq/seqlib.m, seq/seqmidi.m, seq/seqplay.m, widgets/melystrackinfo.m, + config/ports.m: + Extensive changes to Melys to properly recognise patch changes + when reading from a Midi file in XG or some similar format. + We now: + - Recognise GM/S/X Midi files. + - When in XG mode recognise extended program changes with ctrl 0 and 32 + - There is a new attribute in MDML for the Midi mode. + + * gui/trackprop.m: The pan position was broken, fixed. + + * gui/trackprop.m: + Use correct macro to get the right midi value from the + slider value. + +1999-11-21 Steve Ratcliffe + + * seq/seqlib.m: Set direct flag on timer change events, as otherwise + on new sequencer CVS they do not get delivered. + + * seq/seqlib.m, seq/seqmidi.m: Make code backward compatible with 0.4.1 + +1999-11-20 Steve Ratcliffe + + * help/C/melys.sgml, help/C/piano.sgml, help/C/Makefile: + The start of the piano view help. + 1999-11-15 Steve Ratcliffe + + * version: Version 0.1.3 * widgets/melyspiano.m: Implement the drop_elem method. We can now receive a set of notes or a whole track/part. diff -rNu melys-0.1.3/config/Makefile melys-0.1.4/config/Makefile --- melys-0.1.3/config/Makefile Mon Nov 15 23:57:41 1999 +++ melys-0.1.4/config/Makefile Wed Nov 24 00:21:32 1999 @@ -38,5 +38,6 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< +ports.o: ../include/elements.h ports.o: ../include/seqlib.h ports.o: ../include/config.h diff -rNu melys-0.1.3/config/ports.c melys-0.1.4/config/ports.c --- melys-0.1.3/config/ports.c Mon Nov 15 23:57:48 1999 +++ melys-0.1.4/config/ports.c Wed Nov 24 00:21:38 1999 @@ -20,6 +20,7 @@ #include "util.h" #include #include "linux/asequencer.h" +#include "elements.h" #include "seqlib.h" #include "config.h" #include "intl.h" diff -rNu melys-0.1.3/config/ports.m melys-0.1.4/config/ports.m --- melys-0.1.3/config/ports.m Tue Jul 27 10:01:42 1999 +++ melys-0.1.4/config/ports.m Tue Nov 23 20:42:02 1999 @@ -13,6 +13,7 @@ >>header >>header linux/asequencer.h +>>header elements.h >>header seqlib.h >>headerdef --decl config.h diff -rNu melys-0.1.3/doc/mdml.dtd melys-0.1.4/doc/mdml.dtd --- melys-0.1.3/doc/mdml.dtd Tue Oct 19 21:35:26 1999 +++ melys-0.1.4/doc/mdml.dtd Wed Nov 24 00:14:52 1999 @@ -1,5 +1,5 @@ + title?, author?, comment?, midi?)> ]]> + title?, author?, comment?, midi?)> ]]> @@ -193,6 +196,11 @@ + + + diff -rNu melys-0.1.3/files/file.c melys-0.1.4/files/file.c --- melys-0.1.3/files/file.c Mon Nov 15 23:57:50 1999 +++ melys-0.1.4/files/file.c Wed Nov 24 00:21:40 1999 @@ -39,7 +39,7 @@ {".smf", FILE_TYPE_MIDI}, {".mdml", FILE_TYPE_MDML}, {".mdml.gz", FILE_TYPE_MDML_COMPRESSED}, - /* There is nothing to stop .mdml without .gz from being compressed */ + /* Note that you don't need the .gz to read a compressed file */ }; struct typefuncs { @@ -55,6 +55,11 @@ FILE_OPT_COMPRESSED}, }; +struct conv_func { + char *type; + ConvFunc convert; +}; + /* Static functions */ static void guess_type(struct File *file); @@ -134,6 +139,27 @@ } /* + * Set a conversion function for this file. If the file type is + * the same then the specified function convert is set up to be + * applied after the file is read in. When the file is read in + * this function will be called. + * + * Arguments: + * type - Apply if this file type + * convert - Function to do the conversion + */ +void +file_set_convert(struct File *file, char *type, ConvFunc convert) +{ + struct conv_func *cfp; + + cfp = g_new(struct conv_func, 1); + cfp->type = type; + cfp->convert = convert; + file->convlist = g_list_append(file->convlist, cfp); +} + +/* * Returns the status of the last operation. */ int @@ -257,6 +283,11 @@ if (file->msg) g_free(file->msg); + if (file->convlist) { + g_list_foreach(file->convlist, (GFunc)g_free, NULL); + g_list_free(file->convlist); + } + g_free(file); } @@ -297,6 +328,20 @@ } root = file->read(file); + + if (root && file->convlist) { + struct conv_func *cfp; + GList *list; + + list = file->convlist; + while (list) { + cfp = list->data; + if (strcmp(cfp->type, file->type) == 0) + cfp->convert(root); + list = list->next; + } + } + if (root) file_set_success(file); diff -rNu melys-0.1.3/files/file.m melys-0.1.4/files/file.m --- melys-0.1.3/files/file.m Fri Oct 22 23:36:55 1999 +++ melys-0.1.4/files/file.m Tue Nov 23 20:42:05 1999 @@ -1,4 +1,4 @@ ->>name file.m - XXX +>>name file.m - The top level file reading abstraction Copyright (C) 1999 Steve Ratcliffe @@ -21,6 +21,7 @@ struct File; +typedef void (*ConvFunc)(struct rootElement *); typedef struct rootElement *(*fileReadFunc)(struct File *); typedef void (*fileWriteFunc)(struct File *, struct rootElement *); @@ -44,6 +45,8 @@ fileReadFunc read; /* Read function */ fileWriteFunc write; /* Write function */ + + GList *convlist; /* Converters list */ }; @@ -88,7 +91,7 @@ {".smf", FILE_TYPE_MIDI}, {".mdml", FILE_TYPE_MDML}, {".mdml.gz", FILE_TYPE_MDML_COMPRESSED}, - /* There is nothing to stop .mdml without .gz from being compressed */ + /* Note that you don't need the .gz to read a compressed file */ }; struct typefuncs { @@ -104,6 +107,10 @@ FILE_OPT_COMPRESSED}, }; +struct conv_func { + char *type; + ConvFunc convert; +}; >>function file_new struct File * @@ -178,6 +185,28 @@ file->compressed = yesno; +>>function file_set_convert +void +struct File *file; +char *type; Apply if this file type +ConvFunc convert; Function to do the conversion + +>>description +Set a conversion function for this file. +If the file type is the same then the specified function +.A convert +is set up to be applied after the file is read in. +When the file is read in this function will be called. + +>>code + struct conv_func *cfp; + + cfp = g_new(struct conv_func, 1); + cfp->type = type; + cfp->convert = convert; + file->convlist = g_list_append(file->convlist, cfp); + + >>function file_get_status int struct File *file; @@ -303,6 +332,11 @@ if (file->msg) g_free(file->msg); + if (file->convlist) { + g_list_foreach(file->convlist, (GFunc)g_free, NULL); + g_list_free(file->convlist); + } + g_free(file); @@ -347,6 +381,20 @@ } root = file->read(file); + + if (root && file->convlist) { + struct conv_func *cfp; + GList *list; + + list = file->convlist; + while (list) { + cfp = list->data; + if (strcmp(cfp->type, file->type) == 0) + cfp->convert(root); + list = list->next; + } + } + if (root) file_set_success(file); diff -rNu melys-0.1.3/files/mdmlread.c melys-0.1.4/files/mdmlread.c --- melys-0.1.3/files/mdmlread.c Mon Nov 15 23:57:50 1999 +++ melys-0.1.4/files/mdmlread.c Wed Nov 24 00:21:41 1999 @@ -52,7 +52,6 @@ char *errmsg; /* Error message */ int timebase; /* The division time base */ - int program; /* Saved program for track */ int hasprogram:1; /* Has embeded program changes */ int note_seen:1; /* Seen first note on track */ int error:1; /* Set if an error occurred reading in file */ @@ -144,6 +143,7 @@ tag_to_md(struct mdmlstate *msp, const xmlChar *name, const xmlChar **attrs) { struct element *retel = NULL; + char *str; /* * Its slightly important to have the most likely @@ -172,8 +172,6 @@ number = get_int(attrs, "program"); retel = MD_ELEMENT(md_program_new(number)); - if (!msp->note_seen) - msp->program = number; msp->hasprogram = TRUE; } else if (strcmp(name, "pitch") == 0) { @@ -225,7 +223,6 @@ msp->currtime = 0; msp->starttime = 0; msp->devchan = 0; - msp->program = 0; msp->hasprogram = 0; msp->note_seen = 0; @@ -234,7 +231,7 @@ res = get_int(attrs, "program"); if (res >= 0) - msp->program = res; + tp->program->program = res; res = get_int(attrs, "volume"); if (res >= 0) @@ -382,6 +379,20 @@ } else if (strcmp(name, "cuepoint") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_CUE, NULL)); + } else if (strcmp(name, "midi") == 0) { + str = get_str(attrs, "type"); + if (str) { + if (strcmp(str, "GM") == 0) + msp->root->midi_mode = MIDI_MODE_GM; + else if (strcmp(str, "GS") == 0) + msp->root->midi_mode = MIDI_MODE_GS; + else if (strcmp(str, "XG") == 0) + msp->root->midi_mode = MIDI_MODE_XG; + else + g_warning("unknown midi mode"); + } else + g_warning("No type on midi message"); + } else if (strcmp(name, "COPYRIGHT") == 0) { retel = NULL; @@ -666,13 +677,8 @@ else if (MD_TYPE(el) == MD_TYPE_TEXT) te = MD_TEXT(el); - if (iscontainer(el)) { - - if (el->type == MD_TYPE_TRACK) - MD_TRACK(el)->program = msp->program; - + if (iscontainer(el)) msp->currtime = MD_ENDTIME(el); - } } if (ls->text) { diff -rNu melys-0.1.3/files/mdmlread.m melys-0.1.4/files/mdmlread.m --- melys-0.1.3/files/mdmlread.m Fri Nov 12 10:30:05 1999 +++ melys-0.1.4/files/mdmlread.m Tue Nov 23 20:42:05 1999 @@ -42,7 +42,6 @@ char *errmsg; /* Error message */ int timebase; /* The division time base */ - int program; /* Saved program for track */ int hasprogram:1; /* Has embeded program changes */ int note_seen:1; /* Seen first note on track */ int error:1; /* Set if an error occurred reading in file */ @@ -114,6 +113,7 @@ >>code struct element *retel = NULL; + char *str; /* * Its slightly important to have the most likely @@ -142,8 +142,6 @@ number = get_int(attrs, "program"); retel = MD_ELEMENT(md_program_new(number)); - if (!msp->note_seen) - msp->program = number; msp->hasprogram = TRUE; } else if (strcmp(name, "pitch") == 0) { @@ -195,7 +193,6 @@ msp->currtime = 0; msp->starttime = 0; msp->devchan = 0; - msp->program = 0; msp->hasprogram = 0; msp->note_seen = 0; @@ -204,7 +201,7 @@ res = get_int(attrs, "program"); if (res >= 0) - msp->program = res; + tp->program->program = res; res = get_int(attrs, "volume"); if (res >= 0) @@ -352,6 +349,20 @@ } else if (strcmp(name, "cuepoint") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_CUE, NULL)); + } else if (strcmp(name, "midi") == 0) { + str = get_str(attrs, "type"); + if (str) { + if (strcmp(str, "GM") == 0) + msp->root->midi_mode = MIDI_MODE_GM; + else if (strcmp(str, "GS") == 0) + msp->root->midi_mode = MIDI_MODE_GS; + else if (strcmp(str, "XG") == 0) + msp->root->midi_mode = MIDI_MODE_XG; + else + g_warning("unknown midi mode"); + } else + g_warning("No type on midi message"); + } else if (strcmp(name, "COPYRIGHT") == 0) { retel = NULL; @@ -642,13 +653,8 @@ else if (MD_TYPE(el) == MD_TYPE_TEXT) te = MD_TEXT(el); - if (iscontainer(el)) { - - if (el->type == MD_TYPE_TRACK) - MD_TRACK(el)->program = msp->program; - + if (iscontainer(el)) msp->currtime = MD_ENDTIME(el); - } } if (ls->text) { diff -rNu melys-0.1.3/files/mdmlwrite.c melys-0.1.4/files/mdmlwrite.c --- melys-0.1.3/files/mdmlwrite.c Mon Nov 15 23:57:50 1999 +++ melys-0.1.4/files/mdmlwrite.c Wed Nov 24 00:21:41 1999 @@ -88,6 +88,7 @@ struct mdmlstate mstate; struct element *el; struct containerElement *c; + char *str; int i; g_return_if_fail(root != NULL); @@ -138,6 +139,25 @@ if (headel->comment) node = xmlNewChild(head, 0, "comment", headel->comment); + str = NULL; + switch (root->midi_mode) { + case MIDI_MODE_NONE: + break; + case MIDI_MODE_GM: + str = "GM"; + break; + case MIDI_MODE_GS: + str = "GS"; + break; + case MIDI_MODE_XG: + str = "XG"; + break; + } + if (str) { + node = xmlNewChild(head, 0, "midi", 0); + xmlSetProp(node, "type", str); + } + } break; @@ -146,7 +166,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); + set_prop_int(xtrack, "program", MD_TRACK(el)->program->program); if (MD_TRACK(el)->mute) xmlSetProp(xtrack, "mute", "yes"); if (MD_TRACK(el)->solo) diff -rNu melys-0.1.3/files/mdmlwrite.m melys-0.1.4/files/mdmlwrite.m --- melys-0.1.3/files/mdmlwrite.m Fri Oct 22 23:36:55 1999 +++ melys-0.1.4/files/mdmlwrite.m Tue Nov 23 20:42:05 1999 @@ -67,6 +67,7 @@ struct mdmlstate mstate; struct element *el; struct containerElement *c; + char *str; int i; g_return_if_fail(root != NULL); @@ -117,6 +118,25 @@ if (headel->comment) node = xmlNewChild(head, 0, "comment", headel->comment); + str = NULL; + switch (root->midi_mode) { + case MIDI_MODE_NONE: + break; + case MIDI_MODE_GM: + str = "GM"; + break; + case MIDI_MODE_GS: + str = "GS"; + break; + case MIDI_MODE_XG: + str = "XG"; + break; + } + if (str) { + node = xmlNewChild(head, 0, "midi", 0); + xmlSetProp(node, "type", str); + } + } break; @@ -125,7 +145,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); + set_prop_int(xtrack, "program", MD_TRACK(el)->program->program); if (MD_TRACK(el)->mute) xmlSetProp(xtrack, "mute", "yes"); if (MD_TRACK(el)->solo) diff -rNu melys-0.1.3/files/midiread.c melys-0.1.4/files/midiread.c --- melys-0.1.3/files/midiread.c Mon Nov 15 23:57:51 1999 +++ melys-0.1.4/files/midiread.c Wed Nov 24 00:21:41 1999 @@ -53,8 +53,6 @@ struct rootElement *root; /* Pointer into the root */ char *trackname; /* Saved track name */ - guchar lsb_bank; /* LSB of bank select */ - guchar msb_bank; /* MSB of bank select */ int track_devchan; /* Track device channel */ struct except error; /* For exceptional errors */ @@ -273,8 +271,6 @@ */ msp->chunk_count = 0; /* nothing read yet */ msp->trackname = NULL; - msp->msb_bank = 0; - msp->lsb_bank = 0; msp->track_devchan = -1; msp->port = 0; @@ -321,8 +317,6 @@ MD_CONTAINER(track)->duration = msp->track_duration; msp->track_duration = 0; - md_extract_track_info(track, part); - return track; } @@ -398,30 +392,12 @@ case MIDI_CONTROLLER: control = read_int(msp, 1); val = read_int(msp, 1); - val &= 0x7f; /* It shouldn't happen of course */ - - /* - * Special actions for various controls. - */ - switch (control) { - case 0: /* MSB Bank */ - msp->msb_bank = (val & 0x7f); - break; - case 32: /* LSB Bank */ - msp->lsb_bank = (val & 0x7f); - break; - default: - el = MD_ELEMENT(md_control_new(control, val)); - break; - } + el = MD_ELEMENT(md_control_new(control, val)); break; case MIDI_PATCH: val = read_int(msp, 1); - val &= 0x7f; - val |= msp->lsb_bank << 7; - val |= msp->msb_bank << 14; el = MD_ELEMENT(md_program_new(val)); break; @@ -429,6 +405,7 @@ val = read_int(msp, 1); el = MD_ELEMENT(md_pressure_new(val)); break; + case MIDI_PITCH_WHEEL: val = read_int(msp, 1); val |= read_int(msp, 1) << 7; @@ -714,7 +691,7 @@ n->offvel = offvel; n->length = len; if (n->length < 0) { - printf("Len neg: msp->time%d, s->time%d, note=%d, s.vel%d\n", + printf("Len neg: msp->time%d, s->time%ld, note=%d, s.vel%d\n", msp->current_time, MD_ELEMENT(n)->element_time, note, n->vel); n->length = 0; diff -rNu melys-0.1.3/files/midiread.m melys-0.1.4/files/midiread.m --- melys-0.1.3/files/midiread.m Fri Nov 12 09:03:24 1999 +++ melys-0.1.4/files/midiread.m Tue Nov 23 20:42:05 1999 @@ -84,8 +84,6 @@ struct rootElement *root; /* Pointer into the root */ char *trackname; /* Saved track name */ - guchar lsb_bank; /* LSB of bank select */ - guchar msb_bank; /* MSB of bank select */ int track_devchan; /* Track device channel */ struct except error; /* For exceptional errors */ @@ -287,8 +285,6 @@ */ msp->chunk_count = 0; /* nothing read yet */ msp->trackname = NULL; - msp->msb_bank = 0; - msp->lsb_bank = 0; msp->track_devchan = -1; msp->port = 0; @@ -335,8 +331,6 @@ MD_CONTAINER(track)->duration = msp->track_duration; msp->track_duration = 0; - md_extract_track_info(track, part); - return track; >>function handle_status @@ -411,30 +405,12 @@ case MIDI_CONTROLLER: control = read_int(msp, 1); val = read_int(msp, 1); - val &= 0x7f; /* It shouldn't happen of course */ - - /* - * Special actions for various controls. - */ - switch (control) { - case 0: /* MSB Bank */ - msp->msb_bank = (val & 0x7f); - break; - case 32: /* LSB Bank */ - msp->lsb_bank = (val & 0x7f); - break; - default: - el = MD_ELEMENT(md_control_new(control, val)); - break; - } + el = MD_ELEMENT(md_control_new(control, val)); break; case MIDI_PATCH: val = read_int(msp, 1); - val &= 0x7f; - val |= msp->lsb_bank << 7; - val |= msp->msb_bank << 14; el = MD_ELEMENT(md_program_new(val)); break; @@ -442,6 +418,7 @@ val = read_int(msp, 1); el = MD_ELEMENT(md_pressure_new(val)); break; + case MIDI_PITCH_WHEEL: val = read_int(msp, 1); val |= read_int(msp, 1) << 7; @@ -711,7 +688,7 @@ n->offvel = offvel; n->length = len; if (n->length < 0) { - printf("Len neg: msp->time%d, s->time%d, note=%d, s.vel%d\n", + printf("Len neg: msp->time%d, s->time%ld, note=%d, s.vel%d\n", msp->current_time, MD_ELEMENT(n)->element_time, note, n->vel); n->length = 0; diff -rNu melys-0.1.3/files/midiwrite.c melys-0.1.4/files/midiwrite.c --- melys-0.1.3/files/midiwrite.c Mon Nov 15 23:57:51 1999 +++ melys-0.1.4/files/midiwrite.c Wed Nov 24 00:21:42 1999 @@ -44,6 +44,8 @@ int inQ; /* Running through the notes queue */ }; +extern struct sysexElement *get_std_sysex(int ); + /* Static functions */ static void midi_write(struct File *file, FILE *fp, struct rootElement *root); static void write_elem(struct element *el, void *arg, int flags); @@ -641,6 +643,7 @@ * Some things are put out in track one. */ if (MD_TRACKLIKE(track)->number == 1) { + struct sysexElement *sys; if (msp->root->head->copyright) { str = msp->root->head->copyright; @@ -652,6 +655,10 @@ put_data(msp, str, strlen(str)); } + sys = get_std_sysex(msp->root->midi_mode); + if (sys) + write_elem(MD_ELEMENT(sys), msp, 0); + } if (track->name) { @@ -666,7 +673,7 @@ /* If there are no embeded program events */ if (!track->hasprogram) - put_program(msp, MD_DEVCHAN(track), 0, track->program); + put_program(msp, MD_DEVCHAN(track), 0, track->program->program); /* The initial volume */ put_time(msp, 0); @@ -679,4 +686,42 @@ put_status(msp, MIDI_CONTROLLER, MD_DEVCHAN(track)); put_int(msp, 1, SND_MCTL_MSB_PAN); put_int(msp, 1, MD_PAN_TO_MIDI(track->pan)); +} + +/* + * Construct a standard sysex element. + */ +struct sysexElement * +get_std_sysex(int type) +{ + struct sysexElement *sysex; + unsigned char *data; + extern unsigned char gm_reset[]; + extern unsigned char xg_reset[]; + extern unsigned char gm_reset_len; + extern unsigned char xg_reset_len; + + sysex = NULL; + + switch (type) { + case MIDI_MODE_NONE: + case MIDI_MODE_GS: + break; + case MIDI_MODE_GM: + data = g_malloc(gm_reset_len + 1); + memcpy(data, gm_reset, gm_reset_len); + data[gm_reset_len] = 0xf7; + sysex = md_sysex_new(0xf0, data, gm_reset_len + 1); + g_free(data); + break; + case MIDI_MODE_XG: + data = g_malloc(xg_reset_len + 1); + memcpy(data, xg_reset, xg_reset_len); + data[xg_reset_len] = 0xf7; + sysex = md_sysex_new(0xf0, data, xg_reset_len + 1); + g_free(data); + break; + } + + return sysex; } diff -rNu melys-0.1.3/files/midiwrite.m melys-0.1.4/files/midiwrite.m --- melys-0.1.3/files/midiwrite.m Fri Oct 22 23:36:37 1999 +++ melys-0.1.4/files/midiwrite.m Tue Nov 23 20:42:05 1999 @@ -40,6 +40,7 @@ int inQ; /* Running through the notes queue */ }; +extern struct sysexElement *get_std_sysex(int ); >>function midi_write_file void @@ -596,6 +597,7 @@ * Some things are put out in track one. */ if (MD_TRACKLIKE(track)->number == 1) { + struct sysexElement *sys; if (msp->root->head->copyright) { str = msp->root->head->copyright; @@ -607,6 +609,10 @@ put_data(msp, str, strlen(str)); } + sys = get_std_sysex(msp->root->midi_mode); + if (sys) + write_elem(MD_ELEMENT(sys), msp, 0); + } if (track->name) { @@ -621,7 +627,7 @@ /* If there are no embeded program events */ if (!track->hasprogram) - put_program(msp, MD_DEVCHAN(track), 0, track->program); + put_program(msp, MD_DEVCHAN(track), 0, track->program->program); /* The initial volume */ put_time(msp, 0); @@ -634,3 +640,44 @@ put_status(msp, MIDI_CONTROLLER, MD_DEVCHAN(track)); put_int(msp, 1, SND_MCTL_MSB_PAN); put_int(msp, 1, MD_PAN_TO_MIDI(track->pan)); + + +>>function get_std_sysex +struct sysexElement * +int type; + +>>description +Construct a standard sysex element. + +>>code + struct sysexElement *sysex; + unsigned char *data; + extern unsigned char gm_reset[]; + extern unsigned char xg_reset[]; + extern unsigned char gm_reset_len; + extern unsigned char xg_reset_len; + + sysex = NULL; + + switch (type) { + case MIDI_MODE_NONE: + case MIDI_MODE_GS: + break; + case MIDI_MODE_GM: + data = g_malloc(gm_reset_len + 1); + memcpy(data, gm_reset, gm_reset_len); + data[gm_reset_len] = 0xf7; + sysex = md_sysex_new(0xf0, data, gm_reset_len + 1); + g_free(data); + break; + case MIDI_MODE_XG: + data = g_malloc(xg_reset_len + 1); + memcpy(data, xg_reset, xg_reset_len); + data[xg_reset_len] = 0xf7; + sysex = md_sysex_new(0xf0, data, xg_reset_len + 1); + g_free(data); + break; + } + + return sysex; + diff -rNu melys-0.1.3/gui/main.c melys-0.1.4/gui/main.c --- melys-0.1.3/gui/main.c Mon Nov 15 23:57:55 1999 +++ melys-0.1.4/gui/main.c Wed Nov 24 00:21:46 1999 @@ -276,14 +276,13 @@ * is no point continuing. */ file = file_new(filename); + file_set_convert(file, FILE_TYPE_MIDI, md_midi_convert); + root = file_read(file); if (mel_file_error(psong, file, parent)) return NULL; file_close(file); - if (root->head->format == 0) - md_split_midi0(root); - /* Hide the parent dialogue box */ if (parent && GTK_IS_WIDGET(parent)) gtk_widget_hide((GtkWidget *)parent); @@ -295,7 +294,7 @@ else basename = _("Untitled"); - labelstr = g_strdup_printf(_("Track: %s"), basename); + labelstr = g_strdup_printf("%s", basename); /* Create the child mdi widget */ child = (GtkObject *)gnome_mdi_generic_child_new(labelstr); diff -rNu melys-0.1.3/gui/main.m melys-0.1.4/gui/main.m --- melys-0.1.3/gui/main.m Sat Nov 13 09:09:12 1999 +++ melys-0.1.4/gui/main.m Tue Nov 23 20:42:05 1999 @@ -284,14 +284,13 @@ * is no point continuing. */ file = file_new(filename); + file_set_convert(file, FILE_TYPE_MIDI, md_midi_convert); + root = file_read(file); if (mel_file_error(psong, file, parent)) return NULL; file_close(file); - if (root->head->format == 0) - md_split_midi0(root); - /* Hide the parent dialogue box */ if (parent && GTK_IS_WIDGET(parent)) gtk_widget_hide((GtkWidget *)parent); @@ -303,7 +302,7 @@ else basename = _("Untitled"); - labelstr = g_strdup_printf(_("Track: %s"), basename); + labelstr = g_strdup_printf("%s", basename); /* Create the child mdi widget */ child = (GtkObject *)gnome_mdi_generic_child_new(labelstr); diff -rNu melys-0.1.3/gui/trackprop.c melys-0.1.4/gui/trackprop.c --- melys-0.1.3/gui/trackprop.c Mon Nov 15 23:57:56 1999 +++ melys-0.1.4/gui/trackprop.c Wed Nov 24 00:21:47 1999 @@ -65,10 +65,12 @@ NELEM(pages), pages }; + +#define VOL_FULL_SCALE 100 #define PAN_TO_ADJ(pan) ( (MD_PAN_TO_MIDI(pan) - 64.0) * 50.0 / 64.0) -#define ADJ_TO_PAN(val) ( MD_MIDI_TO_PAN((val * 64.0 / 50.0)+64.0) ) -#define VOL_TO_ADJ(vol) ( MD_VOL_TO_MIDI(vol) * 100.0 / 127.0) -#define ADJ_TO_VOL(val) ( MD_MIDI_TO_VOL(val * 127.0 / 100.0)) +#define ADJ_TO_PAN(val) ( MD_MIDI_TO_PAN(((val) * 64.0 / 50.0)+64.0) ) +#define VOL_TO_ADJ(vol) ( MD_VOL_TO_MIDI(vol) * VOL_FULL_SCALE / 127.0) +#define ADJ_TO_VOL(val) ( MD_MIDI_TO_VOL((val) * 127.0 / VOL_FULL_SCALE)) /* Static functions */ static GtkWidget *prop_track_info(struct track_prop *prop); @@ -227,7 +229,8 @@ volbox = gtk_hbox_new(0, 0); vollab = new_lab_align(_("Initial volume")); voladj = (GtkAdjustment *)gtk_adjustment_new( - MD_VOL_TO_MIDI(track->volume), 0.0, 100.0, 1.0, 1.0, 0.0); + VOL_TO_ADJ(track->volume), + 0.0, VOL_FULL_SCALE, 1.0, 1.0, 0.0); vol = gtk_hscale_new(voladj); gtk_scale_set_draw_value((GtkScale *)vol, TRUE); gtk_scale_set_value_pos((GtkScale *)vol, GTK_POS_RIGHT); @@ -253,7 +256,7 @@ panbox = gtk_hbox_new(0, 0); panlab = new_lab_align(_("Pan position")); panadj = (GtkAdjustment *)gtk_adjustment_new(PAN_TO_ADJ(track->pan), - -50.0, 50.0, 1.0, 1.0, 0.0); + -50.0, 49.0, 1.0, 1.0, 0.0); pan = gtk_hscale_new(panadj); gtk_scale_set_draw_value((GtkScale *)pan, TRUE); gtk_scale_set_value_pos((GtkScale *)pan, GTK_POS_RIGHT); @@ -312,12 +315,12 @@ gtk_box_pack_start((GtkBox*)tmpbox, constructionlab, 0, 0, 10); /* Instrument spinner */ - instr = mel_int_spinner(0, 127, track->program & 0x7f); + instr = mel_int_spinner(0, 127, track->program->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); + banklsb = mel_int_spinner(0, 127, (track->program->program >> 7) & 0x7f); + bankmsb = mel_int_spinner(0, 127, (track->program->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); @@ -377,14 +380,18 @@ program |= num << 7; num = gtk_spin_button_get_value_as_int(prop->bankmsb); program |= num << 14; - if (program != track->program) + if (program != track->program->program) { md_set_program(MD_CONTAINER(track), program, TRUE); + if (program & ~0x7f) + track->program->pchange_mode = PCHANGE_NORMAL; + } - num = prop->volume->value; - track->volume = MD_MIDI_TO_VOL(num); + num = prop->volume->value + 0.5; + track->volume = ADJ_TO_VOL(num); num = prop->pan->value; - track->pan = MD_MIDI_TO_PAN(num + 64); + num = CLAMP(num, -50, 49); + track->pan = ADJ_TO_PAN(num); MD_SET_MODIFIED(track, TRUE); song_view_update(PROP_SONG(prop)); diff -rNu melys-0.1.3/gui/trackprop.m melys-0.1.4/gui/trackprop.m --- melys-0.1.3/gui/trackprop.m Mon Nov 1 17:20:21 1999 +++ melys-0.1.4/gui/trackprop.m Tue Nov 23 19:40:46 1999 @@ -65,10 +65,13 @@ }; >>extern + +#define VOL_FULL_SCALE 100 #define PAN_TO_ADJ(pan) ( (MD_PAN_TO_MIDI(pan) - 64.0) * 50.0 / 64.0) -#define ADJ_TO_PAN(val) ( MD_MIDI_TO_PAN((val * 64.0 / 50.0)+64.0) ) -#define VOL_TO_ADJ(vol) ( MD_VOL_TO_MIDI(vol) * 100.0 / 127.0) -#define ADJ_TO_VOL(val) ( MD_MIDI_TO_VOL(val * 127.0 / 100.0)) +#define ADJ_TO_PAN(val) ( MD_MIDI_TO_PAN(((val) * 64.0 / 50.0)+64.0) ) +#define VOL_TO_ADJ(vol) ( MD_VOL_TO_MIDI(vol) * VOL_FULL_SCALE / 127.0) +#define ADJ_TO_VOL(val) ( MD_MIDI_TO_VOL((val) * 127.0 / VOL_FULL_SCALE)) + >>function track_prop_box void @@ -223,7 +226,8 @@ volbox = gtk_hbox_new(0, 0); vollab = new_lab_align(_("Initial volume")); voladj = (GtkAdjustment *)gtk_adjustment_new( - MD_VOL_TO_MIDI(track->volume), 0.0, 100.0, 1.0, 1.0, 0.0); + VOL_TO_ADJ(track->volume), + 0.0, VOL_FULL_SCALE, 1.0, 1.0, 0.0); vol = gtk_hscale_new(voladj); gtk_scale_set_draw_value((GtkScale *)vol, TRUE); gtk_scale_set_value_pos((GtkScale *)vol, GTK_POS_RIGHT); @@ -249,7 +253,7 @@ panbox = gtk_hbox_new(0, 0); panlab = new_lab_align(_("Pan position")); panadj = (GtkAdjustment *)gtk_adjustment_new(PAN_TO_ADJ(track->pan), - -50.0, 50.0, 1.0, 1.0, 0.0); + -50.0, 49.0, 1.0, 1.0, 0.0); pan = gtk_hscale_new(panadj); gtk_scale_set_draw_value((GtkScale *)pan, TRUE); gtk_scale_set_value_pos((GtkScale *)pan, GTK_POS_RIGHT); @@ -309,12 +313,12 @@ gtk_box_pack_start((GtkBox*)tmpbox, constructionlab, 0, 0, 10); /* Instrument spinner */ - instr = mel_int_spinner(0, 127, track->program & 0x7f); + instr = mel_int_spinner(0, 127, track->program->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); + banklsb = mel_int_spinner(0, 127, (track->program->program >> 7) & 0x7f); + bankmsb = mel_int_spinner(0, 127, (track->program->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); @@ -378,14 +382,18 @@ program |= num << 7; num = gtk_spin_button_get_value_as_int(prop->bankmsb); program |= num << 14; - if (program != track->program) + if (program != track->program->program) { md_set_program(MD_CONTAINER(track), program, TRUE); + if (program & ~0x7f) + track->program->pchange_mode = PCHANGE_NORMAL; + } - num = prop->volume->value; - track->volume = MD_MIDI_TO_VOL(num); + num = prop->volume->value + 0.5; + track->volume = ADJ_TO_VOL(num); num = prop->pan->value; - track->pan = MD_MIDI_TO_PAN(num + 64); + num = CLAMP(num, -50, 49); + track->pan = ADJ_TO_PAN(num); MD_SET_MODIFIED(track, TRUE); song_view_update(PROP_SONG(prop)); diff -rNu melys-0.1.3/help/C/Makefile melys-0.1.4/help/C/Makefile --- melys-0.1.3/help/C/Makefile Sat Oct 16 17:24:06 1999 +++ melys-0.1.4/help/C/Makefile Sat Nov 20 16:46:38 1999 @@ -10,7 +10,7 @@ DIR = $(HELPINSTDIR)/$(LOCALEDIR) # The source files -SGMLFILES = melys.sgml menus.sgml track.sgml +SGMLFILES = melys.sgml menus.sgml track.sgml piano.sgml # Stuff that gets created and needs removing. diff -rNu melys-0.1.3/help/C/html/display-pane.html melys-0.1.4/help/C/html/display-pane.html --- melys-0.1.3/help/C/html/display-pane.html Mon Nov 15 23:58:10 1999 +++ melys-0.1.4/help/C/html/display-pane.html Wed Nov 24 00:22:00 1999 @@ -13,7 +13,10 @@ HREF="track.html">
 Next
 Next Piano roll view
3. Piano roll view
The piano roll view
Accessing a piano roll view
Editing in the piano roll view
Piano roll view
Melys User's Guide
Prev 

Chapter 3. Piano roll view

This chapter deals with the piano roll view of Melys. + In this view you can see and edit the notes of a part or + a track. + Later you will be able to edit the controller values from + the same view.

You can have several piano roll views open at the same time, even + on the same track. + Changes made in one view will be reflected in all other open + views.

The piano roll view

This is a very traditional piano roll view.

Accessing a piano roll view

Right click on a track in the track information + display. + This will bring up a menu, from which you should select + Piano roll view. + + A new notebook page will be opened containing the notes + for that track. + + It will also be possible to display just a single part + in the future. + + The view can be placed into its own window by dragging on the + appropriate notebook tab and dropping it outside of Melys. +

There is no way to close a view just yet, the close option + in the menu closes the whole song. + +

Zooming

As will all the graphical views, you can use the zoom + buttons to adjust the scale of the display to suit. + You can zoom in both the horizontal and vertical directions. +

Clicking and holding down a zoom button + will cause the zooming to occur continuously.

Editing in the piano roll view

Editing is designed to be consistant throughout Melys once + you know how to edit in the track view, you should find + that editing notes is very similar. + + Not everything will be finished until version 0.2.0. + so some things will just not work yet. + +

Selecting notes

Left clicking on a note will select it. + Normally selecting a note will deselect any previously + selected notes. + By holding down the control key while selecting you + can select more than one note. + +

Moving notes

Notes can be moved by dragging them with the left + mouse button. + Hold down the shift key when releasing the mouse + button.

PrevHome 
The part display pane  
\ No newline at end of file diff -rNu melys-0.1.3/help/C/melys.sgml melys-0.1.4/help/C/melys.sgml --- melys-0.1.3/help/C/melys.sgml Wed Sep 22 21:38:40 1999 +++ melys-0.1.4/help/C/melys.sgml Sat Nov 20 16:46:39 1999 @@ -8,6 +8,7 @@ --> + ] > @@ -50,5 +51,6 @@ &MENUS-CHAPTER; &TRACK-CHAPTER; +&PIANO-CHAPTER; diff -rNu melys-0.1.3/help/C/piano.sgml melys-0.1.4/help/C/piano.sgml --- melys-0.1.3/help/C/piano.sgml Thu Jan 1 01:00:00 1970 +++ melys-0.1.4/help/C/piano.sgml Sat Nov 20 16:46:39 1999 @@ -0,0 +1,79 @@ + +Piano roll view + + + This chapter deals with the piano roll view of &mel;. + In this view you can see and edit the notes of a part or + a track. + Later you will be able to edit the controller values from + the same view. + + + You can have several piano roll views open at the same time, even + on the same track. + Changes made in one view will be reflected in all other open + views. + + + The piano roll view + + This is a very traditional piano roll view. + + + Accessing a piano roll view + + Right click on a track in the track information + display. + This will bring up a menu, from which you should select + + There is no way to close a view just yet, the close option + in the menu closes the whole song. + + + Zooming + + As will all the graphical views, you can use the zoom + buttons to adjust the scale of the display to suit. + You can zoom in both the horizontal and vertical directions. + + Clicking and holding down a zoom button + will cause the zooming to occur continuously. + + + Editing in the piano roll view + + Editing is designed to be consistant throughout &mel; once + you know how to edit in the track view, you should find + that editing notes is very similar. + + + Not everything will be finished until version 0.2.0. + so some things will just not work yet. + + + Selecting notes + + Left clicking on a note will select it. + Normally selecting a note will deselect any previously + selected notes. + By holding down the control key while selecting you + can select more than one note. + + + Moving notes + + Notes can be moved by dragging them with the left + mouse button. + Hold down the shift key when releasing the mouse + button. + diff -rNu melys-0.1.3/include/elements.h melys-0.1.4/include/elements.h --- melys-0.1.3/include/elements.h Mon Nov 15 23:57:37 1999 +++ melys-0.1.4/include/elements.h Wed Nov 24 00:21:27 1999 @@ -25,18 +25,27 @@ #define MD_CONTAINER_BEGIN 50 /* Begining of container types */ +#define element_time time.tick /* For backward compatibility */ + struct element { struct containerElement *con; /* Containing element */ - guint32 element_time; /* Time for this element */ + union un_time { + unsigned long tick; + struct real_time { + long tv_sec; + long tv_nsec; + } real; + } time; short device_channel; /* Device/channel for this element */ char type; /* Element type */ char tag; /* Element tag */ - int refcount:16; /* Reference count */ - int wref:16; /* Weak references */ + int refcount; /* Reference count */ + int wref; /* Weak references */ int floating:1; /* Not added to anything yet */ int selected:1; /* Element is selected */ int modified:1; /* Element was modified */ int destroyed:1; /* Element is destroyed, (but wref > 0) */ + int realtime:1; /* Using real time */ }; #define MD_ELEMENT(e) \ ((struct element *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_ELEMENT)) @@ -57,7 +66,12 @@ struct headElement *head; /* Pointer to the head information */ short tracks; /* Number of tracks */ short trackid; /* Ever increasing number for default names */ - /*XXX*/GSList *sel_list; /* Selected elements list */ + enum midi_mode { + MIDI_MODE_NONE = 0, /* No special Midi commands */ + MIDI_MODE_GM, /* Recognise GM */ + MIDI_MODE_GS, /* Recognise GS */ + MIDI_MODE_XG /* Recognise XG */ + } midi_mode; /* The midi mode GM, XG etc */ }; #define MD_ROOT(e) \ ((struct rootElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_ROOT)) @@ -88,7 +102,7 @@ struct trackElement { struct tracklikeElement parent; char *name; /* Name of track */ - int program; /* Extended program number */ + struct programElement *program; /* Track level program */ int pan; /* Pan position -32768:32767 */ int volume; /* Initial volume 0:65535 */ int inputdev; /* Input device for this track */ @@ -165,6 +179,13 @@ struct programElement { struct element parent; int program; /* Program number */ + enum pchange_mode { + PCHANGE_NONE = 0, /* No bank select */ + PCHANGE_NORMAL, /* Use MSB (ctrl 0) and LSB (ctrl 32) */ + PCHANGE_MSB, /* Just use ctrl 0 */ + PCHANGE_LSB, /* Just use ctrl 32 */ + /* Others ... */ + } pchange_mode; /* Program change mode */ }; #define MD_PROGRAM(e) \ ((struct programElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_PROGRAM)) diff -rNu melys-0.1.3/include/md.h melys-0.1.4/include/md.h --- melys-0.1.3/include/md.h Mon Nov 15 23:57:37 1999 +++ melys-0.1.4/include/md.h Wed Nov 24 00:21:27 1999 @@ -44,9 +44,10 @@ int md_get_nfree(void); struct element *md_copy(struct element *e); +void md_midi_convert(struct rootElement *root); void md_split_midi0(struct rootElement *root); -gboolean md_extract_track_info(struct trackElement *track, - struct partElement *part); +gboolean md_extract_track_info(struct rootElement *root, + struct trackElement *track, struct partElement *part); struct element *md_copy(struct element *e); void md_list_append(struct containerElement *c, struct element *el); @@ -122,6 +123,7 @@ #define MD_REF(el) (((struct element *)(el))->refcount++) #define MD_FREE(el) md_free((struct element *)(el)) #define MD_UNREF(el) MD_FREE(el) +#define MD_SINK(el) (((struct element *)(el))->floating = 0) #define MD_MK_DEVCHAN(dev, chan) \ ((dev)<<4 | ((chan) & 0xf)) #define MD_MODIFIED(el) ( ((struct element *)el)->modified ) @@ -163,11 +165,11 @@ /* Some MD to Midi macros */ #define MD_MIDI_VOL_SHIFT 9 -#define MD_VOL_TO_MIDI(vol) (((vol) >> MD_MIDI_VOL_SHIFT) & 0x7f) -#define MD_MIDI_TO_VOL(v) (((v)&0x7f) << MD_MIDI_VOL_SHIFT) +#define MD_VOL_TO_MIDI(vol) (((int)(vol) >> MD_MIDI_VOL_SHIFT) & 0x7f) +#define MD_MIDI_TO_VOL(v) ((((int)(v))&0x7f) << MD_MIDI_VOL_SHIFT) #define MD_MIDI_PAN_SHIFT 9 -#define MD_PAN_TO_MIDI(pan) (((((pan)+(int)0x8000) & 0xffff) >> MD_MIDI_PAN_SHIFT) & 0x7f) -#define MD_MIDI_TO_PAN(v) ((((v)&0x7f) << MD_MIDI_PAN_SHIFT) - (int)0x7fff) +#define MD_PAN_TO_MIDI(pan) (((((int)(pan)+(int)0x8000) & 0xffff) >> MD_MIDI_PAN_SHIFT) & 0x7f) +#define MD_MIDI_TO_PAN(v) ((((int)(v)&0x7f) << MD_MIDI_PAN_SHIFT) - (int)0x7fff) /* Defines for md_walk() */ diff -rNu melys-0.1.3/include/melfile.h melys-0.1.4/include/melfile.h --- melys-0.1.3/include/melfile.h Mon Nov 15 23:57:36 1999 +++ melys-0.1.4/include/melfile.h Wed Nov 24 00:21:26 1999 @@ -20,6 +20,7 @@ struct File; +typedef void (*ConvFunc)(struct rootElement *); typedef struct rootElement *(*fileReadFunc)(struct File *); typedef void (*fileWriteFunc)(struct File *, struct rootElement *); @@ -43,6 +44,8 @@ fileReadFunc read; /* Read function */ fileWriteFunc write; /* Write function */ + + GList *convlist; /* Converters list */ }; @@ -78,6 +81,7 @@ struct File *file_new(char *name); void file_set_type(struct File *file, char *type); void file_set_compressed(struct File *file, gboolean yesno); +void file_set_convert(struct File *file, char *type, ConvFunc convert); int file_get_status(struct File *file); char *file_get_message(struct File *file); double file_get_progress(struct File *file); diff -rNu melys-0.1.3/include/midi.h melys-0.1.4/include/midi.h --- melys-0.1.3/include/midi.h Mon Nov 15 23:57:36 1999 +++ melys-0.1.4/include/midi.h Wed Nov 24 00:21:26 1999 @@ -61,3 +61,4 @@ #define MIDI_FILE_COMPRESSED 0x002 void midi_write_file(struct File *file, struct rootElement *root); +struct sysexElement *get_std_sysex(int type); diff -rNu melys-0.1.3/include/seqlib.h melys-0.1.4/include/seqlib.h --- melys-0.1.3/include/seqlib.h Mon Nov 15 23:57:36 1999 +++ melys-0.1.4/include/seqlib.h Wed Nov 24 00:21:26 1999 @@ -21,6 +21,7 @@ * * * + * */ #include @@ -88,8 +89,10 @@ int seq_descriptor(seq_context_t *ctxp); char *seq_addr_string(snd_seq_addr_t *addr); +struct programElement; + void seq_midi_event_init(seq_context_t *ctxp, snd_seq_event_t *ep, - unsigned long time, int devchan); + gboolean real, union un_time time, int devchan); void seq_midi_note(seq_context_t *ctxp, snd_seq_event_t *ep, int note, int vel, int length); void seq_midi_note_on(seq_context_t *ctxp, snd_seq_event_t *ep, int note, diff -rNu melys-0.1.3/include/seqplay.h melys-0.1.4/include/seqplay.h --- melys-0.1.3/include/seqplay.h Mon Nov 15 23:57:35 1999 +++ melys-0.1.4/include/seqplay.h Wed Nov 24 00:21:26 1999 @@ -14,4 +14,6 @@ * */ + +int seq_midi_send_element(struct seq_context *ctxp, struct element *el); void midi_play_prologue(struct seq_context *ctxp, struct rootElement *root); diff -rNu melys-0.1.3/md/elements.c melys-0.1.4/md/elements.c --- melys-0.1.3/md/elements.c Mon Nov 15 23:57:52 1999 +++ melys-0.1.4/md/elements.c Wed Nov 24 00:21:42 1999 @@ -226,7 +226,6 @@ md_container_init(MD_CONTAINER(e)); e->head = NULL; - e->sel_list = NULL; } /* @@ -244,9 +243,6 @@ new->head = NULL; new->tracks = 0; - /* The selection list must be re-built after copying */ - new->sel_list = NULL; - g_warning("A root copied check selection code"); md_container_copy(MD_CONTAINER(new), MD_CONTAINER(e)); } @@ -363,7 +359,9 @@ md_container_init(MD_CONTAINER(e)); e->name = NULL; - e->program = 0; + g_assert(e->program == NULL); + e->program = md_program_new(0); + MD_SINK(e->program); e->notes = NULL; e->volume = MD_MIDI_TO_VOL(127); } @@ -384,6 +382,7 @@ if (e->name) new->name = g_strdup(e->name); new->notes = NULL; + new->program = MD_PROGRAM(md_copy(MD_ELEMENT(e->program))); md_tracklike_copy(MD_TRACKLIKE(new), MD_TRACKLIKE(e)); } diff -rNu melys-0.1.3/md/elements.m melys-0.1.4/md/elements.m --- melys-0.1.3/md/elements.m Sun Nov 14 19:29:36 1999 +++ melys-0.1.4/md/elements.m Tue Nov 23 20:42:05 1999 @@ -27,6 +27,8 @@ #define MD_CONTAINER_BEGIN 50 /* Begining of container types */ +#define element_time time.tick /* For backward compatibility */ + >>extern static int partid; @@ -41,16 +43,23 @@ */ >>elementdef element struct containerElement *con; /* Containing element */ - guint32 element_time; /* Time for this element */ + union un_time { + unsigned long tick; + struct real_time { + long tv_sec; + long tv_nsec; + } real; + } time; short device_channel; /* Device/channel for this element */ char type; /* Element type */ char tag; /* Element tag */ - int refcount:16; /* Reference count */ - int wref:16; /* Weak references */ + int refcount; /* Reference count */ + int wref; /* Weak references */ int floating:1; /* Not added to anything yet */ int selected:1; /* Element is selected */ int modified:1; /* Element was modified */ int destroyed:1; /* Element is destroyed, (but wref > 0) */ + int realtime:1; /* Using real time */ init e->refcount = 1; e->floating = 1; @@ -99,17 +108,18 @@ struct headElement *head; /* Pointer to the head information */ short tracks; /* Number of tracks */ short trackid; /* Ever increasing number for default names */ - /*XXX*/GSList *sel_list; /* Selected elements list */ + enum midi_mode { + MIDI_MODE_NONE = 0, /* No special Midi commands */ + MIDI_MODE_GM, /* Recognise GM */ + MIDI_MODE_GS, /* Recognise GS */ + MIDI_MODE_XG /* Recognise XG */ + } midi_mode; /* The midi mode GM, XG etc */ init e->head = NULL; - e->sel_list = NULL; copy new->head = NULL; new->tracks = 0; - /* The selection list must be re-built after copying */ - new->sel_list = NULL; - g_warning("A root copied check selection code"); /* * A holder for all kinds of information about the file. @@ -143,12 +153,13 @@ >>elementdef track tracklike char *name; /* Name of track */ - int program; /* Extended program number */ + struct programElement *program; /* Track level program */ int pan; /* Pan position -32768:32767 */ int volume; /* Initial volume 0:65535 */ int inputdev; /* Input device for this track */ + /* Flags (Maybe should go on container) */ int record:1; /* Set for record */ int mute:1; /* Track muted */ @@ -163,13 +174,16 @@ int hasprogram:1; /* Has embeded program changes */ init e->name = NULL; - e->program = 0; + g_assert(e->program == NULL); + e->program = md_program_new(0); + MD_SINK(e->program); e->notes = NULL; e->volume = MD_MIDI_TO_VOL(127); copy if (e->name) new->name = g_strdup(e->name); new->notes = NULL; + new->program = MD_PROGRAM(md_copy(MD_ELEMENT(e->program))); >># For the tempomap, its a special kind of track. >>elementdef tempomap tracklike @@ -233,6 +247,13 @@ >>elementdef program element int program; /* Program number */ + enum pchange_mode { + PCHANGE_NONE = 0, /* No bank select */ + PCHANGE_NORMAL, /* Use MSB (ctrl 0) and LSB (ctrl 32) */ + PCHANGE_MSB, /* Just use ctrl 0 */ + PCHANGE_LSB, /* Just use ctrl 32 */ + /* Others ... */ + } pchange_mode; /* Program change mode */ new int program e->program = program; diff -rNu melys-0.1.3/md/mdadd.c melys-0.1.4/md/mdadd.c --- melys-0.1.3/md/mdadd.c Mon Nov 15 23:57:52 1999 +++ melys-0.1.4/md/mdadd.c Wed Nov 24 00:21:43 1999 @@ -204,6 +204,7 @@ case MD_TYPE_TRACK: if (MD_TRACK(el)->name) g_free(MD_TRACK(el)->name); + md_free((struct element *)MD_TRACK(el)->program); break; case MD_TYPE_PARTREF: case MD_TYPE_PART: diff -rNu melys-0.1.3/md/mdadd.m melys-0.1.4/md/mdadd.m --- melys-0.1.3/md/mdadd.m Mon Nov 15 23:36:29 1999 +++ melys-0.1.4/md/mdadd.m Tue Nov 23 20:42:05 1999 @@ -211,6 +211,7 @@ case MD_TYPE_TRACK: if (MD_TRACK(el)->name) g_free(MD_TRACK(el)->name); + md_free((struct element *)MD_TRACK(el)->program); break; case MD_TYPE_PARTREF: case MD_TYPE_PART: diff -rNu melys-0.1.3/md/mdconv.c melys-0.1.4/md/mdconv.c --- melys-0.1.3/md/mdconv.c Mon Nov 15 23:57:52 1999 +++ melys-0.1.4/md/mdconv.c Wed Nov 24 00:21:43 1999 @@ -24,8 +24,58 @@ #include "intl.h" +/* + * Data that appears in sysex commands that we can use to + * recognise different Midi modes. + */ +unsigned char gm_reset[] = { + 0x7e,0x7f,0x09,0x01 +}; +int gm_reset_len = NELEM(gm_reset); +unsigned char xg_reset[] = { + 0x43,0x10,0x4c,0x00,0x00,0x7e,0x00 +}; +int xg_reset_len = NELEM(xg_reset); +unsigned char gs_prefix[] = { + 0x41,0x10,0x42,0x12,0x40 +}; +int gs_prefix_len = NELEM(gs_prefix); + /* Static functions */ +static gboolean extract_sysex(struct rootElement *root, + struct sysexElement *sysex); + + +/* + * This converts from the raw MD file that you get when you read + * in a midi file to one that is more suitable for use in a + * sequencer. This includes things like splitting up a type 0 + * file into tracks, extracting patch information etc. + */ +void +md_midi_convert(struct rootElement *root) +{ + struct trackElement *track; + struct partElement *part; + int i; + + if (root->head->format == 0) + md_split_midi0(root); + + for (i = 0; i < root->tracks; i++) { + track = md_track_nth(root, i); + /* + * We expect for a midi file that each track has exactly one part. + */ + if (MD_CONTAINER_LEN(track) != 1) + continue; + + part = (struct partElement *)MD_CONTAINER(track)->elements->pdata[0]; + if (MD_TYPE(part) == MD_TYPE_PART) + md_extract_track_info(root, track, part); + } +} /* * Split a file that is in midi type 0 form into a track based @@ -70,15 +120,20 @@ tnum = el->device_channel % MAX_0_TRACKS; maxtnum = MAX(tnum, maxtnum); + + MD_REF(el); + md_remove(con, el); md_add(MD_CONTAINER(parts[tnum]), el); + i--; + MD_UNREF(el); } md_ensure_track(root, maxtnum - 1); for (i = 0; i < maxtnum; i++) { trk = md_track_nth(root, i); - md_extract_track_info(trk, parts[i]); md_add(MD_CONTAINER(trk), MD_ELEMENT(parts[i])); } + /* Free remaining */ for (; i < MAX_0_TRACKS; i++) MD_FREE(parts[i]); @@ -103,33 +158,104 @@ * program and channel information etc. */ gboolean -md_extract_track_info(struct trackElement *track, struct partElement *part) +md_extract_track_info(struct rootElement *root, struct trackElement *track, + struct partElement *part) { - int i; + int ind; + int val; + int rm; struct element *el; + struct controlElement *ctl; + struct programElement *prg; - for (i = 0; i < MD_CONTAINER_LEN(part); i++) { - el = MD_GET_INDEX(part, i); + for (ind = 0; ind < MD_CONTAINER_LEN(part); ind++) { + el = MD_GET_INDEX(part, ind); switch (el->type) { case MD_TYPE_NOTE: return TRUE; + case MD_TYPE_SYSEX: + rm = extract_sysex(root, MD_SYSEX(el)); + if (rm == TRUE) { + md_remove(MD_CONTAINER(part), el); + ind--; + } + break; + case MD_TYPE_CONTROL: - switch (MD_CONTROL(el)->control) { + + ctl = MD_CONTROL(el); + track->controllers[(guchar)ctl->control] = ctl->value; + + switch (ctl->control) { case SND_MCTL_MSB_MAIN_VOLUME: - track->volume = MD_MIDI_TO_VOL(MD_CONTROL(el)->value); + track->volume = MD_MIDI_TO_VOL(ctl->value); + md_remove(MD_CONTAINER(part), el); + ind--; break; case SND_MCTL_MSB_PAN: - track->pan = MD_MIDI_TO_PAN(MD_CONTROL(el)->value); + track->pan = MD_MIDI_TO_PAN(ctl->value); + md_remove(MD_CONTAINER(part), el); + ind--; break; } break; + case MD_TYPE_PROGRAM: - track->program = MD_PROGRAM(el)->program; + prg = MD_PROGRAM(el); + switch (root->midi_mode) { + case MIDI_MODE_NONE: + case MIDI_MODE_GM: + prg->pchange_mode = PCHANGE_NONE; + break; + case MIDI_MODE_GS: + case MIDI_MODE_XG: + prg->pchange_mode = PCHANGE_NORMAL; + break; + } + + val = prg->program & 0x7f; + if (prg->pchange_mode == PCHANGE_NORMAL + || prg->pchange_mode == PCHANGE_MSB) { + val |= track->controllers[SND_MCTL_MSB_BANK] << 14; + } + if (prg->pchange_mode == PCHANGE_NORMAL + || prg->pchange_mode == PCHANGE_LSB) { + val |= track->controllers[SND_MCTL_LSB_BANK] << 7; + } + + prg->program = val; + MD_UNREF(track->program); + MD_REF(prg); + track->program = prg; + md_remove(MD_CONTAINER(part), el); + ind--; break; } } return FALSE; +} + +/* + * Check if this sysex is a GM, GS or XG reset. + */ +static gboolean +extract_sysex(struct rootElement *root, struct sysexElement *sysex) +{ + int rm = FALSE; + + if (memcmp(sysex->data, gm_reset, sizeof(gm_reset)) == 0) { + root->midi_mode = MIDI_MODE_GM; + rm = TRUE; + } else if (memcmp(sysex->data, gs_prefix, sizeof(gs_prefix)) == 0) { + root->midi_mode = MIDI_MODE_GS; + rm = FALSE; + } else if (memcmp(sysex->data, xg_reset, sizeof(xg_reset)) == 0) { + root->midi_mode = MIDI_MODE_XG; + rm = TRUE; + } + + return rm; } diff -rNu melys-0.1.3/md/mdconv.m melys-0.1.4/md/mdconv.m --- melys-0.1.3/md/mdconv.m Sun Oct 24 19:20:00 1999 +++ melys-0.1.4/md/mdconv.m Tue Nov 23 20:42:05 1999 @@ -15,6 +15,60 @@ >>header elements.h >>headerdef --decl md.h +>>extern + +/* + * Data that appears in sysex commands that we can use to + * recognise different Midi modes. + */ +unsigned char gm_reset[] = { + 0x7e,0x7f,0x09,0x01 +}; +int gm_reset_len = NELEM(gm_reset); +unsigned char xg_reset[] = { + 0x43,0x10,0x4c,0x00,0x00,0x7e,0x00 +}; +int xg_reset_len = NELEM(xg_reset); +unsigned char gs_prefix[] = { + 0x41,0x10,0x42,0x12,0x40 +}; +int gs_prefix_len = NELEM(gs_prefix); + + +>>function md_midi_convert +void +struct rootElement *root; + +>>description +This converts from the raw MD file that you get when you +read in a midi file to one that is more suitable for use in a +sequencer. +This includes things like splitting up a type 0 file into tracks, +extracting patch information etc. + +>>code + struct trackElement *track; + struct partElement *part; + int i; + + if (root->head->format == 0) + md_split_midi0(root); + + for (i = 0; i < root->tracks; i++) { + track = md_track_nth(root, i); + + /* + * We expect for a midi file that each track has exactly one part. + */ + if (MD_CONTAINER_LEN(track) != 1) + continue; + + part = (struct partElement *)MD_CONTAINER(track)->elements->pdata[0]; + if (MD_TYPE(part) == MD_TYPE_PART) + md_extract_track_info(root, track, part); + } + + >>function md_split_midi0 void struct rootElement *root; @@ -60,15 +114,20 @@ tnum = el->device_channel % MAX_0_TRACKS; maxtnum = MAX(tnum, maxtnum); + + MD_REF(el); + md_remove(con, el); md_add(MD_CONTAINER(parts[tnum]), el); + i--; + MD_UNREF(el); } md_ensure_track(root, maxtnum - 1); for (i = 0; i < maxtnum; i++) { trk = md_track_nth(root, i); - md_extract_track_info(trk, parts[i]); md_add(MD_CONTAINER(trk), MD_ELEMENT(parts[i])); } + /* Free remaining */ for (; i < MAX_0_TRACKS; i++) MD_FREE(parts[i]); @@ -85,6 +144,7 @@ >>function md_extract_track_info gboolean +struct rootElement *root; struct trackElement *track; struct partElement *part; @@ -98,30 +158,104 @@ contain a hodge-podge of program and channel information etc. >>code - int i; + int ind; + int val; + int rm; struct element *el; + struct controlElement *ctl; + struct programElement *prg; - for (i = 0; i < MD_CONTAINER_LEN(part); i++) { - el = MD_GET_INDEX(part, i); + for (ind = 0; ind < MD_CONTAINER_LEN(part); ind++) { + el = MD_GET_INDEX(part, ind); switch (el->type) { case MD_TYPE_NOTE: return TRUE; + case MD_TYPE_SYSEX: + rm = extract_sysex(root, MD_SYSEX(el)); + if (rm == TRUE) { + md_remove(MD_CONTAINER(part), el); + ind--; + } + break; + case MD_TYPE_CONTROL: - switch (MD_CONTROL(el)->control) { + + ctl = MD_CONTROL(el); + track->controllers[(guchar)ctl->control] = ctl->value; + + switch (ctl->control) { case SND_MCTL_MSB_MAIN_VOLUME: - track->volume = MD_MIDI_TO_VOL(MD_CONTROL(el)->value); + track->volume = MD_MIDI_TO_VOL(ctl->value); + md_remove(MD_CONTAINER(part), el); + ind--; break; case SND_MCTL_MSB_PAN: - track->pan = MD_MIDI_TO_PAN(MD_CONTROL(el)->value); + track->pan = MD_MIDI_TO_PAN(ctl->value); + md_remove(MD_CONTAINER(part), el); + ind--; break; } break; + case MD_TYPE_PROGRAM: - track->program = MD_PROGRAM(el)->program; + prg = MD_PROGRAM(el); + switch (root->midi_mode) { + case MIDI_MODE_NONE: + case MIDI_MODE_GM: + prg->pchange_mode = PCHANGE_NONE; + break; + case MIDI_MODE_GS: + case MIDI_MODE_XG: + prg->pchange_mode = PCHANGE_NORMAL; + break; + } + + val = prg->program & 0x7f; + if (prg->pchange_mode == PCHANGE_NORMAL + || prg->pchange_mode == PCHANGE_MSB) { + val |= track->controllers[SND_MCTL_MSB_BANK] << 14; + } + if (prg->pchange_mode == PCHANGE_NORMAL + || prg->pchange_mode == PCHANGE_LSB) { + val |= track->controllers[SND_MCTL_LSB_BANK] << 7; + } + + prg->program = val; + MD_UNREF(track->program); + MD_REF(prg); + track->program = prg; + md_remove(MD_CONTAINER(part), el); + ind--; break; } } return FALSE; + + + +>>function extract_sysex +static gboolean +struct rootElement *root; +struct sysexElement *sysex; + +>>description +Check if this sysex is a GM, GS or XG reset. + +>>code + int rm = FALSE; + + if (memcmp(sysex->data, gm_reset, sizeof(gm_reset)) == 0) { + root->midi_mode = MIDI_MODE_GM; + rm = TRUE; + } else if (memcmp(sysex->data, gs_prefix, sizeof(gs_prefix)) == 0) { + root->midi_mode = MIDI_MODE_GS; + rm = FALSE; + } else if (memcmp(sysex->data, xg_reset, sizeof(xg_reset)) == 0) { + root->midi_mode = MIDI_MODE_XG; + rm = TRUE; + } + + return rm; diff -rNu melys-0.1.3/md/mdutil.c melys-0.1.4/md/mdutil.c --- melys-0.1.3/md/mdutil.c Mon Nov 15 23:57:53 1999 +++ melys-0.1.4/md/mdutil.c Wed Nov 24 00:21:44 1999 @@ -245,7 +245,7 @@ int i; if (MD_TYPE(base) == MD_TYPE_TRACK) { - MD_TRACK(base)->program = program; + MD_TRACK(base)->program->program = program; if (clear) MD_TRACK(base)->hasprogram = FALSE; } diff -rNu melys-0.1.3/md/mdutil.m melys-0.1.4/md/mdutil.m --- melys-0.1.3/md/mdutil.m Mon Nov 15 14:52:52 1999 +++ melys-0.1.4/md/mdutil.m Tue Nov 23 20:42:05 1999 @@ -32,6 +32,7 @@ #define MD_REF(el) (((struct element *)(el))->refcount++) #define MD_FREE(el) md_free((struct element *)(el)) #define MD_UNREF(el) MD_FREE(el) +#define MD_SINK(el) (((struct element *)(el))->floating = 0) #define MD_MK_DEVCHAN(dev, chan) \ ((dev)<<4 | ((chan) & 0xf)) #define MD_MODIFIED(el) ( ((struct element *)el)->modified ) @@ -73,11 +74,11 @@ /* Some MD to Midi macros */ #define MD_MIDI_VOL_SHIFT 9 -#define MD_VOL_TO_MIDI(vol) (((vol) >> MD_MIDI_VOL_SHIFT) & 0x7f) -#define MD_MIDI_TO_VOL(v) (((v)&0x7f) << MD_MIDI_VOL_SHIFT) +#define MD_VOL_TO_MIDI(vol) (((int)(vol) >> MD_MIDI_VOL_SHIFT) & 0x7f) +#define MD_MIDI_TO_VOL(v) ((((int)(v))&0x7f) << MD_MIDI_VOL_SHIFT) #define MD_MIDI_PAN_SHIFT 9 -#define MD_PAN_TO_MIDI(pan) (((((pan)+(int)0x8000) & 0xffff) >> MD_MIDI_PAN_SHIFT) & 0x7f) -#define MD_MIDI_TO_PAN(v) ((((v)&0x7f) << MD_MIDI_PAN_SHIFT) - (int)0x7fff) +#define MD_PAN_TO_MIDI(pan) (((((int)(pan)+(int)0x8000) & 0xffff) >> MD_MIDI_PAN_SHIFT) & 0x7f) +#define MD_MIDI_TO_PAN(v) ((((int)(v)&0x7f) << MD_MIDI_PAN_SHIFT) - (int)0x7fff) /* Defines for md_walk() */ @@ -340,7 +341,7 @@ int i; if (MD_TYPE(base) == MD_TYPE_TRACK) { - MD_TRACK(base)->program = program; + MD_TRACK(base)->program->program = program; if (clear) MD_TRACK(base)->hasprogram = FALSE; } diff -rNu melys-0.1.3/midi/Makefile melys-0.1.4/midi/Makefile --- melys-0.1.3/midi/Makefile Mon Nov 15 23:57:47 1999 +++ melys-0.1.4/midi/Makefile Wed Nov 24 00:21:38 1999 @@ -40,15 +40,15 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< -play.o: ../include/seqlib.h -play.o: ../include/seqplay.h play.o: ../include/elements.h +play.o: ../include/seqlib.h play.o: ../include/md.h +play.o: ../include/seqplay.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/seqlib.h record.o: ../include/config.h record.o: ../include/md.h record.o: ../include/melmsg.h diff -rNu melys-0.1.3/midi/play.c melys-0.1.4/midi/play.c --- melys-0.1.3/midi/play.c Mon Nov 15 23:58:01 1999 +++ melys-0.1.4/midi/play.c Wed Nov 24 00:21:51 1999 @@ -23,15 +23,14 @@ #include "util.h" #include #include -#include #include #include "gdk/gdk.h" #include "gtk/gtkmain.h" #include "gtk/gtkadjustment.h" -#include "seqlib.h" -#include "seqplay.h" #include "elements.h" +#include "seqlib.h" #include "md.h" +#include "seqplay.h" #include "config.h" #include "melmsg.h" #include "melmidi.h" @@ -70,9 +69,6 @@ static void run_events(struct play *play); static void get_events(gpointer vplay, gint fd, GdkInputCondition cond); static void do_special(struct play *play, int type); -static int send_element(struct seq_context *ctxp, struct element *el); -static void conv_event(struct seq_context *ctxp, struct element *el, - snd_seq_event_t *ep); static gint play_pos_cb(gpointer data); static void add_io_cb(struct play *play, int which); static void remove_io_cb(struct play *play, int which); @@ -253,7 +249,9 @@ ctxp = play->ctxp; for (i = 0; i < 16; i++) { - seq_midi_event_init(ctxp, &ev, 0, i); + union un_time t; + t.tick = 0; + seq_midi_event_init(ctxp, &ev, FALSE, t, i); seq_midi_control(ctxp, &ev, SND_MCTL_ALL_SOUNDS_OFF, 0); seq_control_write(ctxp, &ev); } @@ -525,7 +523,7 @@ /* Push out any pending element */ if (play->pend_element) { - status = send_element(play->ctxp, play->pend_element); + status = seq_midi_send_element(play->ctxp, play->pend_element); if (status < 0) { dprintf2("Couldn't send the pending event"); return; @@ -544,7 +542,7 @@ dprintf2("Sending type %d for %d at %ld", el->type, el->device_channel, el->element_time); - status = send_element(play->ctxp, el); + status = seq_midi_send_element(play->ctxp, el); if (status < 0) { play->pend_element = el; break; @@ -595,7 +593,7 @@ do_special(play, ep->data.raw32.d[0]); break; default: - printf("Event NOT ECHO type %d revceived\n", ep->type); + dprintf1("Event NOT ECHO type %d revceived\n", ep->type); break; } @@ -644,100 +642,9 @@ break; default: - printf("Unknown echo event %d\n", type); - break; - } -} - -/* - * The element is converted into an event and sent to the - * sequencer. - * - * Arguments: - * ctxp - Sequence state - * el - Element to send to sequencer - */ -static int -send_element(struct seq_context *ctxp, struct element *el) -{ - snd_seq_event_t ev; - int status = 0; - - conv_event(ctxp, el, &ev); - - if (ev.type != 0) - status = seq_write(ctxp, &ev); - - seq_event_data_free(&ev); - - return status; -} - -/* - * Convert an element to an event. Pass in the address of an - * event to be completed. - * - * Arguments: - * ctxp - Sequencer context - * el - Element to be converted - * ep - Event is written here - */ -static void -conv_event(struct seq_context *ctxp, struct element *el, snd_seq_event_t *ep) -{ - struct tempomapElement *tmap; - - seq_midi_event_init(ctxp, ep, el->element_time, el->device_channel); - - switch (el->type) { - case MD_TYPE_ROOT: - tmap = md_get_tempomap(MD_ROOT(el)); - seq_init_tempo(ctxp, tmap->timebase, 120, 1); - seq_timer_start(ctxp); - break; - case MD_TYPE_HEAD: - break; - case MD_TYPE_NOTE: - seq_midi_note(ctxp, ep, MD_NOTE(el)->note, MD_NOTE(el)->vel, - MD_NOTE(el)->length); - break; - case MD_TYPE_CONTROL: - seq_midi_control(ctxp, ep, MD_CONTROL(el)->control, - MD_CONTROL(el)->value); - break; - case MD_TYPE_PROGRAM: - seq_midi_program(ctxp, ep, MD_PROGRAM(el)->program); - break; - case MD_TYPE_TEMPO: - seq_midi_tempo(ctxp, ep, MD_TEMPO(el)->micro_tempo); - break; - case MD_TYPE_PITCH: - seq_midi_pitchbend(ctxp, ep, MD_PITCH(el)->pitch); - break; - case MD_TYPE_PRESSURE: - seq_midi_chanpress(ctxp, ep, MD_PRESSURE(el)->velocity); - break; - case MD_TYPE_KEYTOUCH: - seq_midi_keypress(ctxp, ep, MD_KEYTOUCH(el)->note, - MD_KEYTOUCH(el)->velocity); - break; - case MD_TYPE_SYSEX: - seq_midi_sysex(ctxp, ep, MD_SYSEX(el)->status, MD_SYSEX(el)->data, - MD_SYSEX(el)->length); - break; - 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 */ - break; - default: - printf("WARNING: play: not implemented yet %d\n", el->type); + dprintf(0, "Unknown echo event %d\n", type); break; } - - ep->tag = el->tag; } /* diff -rNu melys-0.1.3/midi/play.m melys-0.1.4/midi/play.m --- melys-0.1.3/midi/play.m Thu Nov 11 23:54:44 1999 +++ melys-0.1.4/midi/play.m Tue Nov 23 20:42:05 1999 @@ -13,17 +13,16 @@ >>header >>header ->>header >>header >>header gdk/gdk.h >>header gtk/gtkmain.h >>header gtk/gtkadjustment.h ->>header seqlib.h ->>header seqplay.h >>header elements.h +>>header seqlib.h >>header md.h +>>header seqplay.h >>header config.h >>header melmsg.h @@ -244,7 +243,9 @@ ctxp = play->ctxp; for (i = 0; i < 16; i++) { - seq_midi_event_init(ctxp, &ev, 0, i); + union un_time t; + t.tick = 0; + seq_midi_event_init(ctxp, &ev, FALSE, t, i); seq_midi_control(ctxp, &ev, SND_MCTL_ALL_SOUNDS_OFF, 0); seq_control_write(ctxp, &ev); } @@ -392,6 +393,7 @@ } #endif + >>function play_unmute void struct play *play; @@ -522,7 +524,7 @@ /* Push out any pending element */ if (play->pend_element) { - status = send_element(play->ctxp, play->pend_element); + status = seq_midi_send_element(play->ctxp, play->pend_element); if (status < 0) { dprintf2("Couldn't send the pending event"); return; @@ -541,7 +543,7 @@ dprintf2("Sending type %d for %d at %ld", el->type, el->device_channel, el->element_time); - status = send_element(play->ctxp, el); + status = seq_midi_send_element(play->ctxp, el); if (status < 0) { play->pend_element = el; break; @@ -591,7 +593,7 @@ do_special(play, ep->data.raw32.d[0]); break; default: - printf("Event NOT ECHO type %d revceived\n", ep->type); + dprintf1("Event NOT ECHO type %d revceived\n", ep->type); break; } @@ -638,98 +640,9 @@ break; default: - printf("Unknown echo event %d\n", type); - break; - } - - - ->>function send_element -static int -struct seq_context *ctxp; Sequence state -struct element *el; Element to send to sequencer - ->>description -The element is converted into an event and sent to the sequencer. - ->>code - snd_seq_event_t ev; - int status = 0; - - conv_event(ctxp, el, &ev); - - if (ev.type != 0) - status = seq_write(ctxp, &ev); - - seq_event_data_free(&ev); - - return status; - - ->>function conv_event -static void -struct seq_context *ctxp; Sequencer context -struct element *el; Element to be converted -snd_seq_event_t *ep; Event is written here - ->>description -Convert an element to an event. -Pass in the address of an event to be completed. - ->>code - struct tempomapElement *tmap; - - seq_midi_event_init(ctxp, ep, el->element_time, el->device_channel); - - switch (el->type) { - case MD_TYPE_ROOT: - tmap = md_get_tempomap(MD_ROOT(el)); - seq_init_tempo(ctxp, tmap->timebase, 120, 1); - seq_timer_start(ctxp); - break; - case MD_TYPE_HEAD: - break; - case MD_TYPE_NOTE: - seq_midi_note(ctxp, ep, MD_NOTE(el)->note, MD_NOTE(el)->vel, - MD_NOTE(el)->length); - break; - case MD_TYPE_CONTROL: - seq_midi_control(ctxp, ep, MD_CONTROL(el)->control, - MD_CONTROL(el)->value); - break; - case MD_TYPE_PROGRAM: - seq_midi_program(ctxp, ep, MD_PROGRAM(el)->program); - break; - case MD_TYPE_TEMPO: - seq_midi_tempo(ctxp, ep, MD_TEMPO(el)->micro_tempo); - break; - case MD_TYPE_PITCH: - seq_midi_pitchbend(ctxp, ep, MD_PITCH(el)->pitch); - break; - case MD_TYPE_PRESSURE: - seq_midi_chanpress(ctxp, ep, MD_PRESSURE(el)->velocity); - break; - case MD_TYPE_KEYTOUCH: - seq_midi_keypress(ctxp, ep, MD_KEYTOUCH(el)->note, - MD_KEYTOUCH(el)->velocity); - break; - case MD_TYPE_SYSEX: - seq_midi_sysex(ctxp, ep, MD_SYSEX(el)->status, MD_SYSEX(el)->data, - MD_SYSEX(el)->length); - break; - 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 */ - break; - default: - printf("WARNING: play: not implemented yet %d\n", el->type); + dprintf(0, "Unknown echo event %d\n", type); break; } - - ep->tag = el->tag; >>function play_pos_cb diff -rNu melys-0.1.3/midi/record.c melys-0.1.4/midi/record.c --- melys-0.1.3/midi/record.c Mon Nov 15 23:58:01 1999 +++ melys-0.1.4/midi/record.c Wed Nov 24 00:21:52 1999 @@ -19,8 +19,8 @@ #include "glib.h" #include "except.h" #include "util.h" -#include "seqlib.h" #include "elements.h" +#include "seqlib.h" #include "config.h" #include "md.h" #include "gdk/gdk.h" @@ -270,6 +270,7 @@ /* This is an ALSA bug (reported) keyboard events have the REL bit * set but they are not relative + * Should be fixed in CVS (19 Nov). */ ep->flags &= ~SND_SEQ_TIME_MODE_REL; @@ -565,11 +566,23 @@ /* 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; + program = val; + switch (track->program->pchange_mode) { + case PCHANGE_NONE: + break; + case PCHANGE_NORMAL: + program |= track->controllers[SND_MCTL_MSB_BANK] << 14; + program |= track->controllers[SND_MCTL_LSB_BANK] << 7; + break; + case PCHANGE_MSB: + program |= track->controllers[SND_MCTL_MSB_BANK] << 14; + break; + case PCHANGE_LSB: + program |= track->controllers[SND_MCTL_LSB_BANK] << 7; + break; + } - track->program = program; + track->program->program = program; MD_SET_MODIFIED(track, TRUE); return el; diff -rNu melys-0.1.3/midi/record.m melys-0.1.4/midi/record.m --- melys-0.1.3/midi/record.m Mon Nov 15 23:36:52 1999 +++ melys-0.1.4/midi/record.m Tue Nov 23 20:42:05 1999 @@ -11,8 +11,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ->>header seqlib.h >>header elements.h +>>header seqlib.h >>header config.h >>header md.h >>header gdk/gdk.h @@ -246,6 +246,7 @@ /* This is an ALSA bug (reported) keyboard events have the REL bit * set but they are not relative + * Should be fixed in CVS (19 Nov). */ ep->flags &= ~SND_SEQ_TIME_MODE_REL; @@ -543,11 +544,23 @@ /* 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; + program = val; + switch (track->program->pchange_mode) { + case PCHANGE_NONE: + break; + case PCHANGE_NORMAL: + program |= track->controllers[SND_MCTL_MSB_BANK] << 14; + program |= track->controllers[SND_MCTL_LSB_BANK] << 7; + break; + case PCHANGE_MSB: + program |= track->controllers[SND_MCTL_MSB_BANK] << 14; + break; + case PCHANGE_LSB: + program |= track->controllers[SND_MCTL_LSB_BANK] << 7; + break; + } - track->program = program; + track->program->program = program; MD_SET_MODIFIED(track, TRUE); return el; diff -rNu melys-0.1.3/programs/Makefile melys-0.1.4/programs/Makefile --- melys-0.1.3/programs/Makefile Mon Nov 15 23:57:48 1999 +++ melys-0.1.4/programs/Makefile Wed Nov 24 00:21:38 1999 @@ -111,16 +111,17 @@ mcode $(MCODEFLAGS) -o $@ $< mdmlconv.o: ../include/util.h -mdmlconv.o: ../include/melfile.h mdmlconv.o: ../include/elements.h +mdmlconv.o: ../include/melfile.h mdmlconv.o: ../include/md.h +melplay.o: ../include/elements.h melplay.o: ../include/seqlib.h melplay.o: ../include/seqplay.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/elements.h showseq.o: ../include/seqlib.h melys.o: ../include/melmsg.h melys.o: ../include/melys.h diff -rNu melys-0.1.3/programs/mdmlconv.c melys-0.1.4/programs/mdmlconv.c --- melys-0.1.3/programs/mdmlconv.c Mon Nov 15 23:58:02 1999 +++ melys-0.1.4/programs/mdmlconv.c Wed Nov 24 00:21:52 1999 @@ -25,8 +25,8 @@ #include #include #include -#include "melfile.h" #include "elements.h" +#include "melfile.h" #include "md.h" #include #include "intl.h" diff -rNu melys-0.1.3/programs/mdmlconv.m melys-0.1.4/programs/mdmlconv.m --- melys-0.1.3/programs/mdmlconv.m Sun Oct 24 19:19:04 1999 +++ melys-0.1.4/programs/mdmlconv.m Tue Nov 23 20:42:05 1999 @@ -27,8 +27,8 @@ >>header >>header >>header util.h ->>header melfile.h >>header elements.h +>>header melfile.h >>header md.h /* Options for the command */ diff -rNu melys-0.1.3/programs/melplay.c melys-0.1.4/programs/melplay.c --- melys-0.1.3/programs/melplay.c Mon Nov 15 23:58:02 1999 +++ melys-0.1.4/programs/melplay.c Wed Nov 24 00:21:53 1999 @@ -23,9 +23,9 @@ #include #include #include +#include "elements.h" #include "seqlib.h" #include "seqplay.h" -#include "elements.h" #include "melfile.h" #include "melmidi.h" #include "midi.h" @@ -371,7 +371,7 @@ seq_context_t *ctxp = arg; snd_seq_event_t ev; - seq_midi_event_init(ctxp, &ev, el->element_time, el->device_channel); + seq_midi_event_init(ctxp, &ev, FALSE, el->time, el->device_channel); switch (el->type) { case MD_TYPE_ROOT: tmap = md_get_tempomap(MD_ROOT(el)); diff -rNu melys-0.1.3/programs/melplay.m melys-0.1.4/programs/melplay.m --- melys-0.1.3/programs/melplay.m Sun Oct 24 19:19:04 1999 +++ melys-0.1.4/programs/melplay.m Tue Nov 23 20:42:05 1999 @@ -26,9 +26,9 @@ >>header >>header >>header +>>header elements.h >>header seqlib.h >>header seqplay.h ->>header elements.h >>header melfile.h >>header melmidi.h >>header midi.h @@ -370,7 +370,7 @@ seq_context_t *ctxp = arg; snd_seq_event_t ev; - seq_midi_event_init(ctxp, &ev, el->element_time, el->device_channel); + seq_midi_event_init(ctxp, &ev, FALSE, el->time, el->device_channel); switch (el->type) { case MD_TYPE_ROOT: tmap = md_get_tempomap(MD_ROOT(el)); diff -rNu melys-0.1.3/programs/showseq.c melys-0.1.4/programs/showseq.c --- melys-0.1.3/programs/showseq.c Mon Nov 15 23:58:02 1999 +++ melys-0.1.4/programs/showseq.c Wed Nov 24 00:21:53 1999 @@ -24,6 +24,7 @@ #include #include #include +#include "elements.h" #include "seqlib.h" #include #include "intl.h" diff -rNu melys-0.1.3/programs/showseq.m melys-0.1.4/programs/showseq.m --- melys-0.1.3/programs/showseq.m Thu Sep 9 00:23:46 1999 +++ melys-0.1.4/programs/showseq.m Tue Nov 23 20:42:05 1999 @@ -22,6 +22,7 @@ >>header >>header >>header +>>header elements.h >>header seqlib.h /* Options for the command */ diff -rNu melys-0.1.3/seq/Makefile melys-0.1.4/seq/Makefile --- melys-0.1.3/seq/Makefile Mon Nov 15 23:57:42 1999 +++ melys-0.1.4/seq/Makefile Wed Nov 24 00:21:33 1999 @@ -46,13 +46,17 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< -seqplay.o: ../include/seqlib.h seqplay.o: ../include/elements.h +seqplay.o: ../include/seqlib.h seqplay.o: ../include/md.h seqplay.o: ../include/melmidi.h +seqplay.o: ../include/melfile.h +seqplay.o: ../include/midi.h seqplay.o: ../include/seqplay.h +seqmidi.o: ../include/elements.h seqmidi.o: ../include/seqlib.h seqmidi.o: ./seqpriv.h +seqlib.o: ../include/elements.h seqlib.o: ../include/seqlib.h seqlib.o: ./seqpriv.h sequtil.o: ../include/elements.h diff -rNu melys-0.1.3/seq/seqlib.c melys-0.1.4/seq/seqlib.c --- melys-0.1.3/seq/seqlib.c Mon Nov 15 23:57:49 1999 +++ melys-0.1.4/seq/seqlib.c Wed Nov 24 00:21:39 1999 @@ -21,6 +21,7 @@ * * * + * */ @@ -30,6 +31,7 @@ #include #include #include +#include "elements.h" #include "seqlib.h" #include "seqpriv.h" #include "intl.h" @@ -598,7 +600,8 @@ ev.dest.port = SND_SEQ_PORT_SYSTEM_TIMER; /* timer */ ev.dest.channel = 0; /* don't care */ - ev.data.queue.addr.queue = ctxp->queue; + /* Will be: ev.data.queue.addr.queue = ctxp->queue; */ + ((snd_seq_addr_t *)&ev.data.control)->queue = ctxp->queue; ev.flags = SND_SEQ_TIME_STAMP_REAL | SND_SEQ_TIME_MODE_REL; ev.time.real.tv_sec = 0; @@ -640,6 +643,15 @@ if (ep->type == SND_SEQ_EVENT_TEMPO) return seq_control_write(ctxp, ep); +#if 0 + printf("ev %d chan %d time %d data %d:%d:%d:%d %d:%d:%d:%d\n", + ep->type, ep->dest.channel, + ep->time.tick, ep->data.raw8.d[0], ep->data.raw8.d[1], + ep->data.raw8.d[2], ep->data.raw8.d[3], + ep->data.raw8.d[4], ep->data.raw8.d[5], + ep->data.raw8.d[6], ep->data.raw8.d[7] + ); +#endif n = snd_seq_event_output(ctxp->handle, ep); return n; diff -rNu melys-0.1.3/seq/seqlib.m melys-0.1.4/seq/seqlib.m --- melys-0.1.3/seq/seqlib.m Thu Nov 11 23:54:43 1999 +++ melys-0.1.4/seq/seqlib.m Tue Nov 23 20:42:05 1999 @@ -23,6 +23,8 @@ >>header >>header +>>header elements.h + >>headerdef --decl seqlib.h #include @@ -638,7 +640,8 @@ ev.dest.port = SND_SEQ_PORT_SYSTEM_TIMER; /* timer */ ev.dest.channel = 0; /* don't care */ - ev.data.queue.addr.queue = ctxp->queue; + /* Will be: ev.data.queue.addr.queue = ctxp->queue; */ + ((snd_seq_addr_t *)&ev.data.control)->queue = ctxp->queue; ev.flags = SND_SEQ_TIME_STAMP_REAL | SND_SEQ_TIME_MODE_REL; ev.time.real.tv_sec = 0; @@ -680,6 +683,15 @@ if (ep->type == SND_SEQ_EVENT_TEMPO) return seq_control_write(ctxp, ep); +#if 0 + printf("ev %d chan %d time %d data %d:%d:%d:%d %d:%d:%d:%d\n", + ep->type, ep->dest.channel, + ep->time.tick, ep->data.raw8.d[0], ep->data.raw8.d[1], + ep->data.raw8.d[2], ep->data.raw8.d[3], + ep->data.raw8.d[4], ep->data.raw8.d[5], + ep->data.raw8.d[6], ep->data.raw8.d[7] + ); +#endif n = snd_seq_event_output(ctxp->handle, ep); return n; diff -rNu melys-0.1.3/seq/seqmidi.c melys-0.1.4/seq/seqmidi.c --- melys-0.1.3/seq/seqmidi.c Mon Nov 15 23:57:49 1999 +++ melys-0.1.4/seq/seqmidi.c Wed Nov 24 00:21:40 1999 @@ -21,6 +21,7 @@ #include "except.h" #include "util.h" #include +#include "elements.h" #include "seqlib.h" #include "seqpriv.h" #include "intl.h" @@ -40,12 +41,13 @@ * Arguments: * ctxp - Client application * ep - Event to init + * real - True if real (not tick) time * time - Midi time * devchan - Midi channel */ void -seq_midi_event_init(seq_context_t *ctxp, snd_seq_event_t *ep, - unsigned long time, int devchan) +seq_midi_event_init(seq_context_t *ctxp, snd_seq_event_t *ep, gboolean real, + union un_time time, int devchan) { int dev; int channel; @@ -65,8 +67,16 @@ } memset(ep, '\0', sizeof(*ep)); - ep->flags = SND_SEQ_TIME_STAMP_TICK | SND_SEQ_TIME_MODE_ABS; - ep->time.tick = time; + ep->flags = SND_SEQ_TIME_MODE_ABS; + + if (real) { + ep->flags |= SND_SEQ_TIME_STAMP_TICK; + ep->time.real.tv_sec = time.real.tv_sec; + ep->time.real.tv_nsec = time.real.tv_nsec; + } else { + ep->flags |= SND_SEQ_TIME_STAMP_TICK; + ep->time.tick = time.tick; + } ep->source = ctxp->source; if (addr) ep->dest = *addr; @@ -179,8 +189,13 @@ ep->type = SND_SEQ_EVENT_PGMCHANGE; +#if notyet /* Wait to 0.5.0 to be released */ ep->data.queue.addr.queue = ctxp->queue; ep->data.queue.value = program; +#else + ((snd_seq_addr_t *)&ep->data.control)->queue = ctxp->queue; + ep->data.control.value = program; +#endif } /* @@ -233,8 +248,13 @@ ep->type = SND_SEQ_EVENT_TEMPO; +#if notyet /* Wait to 0.5.0 to be released */ ep->data.queue.addr.queue = ctxp->queue; ep->data.queue.value = tempo; +#else + ((snd_seq_addr_t *)&ep->data.control)->queue = ctxp->queue; + ep->data.control.value = tempo; +#endif ep->dest.client = SND_SEQ_PORT_SYSTEM_TIMER; } @@ -302,9 +322,11 @@ seq_midi_send_echo(seq_context_t *ctxp, unsigned long time, int type) { snd_seq_event_t ev; + union un_time t; int n; - seq_midi_event_init(ctxp, &ev, time, 0); + t.tick = time; + seq_midi_event_init(ctxp, &ev, 0, t, 0); ev.type = SND_SEQ_EVENT_ECHO; /* Loop back */ diff -rNu melys-0.1.3/seq/seqmidi.m melys-0.1.4/seq/seqmidi.m --- melys-0.1.3/seq/seqmidi.m Tue Oct 5 21:28:48 1999 +++ melys-0.1.4/seq/seqmidi.m Tue Nov 23 20:42:05 1999 @@ -13,16 +13,20 @@ GNU General Public License for more details. >>header +>>header elements.h >>header seqlib.h >>header seqpriv.h >>headerdef --decl seqlib.h +struct programElement; + >>function seq_midi_event_init void seq_context_t *ctxp; Client application snd_seq_event_t *ep; Event to init -unsigned long time; Midi time +gboolean real; True if real (not tick) time +union un_time time; Midi time int devchan; Midi channel >>description @@ -52,8 +56,16 @@ } memset(ep, '\0', sizeof(*ep)); - ep->flags = SND_SEQ_TIME_STAMP_TICK | SND_SEQ_TIME_MODE_ABS; - ep->time.tick = time; + ep->flags = SND_SEQ_TIME_MODE_ABS; + + if (real) { + ep->flags |= SND_SEQ_TIME_STAMP_TICK; + ep->time.real.tv_sec = time.real.tv_sec; + ep->time.real.tv_nsec = time.real.tv_nsec; + } else { + ep->flags |= SND_SEQ_TIME_STAMP_TICK; + ep->time.tick = time.tick; + } ep->source = ctxp->source; if (addr) ep->dest = *addr; @@ -153,8 +165,13 @@ ep->type = SND_SEQ_EVENT_PGMCHANGE; +#if notyet /* Wait to 0.5.0 to be released */ ep->data.queue.addr.queue = ctxp->queue; ep->data.queue.value = program; +#else + ((snd_seq_addr_t *)&ep->data.control)->queue = ctxp->queue; + ep->data.control.value = program; +#endif >>function seq_midi_chanpress @@ -199,8 +216,13 @@ ep->type = SND_SEQ_EVENT_TEMPO; +#if notyet /* Wait to 0.5.0 to be released */ ep->data.queue.addr.queue = ctxp->queue; ep->data.queue.value = tempo; +#else + ((snd_seq_addr_t *)&ep->data.control)->queue = ctxp->queue; + ep->data.control.value = tempo; +#endif ep->dest.client = SND_SEQ_PORT_SYSTEM_TIMER; @@ -259,9 +281,11 @@ >>code snd_seq_event_t ev; + union un_time t; int n; - seq_midi_event_init(ctxp, &ev, time, 0); + t.tick = time; + seq_midi_event_init(ctxp, &ev, 0, t, 0); ev.type = SND_SEQ_EVENT_ECHO; /* Loop back */ @@ -270,3 +294,5 @@ n = seq_write(ctxp, &ev); n = snd_seq_flush_output(ctxp->handle); + + diff -rNu melys-0.1.3/seq/seqplay.c melys-0.1.4/seq/seqplay.c --- melys-0.1.3/seq/seqplay.c Mon Nov 15 23:57:49 1999 +++ melys-0.1.4/seq/seqplay.c Wed Nov 24 00:21:40 1999 @@ -18,19 +18,156 @@ #include "glib.h" #include "except.h" #include "util.h" -#include "seqlib.h" #include "elements.h" +#include "seqlib.h" #include "md.h" #include "melmidi.h" +#include "melfile.h" +#include "midi.h" #include "seqplay.h" #include "intl.h" /* Static functions */ -static snd_seq_real_time_t set_time(snd_seq_event_t *ep, - snd_seq_real_time_t time); +static void conv_event(struct seq_context *ctxp, struct element *el, + snd_seq_event_t *ep); +static void send_program(struct seq_context *ctxp, struct programElement *prg, + snd_seq_event_t *ep); +static union un_time set_time(snd_seq_event_t *ep, union un_time time); + + +/* + * The element is converted into an event and sent to the + * sequencer. + * + * Arguments: + * ctxp - Sequence state + * el - Element to send to sequencer + */ +int +seq_midi_send_element(struct seq_context *ctxp, struct element *el) +{ + snd_seq_event_t ev; + int status = 0; + + conv_event(ctxp, el, &ev); +//printf("ev %d, time %d fl %d\n", ev.type, ev.time.tick, ev.flags & SND_SEQ_TIME_STAMP_MASK); + if (ev.type != 0) + status = seq_write(ctxp, &ev); + + seq_event_data_free(&ev); + + return status; +} + +/* + * Convert an element to an event. Pass in the address of an + * event to be completed. + * + * Arguments: + * ctxp - Sequencer context + * el - Element to be converted + * ep - Event is written here + */ +static void +conv_event(struct seq_context *ctxp, struct element *el, snd_seq_event_t *ep) +{ + struct tempomapElement *tmap; + + seq_midi_event_init(ctxp, ep, el->realtime, el->time, el->device_channel); + + switch (el->type) { + case MD_TYPE_ROOT: + tmap = md_get_tempomap(MD_ROOT(el)); + seq_init_tempo(ctxp, tmap->timebase, 120, 1); + seq_timer_start(ctxp); + break; + case MD_TYPE_HEAD: + break; + case MD_TYPE_NOTE: + seq_midi_note(ctxp, ep, MD_NOTE(el)->note, MD_NOTE(el)->vel, + MD_NOTE(el)->length); + break; + case MD_TYPE_CONTROL: + seq_midi_control(ctxp, ep, MD_CONTROL(el)->control, + MD_CONTROL(el)->value); + break; + case MD_TYPE_PROGRAM: + send_program(ctxp, MD_PROGRAM(el), ep); + break; + case MD_TYPE_TEMPO: + seq_midi_tempo(ctxp, ep, MD_TEMPO(el)->micro_tempo); + break; + case MD_TYPE_PITCH: + seq_midi_pitchbend(ctxp, ep, MD_PITCH(el)->pitch); + break; + case MD_TYPE_PRESSURE: + seq_midi_chanpress(ctxp, ep, MD_PRESSURE(el)->velocity); + break; + case MD_TYPE_KEYTOUCH: + seq_midi_keypress(ctxp, ep, MD_KEYTOUCH(el)->note, + MD_KEYTOUCH(el)->velocity); + break; + case MD_TYPE_SYSEX: + seq_midi_sysex(ctxp, ep, MD_SYSEX(el)->status, MD_SYSEX(el)->data, + MD_SYSEX(el)->length); + break; + 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 */ + break; + default: + dprintf(0, "WARNING: play: not implemented yet %d\n", el->type); + break; + } + + ep->tag = el->tag; +} + +static void +send_program(struct seq_context *ctxp, struct programElement *prg, + snd_seq_event_t *ep) +{ + struct controlElement *ctl; + + ctl = md_control_new(0, 0); + MD_ELEMENT(ctl)->realtime = MD_ELEMENT(prg)->realtime; + MD_ELEMENT(ctl)->time = MD_ELEMENT(prg)->time; + + switch (prg->pchange_mode) { + case PCHANGE_NONE: + break; + case PCHANGE_NORMAL: + ctl->control = SND_MCTL_MSB_BANK; + ctl->value = (prg->program >> 14) & 0x7f; + seq_midi_send_element(ctxp, MD_ELEMENT(ctl)); + + ctl->control = SND_MCTL_LSB_BANK; + ctl->value = (prg->program >> 7) & 0x7f; + seq_midi_send_element(ctxp, MD_ELEMENT(ctl)); + break; + case PCHANGE_MSB: + ctl->control = SND_MCTL_MSB_BANK; + ctl->value = (prg->program >> 14) & 0x7f; + seq_midi_send_element(ctxp, MD_ELEMENT(ctl)); + break; + case PCHANGE_LSB: + ctl->control = SND_MCTL_LSB_BANK; + ctl->value = (prg->program >> 7) & 0x7f; + seq_midi_send_element(ctxp, MD_ELEMENT(ctl)); + break; + } + + seq_midi_program(ctxp, ep, prg->program); + seq_write(ctxp, ep); + + MD_FREE(ctl); +} /* * Send all events to setup the midi state for this root. This @@ -51,59 +188,65 @@ midi_play_prologue(struct seq_context *ctxp, struct rootElement *root) { struct trackElement *track; - snd_seq_real_time_t time = {0}; + union un_time time; snd_seq_event_t ev; int n; + time.real.tv_sec = 0; + time.real.tv_nsec = 0; + seq_timer_start(ctxp); + if (root->midi_mode != MIDI_MODE_NONE) { + struct sysexElement *sysex; + + sysex = get_std_sysex(root->midi_mode); + if (sysex) { + MD_ELEMENT(sysex)->realtime = TRUE; + MD_ELEMENT(sysex)->time = time; + seq_midi_send_element(ctxp, MD_ELEMENT(sysex)); + + MD_FREE(sysex); + } + } + + 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_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); seq_midi_control(ctxp, &ev, SND_MCTL_RESET_CONTROLLERS, 0); time = set_time(&ev, time); seq_write(ctxp, &ev); /* Set to initial volume */ - seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); + seq_midi_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); seq_midi_control(ctxp, &ev, SND_MCTL_MSB_MAIN_VOLUME, MD_VOL_TO_MIDI(track->volume)); time = set_time(&ev, time); seq_write(ctxp, &ev); /* Set initial pan position */ - seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); + seq_midi_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); seq_midi_control(ctxp, &ev, SND_MCTL_MSB_PAN, MD_PAN_TO_MIDI(track->pan)); 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); + send_program(ctxp, track->program, &ev); } - seq_midi_event_init(ctxp, &ev, 0, 0); + seq_midi_event_init(ctxp, &ev, TRUE, time, 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)); + do { + n = snd_seq_flush_output(seq_handle(ctxp)); + } while (n != 0); } /* @@ -113,22 +256,23 @@ * 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) +static union un_time +set_time(snd_seq_event_t *ep, union un_time 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_STAMP_MASK | SND_SEQ_TIME_MODE_MASK); ep->flags |= SND_SEQ_TIME_MODE_ABS; + ep->flags |= SND_SEQ_TIME_STAMP_REAL; - ep->time.real = time; + ep->time.real.tv_sec = time.real.tv_sec; + ep->time.real.tv_sec = time.real.tv_sec; - time.tv_nsec += 1000000; - while (time.tv_nsec > 1000000000) { - time.tv_nsec -= 1000000000; - time.tv_sec++; + time.real.tv_nsec += 1000000; + while (time.real.tv_nsec > 1000000000) { + time.real.tv_nsec -= 1000000000; + time.real.tv_sec++; } return time; diff -rNu melys-0.1.3/seq/seqplay.m melys-0.1.4/seq/seqplay.m --- melys-0.1.3/seq/seqplay.m Fri Oct 22 23:38:13 1999 +++ melys-0.1.4/seq/seqplay.m Tue Nov 23 20:42:05 1999 @@ -13,13 +13,148 @@ >>extern ->>header seqlib.h >>header elements.h +>>header seqlib.h >>header md.h >>header melmidi.h +>>header melfile.h +>>header midi.h >>headerdef --decl seqplay.h + +>>function seq_midi_send_element +int +struct seq_context *ctxp; Sequence state +struct element *el; Element to send to sequencer + +>>description +The element is converted into an event and sent to the sequencer. + +>>code + snd_seq_event_t ev; + int status = 0; + + conv_event(ctxp, el, &ev); + +//printf("ev %d, time %d fl %d\n", ev.type, ev.time.tick, ev.flags & SND_SEQ_TIME_STAMP_MASK); + if (ev.type != 0) + status = seq_write(ctxp, &ev); + + seq_event_data_free(&ev); + + return status; + + +>>function conv_event +static void +struct seq_context *ctxp; Sequencer context +struct element *el; Element to be converted +snd_seq_event_t *ep; Event is written here + +>>description +Convert an element to an event. +Pass in the address of an event to be completed. + +>>code + struct tempomapElement *tmap; + + seq_midi_event_init(ctxp, ep, el->realtime, el->time, el->device_channel); + + switch (el->type) { + case MD_TYPE_ROOT: + tmap = md_get_tempomap(MD_ROOT(el)); + seq_init_tempo(ctxp, tmap->timebase, 120, 1); + seq_timer_start(ctxp); + break; + case MD_TYPE_HEAD: + break; + case MD_TYPE_NOTE: + seq_midi_note(ctxp, ep, MD_NOTE(el)->note, MD_NOTE(el)->vel, + MD_NOTE(el)->length); + break; + case MD_TYPE_CONTROL: + seq_midi_control(ctxp, ep, MD_CONTROL(el)->control, + MD_CONTROL(el)->value); + break; + case MD_TYPE_PROGRAM: + send_program(ctxp, MD_PROGRAM(el), ep); + break; + case MD_TYPE_TEMPO: + seq_midi_tempo(ctxp, ep, MD_TEMPO(el)->micro_tempo); + break; + case MD_TYPE_PITCH: + seq_midi_pitchbend(ctxp, ep, MD_PITCH(el)->pitch); + break; + case MD_TYPE_PRESSURE: + seq_midi_chanpress(ctxp, ep, MD_PRESSURE(el)->velocity); + break; + case MD_TYPE_KEYTOUCH: + seq_midi_keypress(ctxp, ep, MD_KEYTOUCH(el)->note, + MD_KEYTOUCH(el)->velocity); + break; + case MD_TYPE_SYSEX: + seq_midi_sysex(ctxp, ep, MD_SYSEX(el)->status, MD_SYSEX(el)->data, + MD_SYSEX(el)->length); + break; + 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 */ + break; + default: + dprintf(0, "WARNING: play: not implemented yet %d\n", el->type); + break; + } + + ep->tag = el->tag; + + +>>function send_program +static void +struct seq_context *ctxp; Sequence state +struct programElement *prg; Element to send to sequencer +snd_seq_event_t *ep; Event is written here + +>>code + struct controlElement *ctl; + + ctl = md_control_new(0, 0); + MD_ELEMENT(ctl)->realtime = MD_ELEMENT(prg)->realtime; + MD_ELEMENT(ctl)->time = MD_ELEMENT(prg)->time; + + switch (prg->pchange_mode) { + case PCHANGE_NONE: + break; + case PCHANGE_NORMAL: + ctl->control = SND_MCTL_MSB_BANK; + ctl->value = (prg->program >> 14) & 0x7f; + seq_midi_send_element(ctxp, MD_ELEMENT(ctl)); + + ctl->control = SND_MCTL_LSB_BANK; + ctl->value = (prg->program >> 7) & 0x7f; + seq_midi_send_element(ctxp, MD_ELEMENT(ctl)); + break; + case PCHANGE_MSB: + ctl->control = SND_MCTL_MSB_BANK; + ctl->value = (prg->program >> 14) & 0x7f; + seq_midi_send_element(ctxp, MD_ELEMENT(ctl)); + break; + case PCHANGE_LSB: + ctl->control = SND_MCTL_LSB_BANK; + ctl->value = (prg->program >> 7) & 0x7f; + seq_midi_send_element(ctxp, MD_ELEMENT(ctl)); + break; + } + + seq_midi_program(ctxp, ep, prg->program); + seq_write(ctxp, ep); + + MD_FREE(ctl); + + >>function midi_play_prologue void struct seq_context *ctxp; @@ -43,65 +178,72 @@ >>code struct trackElement *track; - snd_seq_real_time_t time = {0}; + union un_time time; snd_seq_event_t ev; int n; + time.real.tv_sec = 0; + time.real.tv_nsec = 0; + seq_timer_start(ctxp); + if (root->midi_mode != MIDI_MODE_NONE) { + struct sysexElement *sysex; + + sysex = get_std_sysex(root->midi_mode); + if (sysex) { + MD_ELEMENT(sysex)->realtime = TRUE; + MD_ELEMENT(sysex)->time = time; + seq_midi_send_element(ctxp, MD_ELEMENT(sysex)); + + MD_FREE(sysex); + } + } + + 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_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); seq_midi_control(ctxp, &ev, SND_MCTL_RESET_CONTROLLERS, 0); time = set_time(&ev, time); seq_write(ctxp, &ev); /* Set to initial volume */ - seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); + seq_midi_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); seq_midi_control(ctxp, &ev, SND_MCTL_MSB_MAIN_VOLUME, MD_VOL_TO_MIDI(track->volume)); time = set_time(&ev, time); seq_write(ctxp, &ev); /* Set initial pan position */ - seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); + seq_midi_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); seq_midi_control(ctxp, &ev, SND_MCTL_MSB_PAN, MD_PAN_TO_MIDI(track->pan)); 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); + send_program(ctxp, track->program, &ev); } - seq_midi_event_init(ctxp, &ev, 0, 0); + seq_midi_event_init(ctxp, &ev, TRUE, time, 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)); + do { + n = snd_seq_flush_output(seq_handle(ctxp)); + } while (n != 0); + >>function set_time -static snd_seq_real_time_t +static union un_time snd_seq_event_t *ep; Event that was sent -snd_seq_real_time_t time; Current time +union un_time time; Current time >>description Return the new time, based on the event just sent. @@ -109,17 +251,18 @@ >>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_STAMP_MASK | SND_SEQ_TIME_MODE_MASK); ep->flags |= SND_SEQ_TIME_MODE_ABS; + ep->flags |= SND_SEQ_TIME_STAMP_REAL; - ep->time.real = time; + ep->time.real.tv_sec = time.real.tv_sec; + ep->time.real.tv_sec = time.real.tv_sec; - time.tv_nsec += 1000000; - while (time.tv_nsec > 1000000000) { - time.tv_nsec -= 1000000000; - time.tv_sec++; + time.real.tv_nsec += 1000000; + while (time.real.tv_nsec > 1000000000) { + time.real.tv_nsec -= 1000000000; + time.real.tv_sec++; } return time; diff -rNu melys-0.1.3/seq/seqpriv.h melys-0.1.4/seq/seqpriv.h --- melys-0.1.3/seq/seqpriv.h Mon Nov 15 23:57:35 1999 +++ melys-0.1.4/seq/seqpriv.h Wed Nov 24 00:21:25 1999 @@ -21,6 +21,7 @@ * * * + * */ struct seq_context { diff -rNu melys-0.1.3/version melys-0.1.4/version --- melys-0.1.3/version Mon Nov 15 23:50:01 1999 +++ melys-0.1.4/version Wed Nov 24 00:16:42 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.1.3" +#define MELYS_VERSION_STRING "0.1.4" diff -rNu melys-0.1.3/widgets/melystrackinfo.c melys-0.1.4/widgets/melystrackinfo.c --- melys-0.1.3/widgets/melystrackinfo.c Mon Nov 15 23:57:59 1999 +++ melys-0.1.4/widgets/melystrackinfo.c Wed Nov 24 00:21:49 1999 @@ -851,7 +851,7 @@ break; case PROGRAM: if (track) - g_snprintf(buf, TMP_BUF_SIZE, "%d", track->program & 0x7f); + g_snprintf(buf, TMP_BUF_SIZE, "%d", track->program->program & 0x7f); str = buf; break; case CHANNEL: @@ -1416,7 +1416,7 @@ case PROGRAM: track = md_track_nth(minfo->mdroot, ntrack); if (track) - g_snprintf(defbuf, TMP_BUF_SIZE, "%d", track->program & 0x7f); + g_snprintf(defbuf, TMP_BUF_SIZE, "%d", track->program->program & 0x7f); str = defbuf; break; default: diff -rNu melys-0.1.3/widgets/melystrackinfo.m melys-0.1.4/widgets/melystrackinfo.m --- melys-0.1.3/widgets/melystrackinfo.m Mon Nov 15 23:37:42 1999 +++ melys-0.1.4/widgets/melystrackinfo.m Tue Nov 23 20:42:05 1999 @@ -829,7 +829,7 @@ break; case PROGRAM: if (track) - g_snprintf(buf, TMP_BUF_SIZE, "%d", track->program & 0x7f); + g_snprintf(buf, TMP_BUF_SIZE, "%d", track->program->program & 0x7f); str = buf; break; case CHANNEL: @@ -1465,7 +1465,7 @@ case PROGRAM: track = md_track_nth(minfo->mdroot, ntrack); if (track) - g_snprintf(defbuf, TMP_BUF_SIZE, "%d", track->program & 0x7f); + g_snprintf(defbuf, TMP_BUF_SIZE, "%d", track->program->program & 0x7f); str = defbuf; break; default: