diff -rNu melys-0.1.16/ChangeLog melys-0.1.17/ChangeLog --- melys-0.1.16/ChangeLog Thu Jan 6 19:03:31 2000 +++ melys-0.1.17/ChangeLog Wed Feb 9 20:54:07 2000 @@ -1,4 +1,48 @@ +2000-02-09 Steve Ratcliffe + + * README: Updated for release 0.1.17. + * Makefile: Modified fordist to remove cfiles. + + * widgets/melysview.m: Removed printf + +2000-02-08 Steve Ratcliffe + + * widgets/melysview.m: Some preparation for future button click + changes. + + * widgets/melystempo.m: Cosmetic changes. + + * seq/seqlib.m, seq/seqmidi.m, seq/seqplay.m: + The ALSA api changed the name of a structure member. + Fixed, and added ifdef kludge that hopefully will work with + most revisions of ALSA. + +2000-01-11 Steve Ratcliffe + + * files/mdmlread.m: Ommit the gnome-xml directory from the include + directive as this is now on the command line in -I. + + * make.conf: Use the gnome-config command directly. + + * widgets/melysgrid.m: Fixed bug where grid wasn't resized + when re-scaled. General tidy up. + + * midi/play.m: Don't allow too many buffered events. This + is not a good idea as events cannot overtake others in the + userspace buffer. + +2000-01-07 Steve Ratcliffe + + * version: Version 0.1.16 + + * seq/seqlib.m, midi/record.m: More 0.4.1 fixes. + + * seq/seqlib.m: Added ifdefs around a SETPOS. (reported by Thomas Hood) + 2000-01-06 Steve Ratcliffe + + * version: Version 0.1.15 + * ChangeLog, INSTALL, README: Mods for release 0.0.15 * widgets/melysgrid.m: Make the grid extend beneath the existing tracks. diff -rNu melys-0.1.16/Makefile melys-0.1.17/Makefile --- melys-0.1.16/Makefile Sat Sep 25 21:53:48 1999 +++ melys-0.1.17/Makefile Wed Feb 9 20:47:12 2000 @@ -25,6 +25,7 @@ $(CFILE) cfiles: for i in $(DIRS); do (cd $$i; $(MAKE) cfiles) || exit 1; done + if [ ! -d CVS ]; then rm */*.m; fi build: for i in $(DIRS); do (cd $$i; $(MAKE) ) || exit 1; done diff -rNu melys-0.1.16/README melys-0.1.17/README --- melys-0.1.16/README Thu Jan 6 19:03:31 2000 +++ melys-0.1.17/README Wed Feb 9 20:41:57 2000 @@ -51,15 +51,14 @@ very badly with Melys, version 1.0.15 just about works but there are problems. - - libxml version 1.7 or above. + - libxml version 1.7 or above, if you get many compilation errors + in mdmlread.c this is the problem. - GTK+ 1.2 - - ALSA, preferably version 0.4.1 or the latest CVS version - - - Its not required but it will help if you want to do any - development to get mcode. http://www.parabola.demon.co.uk/mcode/ - This will deal with the files ending in .m + - ALSA, preferably version 0.5.2 or the latest CVS version. Should + still work with 0.4.1 (untested) but support for the earlier + versions will be dropped in a couple of months (April/May). Other utilities @@ -84,7 +83,8 @@ My attitude to bugs is that they are not allowed even in software under such heavy development as this is. So if you find any, then please mail -them to me at melys-bugs@parabola.demon.co.uk +them to me at melys-bugs@parabola.demon.co.uk or the development +mailing list. There should be no compile warnings, crashes or GTK messages. If compiled with debug, then after closing all windows the debug menu item should diff -rNu melys-0.1.16/config/ports.m melys-0.1.17/config/ports.m --- melys-0.1.16/config/ports.m Mon Nov 29 10:36:41 1999 +++ melys-0.1.17/config/ports.m Thu Jan 1 01:00:00 1970 @@ -1,69 +0,0 @@ ->>name ports.m - Port configuration - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header ->>header linux/asequencer.h ->>header elements.h ->>header seqlib.h ->>headerdef --decl config.h - ->>function conf_get_input_ports -int -snd_seq_addr_t **addrp; Address returned here - ->>description -Get the input ports that have been configured for use. - ->>code - char *portdesc; - int naddr; - - /* At present there is no configuration of course */ - portdesc = getenv("ALSA_INPUT_PORTS"); - if (portdesc == NULL) { - *addrp = NULL; - return 0; - } - - naddr = seq_get_ports_from_desc(portdesc, addrp); - - return naddr; - - ->>function conf_get_output_ports -int -snd_seq_addr_t **addrp; Address returned here - ->>description -Get the output ports that have been configured. - ->>code - char *portdesc; - int naddr; - - /* At present there is no configuration of course */ - portdesc = getenv("ALSA_OUTPUT_PORTS"); - if (portdesc == NULL) { - /* Old name, for compatability */ - portdesc = getenv("ALSA_OUT_PORT"); - if (portdesc == NULL) { - *addrp = NULL; - return 0; - } - } - - naddr = seq_get_ports_from_desc(portdesc, addrp); - - return naddr; - - diff -rNu melys-0.1.16/files/file.m melys-0.1.17/files/file.m --- melys-0.1.16/files/file.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.17/files/file.m Thu Jan 1 01:00:00 1970 @@ -1,527 +0,0 @@ ->>name file.m - The top level file reading abstraction - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -Manage reading and writing to the various file formats. -The initially supported formats will be MIDI and MDML. - ->>header ->>header md.h - ->>headerdef --decl melfile.h - -struct File; - -typedef void (*ConvFunc)(struct rootElement *); -typedef struct rootElement *(*fileReadFunc)(struct File *); -typedef void (*fileWriteFunc)(struct File *, struct rootElement *); - -struct File { - char *type; /* Midi, MDML etc */ - char *name; /* File name */ - - /* Private stuff */ - - int status; /* Result code of operation */ - char *msg; /* Message for a failed operation */ - - gboolean compressed; /* T/F if compressed format */ - - /* Callback for long lasting operations */ - void (*progress_cb)(struct File *, gpointer); - - /* Variables to calculate progress, always use file_get_progress */ - double max; /* Estimate of total work to be done */ - double done; /* Estimate of work done */ - - fileReadFunc read; /* Read function */ - fileWriteFunc write; /* Write function */ - - GList *convlist; /* Converters list */ -}; - - -/* - * Types of file. - */ -#define FILE_TYPE_MIDI "midi" -#define FILE_TYPE_MDML "mdml" -#define FILE_TYPE_MDML_COMPRESSED "gz-mdml" - -enum { - FILE_OPT_COMPRESSED = 0x001, - FILE_OPT_LAST -}; - -/* - * Variables that can appear in the status field. The message - * gives a more useful indication to the user. - */ -enum fileErrors { - FILE_STATUS_NONE,/* This just means that no status has been set yet */ - FILE_SUCCESS, /* Successful status */ - FILE_STATUS_CONFIRM, /* Do you really want to... kind of messages */ - FILE_STATUS_OPEN_FAIL, /* Could not open */ - FILE_STATUS_BAD_FORMAT, /* File had a format problem */ - FILE_STATUS_UNKNOWN, /* Could not recognise file type */ - FILE_STATUS_INTERNAL,/* Probably a Melys bug, rather than user error */ - FILE_STATUS_NO_ROOT, /* Missing the root element, partial file */ - FILE_STATUS_LAST -}; - ->>header mdrw.h ->>header midi.h - ->>extern - -static struct extension_table { - char *ext; /* Extension */ - char *type; /* Type */ -} extension_table[] = { - {".mid", FILE_TYPE_MIDI}, - {".smf", FILE_TYPE_MIDI}, - {".mdml", FILE_TYPE_MDML}, - {".mdml.gz", FILE_TYPE_MDML_COMPRESSED}, - /* Note that you don't need the .gz to read a compressed file */ -}; - -struct typefuncs { - char *type; /* Type of file */ - fileReadFunc read; /* Read function */ - fileWriteFunc write; /* Write function */ - int flags; /* Flags that apply to this type */ -}; -static struct typefuncs typefuncs[] = { - {FILE_TYPE_MIDI, midi_read_file, midi_write_file, 0}, - {FILE_TYPE_MDML, mdml_read_file, mdml_write_file, 0}, - {FILE_TYPE_MDML_COMPRESSED, mdml_read_file, mdml_write_file, - FILE_OPT_COMPRESSED}, -}; - -struct conv_func { - char *type; - ConvFunc convert; -}; - ->>function file_new -struct File * -char *name; File name - ->>code - struct File *file; - - file = g_new0(struct File, 1); - file->type = NULL; - file->name = name; - file->status = FILE_STATUS_NONE; - - file->msg = NULL; - file->progress_cb = NULL; - - file->max = 0.0; - file->done = 0.0; - - file->read = NULL; - file->write = NULL; - - return file; - - ->>function file_set_type -void -struct File *file; -char *type; File type FILE_TYPE_* ->>description -Set the file type. -This is useful for 'save-as' situations where the user -gives the file type, or for when the file doesn't have the -correct extension and can't be recognised automatically. -Also used internally when the type is recognised. ->>code - struct typefuncs *tp; - - g_return_if_fail(type != NULL); - - for (tp = typefuncs; tp < typefuncs+NELEM(typefuncs); tp++) { - if (strcmp(tp->type, type) == 0) { - file->type = type; - file->read = tp->read; - file->write = tp->write; - if (tp->flags & FILE_OPT_COMPRESSED) - file_set_compressed(file, TRUE); - else - file_set_compressed(file, FALSE); - - file->status = 0; - return; - } - } - - file->status = FILE_STATUS_UNKNOWN; - file->msg = _("The file type was not recognised"); - - ->>function file_set_compressed -void -struct File *file; -gboolean yesno; True to start using compressed format. - ->>description -Set the flag to start using the compressed version of a format -that supports compression. -Supported for MDML. -In general there is no need to set this flag -for read, as the correct format will be worked out. ->>code - - 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; ->>description -Returns the status of the last operation. ->>code - return file->status; - ->>function file_get_message -char * -struct File *file; ->>description -Returns the human readable message from the last -operation. ->>code - return file->msg; - ->>function file_get_progress -double -struct File *file; ->>description -Returns a number between 0 and 1 that is an indication of -the progress of a read or write. -The file should be completely processed when the return value -reaches 1.0. ->>code - double res; - - if (file->max == 0) - return 1.0; - - res = file->done / file->max; - if (res > 0.999) - return 1.0; - else if (res <= 0.0001) - return 0.0; - else - return res; - ->>function file_set_progress_callback -void -struct File *file; -void (*cb)(struct File *, gpointer); Callback function - ->>description -This function will be called from time to time during a long -read or write. -The called routine can use -.F file_get_progress -to see how things are going. ->>code - - file->progress_cb = cb; - - ->>function file_set_success -void -struct File *file; ->>description -Set a successful status if there has been no error. ->>code - - if (file->status == FILE_STATUS_NONE) { - file->status = FILE_SUCCESS; - file->msg = NULL; - } - - ->>function file_set_error -void -struct File *file; Users file handle -int code; The error code -char *fmt; A error message format printf-like -... - ->>description -If no error has been set before then set the error -status. -You can't set success with this routine. -It is printf like. - ->>code - va_list args; - char *msg; - - if (code == FILE_STATUS_NONE || code == FILE_SUCCESS) - return; - - if (fmt == NULL) - fmt = _("No information available, sorry"); - - /* - * We don't overwrite existing errors as the first one is - * usually the most relevent. - */ - switch (file->status) { - case FILE_STATUS_NONE: - case FILE_SUCCESS: /* An error overrides success */ - va_start(args, fmt); - msg = g_strdup_vprintf(fmt, args); - va_end(args); - - file->status = code; - if (file->msg) /* Shouldn't really happen.. */ - g_free(file->msg); - file->msg = msg; - break; - default: - break; - } - - ->>function file_close -void -struct File *file; ->>description -Bye Bye file. ->>#The underlying file is closed and all resources are released. ->>code - - g_return_if_fail(file != NULL); - - 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); - - ->># #### The read/write operations. - ->>function file_read -struct rootElement * -struct File *file; ->>description -File is read and converted into a MD tree, which -is returned. - ->>code - struct rootElement *root; - - file->status = FILE_STATUS_NONE; - - /* If there is no filename the return a new, empty MD */ - if (file->name == NULL || file->name == "") { - root = md_song_new(); - if (root) { - file->name = ""; - file_set_success(file); - } - return root; - } - - /* Try to determine the file type, if not already given */ - if (file->type == NULL) - guess_type(file); - - if (file->type == NULL) - return NULL; - - if (file->read == NULL) { - /* This should have been set along with type, so we - * do not expect it to be NULL at all */ - file_set_error(file, FILE_STATUS_INTERNAL, - _("Could not read file\n" - "This is probably a bug")); - return NULL; - } - - 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); - - return root; - - ->>function file_write -void -struct File *file; File to write -struct rootElement *root; Root to write out ->>description -The root is written to the specified file. - ->>code - - file->status = FILE_STATUS_NONE; - - /* Try to determine the file type, if not already given */ - if (file->type == NULL) - guess_type(file); - - if (file->type == NULL) - return; - - if (file->write == NULL) { - /* This should have been set along with type, so we - * do not expect it to be NULL at all */ - file_set_error(file, FILE_STATUS_INTERNAL, - _("Could not write file\n" - "This is probably a bug")); - return; - } - - file->write(file, root); - - /* Success is only set if there was no error */ - file_set_success(file); - - ->>function file_check_root -void -struct rootElement *root; - ->>description -After a file is read in of whatever kind, this routine is -run allows various checks to be made and defaults added. - ->>code - struct mapElement *map; - struct timesigElement *tsig; - struct keysigElement *ksig; - struct tempomapElement *tempomap; - int i; - - tempomap = md_get_tempomap(root); - if (!tempomap) - return; - - /* Default timebase in case it is not set */ - if (tempomap->timebase == 0) - tempomap->timebase = 192; - - /* - * First check is to ensure that there is a time signature at - * the very beginning. If not we add a default one. - */ - tsig = NULL; - for (i = 0; i < MD_CONTAINER_LEN(tempomap); i++) { - map = MD_MAP(MD_GET_INDEX(tempomap, i)); - if (MD_TYPE(map) == MD_TYPE_TIMESIG) { - if (MD_TIME(map) == 0) - tsig = MD_TIMESIG(map); /* We got one */ - - break; - } - } - if (tsig == NULL) { - tsig = md_timesig_new(4, 4, 24, 8); - MD_SET_TIME(tsig, 0); - md_add_sort(MD_CONTAINER(tempomap), MD_ELEMENT(tsig)); - } - - /* Key signature */ - ksig = NULL; - for (i = 0; i < MD_CONTAINER_LEN(tempomap); i++) { - map = MD_MAP(MD_GET_INDEX(tempomap, i)); - if (MD_TYPE(map) == MD_TYPE_KEYSIG) { - if (MD_TIME(map) == 0) - ksig = MD_KEYSIG(map); /* We got one */ - - break; - } - } - if (ksig == NULL) { - ksig = md_keysig_new(0, 0); - MD_SET_TIME(ksig, 0); - md_add_sort(MD_CONTAINER(tempomap), MD_ELEMENT(ksig)); - } - - - ->>function guess_type -static void -struct File *file; - ->>description -Take the filename and guess the type of the file. -First will look at the extension and then may use magic -numbers in the file to deduce the type. - ->>code - struct extension_table *ep; - int namelen; - - namelen = strlen(file->name); - for (ep = extension_table; ep < ENDOF(extension_table); ep++) { - int off; - - off = namelen - strlen(ep->ext); - if (off > 0) - if (strcmp(file->name+off, ep->ext) == 0) { - file_set_type(file, ep->type); - file->status = 0; - return; - } - } - - file->status = FILE_STATUS_UNKNOWN; - file->msg = _("The file type was not recognised"); - diff -rNu melys-0.1.16/files/mdmlread.c melys-0.1.17/files/mdmlread.c --- melys-0.1.16/files/mdmlread.c Fri Jan 7 11:13:47 2000 +++ melys-0.1.17/files/mdmlread.c Wed Feb 9 21:03:32 2000 @@ -26,9 +26,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "melfile.h" #include "midi.h" #include "md.h" diff -rNu melys-0.1.16/files/mdmlread.m melys-0.1.17/files/mdmlread.m --- melys-0.1.16/files/mdmlread.m Sun Dec 19 22:18:51 1999 +++ melys-0.1.17/files/mdmlread.m Thu Jan 1 01:00:00 1970 @@ -1,891 +0,0 @@ ->>name mdmlread.m Read in a mdml file - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -This is the new mdmlread using the SAX parser. -It is about twice as fast as the old one and uses very -much less memory. - ->>extern ->>header ->>header ->>header - ->>header ->>header ->>header - ->>header melfile.h ->>header midi.h ->>header md.h - -xmlSAXHandler SAXhandler; - -struct mdmlstate { - struct File *file; /* Users file handle */ - int currtime; /* Previous time */ - int starttime; /* Start time for this sub-part */ - int devchan; /* Current dev/channel */ - struct rootElement *root; /* Pointer to root of MD tree */ - struct headElement *head; /* Pointer to head element */ - GXStack *estack; /* Element stack */ - int level; /* Container level */ - char *errmsg; /* Error message */ - - int timebase; /* The division time base */ - int hasprogram:1; /* Has embeded program changes */ - int note_seen:1; /* Seen first note on track */ - int error:1; /* Set if an error occurred reading in file */ -}; - -struct levelstate { - struct element *elem; - char *text; - int textlen; -}; - ->>headerdef --decl mdrw.h - ->>function mdml_read_file -struct rootElement * -struct File *file; - ->>description -Read in an mdml file given the filename. -A pointer to a rootElement is returned. - ->>code - struct rootElement *root; - struct mdmlstate mstate; - - memset(&mstate, 0, sizeof(mstate)); - mstate.estack = gx_stack_new(sizeof(struct levelstate)); - mstate.file = file; - mstate.root = NULL; - mstate.errmsg = NULL; - - init_sax_handler(); - ourParseFile(&SAXhandler, file->name, &mstate); - /* - * This can be used when v > 1.7.2 is widely available - xmlSAXUserParseFile(&SAXhandler, &mstate, file->name); - */ - root = mstate.root; - gx_stack_free(mstate.estack); - - if (mstate.error) { - file_set_error(file, FILE_STATUS_BAD_FORMAT, mstate.errmsg); - if (root) - md_free(MD_ELEMENT(root)); - return NULL; - } else if (!root) { - /* No error, but there isn't a root */ - file_set_error(file, FILE_STATUS_NO_ROOT, - _("Incomplete or partial file")); - } - - if (root) { - file_set_success(file); - file_check_root(root); - } - - return root; - - ->>function tag_to_md -static struct element * -struct mdmlstate *msp; Mdml write state -const xmlChar *name; -const xmlChar **attrs; - ->>description -Take an XML document tree and convert it to an MD tree. -Will be converted to use the SAX interface when that is ready. - ->>code - struct element *retel = NULL; - char *str; - - /* - * Its slightly important to have the most likely - * matches appear at the top. - */ - if (strcmp(name, "note") == 0) { - struct noteElement *note; - int off; - - note = md_note_new(get_note(attrs, "n"), get_int(attrs, "v"), - get_int(attrs, "len")); - off = get_int(attrs, "off"); - if (off > 0) - note->offvel = off; - - msp->note_seen = 1; - - retel = MD_ELEMENT(note); - - } else if (strcmp(name, "control") == 0) { - retel = MD_ELEMENT(md_control_new(get_int(attrs, "n"), - get_int(attrs, "v"))); - - } else if (strcmp(name, "program") == 0) { - int number; - - number = get_int(attrs, "program"); - retel = MD_ELEMENT(md_program_new(number)); - msp->hasprogram = TRUE; - - } else if (strcmp(name, "pitch") == 0) { - retel = MD_ELEMENT(md_pitch_new(get_int(attrs, "p"))); - - } else if (strcmp(name, "keytouch") == 0) { - retel = MD_ELEMENT( - md_keytouch_new(get_int(attrs, "n"), get_int(attrs, "v"))); - - } else if (strcmp(name, "pressure") == 0) { - retel = MD_ELEMENT( md_pressure_new(get_int(attrs, "v"))); - - } else if (strcmp(name, "sysex") == 0) { - struct sysexElement *sep; - - sep = md_sysex_new(0, NULL, 0); - - retel = MD_ELEMENT(sep); - - } else if (strcmp(name, "mdml") == 0) { - struct rootElement *root; - root = md_root_new(); - msp->root = root; - retel = MD_ELEMENT(root); - - } else if (strcmp(name, "head") == 0) { - msp->head = md_head_new(); - msp->root->head = msp->head; - retel = MD_ELEMENT(msp->head); - - } else if (strcmp(name, "version") == 0) { - msp->head->ver_major = get_int(attrs, "major"); - msp->head->ver_minor = get_int(attrs, "minor"); - - } else if (strcmp(name, "format") == 0) { - msp->head->format = get_int(attrs, "type"); - -#ifndef MELYS_NO_COMPAT - /* This is the old way of doing it */ - } else if (strcmp(name, "timebase") == 0) { - msp->timebase = get_int(attrs, "division"); -#endif - - } else if (strcmp(name, "track") == 0) { - struct trackElement *tp; - char *str; - int res; - - msp->currtime = 0; - msp->starttime = 0; - msp->devchan = 0; - msp->hasprogram = 0; - msp->note_seen = 0; - - tp = md_track_new(); - tp->name = g_strdup(get_str(attrs, "name")); - - res = get_int(attrs, "program"); - if (res >= 0) - tp->program->program = res; - - res = get_int(attrs, "volume"); - if (res >= 0) - tp->volume = res; - - res = get_int(attrs, "pan"); - if (res != -1) - tp->pan = res; - - str = get_str(attrs, "mute"); - if (str && strcmp(str, "yes") == 0) - tp->mute = TRUE; - - str = get_str(attrs, "solo"); - if (str && strcmp(str, "yes") == 0) - tp->solo = TRUE; - - str = get_str(attrs, "solomute"); - if (str && strcmp(str, "yes") == 0) - tp->solomute = TRUE; - - str = get_str(attrs, "sololast"); - if (str && strcmp(str, "yes") == 0) - tp->sololast = TRUE; - - str = get_str(attrs, "record"); - if (str && strcmp(str, "yes") == 0) - tp->record = TRUE; - - retel = MD_ELEMENT(tp); - - } else if (strcmp(name, "tempomap") == 0) { - struct tempomapElement *tmap; - int timebase; - - tmap = md_tempomap_new(); - timebase = get_int(attrs, "ppq"); - if (timebase > 0) - tmap->timebase = timebase; - else - tmap->timebase = msp->timebase; /* Old compat */ - - retel = MD_ELEMENT(tmap); - - } else if (strcmp(name, "part") == 0) { - struct partElement *pp; - int id; - pp = md_part_new(); - pp->name = g_strdup(get_str(attrs, "name")); - id = get_int(attrs, "id"); - if (id > 0) - pp->id = id; - retel = MD_ELEMENT(pp); - - } else if (strcmp(name, "partref") == 0) { - struct partrefElement *pp; - int id; - pp = md_partref_new(); - MD_PART(pp)->name = g_strdup(get_str(attrs, "name")); - id = get_int(attrs, "ref"); - /* XXX more to do here */ - retel = MD_ELEMENT(pp); - - } else if (strcmp(name, "take") == 0) { - struct takeElement *tp; - - tp = md_take_new(); - tp->name = g_strdup(get_str(attrs, "name")); - retel = MD_ELEMENT(tp); - - } else if (strcmp(name, "tempo") == 0) { - struct tempoElement *tp; - int us; - double bpm; - bpm = get_double(attrs, "bpm"); - if (bpm) { - us = 60000000/bpm; - tp = md_tempo_new(us); - retel = MD_ELEMENT(tp); - } - - } else if (strcmp(name, "timesignature") == 0) { - struct timesigElement *tsp; - int top, bottom; - int clocks, n32pq; - CHAR *prop; - - prop = get_str(attrs, "signature"); - sscanf(prop, "%d/%d", &top, &bottom); - clocks = get_int(attrs, "clocks"); - n32pq = get_int(attrs, "n32PerQuarter"); - - tsp = md_timesig_new(top, bottom, clocks, n32pq); - retel = MD_ELEMENT(tsp); - - } else if (strcmp(name, "keysignature") == 0) { - struct keysigElement *ksp; - CHAR *key; - CHAR *mode; - int m; - - key = get_str(attrs, "key"); - mode = get_str(attrs, "mode"); - if (mode && strcmp(mode, "minor") == 0) - m = 1; - else - m = 0; - - ksp = md_keysig_new(atoi(key), m); - retel = MD_ELEMENT(ksp); - - } else if (strcmp(name, "smpte") == 0) { - CHAR *off; - struct smpteoffsetElement *sp; - int hours, minutes, seconds, frames, subframes; - - off = get_str(attrs, "offset"); - if (off == NULL) - off = "0:0:0:0:0"; - - sscanf(off, "%d:%d:%d:%d:%d", &hours, &minutes, &seconds, &frames, - &subframes); - - sp = md_smpteoffset_new(hours, minutes, seconds, frames, subframes); - retel = MD_ELEMENT(sp); - - } else if (strcmp(name, "text") == 0) { - retel = MD_ELEMENT(md_text_new(MIDI_META_TEXT, NULL)); - - } else if (strcmp(name, "copyright") == 0) { - retel = MD_ELEMENT(md_text_new(MIDI_META_COPYRIGHT, NULL)); - - } else if (strcmp(name, "trackname") == 0) { - retel = MD_ELEMENT(md_text_new(MIDI_META_TRACKNAME, NULL)); - - } else if (strcmp(name, "instrument") == 0) { - retel = MD_ELEMENT(md_text_new(MIDI_META_INSTRUMENT, NULL)); - - } else if (strcmp(name, "lyric") == 0) { - retel = MD_ELEMENT(md_text_new(MIDI_META_LYRIC, NULL)); - - } else if (strcmp(name, "marker") == 0) { - retel = MD_ELEMENT(md_text_new(MIDI_META_MARKER, NULL)); - - } 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; - - } else if (strcmp(name, "title") == 0) { - retel = NULL; - - } else if (strcmp(name, "author") == 0) { - retel = NULL; - - } else if (strcmp(name, "comment") == 0) { - retel = NULL; - - } else { - printf("Unknown node name %s\n", name); - return NULL; - } - - /* Set common attributes like time */ - common_atts(msp, attrs, retel); - - if (retel) { - retel->element_time = msp->currtime; - retel->device_channel = msp->devchan; - } - - return retel; - - ->>function common_atts -static void -struct mdmlstate *msp; -const xmlChar **attrs; Node to examine for attributes -struct element *el; Element to set attributes - ->>description -Extract common attributes from the node. -These are things like time and channel that can apply -to almost any element. - ->>code - int i; - int ival; - - if (attrs == NULL || el == NULL) - return; - - for (i = 0; attrs[i] != NULL; i += 2) { - if (strcmp(attrs[i], "t") == 0) { - ival = atoi(attrs[i+1]); - msp->currtime = msp->starttime + ival; - } else if (strcmp(attrs[i], "channel") == 0) { - msp->devchan = atoi(attrs[i+1]); -#if 1 - } else if (iscontainer(el) && strcmp(attrs[i], "duration") == 0) { - MD_CONTAINER(el)->duration = atoi(attrs[i+1]); -#endif - } else if (strcmp(attrs[i], "selected") == 0) { - if (strcmp(attrs[i+1], "yes") == 0) - MD_SET_SELECTED(el, TRUE); - } - } - - - ->>function get_str -static xmlChar * -const xmlChar **attrs; -const xmlChar *name; Name of attribute to find - ->>code - int i; - - if (!attrs) - return NULL; - - for (i = 0; attrs[i] != NULL; i += 2) { - if (strcmp(attrs[i], name) == 0) - return (xmlChar *)attrs[i+1]; - } - - return NULL; - - ->>function get_int -static int -const xmlChar **attrs; Node to be examined -const xmlChar *name; Name of attribute - ->>description -Return an attribute, converted to an integer. -If the attribute does not exist then -1 is returned. - ->>code - CHAR *cp; - int n; - - cp = get_str(attrs, name); - if (cp == NULL) - return -1; - - n = atoi(cp); - - return n; - ->>function get_double -static double -const xmlChar **attrs; Node to get property from -const xmlChar *name; Name of property to get ->>description -Get a property from a node and convert it to a double value. - ->>code - xmlChar *cp; - double d; - - cp = get_str(attrs, name); - if (cp == NULL) - return 0.0; - - d = strtod(cp, NULL); - - return d; - - ->>function get_note -static int -const xmlChar **attrs; Node for this note -const xmlChar *name; Name of property to get ->>description -Get the note value from the specified note name. - ->>code - xmlChar *note; - int base; - int oct; - xmlChar *cp; - int n; - - note = get_str(attrs, name); - if (note == NULL) - return 0; - - switch (note[0]) { - case 'A': case 'a': - base = 9; - break; - case 'B': case 'b': - base = 11; - break; - case 'C': case 'c': - base = 0; - break; - case 'D': case 'd': - base = 2; - break; - case 'E': case 'e': - base = 4; - break; - case 'F': case 'f': - base = 5; - break; - case 'G': case 'g': - base = 7; - break; - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - /* This is not really a name at all */ - n = atoi(note); - return n; - default: - base = 0; - break; - } - - cp = note; - cp++; - if (*cp == '#') { - base++; - cp++; - } - oct = atoi(cp); - - return base + oct*12; - - ->>function get_hex_data -static unsigned char * -char *hexchars; Input ascii hex characters -int *lenp; Length of returned array - ->>description -Parse the text representation of the sysex and return a newly -allocated buffer containing the data. - ->>code - GByteArray *ba; - guint8 uc; - unsigned char *val; - char *cp; - - ba = g_byte_array_new(); - - for (cp = strtok(hexchars, " \t,"); cp; cp = strtok(NULL, " \t,")) { - uc = (guint8)strtol(cp, NULL, 16); - g_byte_array_append(ba, &uc, 1); - } - val = ba->data; - *lenp = ba->len; - g_byte_array_free(ba, 0); - - return val; - - ->># --- SAX handler functions - ->>function init_sax_handler -static void - ->>description -Initialise the SAX handler callback set. -This only needs to be done once. - ->>code - static xmlSAXHandler zerosax; - - SAXhandler = zerosax; - - SAXhandler.startDocument = startDocument; - SAXhandler.endDocument = endDocument; - - SAXhandler.startElement = startElement; - SAXhandler.endElement = endElement; - - SAXhandler.getEntity = getEntity; - SAXhandler.warning = sax_warning; - SAXhandler.error = sax_error; - SAXhandler.fatalError = fatalError; - SAXhandler.characters = characters; - ->>function startDocument -static void -void *data; - ->>function endDocument -static void -void *data; - - ->>function startElement -static void -void *data; -const xmlChar *name; -const xmlChar **attrs; - ->>code - struct element *el; - struct levelstate state; - struct mdmlstate *msp = data; - - el = tag_to_md(msp, name, attrs); - - state.elem = el; - state.text = NULL; - state.textlen = 0; - gx_stack_push(msp->estack, (gpointer) &state); - if (el && iscontainer(el)) - msp->starttime = msp->currtime; - - ->>function endElement -static void -void *data; -const xmlChar *name; - ->>code - struct levelstate *ls; - struct mdmlstate *msp = data; - struct element *el; - struct textElement *te; - - ls = gx_stack_top(msp->estack); - - el = ls->elem; - te = NULL; - if (el) { - if (MD_TYPE(el) == MD_TYPE_TRACK) - MD_TRACK(el)->hasprogram = msp->hasprogram; - else if (MD_TYPE(el) == MD_TYPE_TEXT) - te = MD_TEXT(el); - - if (iscontainer(el)) - msp->currtime = MD_ENDTIME(el); - } - - if (ls->text) { - if (strcmp(name, "sysex") == 0) { - unsigned char *data; - struct sysexElement *se; - int len; - - data = get_hex_data(ls->text, &len); - if (data && len > 0) { - se = MD_SYSEX(ls->elem); - se->status = data[0]; - se->data = g_memdup(data+1, len-1); - se->length = len - 1; - g_free(data); - } - g_free(ls->text); - - } else if (strcmp(name, "COPYRIGHT") == 0) { - msp->head->copyright = ls->text; - - } else if (strcmp(name, "title") == 0) { - msp->head->title = ls->text; - - } else if (strcmp(name, "author") == 0) { - msp->head->author = ls->text; - - } else if (strcmp(name, "comment") == 0) { - msp->head->comment = ls->text; - - } else if (strcmp(name, "text") == 0) { - te->type = MIDI_META_TEXT; - te->name = md_textname(MIDI_META_TEXT); - te->text = ls->text; - te->length = ls->textlen; - - } else if (strcmp(name, "copyright") == 0) { - te->type = MIDI_META_COPYRIGHT; - te->name = md_textname(MIDI_META_COPYRIGHT); - te->text = ls->text; - te->length = ls->textlen; - - } else if (strcmp(name, "trackname") == 0) { - te->type = MIDI_META_TRACKNAME; - te->name = md_textname(MIDI_META_TRACKNAME); - te->text = ls->text; - te->length = ls->textlen; - - } else if (strcmp(name, "instrument") == 0) { - te->type = MIDI_META_INSTRUMENT; - te->name = md_textname(MIDI_META_INSTRUMENT); - te->text = ls->text; - te->length = ls->textlen; - - } else if (strcmp(name, "lyric") == 0) { - te->type = MIDI_META_LYRIC; - te->name = md_textname(MIDI_META_LYRIC); - te->text = ls->text; - te->length = ls->textlen; - - } else if (strcmp(name, "marker") == 0) { - te->type = MIDI_META_MARKER; - te->name = md_textname(MIDI_META_MARKER); - te->text = ls->text; - te->length = ls->textlen; - - } else if (strcmp(name, "cuepoint") == 0) { - te->type = MIDI_META_CUE; - te->name = md_textname(MIDI_META_CUE); - te->text = ls->text; - te->length = ls->textlen; - - - } else { - g_free(ls->text); - } - } - - if (el && iscontainer(el)) - msp->currtime = MD_ENDTIME(el); - gx_stack_pop(msp->estack, NULL); - ls = gx_stack_top(msp->estack); - if (ls && ls->elem && el) { - md_add(MD_CONTAINER(ls->elem), el); - msp->starttime = MD_TIME(ls->elem); - } - - ->>function getEntity -static xmlEntityPtr -void *data; -const CHAR *name; ->>code - return xmlGetPredefinedEntity(name); - - ->>function characters -static void -void *data; -const xmlChar *ch; -int len; - ->>code - struct levelstate *ls; - struct mdmlstate *msp = data; - struct element *el; - char *str; - int type; - - ls = gx_stack_top(msp->estack); - el = ls->elem; - if (el) - type = MD_TYPE(el); - else - type = -1; - - switch (type) { - case MD_TYPE_NOTE: - case MD_TYPE_CONTROL: - /* if we know that there is no content then don't save */ - ls->text = NULL; - ls->textlen = 0; - break; - default: - str = ls->text; - if (str == NULL) { - ls->text = g_memdup(ch, len+1); - ls->text[len] = '\0'; - ls->textlen = len; - } else { - int nlen = len + ls->textlen; - ls->text = g_realloc(ls->text, nlen+1); - memcpy(ls->text+ls->textlen, ch, len); - ls->textlen = nlen; - ls->text[nlen] = '\0'; - } - break; - } - ->>function ourParseFile -static int -xmlSAXHandlerPtr sax; -const char *filename; -void *data; - ->>description -A replacement for xmlSAXParseFile that allows us -to hand in a user data pointer. -Taken from James Henstridge's document. ->>code - struct mdmlstate *msp = data; - xmlParserCtxtPtr ctxt; - int ret; - - ctxt = xmlCreateFileParserCtxt(filename); - if (ctxt == NULL) { - msp->error = 1; - - file_set_error(msp->file, FILE_STATUS_OPEN_FAIL, - _("Could not open file"), filename); - return -1; - } - - ctxt->sax = sax; - ctxt->userData = data; - - ret = xmlParseDocument(ctxt); - if (sax != NULL) - ctxt->sax = NULL; - xmlFreeParserCtxt(ctxt); - - return ret; - - ->>function sax_warning -static void -void *data; -const char *msg; -... - ->>code - va_list args; - char *str; - struct mdmlstate *msp = data; - - msp->error = 1; - - va_start(args, msg); - str = g_strdup_vprintf(msg, args); - va_end(args); - - if (!msp->errmsg) - msp->errmsg = str; - ->>function sax_error -static void -void *data; -const char *msg; -... - ->>code - va_list args; - char *str; - struct mdmlstate *msp = data; - - msp->error = 1; - - va_start(args, msg); - str = g_strdup_vprintf(msg, args); - va_end(args); - - if (!msp->errmsg) - msp->errmsg = str; - ->>function fatalError -static void -void *data; -const char *msg; -... - ->>code - va_list args; - char *str; - struct mdmlstate *msp = data; - - msp->error = 1; - - va_start(args, msg); - str = g_strdup_vprintf(msg, args); - va_end(args); - - if (!msp->errmsg) - msp->errmsg = str; - diff -rNu melys-0.1.16/files/mdmlwrite.m melys-0.1.17/files/mdmlwrite.m --- melys-0.1.16/files/mdmlwrite.m Tue Dec 14 16:49:02 1999 +++ melys-0.1.17/files/mdmlwrite.m Thu Jan 1 01:00:00 1970 @@ -1,392 +0,0 @@ ->>name mdmlwrite.m - -File: mdmlwrite.m - Write out the current song in mdml format. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. ->>extern - -struct mdmlstate { - ticktime_t lasttime; /* Last event time */ - int devchan; /* Current device channel */ - ticktime_t starttime; /* Use to do relative times */ -}; - ->>header ->>header melfile.h ->>header md.h - ->>headerdef --decl mdrw.h - ->>function mdml_write_file -void - struct File *file; File name to write to - struct rootElement *root; Tree to write - ->>description -Writes the MDML representation of the MD tree to the -specified file -.A name . ->>code - FILE *fp; - - fp = fopen(file->name, "w"); - if (fp == NULL) { - file_set_error(file, FILE_STATUS_OPEN_FAIL, _("Could not open file")); - return; - } - - mdml_write(file, fp, root); - - fclose(fp); - - ->>function mdml_write -static void - struct File *file; Users file handle - FILE *fp; // File stream to write to - struct rootElement *root; // Tree to write - ->>description -Writes the MDML representation of the specified MD tree to -the specified file stream. ->>header gnome-xml/tree.h ->>code - xmlDocPtr doc; - xmlNodePtr node; - xmlNodePtr head; - xmlNodePtr xtrack; - struct mdmlstate mstate; - struct element *el; - struct containerElement *c; - char *str; - int i; - - g_return_if_fail(root != NULL); - - mstate.lasttime = 0; - mstate.devchan = 0; - - doc = xmlNewDoc("1.0"); - node = xmlNewDocNode(doc, 0, "mdml", 0); - doc->root = node; - - /* Now build all the top level elements */ - c = MD_CONTAINER(root); - for (i = 0; i < MD_CONTAINER_LEN(c); i++) { - el = g_ptr_array_index(c->elements, i); - - switch (el->type) { - case MD_TYPE_HEAD: - { - struct headElement *headel; -#ifdef NO_COMPAT - struct tempomapElement *tempomap; -#endif - - headel = MD_HEAD(el); - - /* Build the element */ - head = xmlNewChild(node, 0, "head", 0); - if (headel->copyright) - node = xmlNewChild(head, 0, "COPYRIGHT", headel->copyright); - - node = xmlNewChild(head, 0, "version", 0); - set_prop_int(node, "major", MDML_VERSION_MAJOR); - set_prop_int(node, "minor", MDML_VERSION_MINOR); - - node = xmlNewChild(head, 0, "format", 0); - set_prop_int(node, "type", headel->format); -#ifdef NO_COMPAT - node = xmlNewChild(head, 0, "timebase", 0); - tempomap = md_get_tempomap(root); - set_prop_int(node, "division", tempomap->timebase); -#endif - - if (headel->title) - node = xmlNewChild(head, 0, "title", headel->title); - if (headel->author) - node = xmlNewChild(head, 0, "author", headel->author); - 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; - - case MD_TYPE_TRACK: - mstate.lasttime = 0; - 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->program); - if (MD_TRACK(el)->mute) - xmlSetProp(xtrack, "mute", "yes"); - if (MD_TRACK(el)->solo) - xmlSetProp(xtrack, "solo", "yes"); - if (MD_TRACK(el)->solomute) - xmlSetProp(xtrack, "solomute", "yes"); - if (MD_TRACK(el)->sololast) - xmlSetProp(xtrack, "sololast", "yes"); - if (MD_TRACK(el)->record) - xmlSetProp(xtrack, "record", "yes"); - if (MD_TRACK(el)->name) - xmlSetProp(xtrack, "name", MD_TRACK(el)->name); - if (MD_TRACK(el)->volume != 127) - set_prop_int(xtrack, "volume", MD_TRACK(el)->volume); - if (MD_TRACK(el)->pan != 64) - set_prop_int(xtrack, "pan", MD_TRACK(el)->pan); - mstate.starttime = 0; - set_common_atts(&mstate, xtrack, el); - build_section(&mstate, xtrack, MD_CONTAINER(el)); - break; - case MD_TYPE_TEMPOMAP: - xtrack = xmlNewChild(doc->root, 0, "tempomap", 0); - set_prop_int(xtrack, "ppq", MD_TEMPOMAP(el)->timebase); - mstate.starttime = 0; - build_section(&mstate, xtrack, MD_CONTAINER(el)); - break; - default: - g_warning("Unknown element type (%d) in @func_name", - el->type); - break; - } - } - -/* #define XML_MEM_LEAK_BUG */ -#ifdef XML_MEM_LEAK_BUG - { - CHAR *mem; - int size; - - xmlDocDumpMemory(doc, &mem, &size); - fwrite(mem, size, 1, fp); - g_free(mem); - } -#else - /* There is a bad memory leak with this, re-instate when fixed - * in gnome - */ - xmlDocDump(fp, doc); -#endif - xmlFreeDoc(doc); - ->>function build_section -static void -struct mdmlstate *msp; // Current state -xmlNodePtr base; // Base of xml tree -struct containerElement *c; // md tree for a track - ->>description -Deal with one track from a MD tree. -The xml tree is built under the given -.A base . - ->>code - int i; - int elind; - xmlNodePtr node; - struct element *el; - ticktime_t ostart; - - ostart = msp->starttime; - msp->starttime = MD_ELEMENT(c)->element_time; - - for (elind = 0; elind < MD_CONTAINER_LEN(c); elind++) { - el = g_ptr_array_index(c->elements, elind); - - node = NULL; - switch (el->type) { - case MD_TYPE_NOTE: - node = xmlNewChild(base, 0, "note", 0); - set_prop_and_free(node, "n", note_name(MD_NOTE(el)->note)); - set_prop_int(node, "v", MD_NOTE(el)->vel); - set_prop_int(node, "len", MD_NOTE(el)->length); - if (MD_NOTE(el)->offvel > 0) - set_prop_int(node, "off", MD_NOTE(el)->offvel); - break; - case MD_TYPE_CONTROL: - node = xmlNewChild(base, 0, "control", 0); - set_prop_int(node, "n", MD_CONTROL(el)->control); - set_prop_int(node, "v", MD_CONTROL(el)->value); - break; - case MD_TYPE_PROGRAM: - node = xmlNewChild(base, 0, "program", 0); - set_prop_int(node, "program", MD_PROGRAM(el)->program); - break; - case MD_TYPE_PITCH: - node = xmlNewChild(base, 0, "pitch", 0); - set_prop_int(node, "p", MD_PITCH(el)->pitch); - break; - case MD_TYPE_KEYTOUCH: - node = xmlNewChild(base, 0, "keytouch", 0); - set_prop_int(node, "n", MD_KEYTOUCH(el)->note); - set_prop_int(node, "v", MD_KEYTOUCH(el)->velocity); - break; - case MD_TYPE_PRESSURE: - node = xmlNewChild(base, 0, "pressure", 0); - set_prop_int(node, "v", MD_PRESSURE(el)->velocity); - break; - case MD_TYPE_TEXT: - node = xmlNewChild(base, 0, MD_TEXT(el)->name, MD_TEXT(el)->text); - break; - case MD_TYPE_SMPTEOFFSET: - node = xmlNewChild(base, 0, "smpte", 0); - set_prop_and_free(node, "offset", - g_strdup_printf("%d:%d:%d:%d:%d", - MD_SMPTEOFFSET(el)->hours, - MD_SMPTEOFFSET(el)->minutes, - MD_SMPTEOFFSET(el)->seconds, - MD_SMPTEOFFSET(el)->frames, - MD_SMPTEOFFSET(el)->subframes - )); - break; - case MD_TYPE_TEMPO: - { - double bpm; - - node = xmlNewChild(base, 0, "tempo", 0); - bpm = (double)60000000 / MD_TEMPO(el)->micro_tempo; - set_prop_and_free(node, "bpm", g_strdup_printf("%.1f", bpm)); - } - break; - case MD_TYPE_TIMESIG: - node = xmlNewChild(base, 0, "timesignature", 0); - set_prop_and_free(node, "signature", - g_strdup_printf("%d/%d", - MD_TIMESIG(el)->top, MD_TIMESIG(el)->bottom)); - set_prop_int(node, "clocks", MD_TIMESIG(el)->clocks); - set_prop_int(node, "n32PerQuarter", MD_TIMESIG(el)->n32pq); - break; - case MD_TYPE_KEYSIG: - node = xmlNewChild(base, 0, "keysignature", 0); - set_prop_int(node, "key", MD_KEYSIG(el)->key); - xmlSetProp(node, "mode", MD_KEYSIG(el)->minor? "minor": "major"); - break; - case MD_TYPE_SYSEX: - { - struct sysexElement *se = MD_SYSEX(el); - GString *s = g_string_new(""); - gchar *status = g_strdup_printf("%02x", se->status); - gchar *stmp; - - g_string_append(s, status); - g_free(status); - for (i = 0; i < se->length; i++) { - stmp = g_strdup_printf(" %02x", se->data[i]); - g_string_append(s, stmp); - g_free(stmp); - } - node = xmlNewChild(base, 0, "sysex", s->str); - g_string_free(s, 1); - } - break; - case MD_TYPE_PART: - node = xmlNewChild(base, 0, "part", 0); - set_prop_int(node, "duration", MD_CONTAINER(el)->duration); - if (MD_PART(el)->id > 0) - set_prop_int(node, "id", MD_PART(el)->id); - if (MD_PART(el)->name) - xmlSetProp(node, "name", MD_PART(el)->name); - build_section(msp, node, MD_CONTAINER(el)); - break; - case MD_TYPE_TAKE: - node = xmlNewChild(base, 0, "take", 0); - set_prop_int(node, "duration", MD_CONTAINER(el)->duration); - if (MD_TAKE(el)->name) - xmlSetProp(node, "name", MD_PART(el)->name); - build_section(msp, node, MD_CONTAINER(el)); - break; - default: - printf("Unimplemented %d element in @func_name\n", el->type); - break; - } - - if (node) - set_common_atts(msp, node, el); - } - - msp->starttime = ostart; - ->>function set_common_atts -static void -struct mdmlstate *msp; Current state including current time and channel -xmlNodePtr node; The xml node to set the attribute on -struct element *el; the md element with time and channel info. - ->>description -Fills in the time and channel attributes. -These attributes do not appear it they are the same as the previous -values. -This applies completely across the file, including track changes etc. - ->>code - ticktime_t t; - - t = el->element_time - msp->starttime; - //if (t != msp->lasttime) { - set_prop_int(node, "t", t); - msp->lasttime = t; - //} - if (el->device_channel != msp->devchan) { - set_prop_int(node, "channel", el->device_channel); - msp->devchan = el->device_channel; - } - - if (MD_SELECTED(el)) - xmlSetProp(node, "selected", "yes"); - - ->>function set_prop_int -static void -xmlNodePtr node; // the xml node -char *name; // Name of property -int n; // value of property ->>description -Set a property from an integer value. ->>code - gchar *cp; - - cp = g_strdup_printf("%d", n); - xmlSetProp(node, name, cp); - g_free(cp); - ->>function set_prop_and_free -static void -xmlNodePtr node; // the xml node -char *name; // Name of property -char *cp; // value of property and will be freed ->>description -Set a property from a string and free the string. ->>code - - xmlSetProp(node, name, cp); - g_free(cp); - - diff -rNu melys-0.1.16/files/midiread.m melys-0.1.17/files/midiread.m --- melys-0.1.16/files/midiread.m Sat Nov 27 11:43:22 1999 +++ melys-0.1.17/files/midiread.m Thu Jan 1 01:00:00 1970 @@ -1,726 +0,0 @@ ->>name midiread.m - -File: midiread.m - Read in a midi file. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>extern - ->>header ->>header ->>header md.h ->>header melfile.h - ->>headerdef --decl midi.h -/* - * Midi status byte values. - */ -#define MIDI_NOTE_OFF 0x80 -#define MIDI_NOTE_ON 0x90 -#define MIDI_KEY_AFTERTOUCH 0xa0 -#define MIDI_CONTROLLER 0xb0 -#define MIDI_PATCH 0xc0 -#define MIDI_CHANNEL_AFTERTOUCH 0xd0 -#define MIDI_PITCH_WHEEL 0xe0 -#define MIDI_SYSEX 0xf0 -#define MIDI_META 0xff - -/* Meta event defines */ -#define MIDI_META_SEQUENCE 0 -/* The text type meta events */ -#define MIDI_META_TEXT 1 -#define MIDI_META_COPYRIGHT 2 -#define MIDI_META_TRACKNAME 3 -#define MIDI_META_INSTRUMENT 4 -#define MIDI_META_LYRIC 5 -#define MIDI_META_MARKER 6 -#define MIDI_META_CUE 7 -/* More meta events */ -#define MIDI_META_CHANNEL 0x20 -#define MIDI_META_PORT 0x21 -#define MIDI_META_EOT 0x2f -#define MIDI_META_TEMPO 0x51 -#define MIDI_META_SMPTE_OFFSET 0x54 -#define MIDI_META_TIME 0x58 -#define MIDI_META_KEY 0x59 -#define MIDI_META_PROP 0x7f - -/** The maximum of the midi defined text types */ -#define MIDI_MAX_TEXT_TYPE 7 - -#define MIDI_HEAD_MAGIC 0x4d546864 -#define MIDI_TRACK_MAGIC 0x4d54726b - ->>extern - -/* - * This structure is used to keep track of the state while - * reading in a midi file. - */ -struct midistate { - struct File *file; /* Users file handle */ - - FILE *fp; /* File being read */ - int current_time; /* Current midi time */ - int port; /* Midi port number */ - int device; /* Midi device number */ - int num_chunks; /* Count of chunks */ - int chunk_size; /* Size of current chunk */ - int chunk_count; /* Count within current chunk */ - GPtrArray *notes; /* Currently on notes */ - ticktime_t track_duration; /* Track duration */ - - struct tempomapElement *tempo_map; /* The tempo map */ - struct headElement *head; /* Pointer into head element */ - struct rootElement *root; /* Pointer into the root */ - - char *trackname; /* Saved track name */ - int track_devchan; /* Track device channel */ - - struct except error; /* For exceptional errors */ -}; - ->>function midi_read_file -struct rootElement * -struct File *file; - ->>description -Read in a midi file from the specified file name. - ->>code - FILE *fp; - char *name; - struct rootElement *root; - struct midistate mState; - struct midistate *msp; - - - name = file->name; - fp = fopen(name, "rb"); - if (fp == NULL) { - file_set_error(file, - FILE_STATUS_OPEN_FAIL, - _("Could not open file\n\n%s"), g_strerror(errno)); - return NULL; - } - - msp = &mState; - msp->file = file; - msp->fp = fp; - msp->tempo_map = md_tempomap_new(); - msp->notes = g_ptr_array_new(); - msp->port = 0; - - root = midi_read(msp, fp); - - fclose(fp); - g_ptr_array_free(msp->notes, 1); - - if (root) - file_set_success(file); - - file_check_root(root); - return root; - ->>function midi_read -static struct rootElement * -struct midistate *msp; -FILE *fp; // Input file pointer - ->>description -Read in a midi file from the specified open file pointer, -.A fp -and return an -.M mtree -structure tree representing the file. - ->>code - struct rootElement *root = NULL; - struct element *el; - int i; - - root = read_head(msp); - if (root == NULL) - return NULL; - - /* - * Now that we know it is probably a midi file errors - * are caught here. - */ - if CATCH(&msp->error) { - - file_set_error(msp->file, - FILE_STATUS_BAD_FORMAT, - _("Could not read file\n\n%s"), msp->error.message); - - if (root) - md_free(MD_ELEMENT(root)); - - return NULL; - } - - md_add(MD_CONTAINER(root), MD_ELEMENT(msp->tempo_map)); - - msp->root->tracks = 0; /* Is re-calculated when tracks are added */ - - /* - * Read in each track and add it to the root. In a type 1 file - * the first track is a tempo map which we treat differently in MD. - */ - for (i = 0; i < msp->num_chunks; i++) { - el = MD_ELEMENT(read_track(msp)); - - /* If format 1 then the first track is really the tempo map */ - if (msp->head->format == 1 && i == 0) { - /* It will be added after the loop */ - md_free(el); - continue; - } - - md_add(MD_CONTAINER(root), el); - } - - msp->tempo_map = NULL; - - UNCATCH(&msp->error); - - return root; - ->>function read_head -static struct rootElement * -struct midistate *msp; // current midi state - ->>description -Read the header information from a midi file - ->>code - guint32 magic; - int length; - struct rootElement *root; - struct headElement *head; - - root = md_root_new(); - - head = md_head_new(); - md_add(MD_CONTAINER(root), MD_ELEMENT(head)); - - root->head = head; - msp->root = root; - msp->head = head; - - /* The first word just identifies the file as a midi file */ - magic = read_int(msp, 4); - - if (magic != MIDI_HEAD_MAGIC) { - file_set_error(msp->file, FILE_STATUS_BAD_FORMAT, - _("Bad header (%x), probably not a real midi file"), magic); - - md_free(MD_ELEMENT(root)); - return NULL; - } - - /* The header chunk should be 6 bytes, (perhaps longer in the future) */ - length = read_int(msp, 4); - - if (length < 6) { - file_set_error(msp->file, FILE_STATUS_BAD_FORMAT, - _("Bad header length, probably not a real midi file")); - - md_free(MD_ELEMENT(root)); - return NULL; - } - - head->format = read_int(msp, 2); - msp->num_chunks = read_int(msp, 2); - msp->tempo_map->timebase = read_int(msp, 2); - - /* Should skip any extra bytes, (may not be seekable) */ - while (length > 6) { - length--; - (void) getc(msp->fp); - } - - return root; - ->>function read_track -static struct trackElement * -struct midistate *msp; // Midi state - ->>description -Read in one track from the file, and return an element tree -describing it. -Only the part element is allowed under track so one will -be created at the same time as the track. - ->>code - int status, laststatus; - int head; - int length; - int delta_time; - struct trackElement *track; - struct partElement *part; - int i; - - laststatus = 0; - head = read_int(msp, 4); - if (head != MIDI_TRACK_MAGIC) - ethrow(&msp->error, - _("Bad track header (%x), probably not a midi file"), - head); - - length = read_int(msp, 4); - msp->chunk_size = length; - - /* - * All track initialisations. - */ - msp->chunk_count = 0; /* nothing read yet */ - msp->trackname = NULL; - msp->track_devchan = -1; - msp->port = 0; - - track = md_track_new(); - part = md_part_new(); - md_add(MD_CONTAINER(track), MD_ELEMENT(part)); - - msp->current_time = 0; - while (msp->chunk_count < msp->chunk_size) { - - delta_time = read_var(msp); - msp->current_time += delta_time; - - status = read_int(msp, 1); - if ((status & 0x80) == 0) { - - /* - * This is not a status byte and so running status is being - * used. Re-use the previous status and push back this byte. - */ - put_back(msp, status); - status = laststatus; - } else { - laststatus = status; - } - - handle_status(msp, part, status); - } - - restart: - for (i = 0; i < (int)msp->notes->len; i++) { - struct noteElement *ns; - ns = g_ptr_array_index(msp->notes, i); - msp->device = MD_ELEMENT(ns)->device_channel; - finish_note(msp, ns->note, 0); - goto restart; - } - - MD_ELEMENT(track)->device_channel = msp->track_devchan; - MD_ELEMENT(part)->device_channel = msp->track_devchan; - - track->name = msp->trackname; - - MD_CONTAINER(track)->duration = msp->track_duration; - msp->track_duration = 0; - - return track; - ->>function handle_status -static void -struct midistate *msp; // Current midi file status -struct partElement *part; // Current part (track) -int status; // Status byte, ie. current command - ->>description -Complete the reading of the status byte. -The parsed midi command will be added to the specified -.A part . - ->>code - int ch; - int type; - int device; - int length; - short note, vel, control; - int val; - unsigned char *data; - struct element *el; - - ch = status & 0x0f; - type = status & 0xf0; - - /* - * Commands with type 0xf0 are not channel specific. - * Do not set the device if the type is 0xf0 as these commands are - * not channel specific - */ - device = msp->port<<4; - if (type != 0xf0) - device |= ch; - msp->device = device; - - if (msp->track_devchan == -1 && type != 0xf0) - msp->track_devchan = device; - - el = NULL; - - switch (type) { - case MIDI_NOTE_OFF: - note = read_int(msp, 1); - vel = read_int(msp, 1); - - finish_note(msp, note, vel); - break; - - case MIDI_NOTE_ON: - - note = read_int(msp, 1); - vel = read_int(msp, 1); - - if (vel == 0) { - /* This is really a note off */ - finish_note(msp, note, vel); - } else { - /* Save the start, so it can be matched with the note off */ - el = save_note(msp, note, vel); - } - break; - - case MIDI_KEY_AFTERTOUCH: - note = read_int(msp, 1); - vel = read_int(msp, 1); - - /* new aftertouchElement */ - el = MD_ELEMENT(md_keytouch_new(note, vel)); - break; - - case MIDI_CONTROLLER: - control = read_int(msp, 1); - val = read_int(msp, 1); - el = MD_ELEMENT(md_control_new(control, val)); - - break; - - case MIDI_PATCH: - val = read_int(msp, 1); - el = MD_ELEMENT(md_program_new(val)); - break; - - case MIDI_CHANNEL_AFTERTOUCH: - 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; - val -= 0x2000; /* Center it around zero */ - el = MD_ELEMENT(md_pitch_new(val)); - break; - - /* Now for all the non-channel specific ones */ - case 0xf0: - /* Deal with the end of track event first */ - if (ch == 0x0f) { - type = read_int(msp, 1); - if (type == 0x2f) { - - /* End of track - skip to end of real track */ - msp->track_duration = - msp->current_time - MD_ELEMENT(part)->element_time; - - MD_CONTAINER(part)->duration = msp->track_duration; - - skip_chunk(msp); - return; - } - } - - /* Get the length of the following data */ - length = read_var(msp); - data = read_data(msp, length); - if (ch == 0x0f) { - el = (struct element *)handle_meta(msp, type, data); - } else { - el = (struct element *)md_sysex_new(status, data, length); - g_free(data); - } - break; - default: - ethrow(&msp->error, _("Bad status type 0x%x"), type); - /*NOTREACHED*/ - } - - if (el != NULL) { - el->element_time = msp->current_time; - el->device_channel = device; - - md_add(MD_CONTAINER(part), el); - } - ->>function handle_meta -static struct metaElement * -struct midistate *msp; // The midi file state -int type; // The meta event type -unsigned char *data; // The data for the event - ->>description -Do extra handling of meta events. -We want to save time signature and key for use elsewhere, for example. -This routine create the correct type of class and returns it. - ->>code - struct metaElement *el = NULL; - struct mapElement *map = NULL; - int micro_tempo; - - switch (type) { - case MIDI_META_TEMPO: - micro_tempo = ((data[0]<<16) & 0xff0000) - + ((data[1]<<8) & 0xff00) + (data[2] & 0xff); - map = MD_MAP(md_tempo_new(micro_tempo)); - break; - case MIDI_META_TIME: - map = MD_MAP(md_timesig_new(data[0], 1<port = data[0]; - break; - case MIDI_META_TEXT: - case MIDI_META_COPYRIGHT: - case MIDI_META_TRACKNAME: - case MIDI_META_INSTRUMENT: - case MIDI_META_LYRIC: - case MIDI_META_MARKER: - case MIDI_META_CUE: - /* Text based events */ - el = MD_META(md_text_new(type, data)); - if (type == MIDI_META_TRACKNAME && msp->trackname == NULL) { - msp->trackname = g_strdup(data); - MD_FREE(el); - el = NULL; - } else if (type == MIDI_META_COPYRIGHT) { - if (!msp->head->copyright) { - msp->head->copyright = g_strdup(data); - MD_FREE(el); - el = NULL; - } - } - break; - case MIDI_META_SMPTE_OFFSET: - el = MD_META(md_smpteoffset_new(data[0], data[1], data[2], data[3], - data[4])); - break; - case MIDI_META_PROP: - /* Proprietry sequencer specific event */ - /* Just throw it out */ - break; - case MIDI_META_SEQUENCE: - default: - g_warning(_("Meta event %d not implemented\n"), type); - break; - } - - /* If this affected the tempo map then add it */ - if (map) { - MD_ELEMENT(map)->element_time = msp->current_time; - md_add(MD_CONTAINER(msp->tempo_map), MD_ELEMENT(map)); - } - - g_free(data); - - return el; - ->>function read_int -static int -struct midistate *msp; // Midi file state -int n; // Number of bytes to read - ->>description -Reads an interger from the midi file. -The number of bytes to be read is specified in -.A n . - ->>code - int val; - int c; - int i; - - val = 0; - - for (i = 0; i < n; i++) { - val <<= 8; - c = getc(msp->fp); - if (c == -1) - bad_eof(msp, "int"); - - msp->chunk_count++; - val |= c; - } - - return val; - ->>function read_data -static unsigned char * -struct midistate *msp;// Midifile state -int length; // Length of data to read - ->>description -Read in a specified amount of data from the file. -The return is allocated data which must be freed by the caller. -An extra null byte is appended for the sake of text events. ->>code - - unsigned char *data = g_malloc(length+1); - - if (length == 0) { - data[0] = 0; - return data; - } - - if (fread(data, length, 1, msp->fp) == 1) { - msp->chunk_count += length; - data[length] = '\0'; - return data; - } else { - bad_eof(msp, "data"); - /*NOTREACHED*/ - } - return NULL; - ->>function read_var -static gint32 -struct midistate *msp; // Midi file state - ->>description -Read a variable length integer from the midifile and return it. -Returns an int32 so cannot really deal with more than four bytes. - ->>code - int val; - int c; - - val = 0; - do { - c = getc(msp->fp); - if (c == -1) - bad_eof(msp, "variable"); - - msp->chunk_count++; - val <<= 7; - val |= (c & 0x7f); - } while ((c & 0x80) == 0x80); - - return val; - ->>function put_back -static void -struct midistate *msp; Midi input state -char c; Character to push back ->>description -Push back a character. -Have to also keep track of the chunk_count. ->>code - - ungetc(c, msp->fp); - msp->chunk_count--; - ->>function save_note -static struct element * - -struct midistate *msp; // Midi file state -int note; // Note number -int vel; // Velocity - ->>description -Save the initial note-on message. -This will later be paired with a note off message. -We have to keep track of channel and device that the -note-on is for so that it can be correctly matched. - ->>code - struct noteElement *n; - - /* Create a new note and set its length to -1 - * this will be filled in later, when the note-off arrives - */ - n = md_note_new(note, vel, -1); - - /* Save it so that we match up with the note off */ - g_ptr_array_add(msp->notes, n); - - return MD_ELEMENT(n); - ->>function finish_note -static void -struct midistate *msp; Midi file state -int note; Note number -int offvel; Note off velocity - ->>description -Called when a note off is seen. -Finds the corresponding note on and constructs a note element. - ->>code - int i; - GPtrArray *notes; - struct noteElement *n; - int len; - - notes = msp->notes; - n = NULL; - for (i = notes->len-1; i >= 0; i--) { - n = g_ptr_array_index(notes, i); - if (n->note == note && MD_ELEMENT(n)->device_channel == msp->device) { - len = msp->current_time - MD_ELEMENT(n)->element_time; - n->offvel = offvel; - n->length = len; - if (n->length < 0) { - 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; - } - g_ptr_array_remove_index_fast(notes, i); - - /* Do not break here, there may be more than one */ - } - } - ->>function skip_chunk -static void -struct midistate *msp; // Midi file state - ->>description -Skip to the end of the chunk. -Note that the input may not be seekable, so we just read bytes -until at the end of the chunk. - ->>code - - while (msp->chunk_count < msp->chunk_size) - (void) read_int(msp, 1); - ->>function bad_eof -static void -struct midistate *msp; -char *type; - ->>code - - ethrow(&msp->error, - _("Unexpected end of file\n" - " (offset %d/%d, type %s)\n" - ), msp->chunk_count, msp->chunk_size, type); diff -rNu melys-0.1.16/files/midiwrite.m melys-0.1.17/files/midiwrite.m --- melys-0.1.16/files/midiwrite.m Sat Nov 27 11:50:52 1999 +++ melys-0.1.17/files/midiwrite.m Thu Jan 1 01:00:00 1970 @@ -1,683 +0,0 @@ ->>name midiwrite.m -File: midiwrite.m - write out to a file in MIDI format - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header ->>header sys/asoundlib.h ->>header melfile.h ->>header md.h - ->>headerdef --decl midi.h - -/* Flags for writing midi files */ -#define MIDI_FILE_RUNNING_STATUS 0x001 -#define MIDI_FILE_COMPRESSED 0x002 - ->>extern - -struct midiwstate { - struct File *file; /* Users file handle */ - FILE *fp; - int track_start; /* Offset at the start of the track */ - int out_offset; /* Current write offset */ - int prev_status; /* Previous status byte */ - ticktime_t prev_time; /* Previous time */ - int port; /* Current output port */ - int flags; /* File format flags */ - struct rootElement *root; /* Pointer to the root */ - GByteArray *out; /* Output buffer */ - GSList *notes; /* Pending off notes */ - int inQ; /* Running through the notes queue */ -}; - -extern struct sysexElement *get_std_sysex(int ); - ->>function midi_write_file -void -struct File *file; File name to write to -struct rootElement *root; the data to write - ->>description -Write out the specified file. ->>code - FILE *fp; - char *name; - - name = file->name; - - fp = fopen(name, "wb"); - if (fp == NULL) { - file_set_error(file, FILE_STATUS_OPEN_FAIL, _("Can not open file")); - return; - } - - midi_write(file, fp, root); - - fclose(fp); - - ->>function midi_write -static void -struct File *file; -FILE *fp; File stream to write to -struct rootElement *root; The data to write - ->>description -Write the md tree as a midi file to the specified file stream. ->>code - struct midiwstate *msp; - ticktime_t inittime; - - msp = g_new0(struct midiwstate, 1); - msp->file = file; - msp->fp = fp; - msp->root = root; - msp->out = g_byte_array_new(); - msp->notes = NULL; - msp->flags = MIDI_FILE_RUNNING_STATUS; - inittime = 0; - - md_walk(MD_CONTAINER(root), write_elem, msp, 0); - - fwrite(msp->out->data, msp->out->len, 1, fp); - g_byte_array_free(msp->out, TRUE); - g_slist_free(msp->notes); - g_free(msp); - ->>function write_elem -static void -struct element *el; Element to write out -void *arg; Our private data -int flags; Start/end etc - ->>description -Write out an element to the midi file. -We don't actually write to the file at this point, just to -memory structures. -This is because we don't want to require that the stream -be seekable. - ->>code - struct midiwstate *msp; - static int skipping; - - msp = (struct midiwstate *)arg; - - if (skipping && el->type != MD_TYPE_TAKE) - return; - - switch (el->type) { - case MD_TYPE_ROOT: - if (flags & MD_WALK_START) { - int nchunks; - struct tempomapElement *tempomap; - - tempomap = md_get_tempomap(msp->root); - - put_int(msp, 4, MIDI_HEAD_MAGIC); - put_int(msp, 4, 6); /* Header length, always 6 */ - put_int(msp, 2, msp->root->head->format); - nchunks = msp->root->tracks; - if (msp->root->head->format == 1) - nchunks++; - put_int(msp, 2, nchunks); - put_int(msp, 2, tempomap->timebase); - } - break; - case MD_TYPE_TRACK: - case MD_TYPE_TEMPOMAP: - if (flags & MD_WALK_START) { - put_int(msp, 4, MIDI_TRACK_MAGIC); - put_int(msp, 4, 0); /* Leave space for the length */ - msp->track_start = msp->out_offset; - msp->prev_time = 0; - msp->prev_status = 0; - msp->port = 0; - - if (el->type == MD_TYPE_TRACK) - put_prologue(msp, MD_TRACK(el)); - } else { - struct containerElement *ce; - int size; - - /* do pending events */ - run_queue(msp, G_MAXINT); - - ce = MD_CONTAINER(el); - if (ce->duration > 0 - && (el->element_time + ce->duration) >= msp->prev_time) - put_time(msp, el->element_time + ce->duration); - else - put_int(msp, 1, 0); - - /* Put out the end of track message */ - put_status(msp, MIDI_META, 0); - put_int(msp, 1, 0x2f); - put_int(msp, 1, 0); - - /* Calculate the track length */ - size = msp->out_offset - msp->track_start; - put_int_at(msp, 4, msp->track_start - 4, size); /* In header */ - } - break; - case MD_TYPE_PART: - break; - case MD_TYPE_TAKE: - if (flags & MD_WALK_START) { - if (!MD_SELECTED(el)) - skipping = 1; - } else { - skipping = 0; - } - break; - case MD_TYPE_NOTE: - put_time(msp, el->element_time); - put_status(msp, MIDI_NOTE_ON, el->device_channel); - put_int(msp, 1, MD_NOTE(el)->note); - put_int(msp, 1, MD_NOTE(el)->vel); - /* save for note off */ - msp->notes = g_slist_insert_sorted(msp->notes, el, noteoff_cmp); - break; - case MD_TYPE_CONTROL: - put_time(msp, el->element_time); - put_status(msp, MIDI_CONTROLLER, el->device_channel); - put_int(msp, 1, MD_CONTROL(el)->control); - put_int(msp, 1, MD_CONTROL(el)->value); - break; - - case MD_TYPE_KEYTOUCH: - put_time(msp, el->element_time); - put_status(msp, MIDI_KEY_AFTERTOUCH, el->device_channel); - put_int(msp, 1, MD_KEYTOUCH(el)->note); - put_int(msp, 1, MD_KEYTOUCH(el)->velocity); - break; - case MD_TYPE_PITCH: - { - int val; - - put_time(msp, el->element_time); - put_status(msp, MIDI_PITCH_WHEEL, el->device_channel); - val = MD_PITCH(el)->pitch; - val += 0x2000; - put_int(msp, 1, val & 0x7f); - put_int(msp, 1, (val>>7) & 0x7f); - } - break; - case MD_TYPE_PRESSURE: - put_time(msp, el->element_time); - put_status(msp, MIDI_CHANNEL_AFTERTOUCH, el->device_channel); - put_int(msp, 1, MD_PRESSURE(el)->velocity); - break; - case MD_TYPE_PROGRAM: - put_program(msp, MD_DEVCHAN(el), MD_TIME(el), MD_PROGRAM(el)->program); - break; - - case MD_TYPE_SYSEX: - put_time(msp, el->element_time); - /* Status can be either f0 or f7 */ - put_status(msp, MD_SYSEX(el)->status, 0); - put_var(msp, MD_SYSEX(el)->length); - put_data(msp, MD_SYSEX(el)->data, MD_SYSEX(el)->length); - break; - - case MD_TYPE_TEMPO: - { - int mt; - - put_time(msp, el->element_time); - put_status(msp, MIDI_META, el->device_channel); - put_byte(msp, MIDI_META_TEMPO); - /* 3 bytes to follow */ - put_byte(msp, 3); - - mt = MD_TEMPO(el)->micro_tempo; - put_byte(msp, (mt>>16) & 0xff); - put_byte(msp, (mt>>8) & 0xff); - put_byte(msp, (mt) & 0xff); - } - break; - case MD_TYPE_TIMESIG: - put_time(msp, el->element_time); - put_status(msp, MIDI_META, el->device_channel); - put_byte(msp, MIDI_META_TIME); - - { - int bot; - for (bot = 0; bot < 32; bot++) - if ((MD_TIMESIG(el)->bottom >> bot) == 0) - break; - bot--; - - put_byte(msp, 4); /* 4 to follow */ - put_byte(msp, MD_TIMESIG(el)->top); - put_byte(msp, bot); - put_byte(msp, MD_TIMESIG(el)->clocks); - put_byte(msp, MD_TIMESIG(el)->n32pq); - } - break; - - case MD_TYPE_KEYSIG: - put_time(msp, el->element_time); - put_status(msp, MIDI_META, el->device_channel); - put_byte(msp, MIDI_META_KEY); - - put_byte(msp, 2); /* Bytes to follow */ - put_byte(msp, MD_KEYSIG(el)->key); - put_byte(msp, MD_KEYSIG(el)->minor? 1: 0); - break; - case MD_TYPE_SMPTEOFFSET: - put_time(msp, el->element_time); - put_status(msp, MIDI_META, el->device_channel); - put_byte(msp, MIDI_META_SMPTE_OFFSET); - put_byte(msp, 5); /* 5 to follow */ - put_byte(msp, MD_SMPTEOFFSET(el)->hours); - put_byte(msp, MD_SMPTEOFFSET(el)->minutes); - put_byte(msp, MD_SMPTEOFFSET(el)->seconds); - put_byte(msp, MD_SMPTEOFFSET(el)->frames); - put_byte(msp, MD_SMPTEOFFSET(el)->subframes); - break; - case MD_TYPE_TEXT: - put_time(msp, el->element_time); - put_status(msp, MIDI_META, el->device_channel); - put_byte(msp, MD_TEXT(el)->type); - put_var(msp, MD_TEXT(el)->length); - put_data(msp, MD_TEXT(el)->text, MD_TEXT(el)->length); - break; - case MD_TYPE_HEAD: - break; - default: - g_warning("Unknown MD type %d", el->type); - break; - } - ->>function put_int -static void -struct midiwstate *msp; Midi write state -int n; Number of bytes to write -int val; Value of integer ->>description -Write out an integer -.A val -of size -.A n -to the output stream. ->>code -#define WRITE_BUF_SIZE 10 - guint8 data[WRITE_BUF_SIZE]; - - set_int(data, n, val); - g_byte_array_append(msp->out, data, n); - msp->out_offset += n; - - ->>function put_byte -static void -struct midiwstate *msp; Midi write state -int val; Value to write ->>description -Put out a single byte. ->>code - guint8 data[1]; - data[0] = val & 0xff; - - g_byte_array_append(msp->out, data, 1); - msp->out_offset++; - - - ->>function put_int_at -static void -struct midiwstate *msp; Midi write state -int n; Number of bytes in integer -int pos; Position to write at -int val; Value of integer ->>description -Write an -.A n -byte integer at the place specified in the output stream. -This is only used to re-writing the track size. ->>code - - g_return_if_fail(pos < (int)msp->out->len); - - set_int(msp->out->data+pos, n, val); - ->>function set_int -static void -guint8 *data; Buffer to write into -int n; Number of bytes to write -int val; Value of integer ->>description -Take the integer value -.A val -of length -.A n -and place a byte representation into -.A buf , -high byte first. ->>code - int i; - - for (i = 0; i < n; i++) { - data[n - i - 1] = val & 0xff; - val >>= 8; - } - - ->>function put_time -static void -struct midiwstate *msp; Midi write state -int time; Midi time ->>description -Put out the time. -The time is stored as a change from the previous time, in -the variable length format. ->>code - int delta_time; - /* - * If there are any pending off-notes then do them now. - */ - if (!msp->inQ) { - run_queue(msp, time); - } - - delta_time = time - msp->prev_time; - if (delta_time < 0) { - g_warning(_("Negative time difference (%d) writing midi file"), - delta_time); - g_warning(_(" difference set to zero")); - delta_time = 0; - } - - put_var(msp, delta_time); - msp->prev_time = time; - ->>function put_status -static void -struct midiwstate *msp; Midi write state -int status; Midi status byte to write (or not) -int devchan; Midi device and channel ->>description -Write the status byte. -If running status is in effect, then the status is not output -if it is the same as the previous one and isn't 0xf?. ->>code - gboolean isSys = FALSE; - int port; - - status &= 0xff; /* Make sure no extra bits set */ - if ((status & 0xf0) == 0xf0) - isSys = TRUE; - - port = (devchan>>4); - if (port != msp->port) { - msp->port = port; - //put_time(msp, msp->prev_time); - put_status(msp, MIDI_META, port<<4); - put_byte(msp, MIDI_META_PORT); - put_byte(msp, 1); /* Bytes to follow */ - put_byte(msp, port); - put_time(msp, msp->prev_time); /* Re-put the time */ - } - - if (!isSys) - status |= (devchan & 0x0f); - - /* - * We put out the status byte if it is a system message, or - * is different to the last one, or if we are not doing - * running status. - */ - if (isSys || (msp->flags & MIDI_FILE_RUNNING_STATUS) == 0 || - status != msp->prev_status) { - put_int(msp, 1, status); - } - - if (isSys) - msp->prev_status = 0; - else - msp->prev_status = status; - ->>function put_var -static void -struct midiwstate *msp; Midi write state -int val; Value to put ->>description -Write a variable length quantity. -It is split into 7bit quantities and all but the last have -the high bit set when written to the file. ->>code - int pos; - int b; - - g_assert(val >= 0); - - for (pos = 28; pos > 0; pos -= 7) { - b = (val >> pos) & 0x7f; - if (b > 0) - put_int(msp, 1, 0x80 | b); - } - /* Deal with the last 7bits, will not have the high bit set */ - b = val & 0x7f; - put_int(msp, 1, b); - - ->>function put_data -static void -struct midiwstate *msp; Midi write state -guint8 *data; Data to write -int length; Length of data ->>description -Write out a buffer of data with the specified size. ->>code - int i; - - for (i = 0; i < length; i++) - put_byte(msp, data[i]); - ->>function noteoff_cmp -static gint -gconstpointer item1; first to compare -gconstpointer item2; second to compare ->>description -Compare the elements based on the note off time. -That is element_time + length ->>code - struct element *el1 = MD_ELEMENT(item1); - struct element *el2 = MD_ELEMENT(item2); - int time1 = el1->element_time + MD_NOTE(el1)->length; - int time2 = el2->element_time + MD_NOTE(el2)->length; - - if (time1 == time2) - return 0; - else if (time1 < time2) - return -1; - else - return 1; - - ->>function run_queue -static void -struct midiwstate *msp; Midi write state -ticktime_t time; Dequeue events at and before this time - ->>description -Run the queue of pending events that need to be pushed out before -the specified time. - ->>code - - GSList *litem; - struct element *el; - struct noteElement *ne; - - msp->inQ = 1; - litem = msp->notes; - while (litem && litem->data) { - el = MD_ELEMENT(litem->data); - ne = MD_NOTE(el); - if (el->element_time + ne->length <= time) { - int status = MIDI_NOTE_OFF; - - put_time(msp, el->element_time+ne->length); - if (ne->offvel == 0) - status = MIDI_NOTE_ON; - - put_status(msp, status, el->device_channel); - put_int(msp, 1, MD_NOTE(el)->note); - put_int(msp, 1, MD_NOTE(el)->offvel); - litem = g_slist_remove(msp->notes, el); - msp->notes = litem; - } else { - break; /* No more to do */ - } - } - msp->notes = litem; - msp->inQ = 0; - - ->>function put_program -static void -struct midiwstate *msp; Midi write state -int chan; Channel for this change -ticktime_t time; Time for change -int program; The MD program number - ->>description -Put out the program. -This consists of possible bank select controls as well as -the patch number. - ->>code - - if (program > 127) { - /* XXX Everything is put out at the same time, this is very wrong */ - put_time(msp, time); - put_status(msp, MIDI_CONTROLLER, chan); - put_int(msp, 1, SND_MCTL_MSB_BANK); - put_int(msp, 1, (program>>14) & 0x7f); - - put_time(msp, time); - put_status(msp, MIDI_CONTROLLER, chan); - put_int(msp, 1, SND_MCTL_LSB_BANK); - put_int(msp, 1, (program>>7) & 0x7f); - } - put_time(msp, time); - put_status(msp, MIDI_PATCH, chan); - put_int(msp, 1, program & 0x7f); - - ->>function put_prologue -static void -struct midiwstate *msp; Midi write state -struct trackElement *track; The track to output startup info for - ->>description -When the track has been created from within the sequencer there -will be no program changes at the beginning. -Nor will there be any track names etc. - -Currently everything is put out at a time of zero. -I realise that may not work for everyone. - ->>code - char *str; - - /* - * 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; - - put_time(msp, 0); - put_status(msp, MIDI_META, 0); - put_byte(msp, MIDI_META_COPYRIGHT); - put_var(msp, strlen(str)); - 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) { - str = track->name; - put_time(msp, 0); - put_status(msp, MIDI_META, 0); - put_byte(msp, MIDI_META_TRACKNAME); - put_var(msp, strlen(str)); - put_data(msp, str, strlen(str)); - - } - - /* If there are no embeded program events */ - if (!track->hasprogram) - put_program(msp, MD_DEVCHAN(track), 0, track->program->program); - - /* The initial volume */ - put_time(msp, 0); - put_status(msp, MIDI_CONTROLLER, MD_DEVCHAN(track)); - put_int(msp, 1, SND_MCTL_MSB_MAIN_VOLUME); - put_int(msp, 1, MD_VOL_TO_MIDI(track->volume)); - - /* The initial pan position */ - put_time(msp, 0); - 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.16/gui/help.m melys-0.1.17/gui/help.m --- melys-0.1.16/gui/help.m Thu Sep 16 15:32:09 1999 +++ melys-0.1.17/gui/help.m Thu Jan 1 01:00:00 1970 @@ -1,63 +0,0 @@ ->>name help.m - routines for help - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -This replaces the completely sucky gnome help stuff with some -only moderately sucky routines. - ->>header ->>header gtk/gtk.h ->>header libgnome/gnome-help.h ->>headerdef --decl melgui.h - -/* - * Structure to keep references to help locations for property - * boxes with multiple pages. - */ -struct help_entry { - int npages; /* The number of page references */ - struct help_page_entry { - char *name; /* Application name */ - char *path; /* Path to help file */ - char *section; /* Section within help file */ - } *refs; /* The actual page references */ -}; - ->>function mel_prop_help -void -GtkWidget *ignored; A widget that is not used -gint page_num; The page number to display help for -struct help_entry *ref; The help entries reference ->>code - struct help_page_entry *hpe; - gchar *file; - gchar *url; - - if (page_num >= ref->npages) { - g_warning("Not enough help page entries"); - return; - } - - hpe = &ref->refs[page_num]; - - file = gnome_help_file_path(hpe->name, hpe->path); - if (!file) - return; - - url = g_strdup_printf("file:%s#%s", file, hpe->section); - - /* db2html uppercases the name... */ - file = strchr(url, '#'); - g_strup(file); - - gnome_help_goto(ignored, url); - g_free(url); diff -rNu melys-0.1.16/gui/main.m melys-0.1.17/gui/main.m --- melys-0.1.16/gui/main.m Tue Dec 14 17:49:32 1999 +++ melys-0.1.17/gui/main.m Thu Jan 1 01:00:00 1970 @@ -1,841 +0,0 @@ ->>name main.m The main screen - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header - ->>header libgnome/gnome-defs.h ->>header libgnome/gnome-mime.h ->>header libgnomeui/gnome-app-util.h ->>header libgnomeui/gnome-init.h ->>header libgnomeui/gnome-mdi.h ->>header libgnomeui/gnome-mdi-child.h ->>header libgnomeui/gnome-mdi-generic-child.h ->>header libgnomeui/gnome-dialog-util.h ->># header libgnomeui/gnome-popup-help.h - ->>header menus.h ->>header elements.h ->>header melreg.h ->>header melfile.h ->>header melmidi.h ->>header meldnd.h ->>header song.h ->>header melys.h ->>header melystrack.h ->>header melyspos.h ->>header md.h - ->>headerdef --decl melgui.h - -struct File; -struct rootElement; -struct trackElement; - ->># This header is written to be independent of gnome ->>headerdef melmsg.h - -enum message_type { - MEL_MSG_ERROR, - MEL_MSG_WARNING, - MEL_MSG_INFO, - - MEL_MSG_LAST -}; - -/* Yes this is GNUC extension -- patches accepted */ -#define mel_song_error(s, p, f, args...) \ - mel_song_display((s), (p), MEL_MSG_ERROR, f, ##args) -#define mel_song_warning(s, p, f, args...) \ - mel_song_display((s), (p), MEL_MSG_WARNING, f, ##args) -#define mel_song_info(s, p, f, args...) \ - mel_song_display((s), (p), MEL_MSG_INFO, f, ##args) - -#define mel_error(f, args...) \ - mel_song_display(NULL, NULL, MEL_MSG_ERROR, f, ##args) -#define mel_warning(f, args...) \ - mel_song_display(NULL, NULL, MEL_MSG_WARNING, f, ##args) -#define mel_info(f, args...) \ - mel_song_display(NULL, NULL, MEL_MSG_INFO, f, ##args) - -struct song; -struct _GtkObject; -extern void mel_song_display(struct song *sd, struct _GtkObject *parent, - int _type, char *fmt, ...); - -extern void mel_view_update(void); -extern void mel_status_msg(struct song *, char *); - ->>extern - -/* Atoms */ -GdkAtom MelysElemAtom; - -/* For dialogs that do not belong to a particular song */ -static regid_t UnattachedDialog; - -static GnomeMDI *MainMDI; -static struct except childError; -struct except *noActiveChildError = &childError; - ->>function melys_app -int -int argc; The program argument count -char **argv; The program arguments -int optind; Start of the file args - ->>description -Initialise the application and set up the initial screen. - ->>code - GnomeMDI *mdi; - GtkWidget *dw; - struct song *song; - int nopen; - int oldargc = argc; - - /* - * We currently do our own processing. - * But perhaps it time that we didn't ! - */ - argc = 1; - gnome_init("melys", MELYS_VERSION_STRING, argc, argv); - - mdi = GNOME_MDI(gnome_mdi_new("melys", _("Melys"))); - MainMDI = mdi; - - gtk_signal_connect(GTK_OBJECT(mdi), "app_created", app_created_cb, NULL); - - mel_init_menus(mdi); - - /* Set to notebook mode */ - mdi->tab_pos = GTK_POS_BOTTOM; - gnome_mdi_set_mode(mdi, GNOME_MDI_NOTEBOOK); - - gtk_signal_connect(GTK_OBJECT(mdi), "add-view" - , GTK_SIGNAL_FUNC(add_view_cb), NULL); - gtk_signal_connect_after(GTK_OBJECT(mdi), "view-changed" - , GTK_SIGNAL_FUNC(view_changed_cb), NULL); - gtk_signal_connect_after(GTK_OBJECT(mdi), "remove-view" - , GTK_SIGNAL_FUNC(remove_view_cb), NULL); - gtk_signal_connect_after(GTK_OBJECT(mdi), "add-child" - , GTK_SIGNAL_FUNC(add_child_cb), NULL); - gtk_signal_connect_after(GTK_OBJECT(mdi), "remove-child" - , GTK_SIGNAL_FUNC(remove_child_cb), NULL); - - argc = oldargc; - nopen = 0; - while (optind++ < argc) { - song = mel_create_song(GTK_OBJECT(mdi), argv[optind-1], NULL); - if (song) - nopen++; - } - if (nopen == 0) { - song = mel_create_song(GTK_OBJECT(mdi), NULL, NULL); - song->unused = 1; - } - dw = reg_get_widget(UnattachedDialog); - if (dw && dw->window) - gdk_window_raise(dw->window); - - MelysElemAtom = gdk_atom_intern(MELYS_ELEM_ATOM_NAME, FALSE); - - return 0; - ->>function app_created_cb -static void -GnomeMDI *mdi; -GnomeApp *app; The newly created app window -gpointer data; - ->>description -This is called whenever a new app window is created. -We need to catch it so that we can add the status bar -which otherwise would not be added. - ->>code - GtkWidget *hbox; - GtkWidget *status; - GtkWidget *pos; - GtkWidget *frame; - GtkWidget *posbox; - GtkWidget *poslab; - - hbox = gtk_hbox_new(0, 0); - - status = gtk_statusbar_new(); - - pos = melys_pos_new(); - gtk_object_set_data(GTK_OBJECT(app), "song-position", pos); - - frame = gtk_frame_new(NULL); - gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN); - - posbox = gtk_hbox_new(0, 4); - poslab = gtk_label_new(_("Song position")); - gtk_box_pack_start(GTK_BOX(posbox), poslab, 0, 0, 0); - gtk_box_pack_start(GTK_BOX(posbox), pos, 0, 0, 0); - - gtk_container_add(GTK_CONTAINER(frame), posbox); - - gtk_box_pack_start(GTK_BOX(hbox), status, 1, 1, 0); - gtk_box_pack_start(GTK_BOX(hbox), frame, 0, 1, 0); - - gtk_widget_show_all(hbox); - gnome_app_set_statusbar_custom(app, hbox, status); - gnome_app_install_menu_hints(app, gnome_mdi_get_menubar_info(app)); - - gtk_signal_connect(GTK_OBJECT(app), "destroy", app_destroy_cb, mdi); - - ->>function get_song_from_mdi -struct song * -GtkObject *mdi; The MDI to find the active child - ->>description -Get the child info data from the specified MDI. -The active child is found. -If the data does not exist on the child then it is created. ->>code - struct song *sd; - GnomeMDIChild *child; - - child = gnome_mdi_get_active_child(GNOME_MDI(mdi)); - if (child == NULL) - ethrow(noActiveChildError, _("No active child")); - - sd = song_get_data(GTK_OBJECT(child)); - - return sd; - ->>function get_child_count -int -GtkObject *mdi; MDI to get child count of ->>description -Get the child count. -It would be better to use a public interface for this, but -there doesn't appear to be one. ->>code - gpointer data; - - data = gtk_object_get_data(GTK_OBJECT(mdi), MEL_MDI_CHILD_COUNT); - return GPOINTER_TO_INT(data); - ->>function set_child_count -void -GtkObject *mdi; MDI to set count on -int count; The new count to set ->>description -Set the child count. -Would not be needed if you could get the number of children via -a public interface. ->>code - - gtk_object_set_data(GTK_OBJECT(mdi), - MEL_MDI_CHILD_COUNT, GINT_TO_POINTER(count)); - - ->>function mel_create_song -struct song * -GtkObject *mdi; -char *filename; Filename to read. If NULL then default song is created. -GtkObject *parent; The dialogue or object that is creating this song - ->>description -Read in a new file. -A new MDI child will be created for this file and an initial -view on it. -A new song structure is created and returned. - -If the parent song data, -.A psong -has not been used then the file will be read into psong and -.A psong -will be returned. -Otherwise a new song is created. - ->>code - struct rootElement *root; - struct File *file; - struct song *song; - struct song *psong; /* Song from current view, if any */ - GnomeApp *ga; - GtkObject *child; - char *basename; - char *labelstr; - int count; - - psong = NULL; - child = (GtkObject *)gnome_mdi_get_active_child(GNOME_MDI(mdi)); - if (child) - psong = song_get_data(child); - - count = get_child_count(mdi); - - /* - * Read in the file first, if we can't do that then there - * 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); - - /* Hide the parent dialogue box */ - if (parent && GTK_IS_WIDGET(parent)) - gtk_widget_hide((GtkWidget *)parent); - - ga = gnome_mdi_get_active_window(GNOME_MDI(mdi)); - - if (filename) - basename = g_basename(filename); - else - basename = _("Untitled"); - - labelstr = g_strdup_printf("%s", basename); - - /* Create the child mdi widget */ - child = (GtkObject *)gnome_mdi_generic_child_new(labelstr); - g_free(labelstr); - - song = song_new(GTK_OBJECT(mdi), GTK_OBJECT(child)); - song->filename = filename; - song_setup(song, NULL, root); - - gnome_mdi_add_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); - - mel_initial_view((GtkObject *)mdi, (GtkObject *)child, song->mdroot, - ((psong && psong->unused) || (!psong && ga))? FALSE: TRUE); - - if (psong && psong->unused) { - count--; - gnome_mdi_remove_child(GNOME_MDI(mdi), - GNOME_MDI_CHILD(psong->child), 0); - } - - set_child_count((GtkObject *)mdi, ++count); - - /* Now set this up as a drag destination for filenames */ - ga = gnome_mdi_get_active_window(GNOME_MDI(mdi)); - mel_accept_files(mdi, GTK_WIDGET(ga)); - - return song; - - ->>function mel_add_view -void -GtkObject *mdi; -GtkObject *child; -GtkWidget *view; -gboolean toplevel; True if toplevel view required ->>description -Add the view to the child. -We have to go in a very round about way of doing this... - ->>code - struct song *song = song_get_data(child); - - gtk_object_set_data(child, MEL_NEW_VIEW, view); - - gnome_mdi_generic_child_set_view_creator - (GNOME_MDI_GENERIC_CHILD(child), create_view, NULL); - - if (toplevel) - gnome_mdi_add_toplevel_view(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); - else - gnome_mdi_add_view(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); - - song_set_view(song, view); - ->>function mel_initial_view -void -GtkObject *mdi; -GtkObject *child; -struct rootElement *root; -gboolean toplevel; True if toplevel view required ->>description -Create the initial view on a file. - ->>code - GtkWidget *w; - struct song *song = song_get_data(child); - - /* Our initial view is the track based view */ - w = melys_track_new(root); - - if (toplevel) { - gtk_widget_set_usize - (w, 80*gdk_screen_width()/100, 50*gdk_screen_height()/100); - } - - song_set_view(song, w); - - melys_track_set_song(MELYS_TRACK(w), song); - - mel_add_view(mdi, child, w, toplevel); - - /* Notebook bug? Need this to get it drawn properly */ - while (gtk_events_pending()) - gtk_main_iteration(); - - gnome_mdi_set_active_view(GNOME_MDI(mdi), w); - - - ->>function mel_view_update -void - ->>description -Update the current view. -Use -.F song_view_update -if you have the song pointer. - ->>code - struct song *song; - - song = get_song_from_mdi((GtkObject *)MainMDI); - song_view_update(song); - - ->>function create_view -static GtkWidget * -GnomeMDIChild *child; -gpointer data; - ->>description -The view add interface to Gnome MDI is inside out, so we have -to set a function into the child to create views. -What we want to be able to do is create a view and then add it. -Too simple? -So we get round this by having our routine that adds the view -save it as a property on the child. -All this routine does is retreives it and returns it back -into the depths of MDI. - ->>code - GtkWidget *w; - - w = (GtkWidget*)gtk_object_get_data(GTK_OBJECT(child), MEL_NEW_VIEW); - - if (w == NULL) - ethrow(debugError, "@func_name: NEW_VIEW not set up"); - - gtk_object_set_data(GTK_OBJECT(child), MEL_NEW_VIEW, 0); - - return w; - ->>function mel_song_display -void -struct song *sd; -GtkObject *parent; The parent that the dialog 'belongs' to -int _type; The type of message -char *fmt; The message to place in the dialog box -... - ->>description -Put up an error box. -If song is supplied then there will only be one error box active -for a file at once, although they are not modal. -Another message will just cause the original to go away. -If -.A parent -is supplied then when that object is destroyed or unmapped -the dialog will be destroyed to. -The routine is printf like. ->>code - va_list ap; - enum message_type type = _type; - GtkWidget *dialog = NULL; - GtkWindow *parent_win; - int d_id = 0; - char *msg; - - va_start(ap, fmt); - msg = g_strdup_vprintf(fmt, ap); - va_end(ap); - - /* The gnome idea of parent only includes windows */ - parent_win = NULL; - if (parent && GTK_IS_WINDOW(parent)) - parent_win = GTK_WINDOW(parent); - - /* Destroy any old one */ - if (sd) - reg_destroy(sd->dialog); - - /* Create the gnome dialog */ - switch (type) { - case MEL_MSG_LAST: - case MEL_MSG_ERROR: - dialog = gnome_error_dialog_parented(msg, parent_win); - break; - case MEL_MSG_WARNING: - dialog = gnome_warning_dialog_parented(msg, parent_win); - break; - case MEL_MSG_INFO: - dialog = gnome_ok_dialog_parented(msg, parent_win); - break; - } - - if (dialog) - d_id = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); - if (sd) - sd->dialog = d_id; - else - UnattachedDialog = d_id; - - /* Destroy dialog when the parent is hidden as well */ - if (parent) - gtk_signal_connect_object_while_alive(GTK_OBJECT(parent), "hide" - , gtk_widget_destroy, GTK_OBJECT(dialog)); - - g_free(msg); - - ->>function mel_ui_warn -void -struct song *sd; -char *msg; The message to place in the dialog box -GtkObject *parent; The parent that the dialog 'belongs' to - ->>description -Put up a warning box. -There can only be one error box active for a file at once although they -are not modal. -Another message will just cause the original to go away. -If -.A parent -is supplied then when that object is destroyed or unmapped -the dialog will be destroyed to. - ->>code - GtkWidget *dialog; - - /* Destroy any old one */ - reg_destroy(sd->dialog); - - /* Create the gnome dialog */ - dialog = gnome_warning_dialog(msg); - - sd->dialog = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); - - /* Destroy dialog when the parent is hidden as well */ - if (parent) - gtk_signal_connect_object_while_alive(GTK_OBJECT(parent), "hide" - , gtk_widget_destroy, GTK_OBJECT(dialog)); - - ->>function mel_file_error -gboolean -struct song *song; -struct File *file; File status to check -GtkObject *parent; - ->>description -Check the file status and take any action. -Put up an error or warning message. -If the status is to confirm then a dialog is put -up for the user. -Returns TRUE if there is an error that should stop further -processing. -False if there is no error and things can carry on. - ->>code - int code = file_get_status(file); - - if (code == FILE_SUCCESS) - return FALSE; - - if (code == FILE_STATUS_CONFIRM) { - printf("@func_name: confirm not implemented yet\n"); - return FALSE; - } - - switch (code) { - char *msg; - - default: - msg = g_strdup_printf( - _("There was a problem opening the file %s\n%s"), - file->name, file_get_message(file) - ); - mel_song_error(song, parent, msg); - break; - } - - return TRUE; /* True, there is an error */ - - ->>function mel_status_msg -void -struct song *song; -char *msg; - ->>code - GnomeApp *app; - GtkWidget *view; - GtkStatusbar *sbar; - guint ctx; - - view = gnome_mdi_get_active_view(GNOME_MDI(song->mdi)); - if (view) { - app = gnome_mdi_get_app_from_view(view); - sbar = GTK_STATUSBAR(app->statusbar); - ctx = gtk_statusbar_get_context_id(sbar, "hello"); - gtk_statusbar_pop(sbar, ctx); - gtk_statusbar_push(sbar, ctx, msg); - } - ->>function mel_accept_files -void -GtkObject *mdi; -GtkWidget *w; - ->>description -Set the specified widget, -.A w , -up to receive file names from a desktop file browser or -whatever. -Accepts text/uri-list, but to begin with we are only going -to allow local files. - ->>code - static GtkTargetEntry targets[] = { - /* Allow filename lists from any application */ - {"text/uri-list", 0, 0}, - }; - gpointer data; - - /* See if there is one already */ - data = gtk_object_get_data(GTK_OBJECT(w), "FILE_DRAG"); - - if (GPOINTER_TO_INT(data) != 1) { - data = GINT_TO_POINTER(1); - gtk_object_set_data(GTK_OBJECT(w), "FILE_DRAG", data); - - /* Set up to receive filenames. The names are only ever copied */ - gtk_drag_dest_set(w, GTK_DEST_DEFAULT_ALL, targets, NELEM(targets), - GDK_ACTION_COPY); - gtk_signal_connect(GTK_OBJECT(w), "drag_data_received", - GTK_SIGNAL_FUNC(drag_files_received), mdi); - } - - ->>function drag_files_received -static int -GtkWidget *w; The app data drop on -GdkDragContext *context; -gint x; x location (not used) -gint y; y location (not used) -GtkSelectionData *data; -guint info; -guint time; - ->>description -Respond to the signal that we have received a filename drop. - ->>code - GList *list; - - /* Extract just the filenames */ - list = gnome_uri_list_extract_filenames(data->data); - if (!list) { - gtk_drag_finish(context, FALSE, FALSE, time); - return FALSE; - } - - /* Add for later execution */ - g_idle_add(create_files, list); - - return TRUE; - ->>function create_files -static gboolean -gpointer data; ->>description -Helper function to create some files. -Needed because when we create a file we may also be creating a window -that we are going to set up to receive drags. -This leads to a nasty loop. - ->>code - GList *list = data; - GList *lname; - - lname = list; - while (lname) { - mel_create_song((GtkObject *)MainMDI, lname->data, NULL); - - lname = lname->next; - } - - gnome_uri_list_free_strings(list); - - return FALSE; - ->>function view_changed_cb -static void -GtkObject *mdi; The mdi object -GtkWidget *widget; The newly added view -gpointer user_data; User data - ->>description -Called when the view is changed. -This function and the {child|view}{add|remove} functions -all work together to keep the song position counter in the -status line up to date with what is being shown in the window. -This is a mess but ultimately the position counter is going -to be removed from the status bar. - ->>code - GtkWidget *actview; - GnomeApp *app; - struct song *song; - MelysPos *pos; - - dprintf1("@func_name"); - - if (widget) - gtk_widget_grab_focus(widget); - - actview = gnome_mdi_get_active_view(GNOME_MDI(mdi)); - - if (actview) { - mel_accept_files(GTK_OBJECT(MainMDI), GTK_WIDGET(actview)); - - app = gnome_mdi_get_app_from_view(actview); - pos = gtk_object_get_data(GTK_OBJECT(app), "song-position"); - song = get_song_from_mdi((GtkObject *)mdi); - - melys_pos_set_controls(pos, md_get_tempomap(song->mdroot), - song->posadj); - } - - - ->>function add_view_cb -static int -GtkObject *mdi; The mdi object -GtkWidget *widget; The newly added view -gpointer user_data; User data - ->>description -Called when a view is added to a child of the mdi. - ->>code - - dprintf1("@func_name: View Added"); - view_changed_cb(mdi, NULL, user_data); - - return TRUE; - ->>function remove_view_cb -static gboolean -GtkObject *mdi; The mdi object -GtkWidget *view; The view being removed -gpointer user_data; User data - ->>code - GnomeApp *app; - MelysPos *pos; - - dprintf1("@func_name"); - - if (view) { - - app = gnome_mdi_get_app_from_view(view); - pos = gtk_object_get_data(GTK_OBJECT(app), "song-position"); - if (pos) - melys_pos_clear(pos); - } - - return TRUE; - - ->>function add_child_cb -static gboolean -GtkObject *mdi; The mdi object -GtkObject *child; The child being added -gpointer user_data; User data - ->>code - dprintf1("@func_name"); - - /* Call this in case the view hasn't actually changed */ - view_changed_cb(mdi, NULL, user_data); - return TRUE; - ->>function remove_child_cb -static gboolean -GtkObject *mdi; The mdi object -GtkObject *child; The child being removed -gpointer user_data; User data - ->>code - GnomeApp *app; - GtkWidget *view; - MelysPos *pos; - - dprintf1("@func_name"); - - view = gnome_mdi_get_active_view(GNOME_MDI(mdi)); - if (view) { - app = gnome_mdi_get_app_from_view(view); - pos = gtk_object_get_data(GTK_OBJECT(app), "song-position"); - if (pos) - melys_pos_clear(pos); - } - view_changed_cb(mdi, NULL, NULL); - - return TRUE; - ->>function app_destroy_cb -static void -GtkWidget *app; -gpointer data; - ->>code - dprintf1("@func_name"); - view_changed_cb(GTK_OBJECT(MainMDI), NULL, NULL); - ->>function set_tip -void -GtkWidget *w; Widget that tool tip is for -char *tip; The text of the tool tip - ->>description -Add a tool tip to a widget. - ->>code - static GtkTooltips *tips; - - if (!tips) - tips = gtk_tooltips_new(); - - gtk_tooltips_set_tip(tips, w, tip, NULL); - - ->>function mel_debug_print_type -void -char *msg; Message to print first -GtkObject *o; Object to print type of ->>description -Print out the type of the specified object. ->>code - - g_message("%s: %s\n", msg, gtk_type_name(GTK_OBJECT_TYPE(o))); - - diff -rNu melys-0.1.16/gui/menus.m melys-0.1.17/gui/menus.m --- melys-0.1.16/gui/menus.m Tue Dec 14 17:49:32 1999 +++ melys-0.1.17/gui/menus.m Thu Jan 1 01:00:00 1970 @@ -1,734 +0,0 @@ ->>name menus.m - Code for the menus. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header gtk/gtk.h ->>header gdk/gdkkeysyms.h - ->>header libgnomeui/gnome-app.h ->>header libgnomeui/gnome-mdi.h ->>header libgnomeui/gnome-mdi-generic-child.h ->>header libgnomeui/gnome-about.h - ->>header melreg.h ->>header elements.h ->>header song.h ->>header melys.h ->>header melfile.h ->>header melmidi.h ->>header melmsg.h ->>header melgui.h ->>header pixmaps.h ->>header md.h ->>header melystrack.h ->>header melyspos.h - ->>headerdef --decl menus.h - ->>extern -a - -/* The file menu */ -GnomeUIInfo filemenu[] = { - GNOMEUIINFO_MENU_NEW_ITEM(N_("New"), - N_("Start a new piece of music"), new_cb, NULL), - GNOMEUIINFO_MENU_OPEN_ITEM(open_cb, NULL), - GNOMEUIINFO_MENU_SAVE_ITEM(save_cb, NULL), - GNOMEUIINFO_MENU_SAVE_AS_ITEM(save_as_cb, NULL), - GNOMEUIINFO_MENU_CLOSE_ITEM(close_cb, NULL), - GNOMEUIINFO_SEPARATOR, - GNOMEUIINFO_MENU_EXIT_ITEM(exit_cb, NULL), - GNOMEUIINFO_END -}; - -/* - * The windows menu that allows you to switch between the different - * open files. This is created empty of file names but will be - * filled in at run time - */ -GnomeUIInfo windowmenu[] = { - {GNOME_APP_UI_ITEM, N_("_Close all"), N_("Close all open windows"), - close_all_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ - 0, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, -#ifdef DEBUG - {GNOME_APP_UI_ITEM, N_("_Debug"), N_("Bring up a debugging window"), - debug_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ - 0, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, -#endif - GNOMEUIINFO_SEPARATOR, - GNOMEUIINFO_END -}; - -/* The tracks menu */ -/* NOTE: this should only appear with the tracks view */ -GnomeUIInfo tracksmenu[] = { - {GNOME_APP_UI_ITEM, N_("_Add"), N_("Add a new track"), - add_track_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - 0, NULL, /* Pixmap */ - 0, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - {GNOME_APP_UI_ITEM, N_("_Delete"), N_("Delete selected tracks"), - delete_track_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - 0, NULL, /* Pixmap */ - GDK_Delete, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - {GNOME_APP_UI_ITEM, N_("Delete empty"), N_("Delete all empty tracks"), - delete_empty_track_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - 0, NULL, /* Pixmap */ - 0, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - {GNOME_APP_UI_ITEM, N_("Properties..."), N_("The track properties box"), - track_prop_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - 0, NULL, /* Pixmap */ - 0, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - GNOMEUIINFO_END -}; - -/* The play menu */ -/* NOTE add accelerators later */ -GnomeUIInfo actionmenu[] = { - {GNOME_APP_UI_ITEM, N_("_Start"), N_("Start or continue playing"), - start_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - GNOME_APP_PIXMAP_DATA, mplay_xpm, /* Pixmap */ - GDK_Return, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - - {GNOME_APP_UI_ITEM, N_("_Pause"), N_("Pause playing"), - pause_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - GNOME_APP_PIXMAP_DATA, mpause_xpm, /* Pixmap */ - 'p', (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - - {GNOME_APP_UI_ITEM, N_("S_top"), N_("Stop and return to beginning"), - stop_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - GNOME_APP_PIXMAP_DATA, mstop_xpm, /* Pixmap */ - ' ', (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - - {GNOME_APP_UI_ITEM, N_("_Record"), N_("Start recording"), - record_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - GNOME_APP_PIXMAP_DATA, mrec_xpm, /* Pixmap */ - GDK_KP_Add, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - - {GNOME_APP_UI_ITEM, N_("Record stop"), N_("Stop recording"), - record_stop_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - 0, NULL, /* Pixmap */ - GDK_KP_Subtract, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - - GNOMEUIINFO_END -}; - -/* The help menu */ -GnomeUIInfo helpmenu[] = { - GNOMEUIINFO_HELP("melys"), - GNOMEUIINFO_MENU_ABOUT_ITEM(about_cb, NULL), - GNOMEUIINFO_END -}; - -/* The menubar, made up of the file menu etc */ -GnomeUIInfo menubar[] = { - GNOMEUIINFO_MENU_FILE_TREE(filemenu), - GNOMEUIINFO_SUBTREE(N_("_Tracks"), tracksmenu), - GNOMEUIINFO_SUBTREE(N_("_Actions"), actionmenu), - GNOMEUIINFO_MENU_WINDOWS_TREE(windowmenu), - GNOMEUIINFO_MENU_HELP_TREE(helpmenu), - GNOMEUIINFO_END -}; - -extern struct except *noActiveChildError; - ->>function mel_init_menus -void -GnomeMDI *mdi; MDI widget ->>description -Initialise the menus for the application. - ->>code - - gnome_mdi_set_menubar_template(mdi, menubar); - gnome_mdi_set_child_list_path(mdi, "Windows/"); - - ->># Callback functions. - ->>function new_cb -static void -GtkWidget *wid; -gpointer data; The mdi widget - ->>description -Starts a new empty song. - ->>code - GtkObject *mdi = data; - struct song *song; - - /* Create a new child for this file */ - song = mel_create_song(GTK_OBJECT(mdi), NULL, NULL); - song->unused = 1; - - ->>function open_cb -static void -GtkWidget *wid; widget event received on -gpointer data; This will be the mdi widget - ->>description -Bring up a file dialog. -It is either re-used or created from scratch. -This function is called when the user selects open from -the menu. - -There is no gnome dialog yet, but it will be used when there is -one. - ->>code - GtkObject *mdi = data; - GtkWidget *w; - GtkFileSelection *sel; - - /* Get a new file selection dialog or re-use the old one */ - w = get_open_dialog(mdi); - - if (w == NULL) { - - /* Need to create a new file selection dialog. This - * is the first time, or the old one was killed from the - * window manager etc. - */ - w = gtk_file_selection_new(_("Select the file to read in...")); - sel = GTK_FILE_SELECTION(w); - set_open_dialog(mdi, w); - - gtk_signal_connect(GTK_OBJECT(sel->ok_button), "clicked", - open_ok_cb, mdi); - gtk_signal_connect(GTK_OBJECT(sel->cancel_button), "clicked", - file_cancel_cb, sel); - } else { - - /* Else reuse it, and ensure raised */ - sel = GTK_FILE_SELECTION(w); - gtk_window_set_position(GTK_WINDOW(w), GTK_WIN_POS_MOUSE); - gdk_window_raise(w->window); - gtk_editable_select_region(GTK_EDITABLE(sel->selection_entry), 0, -1); - } - - gtk_window_set_position(GTK_WINDOW(w), GTK_WIN_POS_MOUSE); - gtk_widget_show(w); - - ->>function open_ok_cb -static void -GtkWidget *button; -gpointer data; The mdi - ->>description -Open a file. -A new child window will be created if necessary. - ->>code - GtkObject *mdi; - GtkFileSelection *sel; - struct song *song; - char *filename; - - if (CATCH(noActiveChildError)) { - mdi = GTK_OBJECT(data); - song = NULL; - } else { - mdi = GTK_OBJECT(data); - song = get_song_from_mdi(mdi); - } - - UNCATCH(noActiveChildError); - - - /* Get the filename that the user selected */ - sel = (GtkFileSelection*)get_open_dialog(mdi); - if (sel == NULL) - return; - - filename = gtk_file_selection_get_filename(sel); - - /* - * Create a new child. If the current one has not been - * used, then it could be destroyed. - */ - mel_create_song(GTK_OBJECT(mdi), filename, GTK_OBJECT(sel)); - - ->>function save_cb -static void -GtkWidget *mi; The menu item selected -gpointer data; The mdi object ->>description -Save the file. If there is no stored filename -then it behaves like save_as. ->>code - GtkObject *mdi = data; - GtkObject *child; - struct song *sd; - struct File *file; - - sd = get_song_from_mdi(mdi); - - if (sd->filename == NULL) { - save_as_cb(mi, data); - return; - } - - child = sd->child; - - file = file_new(sd->filename); - file_write(file, sd->mdroot); - if (mel_file_error(sd, file, NULL)); - return; - - gnome_mdi_child_set_name(GNOME_MDI_CHILD(child), g_basename(sd->filename)); - - - ->>function save_as_cb -static void -GtkWidget *mi; The menu item selected -gpointer data; The mdi object - ->>description -Bring up a save-as dialog and write the song to the selected file. - ->>code - GtkObject *mdi = data; - GtkObject *child; - struct song *sd; - GtkWidget *w; - GtkFileSelection *sel; - - sd = get_song_from_mdi(mdi); - child = sd->child; - - /* Get a new file selection dialog or re-use the old one */ - w = reg_get_widget(sd->save_dialog); - - if (w == NULL) { - w = gtk_file_selection_new(_("Select the file name to write to...")); - sel = GTK_FILE_SELECTION(w); - sd->save_dialog = reg_object(GTK_OBJECT(sel), GTK_OBJECT(child)); - - gtk_signal_connect(GTK_OBJECT(sel->ok_button), "clicked", - save_ok_cb, child); - gtk_signal_connect(GTK_OBJECT(sel->cancel_button), "clicked", - file_cancel_cb, sel); - } else { - - /* Else reuse it, and ensure raised */ - gdk_window_raise(w->window); - } - - gtk_window_set_position(GTK_WINDOW(w), GTK_WIN_POS_MOUSE); - gtk_widget_show(w); - - ->>function save_ok_cb -static void -GtkWidget *button; -gpointer data; - ->>description -User has selected a file to write to. -All we now have to do is write it out! - ->>code - GtkObject *mdi; - GtkObject *child = GTK_OBJECT(data); - struct song *sd = song_get_data(child); - GtkFileSelection *sel; - struct File *file; - char *filename; - int save_id; - - mdi = sd->mdi; - - /* Get the filename that the user selected */ - save_id = sd->save_dialog; - sel = (GtkFileSelection*)reg_get(save_id); - if (sel == NULL) { - return; - } - filename = gtk_file_selection_get_filename(sel); - - file = file_new(filename); - file_write(file, sd->mdroot); - if (mel_file_error(sd, file, (GtkObject*)sel)) - return; - - sd->filename = filename; - gnome_mdi_child_set_name(GNOME_MDI_CHILD(child), g_basename(filename)); - - gtk_widget_hide(GTK_WIDGET(sel)); - - ->>function file_cancel_cb -static void -GtkWidget *button; -gpointer data; ->>description -Cancel has been clicked, so just hide the dialog. -Allows you to carry on from where you left off after a cancel. - ->>code - GtkWidget *w = GTK_WIDGET(data); - - gtk_widget_hide(w); - - ->>function close_cb -static void -GtkWidget *w; Widget event received on -gpointer data; This will be the mdi widget - ->>description -This function is called when the user clicks on the close -menu item. - ->>code - GtkObject *mdi = GTK_OBJECT(data); - struct song *sd = get_song_from_mdi(mdi); - int count; - - count = get_child_count(mdi); - if (sd->child) { - gnome_mdi_remove_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(sd->child), 0); - set_child_count(mdi, --count); - } - ->>function close_all_cb -static void -GtkWidget *w; Widget event received on -gpointer data; This will be the mdi widget ->>description -Close all the open windows. - ->>code - MelysPos *pos; - GtkObject *mdi = GTK_OBJECT(data); - GnomeApp *gapp; - - gnome_mdi_remove_all(GNOME_MDI(mdi), 0); - - gapp = gnome_mdi_get_active_window(GNOME_MDI(mdi)); - pos = gtk_object_get_data(GTK_OBJECT(gapp), "song-position"); - melys_pos_clear(pos); - dprintf1("Nfree is %d", md_get_nfree()); - - ->>function exit_cb -static void -GtkWidget *w; widget event received on -gpointer data; This will be the mdi widget - ->>description -This function is called when the user clicks on the close -menu item. - ->>code - GnomeMDI *mdi = GNOME_MDI(data); - - /* TODO: check for unsaved stuff */ - - /* Make some attempt to clean up to help in memleak detection */ - gnome_mdi_remove_all(mdi, FALSE); - gtk_object_unref(GTK_OBJECT(mdi)); - - while (gtk_events_pending()) - gtk_main_iteration(); - - gtk_main_quit(); - - ->>function start_cb -static void -GtkWidget *w; Widget event received on -gpointer data; The mdi object - ->>description -Start playing the song. - ->>code - GtkObject *mdi = GTK_OBJECT(data); - struct song *sd; - - sd = get_song_from_mdi(mdi); - - song_play_start(sd); - ->>function pause_cb -static void -GtkWidget *w; Widget event received on -gpointer data; The mdi object ->>code - GtkObject *mdi = GTK_OBJECT(data); - struct song *sd; - - sd = get_song_from_mdi(mdi); - - song_play_pause(sd); - ->>function stop_cb -static void -GtkWidget *w; Widget event received on -gpointer data; The mdi object - ->>code - GtkObject *mdi = GTK_OBJECT(data); - struct song *sd; - - sd = get_song_from_mdi(mdi); - - song_play_stop(sd); - - ->>function record_cb -static void -GtkWidget *w; Widget event received on -gpointer data; The mdi object - ->>code - GtkObject *mdi = GTK_OBJECT(data); - struct song *sd; - - sd = get_song_from_mdi(mdi); - sd->unused = 0; - - song_record_start(sd); - - ->>function record_stop_cb -static void -GtkWidget *w; Widget event received on -gpointer data; The mdi object - ->>code - GtkObject *mdi = GTK_OBJECT(data); - struct song *sd; - - sd = get_song_from_mdi(mdi); - - song_record_stop(sd); - - - - ->>function about_cb -static void -GtkWidget *w; Widget event received on -gpointer data; The mdi object - ->>description -Show a dialog black on a dark background, only visible by vampires. -None of the information is useful anyway so it doesn't matter much. - ->>code - GtkWidget *about; - static regid_t aid; - const gchar *authors[] = { - "Steve Ratcliffe ", - NULL, - }; - - about = reg_get_widget(aid); - if (!about) { - about = gnome_about_new("Melys", - MELYS_VERSION_STRING, - _("Copyright Steve Ratcliffe (C) 1999"), - authors, - _("Melys is a Midi sequencer for ALSA"), - NULL /* Logo */ - ); - aid = reg_object(GTK_OBJECT(about), NULL); - } - - gtk_widget_show(about); - - if (about->window) { - gdk_window_raise(about->window); - gdk_window_show(about->window); - } - - ->>function add_track_cb -static void -GtkWidget *w; Widget event received on -gpointer data; The mdi object - ->>description -Add a new empty track. - ->>code - struct song *sd; - struct trackElement *track; - GtkObject *mdi = data; - - sd = get_song_from_mdi(mdi); - - if (sd->mdroot) { - track = md_track_new(); - - /* Set the default channel to be the track number */ - MD_ELEMENT(track)->device_channel = sd->mdroot->tracks; - md_add(MD_CONTAINER(sd->mdroot), MD_ELEMENT(track)); - } - - song_view_update(sd); - - ->>function delete_track_cb -static void -GtkWidget *w; Widget event received on -gpointer data; The mdi object - ->>description -Delete all selected tracks. - ->>code - struct song *sd; - struct trackElement *track; - GtkObject *mdi = data; - int tn; - - sd = get_song_from_mdi(mdi); - - if (sd->mdroot) { -rescan: - for (tn = 0; tn < sd->mdroot->tracks; tn++) { - track = md_track_nth(sd->mdroot, tn); - if (MD_SELECTED(track)) { - md_remove(MD_CONTAINER(sd->mdroot), MD_ELEMENT(track)); - goto rescan; - } - } - } - - song_view_update(sd); - - ->>function delete_empty_track_cb -static void -GtkWidget *w; Widget event received on -gpointer data; The mdi object - ->>description -Delete all selected tracks. - ->>code - struct song *sd; - struct trackElement *track; - GtkObject *mdi = data; - int tn; - - sd = get_song_from_mdi(mdi); - - if (sd->mdroot) { -rescan: - for (tn = 0; tn < sd->mdroot->tracks; tn++) { - track = md_track_nth(sd->mdroot, tn); - - /* simple method - only deletes tracks never used */ - if (MD_CONTAINER(track)->elements->len == 0) { - md_remove(MD_CONTAINER(sd->mdroot), MD_ELEMENT(track)); - goto rescan; - } - } - } - - song_view_update(sd); - ->>function get_open_dialog -static GtkWidget * -GtkObject *mdi; MDI it is saved on ->>code - gpointer data; - GtkWidget *w; - - data = gtk_object_get_data(mdi, MEL_OPEN_DIALOG); - w = reg_get_widget(GPOINTER_TO_INT(data)); - - return w; - ->>function set_open_dialog -static void -GtkObject *mdi; MDI to set it on -GtkWidget *w; The dialog widget ->>code - regid_t id; - - id = reg_object(GTK_OBJECT(w), NULL); - gtk_object_set_data(mdi, MEL_OPEN_DIALOG, GINT_TO_POINTER(id)); - - -#ifdef DEBUG ->>function debug_cb -static void -GtkWidget *w; Widget event received on -gpointer data; The mdi object - ->>description -Bring up a debugging window -with some debugging info in it. - ->>code - struct song *sd; - GtkObject *mdi = data; - - if (CATCH(noActiveChildError)) - sd = NULL; - else - sd = get_song_from_mdi(mdi); - UNCATCH(noActiveChildError); - - mel_song_info(sd, NULL, - _("Number of allocated elements %d\n" - ), md_get_nfree()); - -#endif - ->>function track_prop_cb -static void -GtkWidget *w; widget event received on -gpointer data; the mdi object - ->>description -Show the properties box for the first selected track. - ->>code - struct song *song; - struct trackElement *track; - int tn; - - song = get_song_from_mdi(GTK_OBJECT(data)); - - for (tn = 0; tn < song->mdroot->tracks; tn++) { - track = md_track_nth(song->mdroot, tn); - if (MD_SELECTED(track)) { - /* Show properties box of first selected track */ - track_prop_box(track, song, 0); - return; - } - } - - mel_song_error(song, (GtkObject*)song->trackview, _("No selected tracks")); - diff -rNu melys-0.1.16/gui/partprop.m melys-0.1.17/gui/partprop.m --- melys-0.1.16/gui/partprop.m Mon Nov 1 17:20:21 1999 +++ melys-0.1.17/gui/partprop.m Thu Jan 1 01:00:00 1970 @@ -1,196 +0,0 @@ ->>name partprop.m - part properties box - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header gtk/gtk.h ->>header libgnomeui/gnome-propertybox.h ->>header libgnome/gnome-help.h ->>header melreg.h ->>header song.h ->>header elements.h ->>header melfile.h ->>header melwidgets.h ->>header md.h - ->>headerdef --decl melgui.h - -/* - * The different pages for the part properties. - */ -#define PART_PROP_BASIC 0 - -struct partElement; - ->>extern - - -/* - * Structure to hold the state of the part property - * change. - */ -struct part_prop { - - struct prop_box common; /* Common part of property box */ - - /* Page numbers */ - int basic_page; - - /* This is where we can collect the values that were set */ - GtkEntry *partname; /* The part name */ -}; - -/* Help page locations */ -static struct help_page_entry pages[] = { - {"melys", "display-pane.html", "part-prop-info"}, -}; -static struct help_entry help_entry = { - NELEM(pages), pages -}; - ->>function part_prop_box -void -struct partElement *part; The part to set the properties for -struct song *song; Song information -int which; Which page to present first - ->>description -Bring up a property box for the specified part. -When the user clicks apply/ok then the part properties are set. - ->>code - GtkWidget *gpb; - GtkWidget *basic; - GtkWidget *basiclab; - struct part_prop *prop; - - prop = (struct part_prop *) mel_prop_box(song, - (struct element *)part, sizeof(struct part_prop)); - - gpb = PROP_BOX(prop); - - if (!prop->common.setup) { - prop->common.setup = TRUE; - basic = prop_part_info(prop); - basiclab = gtk_label_new(_("Basic")); - prop->basic_page = gnome_property_box_append_page( - GNOME_PROPERTY_BOX(gpb), basic, basiclab); - - gtk_signal_connect(GTK_OBJECT(gpb), "apply", - GTK_SIGNAL_FUNC(prop_apply), prop); - - /* - * Set up the help system. The standard gnome help system - * for property boxes does not work well for me. So I am - * using a system that allows the help to be in different - * places and can be different sections in the same document. - */ - gtk_signal_connect(GTK_OBJECT(gpb), "help", - GTK_SIGNAL_FUNC(mel_prop_help), &help_entry); - } - - gtk_notebook_set_page((GtkNotebook*)GNOME_PROPERTY_BOX(gpb)->notebook, - which); - gtk_widget_show(gpb); - - ->>function prop_part_info -static GtkWidget * -struct part_prop *prop; - ->>description -Create the actual widget that makes up the basic part properties -page. -A long routine, but straightforward. -The property box is built up piece by piece. - ->>code - struct partElement *part; - GtkFrame *frame; - GtkBox *mainbox; - GtkWidget *tab; - /* Part name */ - GtkWidget *namelab; - GtkEntry *partname; - GtkBox *tnbox; - - part = (struct partElement *)PROP_ELEM(prop); - - frame = (GtkFrame *)gtk_frame_new(_("Part properties")); - - /* - * Create the boxes that some of the widgets are packed into. - * The mainbox may not be needed. - */ - tab = gtk_table_new(3, 3, 0); - mainbox = (GtkBox *)gtk_vbox_new(0, 0/*spacing*/); - tnbox = (GtkBox *)gtk_hbox_new(0, 0/*spacing*/); - - /* Create the labels */ - namelab = new_lab_align(_("Part name")); - - /* Entry box for the part name */ - partname = (GtkEntry *)gtk_entry_new(); - if (part->name) - gtk_entry_set_text(partname, part->name); - gtk_box_pack_start((GtkBox *)tnbox, (GtkWidget *)partname, 0, 0, 0); - - gtk_container_add((GtkContainer *)frame, (GtkWidget*)mainbox); - gtk_box_pack_start(mainbox, (GtkWidget *)tab, 0, 0, 0); - /* ..., expand, fill, padding */ - - /* Attach all the labels */ - attach_at(tab, namelab, 0, 0, GTK_FILL, 0); - - /* Now attach the form boxes */ - attach_at(tab, (GtkWidget *)tnbox, 0, 1, GTK_FILL, 0); - - /* - * Connect to all the changed signals. All this does is allow - * us to get the apply and OK button activated. Nothing is - * changed in the real part until the apply signal is received. - */ - gtk_signal_connect((GtkObject *)partname, "changed", prop_change, prop); - - prop->partname = partname; - - gtk_widget_show_all((GtkWidget*)frame); - return (GtkWidget *)frame; - - ->>function prop_apply -static void -GtkWidget *w; -gint page; -struct part_prop *prop; - ->>code - struct partElement *part; - char *str; - - part = (struct partElement *) PROP_ELEM(prop); - if (!part || MD_IS_DESTROYED(part)) - return; - - if (page != -1) - return; - - str = gtk_entry_get_text(prop->partname); - if (str) { - if (part->name) - g_free(part->name); - part->name = g_strdup(str); - } - - MD_SET_MODIFIED(part, TRUE); - song_view_update(PROP_SONG(prop)); - - diff -rNu melys-0.1.16/gui/propbox.m melys-0.1.17/gui/propbox.m --- melys-0.1.16/gui/propbox.m Mon Nov 1 17:20:21 1999 +++ melys-0.1.17/gui/propbox.m Thu Jan 1 01:00:00 1970 @@ -1,170 +0,0 @@ ->>name propbox.m - Common routines for the property boxes - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header gtk/gtk.h ->>header libgnomeui/gnome-propertybox.h ->>header libgnome/gnome-help.h ->>header melreg.h ->>header song.h ->>header elements.h ->>header md.h - ->>headerdef --decl melgui.h - -struct element; - -/* - * The common part of the property box state structure. - */ -struct prop_box { - - struct song *song; /* The current song information */ - struct element *elem; /* The element to be modified */ - - GtkWidget *box; /* The gnome property box widget */ - - int setup:1; /* Has already been setup */ -}; - -#define PROP_ELEM(p) (((struct prop_box *)p)->elem) -#define PROP_BOX(p) (((struct prop_box *)p)->box) -#define PROP_SONG(p) (((struct prop_box *)p)->song) - ->>function mel_prop_box -struct prop_box * -struct song *song; Song information -struct element *elem; The affected element -int size; Size of property data - ->>description -This is a common routine for creating the property -boxes. -It handles destroying itself when the parent song is closed. -Also it will be destroyed when the element that it -is displaying is destroyed. - ->>code - GtkWidget *gpb; - struct prop_box *prop; - - /* - * See if we have an existing box for this element. If - * we have then it is raised and shown. - */ - prop = g_dataset_get_data(elem, "property-box"); - - if (!prop) { - - prop = g_malloc(size); - - MD_WREF(elem); - prop->elem = elem; - prop->song = song; - - gpb = gnome_property_box_new(); - prop->box = gpb; - - gtk_signal_connect(GTK_OBJECT(gpb), "destroy", - GTK_SIGNAL_FUNC(prop_box_destroyed), prop); - - g_dataset_set_data_full(elem, "property-box", prop, prop_zap); - - prop->setup = FALSE; - } - - if (prop->box->window) { - gdk_window_raise(prop->box->window); - gdk_window_show(prop->box->window); - } - - return prop; - ->>function attach_at -void -GtkWidget *tab; -GtkWidget *w; -int row; -int col; -int xopts; -int yopts; - ->>code - - gtk_table_attach(GTK_TABLE(tab), w, col, col+1, row, row+1, - xopts, yopts, 10, 4); - - - ->>function new_lab_align -GtkWidget * -char *str; - ->>description -Create a label and set its alignment and/or justification. - ->>code - GtkWidget *lab; - - lab = gtk_label_new(str); - gtk_misc_set_alignment((GtkMisc *)lab, 0.0, 0.5); - return lab; - - ->>function prop_change -void -GtkWidget *w; -gpointer data; - ->>code - struct prop_box *prop = data; - - if (prop->box) - gnome_property_box_changed((GnomePropertyBox *)prop->box); - - ->>function prop_box_destroyed -static void -GtkWidget *w; -gpointer data; - ->>code - struct prop_box *prop = data; - struct element *elem; - GtkWidget *box = prop->box; - - elem = prop->elem; - box = prop->box; - - prop->elem = NULL; - prop->box = NULL; - - g_dataset_remove_no_notify(elem, "property-box"); - if (elem) - MD_WUNREF(elem); - if (box) - gtk_widget_destroy(box); - -#ifdef DEBUG - memset(prop, 0xA5, sizeof(*prop)); -#endif - g_free(prop); - ->>function prop_zap -static void -void *data; - ->>code - struct prop_box *prop = data; - - if (prop->box) - gtk_widget_destroy(prop->box); diff -rNu melys-0.1.16/gui/trackprop.m melys-0.1.17/gui/trackprop.m --- melys-0.1.16/gui/trackprop.m Tue Nov 23 19:40:46 1999 +++ melys-0.1.17/gui/trackprop.m Thu Jan 1 01:00:00 1970 @@ -1,400 +0,0 @@ ->>name trackprop.m - track properties box - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header gtk/gtk.h ->>header libgnomeui/gnome-propertybox.h ->>header libgnome/gnome-help.h ->>header melreg.h ->>header song.h ->>header elements.h ->>header melfile.h ->>header melwidgets.h ->>header md.h - ->>headerdef --decl melgui.h - -/* - * The different pages for the track properties. - */ -#define TRACK_PROP_BASIC 0 -#define TRACK_PROP_INSTR 1 - ->>extern - -/* - * Structure to hold the state of the track property - * change. - */ -struct track_prop { - - struct prop_box common; /* Common part of the property box */ - - /* Page numbers */ - int basic_page; - int instrument_page; - - /* This is where we can collect the values that were set */ - GtkEntry *trackname; /* The track name */ - GtkSpinButton *devname; /* Device name will probably change */ - GtkSpinButton *channel; /* The channel number */ - GtkAdjustment *volume; /* The initial volume */ - GtkAdjustment *pan; /* Initial pan position */ - - GtkSpinButton *instr; /* The instrument number (TEMP) */ - GtkSpinButton *bankmsb; /* The instrument number high bank */ - GtkSpinButton *banklsb; /* The instrument number low bank */ -}; - -/* Help locations */ -static struct help_page_entry pages[] = { - {"melys", "info-pane.html", "track-prop-info"}, - {"melys", "info-pane.html", "track-prop-instruments"}, -}; -static struct help_entry help_entry = { - NELEM(pages), pages -}; - ->>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) * 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 -struct trackElement *track; The track to set the properties for -struct song *song; Song information -int which; Which page to present first - ->>description -Bring up a property box for the specified track. -When the user clicks apply/ok then the track properties are set. - ->>code - GtkWidget *gpb; - GtkWidget *basic; - GtkWidget *basiclab; - GtkWidget *instr; - GtkWidget *instrlab; - struct track_prop *prop; - - prop = (struct track_prop *) mel_prop_box(song, - (struct element *)track, sizeof(struct track_prop)); - - gpb = PROP_BOX(prop); - - if (!prop->common.setup) { - prop->common.setup = TRUE; - - basic = prop_track_info(prop); - basiclab = gtk_label_new(_("Basic")); - prop->basic_page = gnome_property_box_append_page( - GNOME_PROPERTY_BOX(gpb), basic, basiclab); - - instr = prop_track_instruments(prop); - instrlab = gtk_label_new(_("Instruments")); - prop->instrument_page = gnome_property_box_append_page( - GNOME_PROPERTY_BOX(gpb), instr, instrlab); - - gtk_signal_connect(GTK_OBJECT(gpb), "apply", - GTK_SIGNAL_FUNC(prop_apply), prop); - - /* - * Set up the help system. The standard gnome help system - * for property boxes does not work well for me. So I am - * using a system that allows the help to be in different - * places and can be different sections in the same document. - */ - gtk_signal_connect(GTK_OBJECT(gpb), "help", - GTK_SIGNAL_FUNC(mel_prop_help), &help_entry); - } - - gtk_notebook_set_page((GtkNotebook*)GNOME_PROPERTY_BOX(gpb)->notebook, - which); - gtk_widget_show(gpb); - - ->>function prop_track_info -static GtkWidget * -struct track_prop *prop; - ->>description -Create the actual widget that makes up the basic track properties -page. -A long routine, but straightforward. -The property box is built up piece by piece. - ->>code - struct trackElement *track; - GtkFrame *frame; - GtkBox *mainbox; - GtkWidget *tab; - - track = MD_TRACK(PROP_ELEM(prop)); - - frame = (GtkFrame *)gtk_frame_new(_("Track properties")); - - /* - * Create the boxes that some of the widgets are packed into. - */ - tab = gtk_table_new(3, 3, 0); - mainbox = (GtkBox *)gtk_vbox_new(0, 0/*spacing*/); - - gtk_container_add((GtkContainer *)frame, (GtkWidget*)mainbox); - gtk_box_pack_start(mainbox, (GtkWidget *)tab, 0, 0, 0); - /* ..., expand, fill, padding */ - - { - /* Track name */ - GtkWidget *namelab; - GtkEntry *trackname; - GtkWidget *tnbox; - - tnbox = gtk_hbox_new(0, 0); - namelab = new_lab_align(_("Track name")); - - /* Entry box for the track name */ - trackname = (GtkEntry *)gtk_entry_new(); - if (track->name) - gtk_entry_set_text(trackname, track->name); - gtk_box_pack_start((GtkBox *)tnbox, (GtkWidget *)trackname, 0, 0, 0); - attach_at(tab, namelab, 0, 0, GTK_FILL, 0); - attach_at(tab, tnbox, 0, 1, GTK_FILL, 0); - gtk_signal_connect((GtkObject *)trackname, "changed", - prop_change, prop); - prop->trackname = trackname; - } - - { - /* Device name */ - GtkWidget *devlab; - GtkWidget *devlist; - GtkWidget *devbox; - - devbox = gtk_hbox_new(0, 0); - devlab = new_lab_align(_("Output device")); - devlist = mel_int_spinner(1, 4, MD_DEV(track)+1); /* Very temporary */ - - gtk_box_pack_start((GtkBox *)devbox, (GtkWidget *)devlist, 0, 0, 0); - attach_at(tab, devlab, 1, 0, GTK_FILL, 0); - attach_at(tab, devbox, 1, 1, GTK_FILL, 0); - - gtk_signal_connect((GtkObject *)devlist, "changed", prop_change, prop); - prop->devname = GTK_SPIN_BUTTON(devlist); - } - - { - /* Channel number */ - GtkWidget *chanbox; - GtkWidget *chanlab; - GtkWidget *chan; - - chanbox = gtk_hbox_new(0, 0); - chanlab = new_lab_align(_("Channel")); - - /* Channel spinner */ - chan = mel_int_spinner(1, 16, MD_CHAN(track)+1); - - gtk_box_pack_start((GtkBox *)chanbox, chan, 0, 0, 0); - attach_at(tab, chanlab, 2, 0, GTK_FILL, 0); - attach_at(tab, chanbox, 2, 1, GTK_FILL, 0); - - gtk_signal_connect((GtkObject *)chan, "changed", prop_change, prop); - prop->channel = GTK_SPIN_BUTTON(chan); - } - - { - /* Initial volume */ - GtkAdjustment *voladj; - GtkWidget *volbox; - GtkWidget *vollab; - GtkWidget *vol; - - volbox = gtk_hbox_new(0, 0); - vollab = new_lab_align(_("Initial volume")); - voladj = (GtkAdjustment *)gtk_adjustment_new( - 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); - gtk_scale_set_digits((GtkScale *)vol, 0); - - gtk_box_pack_start((GtkBox *)volbox, vol, 1, 1, 0); - attach_at(tab, vollab, 3, 0, GTK_FILL, 0); - attach_at(tab, volbox, 3, 1, GTK_FILL, 0); - - gtk_signal_connect((GtkObject *)voladj, "value_changed", - prop_change, prop); - prop->volume = voladj; - } - - - { - /* Pan position */ - GtkAdjustment *panadj; - GtkWidget *panbox; - GtkWidget *panlab; - GtkWidget *pan; - - panbox = gtk_hbox_new(0, 0); - panlab = new_lab_align(_("Pan position")); - panadj = (GtkAdjustment *)gtk_adjustment_new(PAN_TO_ADJ(track->pan), - -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); - gtk_scale_set_digits((GtkScale *)pan, 0); - - gtk_box_pack_start((GtkBox *)panbox, pan, 1, 1, 0); - attach_at(tab, panlab, 4, 0, GTK_FILL, 0); - attach_at(tab, panbox, 4, 1, GTK_FILL, 0); - - gtk_signal_connect((GtkObject *)panadj, "value_changed", - prop_change, prop); - prop->pan = panadj; - } - - gtk_widget_show_all((GtkWidget*)frame); - return (GtkWidget *)frame; - - ->>function prop_track_instruments -static GtkWidget * -struct track_prop *prop; ->>description -Build up the instrument definition page. - ->>code - struct trackElement *track; - GtkWidget *frame; - GtkWidget *constructionlab; - GtkWidget *tmpbox; - - /* Instrument number */ - GtkWidget *instr; - GtkWidget *instrbox; - GtkWidget *instrlab; - /* Bank MSB */ - GtkWidget *bankmsb; - GtkWidget *bankmsblab; - /* Bank LSB */ - GtkWidget *banklsb; - GtkWidget *banklsblab; - - track = MD_TRACK(PROP_ELEM(prop)); - - frame = gtk_frame_new(_("Instruments")); - tmpbox = gtk_vbox_new(0, 0); - instrbox = gtk_hbox_new(0, 0); - instrlab = new_lab_align(_("Instrument")); - bankmsblab = new_lab_align(_("Bank MSB")); - banklsblab = new_lab_align(_("Bank LSB")); - - constructionlab = gtk_label_new( - _("This page will be a comprehensive instrument selection page\n" - "At present you can just select from program\n" - "and bank MSB/LSB numbers\n" - )); - - gtk_box_pack_start((GtkBox*)tmpbox, constructionlab, 0, 0, 10); - - /* Instrument spinner */ - instr = mel_int_spinner(0, 127, track->program->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->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); - gtk_box_pack_start((GtkBox *)instrbox, banklsb, 0, 0, 0); - - gtk_box_pack_start((GtkBox*)tmpbox, instrbox, 0, 0, 10); - - gtk_container_add((GtkContainer *)frame, tmpbox); - gtk_widget_show_all(frame); - - gtk_signal_connect((GtkObject *)instr, "changed", prop_change, prop); - gtk_signal_connect((GtkObject *)bankmsb, "changed", prop_change, prop); - gtk_signal_connect((GtkObject *)banklsb, "changed", prop_change, prop); - - prop->instr = GTK_SPIN_BUTTON(instr); - prop->bankmsb = GTK_SPIN_BUTTON(bankmsb); - prop->banklsb = GTK_SPIN_BUTTON(banklsb); - - return frame; - - ->>function prop_apply -static void -GtkWidget *w; -gint page; -struct track_prop *prop; - ->>code - struct trackElement *track; - char *str; - int num; - int program; - - track = MD_TRACK(PROP_ELEM(prop)); - if (!track || MD_IS_DESTROYED(track)) - return; - - if (page != -1) - return; - - str = gtk_entry_get_text(prop->trackname); - if (str) { - if (track->name) - g_free(track->name); - track->name = g_strdup(str); - } - - num = gtk_spin_button_get_value_as_int(prop->channel); - num--; /* Really starts at 0 */ - if (num != MD_CHAN(track)) - md_set_devchan(MD_ELEMENT(track), MD_MK_DEVCHAN(MD_DEV(track), num)); - num = gtk_spin_button_get_value_as_int(prop->devname); - num--; /* Really starts at 0 */ - if (num != MD_DEV(track)) - md_set_devchan(MD_ELEMENT(track), MD_MK_DEVCHAN(num, MD_CHAN(track))); - - num = gtk_spin_button_get_value_as_int(prop->instr); - program = num; - - num = gtk_spin_button_get_value_as_int(prop->banklsb); - program |= num << 7; - num = gtk_spin_button_get_value_as_int(prop->bankmsb); - program |= num << 14; - if (program != track->program->program) { - md_set_program(MD_CONTAINER(track), program, TRUE); - if (program & ~0x7f) - track->program->pchange_mode = PCHANGE_NORMAL; - } - - num = prop->volume->value + 0.5; - track->volume = ADJ_TO_VOL(num); - - num = prop->pan->value; - 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.16/include/melysgrid.h melys-0.1.17/include/melysgrid.h --- melys-0.1.16/include/melysgrid.h Fri Jan 7 11:13:34 2000 +++ melys-0.1.17/include/melysgrid.h Wed Feb 9 21:03:19 2000 @@ -11,7 +11,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * A grid widget. You can specify major and minor rulings, the frequency + * A grid widget, conceptually it is infinite in size like the + * canvas. You can specify major and minor rulings, the frequency * of the rulings etc. * * diff -rNu melys-0.1.16/make.conf melys-0.1.17/make.conf --- melys-0.1.16/make.conf Mon Nov 29 10:39:26 1999 +++ melys-0.1.17/make.conf Tue Jan 11 14:50:57 2000 @@ -19,11 +19,12 @@ # Options for glib: output of "gtk-config --cflags" GLIBFLAGS = -I/usr/X11R6/include -I/usr/lib/glib/include -# Options for gnome: output of "gnome-config --cflags gnome" -GNOMEFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/X11R6/include -I/usr/lib/glib/include +# Options for gnome: output of "gnome-config --cflags gnome xml" +GNOMEFLAGS = `gnome-config --cflags gnome xml` +# -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/X11R6/include -I/usr/lib/glib/include -I/usr/include/gnome-xml # Gnome libs: output of "gnome-config --libs gnome gnomeui" -GNOMELIBS = `gnome-config --libs gnome gnomeui` +GNOMELIBS = `gnome-config --libs gnome gnomeui xml` # Options to link with glib # GLIB = -lglib @@ -47,7 +48,7 @@ # --- CFLAGS = $(COPTS) $(DEFINES) $(GNOMEFLAGS) $(INCLUDES) -LIBS = $(GNOMELIBS) -lxml -lz -lasound $(DBMALLOC) +LIBS = $(GNOMELIBS) -lz -lasound $(DBMALLOC) # The gnome data directory GNOME_DATA_DIR = `gnome-config --datadir gnomeui` diff -rNu melys-0.1.16/md/elements.m melys-0.1.17/md/elements.m --- melys-0.1.16/md/elements.m Mon Dec 20 13:39:49 1999 +++ melys-0.1.17/md/elements.m Thu Jan 1 01:00:00 1970 @@ -1,459 +0,0 @@ ->>name elements.m - -File: elements.m - Operation on all elements - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header glib.h - - ->>header md.h ->>header except.h - ->>headerdef --decls elements.h - -/* The version number of mdml */ -#define MDML_VERSION_MAJOR 1 -#define MDML_VERSION_MINOR 0 - -#define MD_CONTAINER_BEGIN 50 /* Begining of container types */ - -#define element_time time.tick /* For backward compatibility */ - ->>extern - -static int partid; - -/* Number of elements active, mainly for debugging */ -int Nelements; - -/* - * The basic element type. All elements have a time associated with - * them and most use the device and channel field. - * This should be kept as small as possible. - */ ->>elementdef element - struct containerElement *con; /* Containing element */ - union un_time { - ticktime_t 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; /* 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; - e->modified = 1; - e->con = NULL; - Nelements++; -copy - Nelements++; - new->con = NULL; - new->refcount = 1; - new->floating = 1; - new->modified = 1; - new->selected = 0; - new->wref = 0; - g_assert(!new->destroyed); - -/* - * An element that holds others. This includes tracks, parts and the - * tempo map. - */ ->>elementdef container element - GPtrArray *elements; /* List of elements */ - ticktime_t duration; /* duration time for this container */ - ticktime_t max_duration; /* duration including note lengths */ - -init - e->elements = g_ptr_array_new(); -copy - new->elements = g_ptr_array_new(); - { - struct element *el; - struct element *cp; - int i; - - for (i = 0; i < MD_CONTAINER_LEN(e); i++) { - el = MD_GET_INDEX(e, i); - cp = md_copy(el); - md_add(MD_CONTAINER(new), cp); - } - } - -/* - * The root element, used to hold all the other elements. - */ ->>elementdef root container - struct headElement *head; /* Pointer to the head information */ - short tracks; /* Number of tracks */ - short trackid; /* Ever increasing number for default names */ - 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; -copy - new->head = NULL; - new->tracks = 0; - - -/* - * A holder for all kinds of information about the file. - */ ->>elementdef head container - short ver_major; /* Major part of version number */ - short ver_minor; /* Minor part of version number */ - short format; /* Midi format */ - char *copyright; /* A copyright message */ - char *author; /* Author information */ - char *title; /* The title of the piece */ - char *comment; /* Comments/notes about the piece */ -init - e->copyright = NULL; - e->author = NULL; - e->title = NULL; - e->comment = NULL; -copy - if (e->copyright) - new->copyright = g_strdup(e->copyright); - if (e->author) - new->author = g_strdup(e->author); - if (e->title) - new->title = g_strdup(e->title); - if (e->comment) - new->comment = g_strdup(e->comment); - ->># Superclass of both track and tempomap ->>elementdef tracklike container - int number; /* Track number, -1 for tempomap */ - ->>elementdef track tracklike - char *name; /* Name of track */ - 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 */ - int solo:1; /* Set for solo */ - int solomute:1; /* Track muted because of solo */ - int sololast:1; /* The last solo */ - - /* Fields below this will not ever be saved out */ - struct containerElement *newpart; /* Part being recorded */ - GPtrArray *notes; /* To save pending on notes */ - unsigned char controllers[128]; /* Current controller values */ - int hasprogram:1; /* Has embeded program changes */ -init - e->name = NULL; - 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 - short timebase; /* Time base value */ -init - MD_TRACKLIKE(e)->number = -1; - ->># This should be kept as small as possible as they will soon ->># begin to eat up memory. ->># ->>elementdef note element - char note; /* Note number */ - char vel; /* Velocity */ - char offvel; /* Note Off velocity */ - int length; /* Length of note */ -new char note, char vel, int length - e->note = note; - e->vel = vel; - e->length = length; - - ->>elementdef part container - char *name; /* Part name */ - int id; /* Part id unique among all referenced parts */ - - /* Private stuff */ -init - e->name = NULL; -copy - if (e->name) - new->name = g_strdup(e->name); - ->># This is not really a part as it is not even a container. ->># I have considered allowing partref to have some extra events ->># that are merged into the parent part, so allowing 'just like this ->># part but with this extra note' type expressions. ->># At present though it is an error to actuall put elements into ->># a partref. ->>elementdef partref part - struct partElement *ref; /* The part referenced */ -init - e->ref = NULL; -copy - e->ref = NULL; - g_warning("@func_name: needs implementing"); - ->>elementdef take container - char *name; -init - e->name = NULL; -copy - new->name = g_strdup(e->name); - ->># As with note should be kept as small as possible ->>elementdef control element - char control; /* Controller number */ - char value; /* Controller value */ -new char control, char value - e->control = control; - e->value = value; - ->>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; - ->>elementdef keytouch element - int note; - int velocity; -new int note, int vel - e->note = note; - e->velocity = vel; - ->>elementdef pressure element - int velocity; -new int vel - e->velocity = vel; - ->>elementdef pitch element - int pitch; -new int val - e->pitch = val; - ->>elementdef sysex element - int status; - unsigned char *data; - int length; -new int status, unsigned char *data, int len - { - unsigned char *dp; - - dp = g_malloc(len); - - e->data = dp; - memcpy(dp, data, len); - } - e->status = status; - e->length = len; -copy - new->data = g_memdup(e->data, e->length); -free - g_free(e->data); - ->>elementdef meta element -init - /* nothing to do */; - ->>elementdef map meta -init - /* nothing to do */; - ->>elementdef keysig map - char key; /* Key signature */ - char minor; /* Is this a minor key or not */ -new short key, short minor - e->key = key; - e->minor = minor != 0? 1: 0; - ->>elementdef timesig map - short top; /* 'top' of timesignature */ - short bottom; /* 'bottom' of timesignature */ - short clocks; /* Can't remember what this is */ - short n32pq; /* Thirtysecond notes per quarter */ -new short top, short bottom, short clocks, short n32pq - e->top = top; - e->bottom = bottom; - e->clocks = clocks; - e->n32pq = n32pq; - ->>elementdef tempo map - int micro_tempo; /* The tempo in microsec per quarter note */ -new int m - e->micro_tempo = m; - ->>elementdef text element - int type; /* Type of text (lyric, copyright etc) */ - char *name; /* Type as text */ - char *text; /* actual text */ - int length; /* length of the text (including a null?) */ -new int type, char *text - e->type = type; - e->name = md_textname(type); - e->text = g_strdup(text); - if (text) - e->length = strlen(text); - else - e->length = 0; -copy - new->text = g_strdup(e->text); -free - g_free(e->text); - ->>elementdef smpteoffset element - short hours; - short minutes; - short seconds; - short frames; - short subframes; -new short hours, short minutes, short seconds, short frames, short subframes - e->hours = hours; - e->minutes = minutes; - e->seconds = seconds; - e->frames = frames; - e->subframes = subframes; - - - -/* - * A do nothing event. This is always totally ignored. - * It exists to provide begining and end markers for containers. - * By adding this event you can stretch a container, or cause - * one to be created. - */ ->>elementdef noop element -new ticktime_t time - MD_TIME(e) = time; - - ->>function md_check_cast -struct element * -struct element *el; // Element to be casted -int type; // type to cast to ->>description -Check that the given element can be casted to the given type. -This is mainly for debugging as mismatches will not happen -in proper use. -In particular do not use this routine to check types unless you -want the program to exit if the check fails. - ->>code - - /* Check for null first so we can cast null pointers */ - if (el == NULL) - return el; - - /* If it's the same type then this is always OK */ - if (type == el->type) - return el; - - switch (type) { - case MD_TYPE_CONTAINER: - if (!iscontainer(el)) - ethrow(debugError, "Cast to container from %d", el->type); - return el; - case MD_TYPE_ELEMENT: - /* Anything can be cast to an element */ - if (el->type > 100 || el->type < 0) - break; /* Sanity check */ - return el; - case MD_TYPE_META: - case MD_TYPE_MAP: - /* TEMP: this is a parent type */ - return el; - case MD_TYPE_PART: - if (el->type == MD_TYPE_PARTREF) - return el; - case MD_TYPE_TRACKLIKE: - if (istracklike(el)) - return el; - break; - } - - ethrow(debugError, "Cast from %d to %d not allowed", el->type, type); - return NULL;/* not reached */ - - ->>function md_root_inc_ref -struct rootElement * -struct rootElement *root; - ->>description -Normal reference count operations are handled with in the md layer, -but other code needs to hold references to the root. -Hence this routine to increase the root reference count. -Returns the root so that you can use code like: - - foo->mdroot = md_root_inc_ref(root); - ->>code - - ((struct element *)root)->refcount++; - return root; - ->>function md_part_id -int ->>code - return partid++; - ->>function md_textname -char * -int type; ->>description -Return the name of a text type given its number. -Based on the midi numbers. ->>code - static char *typenames[] = { - "", - "text", - "copyright", - "trackname", - "instrument", - "lyric", - "marker", - "cuepoint", - }; - return typenames[type]; diff -rNu melys-0.1.16/md/mdadd.m melys-0.1.17/md/mdadd.m --- melys-0.1.16/md/mdadd.m Sun Dec 19 16:36:24 1999 +++ melys-0.1.17/md/mdadd.m Thu Jan 1 01:00:00 1970 @@ -1,481 +0,0 @@ ->>name mdadd.m - Modifications to an MD tree - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -Some operations to modify a MD tree. This only covers general purpose -operations. Specialized tranformation are likely -to be implmented in a tools directory. - ->>extern -#ifdef DEBUG -#include -#endif ->>header gtk/gtkobject.h ->>headerdef --decl md.h -/* - * The merge mode types - */ -enum merge_mode { - MD_ADD_MERGE, /* Events are merged in along with existing events */ - //MD_ADD_REPLACE, /* Events comletely replace existing ones in duration */ - //MD_ADD_RETAKE, /* A new take is created as an alternative to existing */ - MD_ADD_LAST -}; - - -#define md_add(c, el) md_add_elem(c, el, 0) -#define md_add_sort(c, el) md_add_elem(c, el, 1) - ->>extern - -/* Short cut for cast */ -#define CPTR struct containerElement * - ->>function md_add_elem -void -struct containerElement *c; -struct element *el; -int sort; - ->>description -Add an event to a track/part etc. -Event is appended or sorted into its correct position. - ->>code - ticktime_t endtime; - ticktime_t max_time; - ticktime_t t; - - g_assert(el->con == NULL); - if (el->floating) - el->floating = 0; - else - el->refcount++; - - endtime = el->element_time; - if (iscontainer(el)) - endtime += ((struct containerElement *)el)->duration; - - max_time = endtime; - - switch (el->type) { - case MD_TYPE_NOTE: - max_time += ((struct noteElement *)el)->length; - break; - - case MD_TYPE_TRACK: - if (!sort) - MD_TRACKLIKE(el)->number = MD_ROOT(c)->tracks; - MD_ROOT(c)->tracks++; - - /* Default a name if there isn't one already */ - MD_ROOT(c)->trackid++; - if (MD_TRACK(el)->name == NULL) { - char *str; - - str = g_strdup_printf("Track %d", MD_ROOT(c)->trackid); - MD_TRACK(el)->name = str; - } - break; - - case MD_TYPE_PART: - case MD_TYPE_PARTREF: - if (MD_PART(el)->name == NULL) { - /* If adding to a track default to the track name */ - if (MD_TYPE(c) == MD_TYPE_TRACK) - MD_PART(el)->name = g_strdup(MD_TRACK(c)->name); - - /* Otherwise it is unnamed unless the user names it */ - } - break; - - default: - break; - } - - t = endtime - MD_TIME(c); - if (t > c->duration) - c->duration = t; - t = max_time - MD_TIME(c); - if (t > c->max_duration) - c->max_duration = t; - - if (MD_TYPE(c) == MD_TYPE_TRACK) - c->duration = c->max_duration; - - g_assert(c->duration >= 0); - if (sort) - md_list_add_sort(c, el); - else - g_ptr_array_add(c->elements, el); - - if (MD_TYPE(c) == MD_TYPE_ROOT) - md_track_renum(MD_ROOT(c)); - - MD_SET_MODIFIED(c, TRUE); - el->con = c; - ->>function md_remove -void -struct containerElement *c; -struct element *el; - ->>description -This is the correct way to remove events from a song. -his keeps track of all the integrety constraints and -allows the operation to be undone if undo is enabled. -The element that is being removed will have its reference -count decremented and will be freed if there are no other references. - ->>code - gboolean res; - - g_assert(el->con == c); - el->con = NULL; - - switch (el->type) { - case MD_TYPE_TRACK: - g_assert(((struct rootElement *)c)->tracks > 0); - MD_ROOT(c)->tracks--; - break; - } - - res = g_ptr_array_remove(c->elements, el); - g_return_if_fail(res != FALSE); - - /* Dec reference count and possible free */ - md_free(el); - - if (MD_TYPE(c) == MD_TYPE_ROOT) - md_track_renum(MD_ROOT(c)); - - MD_SET_MODIFIED(c, TRUE); - - ->>function md_free -void -struct element *el; // Element tree to free - ->>description -Decrement the reference count on -.A el -and, if it is now zero, free the element. -If the element is freed then the process is applied recursively. - ->>code - struct containerElement *c; - struct element *ep; - extern int Nelements; - int i; - - g_return_if_fail(el->destroyed == 0); - - if (--el->refcount > 0) - return; - - if (el->refcount < 0) { - ethrow(debugError, _("Freed an element %d with bad reference count %d"), - MD_TYPE(el), MD_ELEMENT(el)->refcount); - return; - } - - if (el->type >= MD_CONTAINER_BEGIN) { - c = (struct containerElement *)el; - for (i = 0; i < MD_CONTAINER_LEN(c); i++) { - ep = g_ptr_array_index(c->elements, i); - md_free(ep); - } - g_ptr_array_free(c->elements, 1); - - } - - /* Destroy any associated data */ - g_dataset_destroy(el); - - switch (el->type) { - case MD_TYPE_TEXT: - g_free(MD_TEXT(el)->text); - break; - case MD_TYPE_SYSEX: - g_free(MD_SYSEX(el)->data); - break; - case MD_TYPE_TRACK: - if (MD_TRACK(el)->name) - g_free(MD_TRACK(el)->name); - md_free((struct element *)MD_TRACK(el)->program); - break; - case MD_TYPE_PARTREF: - case MD_TYPE_PART: - if (MD_PART(el)->name) - g_free(MD_PART(el)->name); - break; - case MD_TYPE_HEAD: - if (MD_HEAD(el)->copyright) - g_free(MD_HEAD(el)->copyright); - MD_HEAD(el)->copyright = NULL; - break; - default: - break; - } - - el->destroyed = 1; - - if (el->wref <= 0) { -#ifdef DEBUG - if (iscontainer(el)) - memset(el, 0xa5, sizeof(struct containerElement)); - else - memset(el, 0xa5, sizeof(struct element)); - el->destroyed = 1; -#endif - g_free(el); - Nelements--; - } - - ->>function md_wfree -void -struct element *el; - ->>description -Decrement the back reference count and if zero and the -element is destroyed, then finally free the memory. - ->>code - extern int Nelements; - - /* The wref should never be 0 when this is called */ - g_return_if_fail(el->wref > 0); - el->wref--; - if (el->wref <= 0) { - if (el->destroyed) { - dprintf1("Final free of a %d at %p", el->type, el); -#ifdef DEBUG - if (iscontainer(el)) - memset(el, 0xa9, sizeof(struct containerElement)); - else - memset(el, 0xa9, sizeof(struct element)); - el->destroyed = 1; /* Just in case */ -#endif - g_free(el); - Nelements--; - } - } - - ->>function md_track_renum -void -struct rootElement *root; - ->>description -Renumber the tracks, so that the tempomap is -1 and the -tracks start at zero. - ->>code - struct tracklikeElement *tlike; - int i; - - /* - * Note that this is highly dependant on knowing the layout - * of the elements within the root (ie the head comes first, followed - * by the tempomap and tracks. - * This code needs to keep in step with any changes. - */ - for (i = 1; i < root->tracks; i++) { - tlike = (struct tracklikeElement *) MD_GET_INDEX(root, i); - tlike->number = i - 2; - } - - ->>function md_merge_in -void -struct containerElement *ctrk; Track to add events to -struct containerElement *list; list of elements to be merged in -enum merge_mode mode; Merge mode - ->>description -Add a list of events to a track. -The container -.A c -consists of events that are not containers. -They are merged into the existing track in one of several -ways. - ->>code - - switch (mode) { - case MD_ADD_MERGE: - merge_events(ctrk, list); - break; - case MD_ADD_LAST: - break; - default: - break;//XXX - } - - ->>function merge_events -static void -struct containerElement *ctrk; Track etc. to merge events into -struct containerElement *list; list of elements to be merged in - ->>description -Add a list of events to a track. -The container -.A track -consists of events that are not containers. -They are merged into the existing track in one of several -ways. - ->>code - struct element *el; - int n; - - md_undo_begin_set(MD_UNDO(ctrk)); - - /* Make sure that part elements cover all the duration of the list */ - md_ensure_parts(ctrk, MD_TIME(list), MD_ENDTIME(list)+1); - - for (n = 0; n < md_list_size(list); n++) { - el = md_list_nth_elem(list, n); - merge_in_elem(ctrk, el); - } - list->elements->len = 0; - - md_undo_end_set(MD_UNDO(ctrk)); - - ->>function merge_in_elem -void -struct containerElement *ctrk; -struct element *el; - ->>description -If the container -.A c -consists of other containers, then find the place -where the event should go and create a new part if needed. -Once we have found the part that it can fit into, recurse to -add to that part. -Once we get to a container that is full of events, add it. - -A more concrete way of looking at it. -We are adding to a track, but cannot add events directly to the track. -The events must be added to a part within the track. -Therefore we search for the part. -If one does not exist then it is created. - -We then step into the part that we found or created -and add the event. - -Extra complexity arrises because parts can be nested, but this -just involves recursing down until the bottom is reached. -There can also be references to other parts. - ->>code - struct element *first; - struct containerElement *con; - - /* - * See what is in this container. If it is ordinary elements or - * empty then just add the event (sorted) and we are done. - */ - first = md_list_first(ctrk); - if (!first || !iscontainer(first)) { - g_assert(!iscontainer(el)); - md_add_sort(ctrk, el); - return; - } - - /* - * Search though all the parts (or whatever) in this track and - * find the one where the time range fits the event. - */ - con = (struct containerElement *)md_list_find_by_time(ctrk, MD_TIME(el)); - g_return_if_fail(con != NULL); /* This should have been ensured */ - - /* Recursion will be ended when at bottom of tree */ - merge_in_elem(con, el); - - ->>function md_ensure_parts -void -struct containerElement *ctrk; -ticktime_t begin; Begin time -ticktime_t end; End time - ->>description -Ensure that there are part containers allocated from the times -.A begin -to -.A end . - ->>code - struct containerElement *con; - struct containerElement *cnext; - struct element *el; - ticktime_t end2; - - el = md_list_first(ctrk); - if (el && !iscontainer(el)) - return; /* Return if only leaf elements */ - - if (!el && MD_ELEMENT(ctrk)->type != MD_TYPE_TRACK) - return; - - do { - con = (struct containerElement *)md_list_find_by_time(ctrk, begin); - if (con) { - end2 = MIN(end, MD_ENDTIME(con)); - md_ensure_parts(con, begin, end2); - } else { - - /* - * Create a new part starting at begin. - */ - con = (struct containerElement *)md_part_new(); - MD_TIME(con) = begin; - MD_DEVCHAN(con) = MD_DEVCHAN(ctrk); - - md_add_sort(ctrk, MD_ELEMENT(con)); - - /* - * Examine the next part, if any, and adjust the duration - * of the current part so that it does not overlap the - * next part. - */ - cnext = (CPTR)md_list_next(ctrk, MD_ELEMENT(con)); - if (cnext) - end2 = MIN(MD_TIME(cnext), end); - else - end2 = end; - - con->duration = end2 - MD_TIME(con); - } - - begin = MD_ENDTIME(con); - - } while (end > end2); - - if (MD_ENDTIME(ctrk) < end) - ctrk->duration = end - MD_TIME(ctrk); - - ->>function md_get_nfree -int ->>description -Return the number of allocated elements. -Mainly for debugging. ->>code - extern int Nelements; - - return Nelements; diff -rNu melys-0.1.16/md/mdconv.m melys-0.1.17/md/mdconv.m --- melys-0.1.16/md/mdconv.m Wed Dec 1 13:51:36 1999 +++ melys-0.1.17/md/mdconv.m Thu Jan 1 01:00:00 1970 @@ -1,258 +0,0 @@ ->>name mdconv.m - Conversions from one form to another. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header ->>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; - ->>description -Split a file that is in midi type 0 -form into a track based form. -We split so that each device channel goes into a different track. - ->>code - struct trackElement *track; - struct trackElement *trk; - struct containerElement *con; -#define MAX_0_TRACKS 16 - struct partElement *parts[MAX_0_TRACKS]; - struct element *el; - int maxtnum; - int tnum; - int i; - - if (root->head->format != 0) - return; - - /* - * There should be one track. We remove it and then allocate - * all its events to the correct track. - */ - track = md_track_nth(root, 0); - MD_REF(track); - md_remove(MD_CONTAINER(root), MD_ELEMENT(track)); - - root->trackid = 0; - - /* There will be only one part --> con */ - con = (struct containerElement *)MD_GET_INDEX(track, 0); - - for (i = 0; i < MAX_0_TRACKS; i++) - parts[i] = md_part_new(); - - maxtnum = 0; - for (i = 0; i < MD_CONTAINER_LEN(con); i++) { - el = MD_GET_INDEX(con, i); - - tnum = el->device_channel % MAX_0_TRACKS; - maxtnum = MAX(tnum, maxtnum); - - el->con = NULL; /* Note: not yet removed from con */ - md_add(MD_CONTAINER(parts[tnum]), el); - } - - md_ensure_track(root, (maxtnum>0)? maxtnum-1: maxtnum); - for (i = 0; i < maxtnum; i++) { - trk = md_track_nth(root, i); - md_add(MD_CONTAINER(trk), MD_ELEMENT(parts[i])); - } - - /* Free remaining */ - for (; i < MAX_0_TRACKS; i++) - MD_FREE(parts[i]); - - MD_FREE(track); - - /* - * This converts the format to type 1 and so if the file is saved - * it will be saved as type 1. This will be changed once - * there is a routine to convert back to type 0. - */ - root->head->format = 1; - - ->>function md_extract_track_info -gboolean -struct rootElement *root; -struct trackElement *track; -struct partElement *part; - ->>description -Extract track level information from the existing md tree. -This is used when reading in from a non-native format such as -a midi file. -Of course it is not possible to do this meaningfully in all cases and -because of this music events are not removed from the track. -So tracks will continue to play correctly even if they do -contain a hodge-podge of program and channel information etc. - ->>code - int ind; - int val; - int rm; - struct element *el; - struct controlElement *ctl; - struct programElement *prg; - - 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: - - 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(ctl->value); - md_remove(MD_CONTAINER(part), el); - ind--; - break; - case SND_MCTL_MSB_PAN: - track->pan = MD_MIDI_TO_PAN(ctl->value); - md_remove(MD_CONTAINER(part), el); - ind--; - break; - } - break; - - case MD_TYPE_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.16/md/mdlist.m melys-0.1.17/md/mdlist.m --- melys-0.1.16/md/mdlist.m Sat Nov 27 11:43:22 1999 +++ melys-0.1.17/md/mdlist.m Thu Jan 1 01:00:00 1970 @@ -1,231 +0,0 @@ ->>name mdlist.m - list operations - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -Do not call these except from other MD routines. - -These are lowlevel list manipulation routines. They do not preserve -the integrity of the MD tree or provide any undo facility etc. -and so they should not be called from outside of -the md routines. - ->>header ->>header melmsg.h ->>headerdef --decl md.h - ->>function md_list_append -void -struct containerElement *c; -struct element *el; - ->>code - - g_ptr_array_add(c->elements, (gpointer)el); - ->>function md_list_prepend -void -struct containerElement *c; -struct element *el; ->>code - g_assert_not_reached(); /* Becuase not implemented yet */ - - ->>function md_list_add_sort -int -struct containerElement *c; -struct element *el; - ->>description -Add element at a position sorted by time. -Returns the position that the element was added at. - ->>code - gpointer p; - int n; - - g_return_val_if_fail(el != NULL, 0); - - g_ptr_array_add(c->elements, NULL); /* Ensure enough space */ - for (n = 0; n < MD_CONTAINER_LEN(c); n++) { - p = c->elements->pdata[n]; - if (p == NULL) { - /* This was the one we have just added, add */ - g_assert(n == (int)c->elements->len - 1); /* check it was */ - c->elements->pdata[n] = el; - return n; - } else if (MD_TIME(p) == MD_TIME(el)) { - if (el->type == MD_TYPE_TRACK && MD_TYPE(p) == MD_TYPE_TRACK) { - if (MD_TRACKLIKE(p)->number <= MD_TRACKLIKE(el)->number) - continue; - } else - continue; - } else if (MD_TIME(p) <= MD_TIME(el)) { - - /* Keep going */ - continue; - } - - /* This is the correct place: add it here */ - memmove(c->elements->pdata+n+1, c->elements->pdata+n, - sizeof(gpointer) * (c->elements->len - n - 1)); - c->elements->pdata[n] = el; - - return n; - } - - g_assert_not_reached(); - return 0; - - ->>function md_list_remove -void -struct containerElement *c; Container to remove from -struct element *el; Element to remove from it - ->>description -Remove an element directly from its container. - ->>code - gboolean ok; - - ok = g_ptr_array_remove(c->elements, el); - g_assert(ok); - - ->>function md_list_size -int -struct containerElement *c; ->>description -Return the number of elements in this container. ->>code - - return c->elements->len; - - ->>function md_list_first -struct element * -struct containerElement *c; ->>description -Return the first element. ->>code - - if (c->elements->len == 0) - return NULL; - return (struct element *)c->elements->pdata[0]; - ->>function md_list_last -struct element * -struct containerElement *c; ->>description -Return the last element. ->>code - int len; - - len = c->elements->len; - if (len <= 0) - return NULL; - - return (struct element *)c->elements->pdata[len - 1]; - ->>function md_list_nth_elem -struct element * -struct containerElement *c; -int n; Return element at this position ->>description -Return the nth element. ->>code - int len; - - len = c->elements->len; - if (len <= 0 || n < 0) - return NULL; - if (n >= len) - return NULL; - - return (struct element *)c->elements->pdata[n]; - ->>function md_list_next -struct element * -struct containerElement *c; -struct element *el; - ->>description -Find the element in the specified container, -.A c, -that comes after the specified element, -.A el . -This is not to be used for stepping through a list as -this would be slowish. - ->>code - int n; - - for (n = 0; n < MD_CONTAINER_LEN(c); n++) { - if (c->elements->pdata[n] == el) { - if (n < MD_CONTAINER_LEN(c) - 1) - return c->elements->pdata[n+1]; - break; - } - } - return NULL; - - ->>function md_list_find_by_time -struct element * -struct containerElement *ctrk; A track like container -ticktime_t time; Find container that covers this element - ->>description -Find the container that encompases the given time. -The argument -.A c -is a list of containers. -We find the one that covers the specified -.A time . -If none do then returns NULL. - -If only leaf elements are present then return if the element -is a direct match. - ->>code - struct element *el; - int n; - - for (n = 0; n < md_list_size(ctrk); n++) { - el = md_list_nth_elem(ctrk, n); - - if (iscontainer(el)) { - if (time >= MD_TIME(el) && time < MD_ENDTIME(el)) - return el; - } else { - if (time == MD_TIME(el)) - return el; - } - } - - return NULL; - ->>function md_save_elem -void -struct containerElement *c; -struct element *el; ->>description -Save events into a container. -This must not be part of an MD tree. -The routine only exists so I can follow my own rules about -not using the md_list_* routines. - ->>code - - /* When possible assert that this is not in a tree */ - - md_list_append(c, el); diff -rNu melys-0.1.16/md/mdseq.m melys-0.1.17/md/mdseq.m --- melys-0.1.16/md/mdseq.m Mon Dec 20 13:39:50 1999 +++ melys-0.1.17/md/mdseq.m Thu Jan 1 01:00:00 1970 @@ -1,487 +0,0 @@ ->>name mdseq.m - the md sequencing routines. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header elements.h - ->>headerdef --decl md.h - ->>extern - -/* Information about a particular track */ -struct trackinfo { - struct tracklikeElement *ltrack; /* The associated track */ - GXStack *stack; /* The position stack */ - ticktime_t time; /* Time of last found element on this track */ - struct element *lastelem; /* Last element returned */ - gboolean need_next; /* Need to step onto next element */ - int istrack:1; /* Is this really a track, (not tempomap) */ -}; - -/* To keep track of a particular sequence */ -struct sequenceState { - int merge:1; /* Merge together tracks */ - int nodes:1; /* Don't return nodes */ - int usedroot:1; /* Root has been returned */ - int usedhead:1; /* Head has been returned */ - - struct trackinfo *trackinfos; /* List of track info structures */ - int ntinfo; /* Number of elements in trackinfos */ - - struct rootElement *retroot; /* Root to be returned */ - struct headElement *rethead; /* Head to be returned */ - long duration; /* End time */ -}; - -/* Used in a stack to keep track of our position */ -struct pos { - struct containerElement *con; - int pos; -}; - ->>function md_seq_init -struct sequenceState * -struct containerElement *con; The container to sequence over -gboolean nodes; If false then no nodes apart from root and head are returned - ->>description -Return an object that can be passed to -.F md_sequence_next -to iterate over all the elements in a tree in time sequenced order. - -This is intended for use with a non root container. -For a root you would more likely use -.F md_seq_init_merge . - -If -.A nodes -is set then container type elements are returned as well. - ->>code - struct sequenceState *seq; - struct trackinfo *ti; - GXStack *stack; - struct pos pos; - - /* Actually this is allowed and this test will be removed when - conversion is complete and tested. */ - g_return_val_if_fail(MD_TYPE(con) != MD_TYPE_ROOT, NULL); - - seq = g_new(struct sequenceState, 1); - seq->merge = 0; - seq->nodes = nodes; - - seq->usedroot = 1; - seq->usedhead = 1; - seq->retroot = NULL; - seq->rethead = NULL; - - seq->ntinfo = 1; - seq->trackinfos = g_new(struct trackinfo, seq->ntinfo); - - stack = gx_stack_new(sizeof(struct pos)); - - pos.pos = -1; - pos.con = con; - MD_REF(con); - - gx_stack_push(stack, &pos); - - ti = &seq->trackinfos[0]; - ti->stack = stack; - ti->need_next = 0; - ti->lastelem = NULL; - ti->time = 0; - ti->ltrack = NULL; /* Maybe should set if con is a track ?? */ - - return seq; - - ->>function md_seq_init_merge -struct sequenceState * -struct rootElement *root; -gboolean nodes; - ->>description -Initialises a sequence that will merge all the tracks together -in time order. - ->>code - struct sequenceState *seq; - struct trackinfo *ti; - GXStack *stack; - struct pos pos; - int i; - - g_return_val_if_fail(MD_TYPE(root) == MD_TYPE_ROOT, NULL); - - seq = g_new(struct sequenceState, 1); - seq->merge = 1; - seq->nodes = nodes; - - seq->usedroot = 0; - seq->usedhead = 0; - seq->retroot = md_root_inc_ref(root); - seq->rethead = root->head; - MD_REF(root->head); - - /* The +1 is for the tempo map */ - seq->ntinfo = root->tracks + 1; - seq->trackinfos = g_new(struct trackinfo, seq->ntinfo); - - for (i = 0; i < seq->ntinfo; i++) { - stack = gx_stack_new(sizeof(struct pos)); - ti = &seq->trackinfos[i]; - - pos.pos = -1; - if (i == seq->ntinfo - 1) { - pos.con = (struct containerElement *)md_get_tempomap(root); - ti->istrack = 0; - } else { - pos.con = (struct containerElement *)md_track_nth(root, i); - ti->istrack = 1; - } - MD_REF(pos.con); - - gx_stack_push(stack, &pos); - - ti->stack = stack; - ti->need_next = 0; - ti->lastelem = NULL; - ti->time = 0; - ti->ltrack = MD_TRACKLIKE(pos.con); - MD_REF(ti->ltrack); - } - - return seq; - - ->>function md_seq_end -void -struct sequenceState *seq; - ->>description -Release all resources for this sequence state. - ->>code - int i; - struct trackinfo *ti; - struct pos pos; - GXStack *stack; - - if (seq == NULL) - return; - - for (i = 0; i < seq->ntinfo; i++) { - ti = &seq->trackinfos[i]; - - stack = ti->stack; - /* Pop off any unused entries and un-ref them */ - while (gx_stack_pop(stack, &pos)) - MD_UNREF(pos.con); - - /* Now free the stack */ - gx_stack_free(stack); - - MD_UNREF(ti->ltrack); - } - - if (seq->trackinfos) - g_free(seq->trackinfos); - - if (seq->retroot) - MD_UNREF(seq->retroot); - if (seq->rethead) - MD_UNREF(seq->rethead); - - g_free(seq); - - ->>function md_seq_next -struct element * -struct sequenceState *seq; - ->>description -Get the next element in the sequence. -Elements returned from this routine must not be modified in -any way. -They must also not be assumed to exist beyond the next -.F md_seq_next -or a -.F md_seq_end . - ->>code - long besttime; - struct element *el = NULL; - struct element *bestel; - struct trackinfo *bestti; - struct trackinfo *ti; - int i; - long t; - - if (!seq) - return NULL; - - el = NULL; - - if (!seq->usedroot) { - seq->usedroot = 1; - return MD_ELEMENT(seq->retroot); - } - if (!seq->usedhead) { - seq->usedhead = 1; - return MD_ELEMENT(seq->rethead); - } - - if (!seq->merge) { - ti = &seq->trackinfos[0]; - el = get_elem(ti, seq->nodes); - ti->need_next = 1; - return el; - } - - retry: - besttime = G_MAXLONG; - bestti = NULL; - bestel = NULL; - for (i = 0; i < seq->ntinfo; i++) { - GXStack *stack; - - ti = &seq->trackinfos[i]; - - stack = ti->stack; - if (ti->need_next || ti->lastelem == NULL) { - el = get_elem(ti, seq->nodes); - ti->need_next = 0; - ti->lastelem = el; - } else { - el = ti->lastelem; - } - - if (!el) - continue; - - t = MD_TIME(el); - if (t < besttime) { - besttime = t; - bestel = el; - bestti = ti; - } - } - - if (bestti) { - bestti->need_next = 1; - bestti->time = MD_TIME(bestel); - - /* Set the tag number for this element */ - if (bestti->ltrack) - bestel->tag = bestti->ltrack->number; - else - bestel->tag = 255; - - if (bestti->istrack && MD_TRACK(bestti->ltrack)->mute) { - if (bestel->type == MD_TYPE_NOTE) { - bestti = NULL; - goto retry; - } - } - } - - return bestel; - - ->>function get_elem -static struct element * -struct trackinfo *ti; -gboolean nodes; If true return nodes. - ->>description -Get the current or next element in the sequence. - ->>code - GXStack *pstack; - struct element *el; - struct pos *pos; - struct pos npos; - int next; - - el = NULL; - next = ti->need_next; - pstack = ti->stack; - - while (el == NULL) { - pos = gx_stack_top(pstack); - - if (!pos) - return NULL; - - if (next) { - pos->pos++; - next = 0; - } - - - if (pos->pos < 0) { - el = MD_ELEMENT(pos->con); - next = 1; - } else if (pos->pos >= MD_CONTAINER_LEN(pos->con)) { - /* Do not pop the initial track element */ - if (istracklike(pos->con)) - return NULL; - gx_stack_pop(pstack, &npos); - MD_UNREF(npos.con); - next = 1; - continue; - } else { - el = pos->con->elements->pdata[pos->pos]; - if (iscontainer(el)) { - npos.con = MD_CONTAINER(el); - npos.pos = -1; - MD_REF(npos.con); - gx_stack_push(pstack, &npos); - } - } - - if (el && iscontainer(el) && !nodes) - el = NULL; - } - - return el; - - ->>function md_elem_seek -void -struct sequenceState *seq; -struct tracklikeElement *ltrack; -ticktime_t time; - ->>description -Set the play pointer stack on the specifed track so that the next -event to play from the position stack will be at or later than -the specified -.A time . - ->>code - struct pos pos; - struct pos *posp; - struct element *el; - struct trackinfo *ti; - GXStack *stack; - int i; - - stack = NULL; - ti = NULL; - - for (i = 0; i < seq->ntinfo; i++) { - ti = &seq->trackinfos[i]; - stack = ti->stack; - posp = (struct pos *)stack->array->data; - if (posp->con == MD_CONTAINER(ltrack)) - break; - } - - g_return_if_fail(i < seq->ntinfo); - - /* - * OK this is a very simple algorithm. It just winds back to the - * beginning and steps forward to the correct place. - * Since we sometimes use this routine to step back a short way - * this may not be very efficient. If you notice performance - * problems feel free to improve it... - */ - while(gx_stack_pop(stack, &pos)) - MD_UNREF(pos.con); - - /* Push it back on, positioned at the beginning */ - MD_REF(pos.con); - pos.pos = -1; - gx_stack_push(stack, &pos); - - ti->need_next = 0; - ti->lastelem = NULL; - do { - el = get_elem(ti, FALSE); - ti->need_next = 1; - } while (el && MD_TIME(el) < time); - - ti->time = el? MD_TIME(el): 0; - ti->need_next = 0; - ti->lastelem = NULL; - - ->>function md_elem_seek_back -void -struct sequenceState *seq; -struct tracklikeElement *ltrack; -ticktime_t time; - ->>description -Seek to the specified time as in -.F md_elem_seek -but will not seek forward. -In other words if the time is already greater then the current play position -the the play position is not changed. - ->>code - struct pos *posp; - struct trackinfo *ti; - GXStack *stack; - int i; - - if (seq == NULL) - return; - - stack = NULL; - ti = NULL; - - for (i = 0; i < seq->ntinfo; i++) { - ti = &seq->trackinfos[i]; - stack = ti->stack; - if (gx_stack_empty(stack)) - continue; - posp = (struct pos *)stack->array->data; - if (posp->con == MD_CONTAINER(ltrack)) - break; - } - - g_return_if_fail(i < seq->ntinfo); - - if (ti->time <= time) - return; /* Nothing to do */ - - md_elem_seek(seq, ltrack, time); - - ->>function md_elem_all_seek -void -struct sequenceState *seq; -ticktime_t tick; - ->>description -Seek all tracks to the same time. -XXX may Need a seek back version. - ->>code - struct tempomapElement *tmap; - struct trackElement *trk; - int n; - - g_return_if_fail(MD_TYPE(seq->retroot) == MD_TYPE_ROOT); - - tmap = md_get_tempomap(seq->retroot); - md_elem_seek(seq, MD_TRACKLIKE(tmap), tick); - - for (n = 0; n < seq->retroot->tracks; n++) { - trk = md_track_nth(seq->retroot, n); - md_elem_seek(seq, MD_TRACKLIKE(trk), tick); - } - diff -rNu melys-0.1.16/md/mdtools.m melys-0.1.17/md/mdtools.m --- melys-0.1.16/md/mdtools.m Sat Dec 4 13:58:42 1999 +++ melys-0.1.17/md/mdtools.m Thu Jan 1 01:00:00 1970 @@ -1,124 +0,0 @@ ->>name mdtools.m - routines for modifing md trees - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header elements.h ->>headerdef --decl md.h - - ->>function md_split -struct partElement * -struct partElement *origpart; The part to split -ticktime_t t; The time to split it at - ->>description -Split a part at a specified time. -A new part is created events from -.A origpart -at times greater than or equal to -.A t -are moved into the new part. -The original part has its end time set to -.A t -and the new part has its start time set to -.A t . - -The new part is returned. - ->>code - struct partElement *newpart; - struct element *el; - int i; - - newpart = md_part_new(); - if (origpart->name) - newpart->name = g_strdup(origpart->name); - - MD_SET_TIME(newpart, t); - MD_SET_DURATION(newpart, MD_ENDTIME(origpart) - t); - - /* This whole operation is undone as a set */ - md_undo_begin_set(MD_UNDO(origpart)); - - /* Add elements to the new part */ - for (i = 0; i < MD_CONTAINER_LEN(origpart); i++) { - el = MD_GET_INDEX(origpart, i); - if (MD_TIME(el) >= t) { - - MD_REF(el); - - /* After we remove the elem must decrease i to match */ - md_remove(MD_CONTAINER(origpart), el); - i--; - - md_add(MD_CONTAINER(newpart), el); - MD_UNREF(el); - } - } - - MD_SET_DURATION(origpart, t - MD_TIME(origpart)); - MD_CONTAINER(newpart)->max_duration = MD_DURATION(newpart); - md_undo_time_op(MD_UNDO(origpart), MD_UNDO_CHANGE_DURATION, - MD_ELEMENT(origpart), t); - - md_undo_end_set(MD_UNDO(origpart)); - - return newpart; - - ->>function md_part_join -void -struct containerElement *c; The container containing the parts -struct partElement *part1; First part - ->>description -Join the specified part, -.A part1 -to the next part in the track or part. -All events are removed from the second part and added to the first. -The second part is then removed. - ->>code - struct partElement *part2; - struct element *el; - ticktime_t endtime; - int i; - - part2 = NULL; - - for (i = 0; i < MD_CONTAINER_LEN(c); i++) { - el = MD_GET_INDEX(c, i); - if (el == (struct element *)part1) { - if (++i < MD_CONTAINER_LEN(c)) - part2 = (struct partElement *)MD_GET_INDEX(c, i); - break; - } - } - - if (part2 == NULL) - return; - - while (MD_CONTAINER_LEN(part2) > 0) { - el = MD_GET_INDEX(part2, 0); - MD_REF(el); - md_remove(MD_CONTAINER(part2), el); - md_add(MD_CONTAINER(part1), el); - MD_UNREF(el); - } - - endtime = MD_ENDTIME(part2) - MD_TIME(part1); - if (endtime > MD_ENDTIME(part1)) - MD_SET_DURATION(part1, endtime); - - /* Remove the second part */ - md_remove(c, MD_ELEMENT(part2)); - diff -rNu melys-0.1.16/md/mdundo.m melys-0.1.17/md/mdundo.m --- melys-0.1.16/md/mdundo.m Sat Nov 27 11:43:22 1999 +++ melys-0.1.17/md/mdundo.m Thu Jan 1 01:00:00 1970 @@ -1,110 +0,0 @@ ->>name mdundo.m - Routines to implement undo functionality - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>headerdef --decl md.h - -/* - * The list of operation types that can be undone. This is intended - * to cover all operations that can't simply be undone by the user. - */ -enum undo_op { - MD_UNDO_ADD, /* Event is added */ - MD_UNDO_REMOVE, /* Event is removed */ - MD_UNDO_CHANGE_TIME,/* Begin time of event is changed */ - MD_UNDO_CHANGE_DURATION /* End time of event is changed */ -}; - -struct undo_set { - GXStack *ops; -}; - ->>function md_undo_begin_set -void -struct undo_set *undo; - ->>description -Begin a set of operations that are to be treated as one. -For example if you select a number of events and delete -them all at once, they will be undone as one unit as well. - - ->>function md_undo_end_set -void -struct undo_set *undo; - ->>description -End a previous -.F md_undo_begin_set . -If undoable operations are performed outside of a -.F md_undo_begin_set / -.F md_undo_end_set -pair, then they are undoable individually. - - ->>function md_undo_freeze -void -struct undo_set *undo; ->>description -Undo saving is switched off. -This would happen when building up a tree for -example by reading in from a file, or by hand. - - ->>function md_undo_thaw -void -struct undo_set *undo; ->>description -Undo saving is switched back on again after a -.F md_undo_freeze . - - ->>function md_undo_op -void -struct undo_set *undo; The undo set -enum undo_op op; Operation performed -struct containerElement *c; Container added/removed from -struct element *el; Element that was added/removed/changed - ->>description -Save an operation so that it can be undone again. - ->>function md_undo_time_op -void -struct undo_set *undo; The undo set for the element -enum undo_op op; Operation performed -struct element *el; Element that was added/removed/changed -ticktime_t t; The time difference to apply - ->>description -Save an time based operation (duration, -different start time etc) so that it can be undone again. - - ->>function md_undo_back -void -struct undo_set *undo; The undo operation set - ->>description -Step back one group of undo operations. -This will effectively undo the previous operation set. -Operations that have been grouped will be done as a unit. -It is possible to step forward again, as long as no other change -is made. - ->>function md_undo_forward -void -struct undo_set *undo; The undo operation set - ->>description -Step forward one group of undo operations. -This corresponds to a redo operation. diff -rNu melys-0.1.16/md/mdutil.m melys-0.1.17/md/mdutil.m --- melys-0.1.16/md/mdutil.m Thu Jan 6 16:52:34 2000 +++ melys-0.1.17/md/mdutil.m Thu Jan 1 01:00:00 1970 @@ -1,796 +0,0 @@ ->>name mdutil.m -File: mdutil.m - Utility routines for manipulating MD - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header "seqlib.h" ->>header "stdlib.h" ->>header "melfile.h" ->>headerdef --decl md.h - -/* - * Some macros to handle accessing some common fields in the - * element - */ -#define MD_TYPE(el) ( ((struct element *)(el))->type) -#define MD_TIME(el) ( ((struct element *)(el))->element_time) -#define MD_DURATION(el) ( MD_CONTAINER(el)->duration ) -#define MD_ENDTIME(el) \ - (MD_TIME(el) + ((struct containerElement *)(el))->duration) -#define MD_DEVCHAN(el) (((struct element *)(el))->device_channel) -#define MD_DEV(el) ( (((struct element *)(el))->device_channel & ~0x0f) >> 4) -#define MD_CHAN(el) ( (((struct element *)(el))->device_channel & 0x0f)) -#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 ) -#define MD_SELECTED(el) ( ((struct element *)el)->selected ) -#define MD_WREF(el) ( ((struct element *)el)->wref++) -#define MD_WUNREF(el) ( md_wfree((struct element *)el)) -#define MD_IS_DESTROYED(el) ( ((struct element *)el)->destroyed) -#define iscontainer(el) ( (MD_TYPE(el) >= MD_CONTAINER_BEGIN)? TRUE: FALSE) -#define istracklike(el) ( MD_TYPE(el)==MD_TYPE_TRACK || MD_TYPE(el)==MD_TYPE_TEMPOMAP ) -#define MD_UNDO(el) NULL /* XXX */ -#define MD_TEMPO_TO_BPM(ut) ((double)60000000 / (ut)) -#define MD_BPM_TO_TEMPO(bpm) ((double) 60000000 / (bpm)) - -#define MD_CONTAINER_LEN(c) ( (int)((struct containerElement *)c)->elements->len) -#define MD_GET_INDEX(c, i) \ - ( (struct element *)((struct containerElement *)c)->elements->pdata[i]) -#define MD_TRACK_NUMBER(trk) ( ((struct tracklikeElement *)trk)->number) - -/* - * You must be careful about using the MD_SET macros. They - * operate directly on the elements. This is sometimes what - * you want but if for example you want to change the time of - * an element and reposition that element within its container - * then you will need to use (or write) a routine to do this. - * Also these macros are not undoable, so to summarise they should - * only be used for building up higher level routines. - */ -#define MD_SET_MODIFIED(el, v) ( ((struct element *)el)->modified = v) -#define MD_SET_DEVCHAN(el, devchan) do {\ - (((struct element *)el)->device_channel = devchan);\ - MD_SET_MODIFIED(el, TRUE); } while (0) -#define MD_SET_TIME(el, t) do {MD_TIME(el) = (t);\ - MD_SET_MODIFIED(el, TRUE); } while (0) -#define MD_SET_DURATION(el, t) do { \ - ((struct containerElement *)(el))->duration = (t); \ - MD_SET_MODIFIED(el, TRUE); \ - } while (0) -#define MD_SET_SELECTED(el, tf) do { \ - ((struct element *)el)->selected = (tf); \ - MD_SET_MODIFIED(el, 1); \ - } while (0) - -/* Some MD to Midi macros */ -#define MD_MIDI_VOL_SHIFT 9 -#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) (((((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() */ -#define MD_WALK_NODES 0x01 /* Just callback on nodes */ -#define MD_WALK_LEAF 0x02 /* Callback on leaves */ -#define MD_WALK_ALL (MD_WALK_NODES|MD_WALK_LEAF) - -/* Defines for walk callback flags */ -#define MD_WALK_START 0x001 /* This is a start element */ -#define MD_WALK_END 0x002 /* This is the end of an element */ -#define MD_WALK_EMPTY (MD_WALK_START|MD_WALK_END) /* Empty element */ - -#ifdef DEBUG_CASTS -#define MD_CHECK_CAST(el, t) md_check_cast((el), (t)) -#else -#define MD_CHECK_CAST(el, t) (el) -#endif - - -/* Typedef for md_walk callback function */ -typedef void (*walkFunc)(struct element *, void *, int); - -/* Structure for meter, beats and tick representation */ -struct mbt { - int bars; - short beats; - short ticks; - - /* The following are only valid after a md_tick_to_mbt and - * are just for convenience. */ - short top; /* Time sig at the current time */ - short bottom; -}; - - ->>function md_walk -void -struct containerElement *c; Container to be walked -walkFunc fn; Callback function to call on each element -void *arg; Argument passed to fn -int flags; Flags eg. include all elements or just current ones. ->>description -Given a container -.A c -then @func_name iterates through all elements and calls -.A fn -for each one with the following arguments: - - fn(element, arg, start-end-flags) - -The flag MD_WALK_START is set if this is an element start -and MD_WALK_END is set if this is an element end. -Both are set for empty elements (also can use MD_WALK_EMPTY) - ->>code - struct element *el; - GPtrArray *ar; - unsigned i; - - if (flags == 0) - flags = MD_WALK_ALL; - - if (flags & MD_WALK_NODES) - fn((struct element *)c, arg, MD_WALK_START); - - ar = c->elements; - for (i = 0; i < ar->len; i++) { - el = g_ptr_array_index(ar, i); - if (iscontainer(el)) { - md_walk((struct containerElement *)el, fn, arg, flags); - } else { - if (flags & MD_WALK_LEAF) - fn(el, arg, MD_WALK_EMPTY); - } - } - - if (flags & MD_WALK_NODES) - fn((struct element *)c, arg, MD_WALK_END); - - ->>function md_empty -struct rootElement * - ->>description -Create a new empty md tree. - ->>code - struct rootElement *root; - struct headElement *head; - struct tempomapElement *map; - struct tempoElement *tempo; - - root = md_root_new(); - head = md_head_new(); - - root->head = head; - root->tracks = 0; - - head->ver_major = MDML_VERSION_MAJOR; - head->ver_major = MDML_VERSION_MINOR; - head->format = 1; - - md_add(MD_CONTAINER(root), MD_ELEMENT(head)); - - map = md_tempomap_new(); - map->timebase = 192; - - tempo = md_tempo_new(500000); - md_add(MD_CONTAINER(map), MD_ELEMENT(tempo)); - - md_add(MD_CONTAINER(root), MD_ELEMENT(map)); - - return root; - - ->>function md_song_new -struct rootElement * - ->>description -Create a new song with a default number of tracks already -initialised. - ->>code - struct rootElement *root; - struct trackElement *track; - int i; - - root = md_empty(); - - for (i = 0; i < 32; i++) { - track = md_track_new(); - MD_ELEMENT(track)->device_channel = i; - md_add((struct containerElement *)root, (struct element *)track); - } - - file_check_root(root); - return root; - - ->>function md_get_duration -ticktime_t -struct element *el; - ->>code - - if (iscontainer(el)) - return MD_CONTAINER(el)->duration; - else switch (MD_TYPE(el)) { - case MD_TYPE_NOTE: - return MD_NOTE(el)->length; - case MD_TYPE_TEMPO: - return 400; - default: - g_warning("Unexpected element type %d for @func_name", MD_TYPE(el)); - break; - } - return 0; - ->>function md_track_nth -struct trackElement * -struct rootElement *root; -int n; - ->>description -Get the nth track of the composition. -Track numbers start at 0. -Routine assumes that tempomap is at position 1 and that the -music tracks start right after. - ->>code - GPtrArray *p; - struct trackElement *track = NULL; - unsigned idx; - - if (n < 0 || root == NULL) - return NULL; - - /* Allow for head and tempomap */ - idx = n + 2; - - p = MD_CONTAINER(root)->elements; - - if (idx < p->len) { - track = MD_TRACK(g_ptr_array_index(p, idx)); - ((struct tracklikeElement *)track)->number = n; - } - - return track; - - ->>function md_ensure_track -void -struct rootElement *root; -int n; Ensure that there is a track n. - ->>description -If there a track -.A n -exists then nothing happens. -Otherwise empty tracks are created until track -.A n -exists. - ->>code - struct trackElement *track; - int i; - - for (i = root->tracks - 1; i < n; i++) { - track = md_track_new(); - MD_SET_DEVCHAN(track, root->tracks); - md_add(MD_CONTAINER(root), MD_ELEMENT(track)); - } - - g_assert(md_track_nth(root, n)); - ->>function md_get_tempomap -struct tempomapElement * -struct rootElement *root; - ->>description -Get the nth track of the composition. -Track numbers start at 0. -Routine assumes that tempomap is at position 1 and that the -music tracks start right after. - ->>code - GPtrArray *p; - struct tempomapElement *tmap = NULL; - - if (root == NULL) - return NULL; - - p = MD_CONTAINER(root)->elements; - - if (p->len > 1) - tmap = MD_TEMPOMAP(g_ptr_array_index(p, 1)); - - g_assert(MD_TYPE(tmap) == MD_TYPE_TEMPOMAP); - return tmap; - - ->>function md_set_devchan -void -struct element *base; -int devchan; - ->>description -Sets the channel on given element and all its children. -You would normally call this with a track or -part argument. - ->>code - struct element *el; - int i; - - MD_SET_DEVCHAN(base, devchan); - - if (iscontainer(base)) { - for (i = 0; i < MD_CONTAINER_LEN(base); i++) { - el = MD_GET_INDEX(base, i); - MD_SET_DEVCHAN(el, devchan); - if (iscontainer(el)) - md_set_devchan(el, devchan); - } - } - - ->>function md_set_program -void -struct containerElement *base; The track to set program for -int program; Program number to set -gboolean clear; Clear any embedded program changes - ->>description -Set the program number for this track. -If -.A clear -is true, then all embedded program changes for the track -events are removed. -Clear may not be needed, as we always do it? - ->>code - struct element *el; - int i; - - if (MD_TYPE(base) == MD_TYPE_TRACK) { - MD_TRACK(base)->program->program = program; - if (clear) - MD_TRACK(base)->hasprogram = FALSE; - } - - if (clear) { - for (i = 0; i < MD_CONTAINER_LEN(base); i++) { - el = MD_GET_INDEX(base, i); - - if (iscontainer(el)) { - md_set_program(MD_CONTAINER(el), program, clear); - } else if (el->type == MD_TYPE_PROGRAM) { - md_remove(base, el); - i--; - } - } - } - - ->>function md_change_time -void -struct element *el; The element to change time -ticktime_t t; The time to change to. - ->>description -Change the time in such a way that it can be undone again. -The element should not be in a container when this is done. -So you should remove it, change the time and add it -back in sorted. -I think that this will be undoable. - ->>code - struct undo_set *undo; - ticktime_t tdiff; - - undo = MD_UNDO(el); - - md_undo_time_op(undo, MD_UNDO_CHANGE_TIME, el, t); - - tdiff = t - MD_TIME(el); - set_diff_time(el, tdiff); - - ->>function set_diff_time -static void -struct element *base; -ticktime_t tdiff; - ->>description ->>code - int i; - struct element *el; - - MD_SET_TIME(base, MD_TIME(base) + tdiff); - - if (!iscontainer(base)) - return; - - for (i = 0; i < MD_CONTAINER_LEN(base); i++) { - el = MD_GET_INDEX(base, i); - MD_SET_TIME(el, MD_TIME(el) + tdiff); - if (iscontainer(el)) - set_diff_time(el, tdiff); - } - - ->>function md_clear_all_mod -void -struct element *base; - ->>description -Clear the modification flag on the specified element -.A base -and all descendant elements. - ->>code - int i; - struct element *el; - - base->modified = 0; - - if (iscontainer(base)) { - for (i = 0; i < MD_CONTAINER_LEN(base); i++) { - el = MD_GET_INDEX(base, i); - if (iscontainer(el)) - md_clear_all_mod(el); - else - el->modified = 0; - } - } - - ->>function md_clear_data -void -struct element *base; - ->>description -Clear all data that has been set with g_dataset_set_data. -This will destroy all the display info that we set and so -remove all associated display items. -We need to do this because even when deleted elements will almost -never be freed when the undo system is working. - ->>code - int i; - struct element *el; - - g_dataset_destroy(base); - - if (iscontainer(base)) { - for (i = 0; i < MD_CONTAINER_LEN(base); i++) { - el = MD_GET_INDEX(base, i); - if (iscontainer(el)) - md_clear_data(el); - else - g_dataset_destroy(el); - } - } - - ->>function md_clear_all_sel_by_type -void -struct element *base; -int type; - ->>code - int n; - struct element *el; - - if (MD_TYPE(base) == type && MD_SELECTED(base)) - MD_SET_SELECTED(base, FALSE); - - if (iscontainer(base)) { - for (n = 0; n < MD_CONTAINER_LEN(base); n++) { - el = MD_GET_INDEX(base, n); - md_clear_all_sel_by_type(el, type); - } - } - - ->>function md_build_sel -GSList * -GSList *list; -struct element *base; -int type; - ->>description -Build up a list of all the elements below base -that match the given -.A type . - ->>code - - if (base->type == type && MD_SELECTED(base)) - list = g_slist_prepend(list, base); - - if (iscontainer(base)) { - int n; - struct element *el; - - for (n = 0; n < MD_CONTAINER_LEN(base); n++) { - el = MD_GET_INDEX(base, n); - list = md_build_sel(list, el, type); - } - } - - return list; - - ->>function md_shrink -void -struct rootElement *root; - ->>description -Shrink the root duration to just fit the track durations. -This is needed because we artificially increase the root -duration while recording. -The tracks are also shrunk down to the maximum duration -of the parts within them. - ->>code - struct trackElement *track; - struct element *epart; - ticktime_t dur, max_track, max_part; - int i; - int j; - - max_track = 0; - max_part = 0; - - for (i = 0; i < root->tracks; i++) { - track = md_track_nth(root, i); - - for (j = 0; j < MD_CONTAINER_LEN(track); j++) { - epart = MD_GET_INDEX(track, j); - max_part = MAX(max_part, MD_ENDTIME(epart)); - } - MD_SET_DURATION(track, max_part); - - dur = MD_ENDTIME(track); - max_track = MAX(max_track, dur); - } - - MD_SET_DURATION(root, max_track); - ->>function md_tick_to_mbt -void -struct tempomapElement *tempomap; the tempomap -ticktime_t tick; Input time -struct mbt *mbtp; Meters, beats and ticks return value - ->>description -Convert the specified time into a mbt representation. - ->>code - struct timesigElement *lasttsig; - struct timesigElement *tsig; - struct mapElement *map; - ticktime_t t; - int i; - int count; - - g_return_if_fail(mbtp != NULL); - - lasttsig = NULL; - count = 0; - for (i = 0; i < MD_CONTAINER_LEN(tempomap); i++) { - map = (struct mapElement *) MD_GET_INDEX(tempomap, i); - - if (MD_TYPE(map) != MD_TYPE_TIMESIG) - continue; - - tsig = MD_TIMESIG(map); - - if (MD_TIME(tsig) > tick) - break; - - if (lasttsig) { - t = MD_TIME(tsig) - MD_TIME(lasttsig); - - mbtoffset(lasttsig, t, tempomap->timebase, mbtp); - count += mbtp->bars; - g_assert(mbtp->beats == 0); - g_assert(mbtp->ticks == 0); - } - - lasttsig = tsig; - } - - /* There must always be one */ - g_return_if_fail(lasttsig != NULL); - - t = tick - MD_TIME(lasttsig); - mbtoffset(lasttsig, t, tempomap->timebase, mbtp); - - mbtp->bars += count; - mbtp->top = lasttsig->top; - mbtp->bottom = lasttsig->bottom; - - ->>function md_mbt_to_tick -ticktime_t -struct tempomapElement *tempomap; the tempomap -struct mbt *inmbtp; Meters, beats and ticks input value - ->>description -Convert the specified time into a mbt representation. - ->>code - struct timesigElement *lasttsig; - struct timesigElement *tsig; - struct mapElement *map; - struct mbt mbt; - ticktime_t t; - ticktime_t full; - int i; - int count; - - g_return_val_if_fail(inmbtp != NULL, 0); - - full = tempomap->timebase * 4; - lasttsig = NULL; - count = 0; - for (i = 0; i < MD_CONTAINER_LEN(tempomap); i++) { - map = (struct mapElement *) MD_GET_INDEX(tempomap, i); - - if (MD_TYPE(map) != MD_TYPE_TIMESIG) - continue; - - tsig = MD_TIMESIG(map); - - if (lasttsig) { - t = MD_TIME(tsig) - MD_TIME(lasttsig); - - mbtoffset(lasttsig, t, tempomap->timebase, &mbt); - count += mbt.bars; - g_assert(mbt.beats == 0); - g_assert(mbt.ticks == 0); - } - - if (count > inmbtp->bars) { - count -= mbt.bars; - break; - } - - lasttsig = tsig; - } - - /* There must always be one */ - g_return_val_if_fail(lasttsig != NULL, 0); - - t = MD_TIME(lasttsig); - t += (inmbtp->bars - count) * (full * lasttsig->top) / lasttsig->bottom; - t += (inmbtp->beats * full) / lasttsig->bottom; - t += inmbtp->ticks; - - return t; - - ->>function md_snap_tick -ticktime_t -struct tempomapElement *tmap; The tempomap -enum snap_type snap; The boundry to snap to -ticktime_t tick; The tick value to snap - ->>description -The given time is snapped to the nearest boundry -of the specified type. - ->>code - struct mbt mbt; - ticktime_t try1; - ticktime_t try2; - - md_tick_to_mbt(tmap, tick, &mbt); - - switch (snap) { - case SNAP_NONE: - break; /* Nothing to do */ - case SNAP_BAR: - mbt.beats = 0; - mbt.ticks = 0; - try1 = md_mbt_to_tick(tmap, &mbt); - mbt.bars++; - try2 = md_mbt_to_tick(tmap, &mbt); - if (tick - try1 < try2 - tick) - mbt.bars--; - tick = md_mbt_to_tick(tmap, &mbt); - break; - - case SNAP_1: tick = tickround(tmap, tick, 1); break; - case SNAP_1_2: tick = tickround(tmap, tick, 2); break; - case SNAP_1_4: tick = tickround(tmap, tick, 4); break; - case SNAP_1_8: tick = tickround(tmap, tick, 8); break; - case SNAP_1_16: tick = tickround(tmap, tick, 16); break; - case SNAP_1_32: tick = tickround(tmap, tick, 32); break; - case SNAP_1_64: tick = tickround(tmap, tick, 64); break; - case SNAP_1_3: tick = tickround(tmap, tick, 3); break; - case SNAP_1_6: tick = tickround(tmap, tick, 6); break; - case SNAP_1_24: tick = tickround(tmap, tick, 24); break; - case SNAP_1_48: tick = tickround(tmap, tick, 48); break; - case SNAP_1_96: tick = tickround(tmap, tick, 96); break; - case SNAP_1_192: tick = tickround(tmap, tick, 192); break; - } - - return tick; - - ->>function mbtoffset -static void -struct timesigElement *tsig; an individual time signature element -ticktime_t tdiff; the time difference from begining of tsig in ticks -int ppq; Ticks per quarter note -struct mbt *mbtp; output as meters, beats and ticks - ->>description -Internal routine to calculate the offset within a particualar -timesignature region. -When there are a number of timesignatures in a piece, we -step through them all and calculate the offsets separately. - ->>code - int ppnote; - int ppbeat; - int ppbar; - int rem; - - ppnote = ppq * 4; - ppbeat = ppnote / tsig->bottom; - ppbar = tsig->top * ppbeat; - mbtp->bars = tdiff / ppbar; - - rem = tdiff - (mbtp->bars * ppbar); - - mbtp->beats = rem / ppbeat; - - rem = rem - (mbtp->beats * ppbeat); - mbtp->ticks = rem; - - ->>function tickround -static ticktime_t -struct tempomapElement *tmap; The tempomap. -ticktime_t ticks; The mbt to snap to the given note division -int div; The division of a note to snap to - ->>description -Routine for rounding to nearest simple note divisions (non-swing). -When rounding to a whole note, other programs appear to never -round beyond the next bar line, which we do not do here yet. - ->>code - int ppq; - int ppnote; - int roundval; - - ppq = tmap->timebase; /* ticks per quarter note */ - ppnote = ppq * 4; - - roundval = ppnote / div; - - /* Round to the nearest requested division */ - ticks = (ticks + roundval/2) / roundval; - ticks *= roundval; - - return ticks; diff -rNu melys-0.1.16/midi/play.c melys-0.1.17/midi/play.c --- melys-0.1.16/midi/play.c Fri Jan 7 11:13:59 2000 +++ melys-0.1.17/midi/play.c Wed Feb 9 21:03:44 2000 @@ -568,6 +568,11 @@ dprintf2("Sending type %d for %d at %ld", el->type, el->device_channel, el->element_time); status = seq_midi_send_element(play->ctxp, el); + + /* Don't allow too many buffered events */ + if (status > 200) + status = snd_seq_flush_output(seq_handle(play->ctxp)); + if (status < 0) { play->pend_element = el; break; diff -rNu melys-0.1.16/midi/play.m melys-0.1.17/midi/play.m --- melys-0.1.16/midi/play.m Mon Dec 20 13:31:01 1999 +++ melys-0.1.17/midi/play.m Thu Jan 1 01:00:00 1970 @@ -1,775 +0,0 @@ ->>name play.m - Routines to manage midi playing. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header ->>header ->>header - ->>header gdk/gdk.h ->>header gtk/gtkmain.h ->>header gtk/gtkadjustment.h ->>header gtk/gtksignal.h - ->>header elements.h ->>header seqlib.h ->>header md.h ->>header seqplay.h ->>header config.h ->>header melmsg.h - ->>headerdef --decl melmidi.h - -/* Opaque type to save all playing state */ -struct play; -struct seq_context; -struct _GtkAdjustment; - -#define ECHO_NOOP 0 -#define ECHO_END_SONG 1 -#define ECHO_END_PROLOGUE 2 - ->>extern - -#define INPUT_ALL (GDK_INPUT_READ | GDK_INPUT_WRITE) - -struct play { - int isplaying:1, /* True if playing now */ - ispaused:1, /* True if paused */ - isrecording:1, /* True if recording */ - isended:1 /* True if song ended */ - ; - int run_sched:1; /* A run_events is scheduled */ - - guint write_id; /* ID of write handler */ - guint read_id; /* ID of read handler */ - - seq_context_t *ctxp; /* Sequencer context */ - struct rootElement *mdroot; /* Midi song to play */ - struct sequenceState *seq; /* To hold current sequence position */ - struct element *pend_element;/* Element that is pending play */ - - struct _GtkAdjustment *posadj; /* Play position adjustment */ - - ticktime_t lastpos; /* Last time position we set */ - - int pos_sig; /* Signal for position */ - int to_id; /* Timeout id */ -}; - -#define ADDR_PARTS 4 -#define SEP ", \t\n" - ->>function play_new -struct play * - ->>description -Return a newly allocated play structure. - ->>code - struct play *play; - - play = g_new0(struct play, 1); - - play->isplaying = 0; - play->ispaused = 0; - play->isended = 0; - - play->mdroot = NULL; - play->pend_element = NULL; - play->ctxp = seq_context_new(_("Melys sequencer")); - snd_seq_block_mode(seq_handle(play->ctxp), 0); - play->seq = NULL; - play->write_id = 0; - play->read_id = 0; - play->pos_sig = 0; - - return play; - - ->>function play_free -void -struct play *play; The play object to free - ->>description -Free all resources. - ->>code - - remove_io_cb(play, INPUT_ALL); - - if (play->pos_sig) - gtk_signal_disconnect(GTK_OBJECT(play->posadj), play->pos_sig); - - if (play->to_id) - gtk_timeout_remove(play->to_id); - - if (play->seq) - (void) md_seq_end(play->seq); - - if (play->mdroot) - md_free(MD_ELEMENT(play->mdroot)); - - if (play->ctxp) - seq_context_free(play->ctxp); - - if (play->posadj) - gtk_object_unref(GTK_OBJECT(play->posadj)); - - g_free(play); - - ->>function play_set_mdroot -void -struct play *play; The play object -struct rootElement *root; Root of the md tree to use - ->>description -Sets the md root for this play structure. -It is an error to set it if one is already set. - ->>code - - play->mdroot = md_root_inc_ref(root); - - ->>function play_set_pos_adj -void -struct play *play; -struct _GtkAdjustment *adj; - ->>code - - if (play) { - if (play->pos_sig) { - gtk_signal_disconnect(GTK_OBJECT(play->posadj), play->pos_sig); - gtk_object_unref(GTK_OBJECT(play->posadj)); - } - - play->posadj = adj; - gtk_object_ref(GTK_OBJECT(adj)); - play->pos_sig = gtk_signal_connect(GTK_OBJECT(adj), - "value-changed", pos_changed_cb, play); - } - - ->>function play_set_ports -void -struct play *play; ->>description -Set the port addresses from the configuration and any -information from the current song. ->>code - int n; - snd_seq_addr_t *addrs; - - if (!play->ctxp) - return; - - n = conf_get_input_ports(&addrs); - seq_set_addresses(play->ctxp, SEQ_ADDR_INPUT, addrs, n); - g_free(addrs); - - n = conf_get_output_ports(&addrs); - seq_set_addresses(play->ctxp, SEQ_ADDR_OUTPUT, addrs, n); - g_free(addrs); - - ->>function play_start -void -struct play *play; The play object - ->>description -Start playing the midi. -If one is not set then nothing happens. -XXX some warning/error? - ->>code - seq_context_t *ctxp; - - if (!play || play->isplaying || play->mdroot == NULL) - return; - - ctxp = play->ctxp; - if (ctxp == NULL) - return; - - /* Init the sequence */ - if (play->ispaused) { - seq_timer_continue(ctxp); - /* set playing */ - play->isplaying = TRUE; - } else { - play->isended = FALSE; - play->isplaying = FALSE; - play->seq = md_seq_init_merge(play->mdroot, FALSE); - play->pend_element = NULL; - - seq_drain_output(ctxp); - seq_connect_addresses(ctxp, SEQ_ADDR_OUTPUT); - - /* Reset timer */ - seq_timer_stop(ctxp); - midi_play_prologue(ctxp, play->mdroot); - } - - - add_io_cb(play, INPUT_ALL); - - /* Timeout is in ms */ - if (play->to_id == 0) - play->to_id = gtk_timeout_add(40, play_to_cb, play); - - - ->>function play_pause -void -struct play *play; The play object - ->>description -Stop playing. -If start is called after the song will be restarted from where it -was stopped. -Use -.F play_stop -to stop and play from the beginning. - ->>code - seq_context_t *ctxp; - snd_seq_event_t ev; - union un_time t; - - if (play->isplaying == FALSE || play->mdroot == NULL) - return; - - play->isplaying = FALSE; - play->ispaused = TRUE; - - if (play->to_id) { - gtk_timeout_remove(play->to_id); - play->to_id = 0; - } - - remove_io_cb(play, INPUT_ALL); - - ctxp = play->ctxp; - - t.tick = 0; - seq_midi_event_init(ctxp, &ev, FALSE, t, 0); - seq_midi_control(ctxp, &ev, 0, SND_MCTL_ALL_SOUNDS_OFF, 0); - seq_send_to_all_now(ctxp, &ev); - seq_timer_stop(ctxp); - - ->>function play_stop -void -struct play *play; The play object to stop and rewind - ->>description -Rewind the song back to the beginning. -The next start will play the song from the beginning. - ->>code - - play_pause(play); - - if (play->seq) - (void) md_seq_end(play->seq); - play->seq = NULL; - - play->ispaused = FALSE; - - ->>function play_set_record -void -struct play *play; -int recmode; True if recording is started ->>description -Sets a flag to say if recording is active or not. -Needed because if recording we must not stop the timer -at the end of the song as it should be extended instead. - ->>code - - if (recmode == 0 && play->isrecording && play->isended) { - play_pause(play); - - play->isplaying = FALSE; - play->ispaused = FALSE; - } - - play->isrecording = recmode; - - ->>function play_get_context -struct seq_context * -struct play *play; Will return play->ctxp - ->>description -Get the sequencer context. ->>code - if (play == NULL) - return NULL; - - return play->ctxp; - - - ->>function play_mute -void -struct play *play; -struct trackElement *track; - ->>code -#ifdef SND_SEQ_REMOVE_DEST - snd_seq_remove_events_t fqueue; - snd_seq_addr_t *addr; -#endif - int dev; - int chan; - - dev = ((struct element *)track)->device_channel >> 4; - chan = ((struct element *)track)->device_channel & 0x0f; - - if (dev < 0) - return; - -#ifdef SND_SEQ_REMOVE_DEST - addr = seq_dev_addr(play->ctxp, dev, SEQ_ADDR_OUTPUT); - if (!addr) - return; - - /* - * Remove all note events from this channel, resticted by - * channel tag. - */ - memset(&fqueue, 0, sizeof(fqueue)); - fqueue.output = 1; - fqueue.dest = *addr; -#ifndef SEQ_API_2 - fqueue.dest.channel = chan; -#else /* SEQ_API_2 */ - fqueue.channel = chan; - fqueue.queue = seq_xxx_get_queue(play->ctxp); /*FIXME*/ -#endif /* SEQ_API_2 */ - fqueue.type = SND_SEQ_EVENT_NOTE; - fqueue.tag = MD_TRACKLIKE(track)->number; /* XXX TEMP */ - fqueue.remove_mode = - SND_SEQ_REMOVE_DEST | - SND_SEQ_REMOVE_DEST_CHANNEL | - SND_SEQ_REMOVE_TAG_MATCH | - SND_SEQ_REMOVE_EVENT_TYPE - ; - - snd_seq_remove_events(seq_handle(play->ctxp), &fqueue); -#elif defined(SND_SEQ_IOCTL_RESET_POOL) - { - snd_seq_reset_pool_t reset; - ticktime_t now; - int i; - static int warned; - - if (!warned) { - warned = 1; - mel_warning(_("Melys was not built with the ALSA remove_events\n" - "patch. The muting function will not work very well\n" - "You will get hanging notes, for example") - ); - } - - /* - * The best we can do is flush everything and reset all our - * play position pointers. This works quite well, but - * you get hanging note problems. - */ - now = seq_get_time(play->ctxp); - - memset(&reset, 0, sizeof(reset)); - reset.reset_output = SND_SEQ_RESET_POOL_ALL; - ioctl(seq_descriptor(play->ctxp), SND_SEQ_IOCTL_RESET_POOL, &reset); - - for (i = 0; i < play->mdroot->tracks; i++) { - track = md_track_nth(play->mdroot, i); - md_elem_seek_back(MD_CONTAINER(track), now); - } - - } -#else - { - static int warned; - - if (!warned) { - warned = 1; - mel_warning(_("Melys should be built with ALSA version of\n" - "at least 0.4.1. The muting function will hardly work at all") - ); - } - } -#endif - - ->>function play_unmute -void -struct play *play; -struct trackElement *track; - ->>code - ticktime_t now; - ticktime_t ahead; - - dprintf1("midi play unmute\n"); - now = seq_get_time(play->ctxp); - - -#ifdef SND_SEQ_REMOVE_DEST - { - snd_seq_remove_events_t fqueue; - snd_seq_addr_t *addr; - struct trackElement *t; - ticktime_t t2; - int dev; - int chan; - int n; - - dev = ((struct element *)track)->device_channel >> 4; - chan = ((struct element *)track)->device_channel & 0x0f; - - addr = seq_dev_addr(play->ctxp, dev, SEQ_ADDR_OUTPUT); - if (addr == NULL) - return; - - /* Should flush all events after the current time on this track */ - memset(&fqueue, 0, sizeof(fqueue)); - fqueue.output = 1; - fqueue.remove_mode = SND_SEQ_REMOVE_DEST | - SND_SEQ_REMOVE_DEST_CHANNEL | - SND_SEQ_REMOVE_IGNORE_OFF | - SND_SEQ_REMOVE_TAG_MATCH | - SND_SEQ_REMOVE_TIME_AFTER; - fqueue.dest = *seq_dev_addr(play->ctxp, dev, SEQ_ADDR_OUTPUT);/*XXX*/ -#ifndef SEQ_API_2 - fqueue.dest.channel = chan; -#else /* SEQ_API_2 */ - fqueue.channel = chan; -#endif /* SEQ_API_2 */ - fqueue.tag = MD_TRACKLIKE(track)->number; - fqueue.tick = 1; - fqueue.time.tick = now; - - snd_seq_remove_events(seq_handle(play->ctxp), &fqueue); - md_elem_seek_back(play->seq, MD_TRACKLIKE(track), now); - - /* - * Next need to make room for more events. It is quite likely - * that the queue is full up of events that will not be playing - * for a long time. We need to make room for our events that - * are just about to be entered on the queue. - */ - ahead = now + 500; /* Totally random value that I made up */ - fqueue.time.tick = ahead; - fqueue.remove_mode = SND_SEQ_REMOVE_DEST | - SND_SEQ_REMOVE_IGNORE_OFF | - SND_SEQ_REMOVE_TIME_AFTER; - - debug_pool(play); - dprintf1("Removing MOST events"); - snd_seq_remove_events(seq_handle(play->ctxp), &fqueue); - debug_pool(play); - - /* - * Seek back all tracks that are too far ahead. - */ - for (n = 0; n < play->mdroot->tracks; n++) { - if (n == MD_TRACKLIKE(track)->number) - continue; - t = md_track_nth(play->mdroot, n); - md_elem_seek_back(play->seq, MD_TRACKLIKE(t), ahead); - } - - t2 = seq_get_time(play->ctxp); - if (t2 > ahead) - mel_warning(_("BUG: @func_name: t2=%ld, ahead time=%ld\n"), - t2, ahead); - } -#endif - - if (!play->run_sched) { - play->run_sched = 1; - gtk_idle_add(run_events_idle, play); - } - - ->>function run_events_idle -static gint -gpointer data; ->>code - struct play *play = data; - dprintf2("@func_name play_id %d", play->write_id); - play->run_sched = 0; - if (play->isplaying) { - run_events(play); - add_io_cb(play, GDK_INPUT_WRITE); - } - return FALSE; - ->>function run_events_cb -static void -gpointer vplay; This will be a play object -gint fd; The file descriptor that is ready -GdkInputCondition cond; The condition that matched ->>code - dprintf2("@func_name"); - run_events((struct play *)vplay); - - ->>function run_events -static void -struct play *play; ->>description -This is called when the front end is not busy and is -used to control the interaction between the front end and -the midi engine. -It is possible that this will be done in a separate thread -in future, but there still has to be an interface between threads -and this is it. - ->>code - struct element *el = NULL; - int status = 0; - ticktime_t end; - - debug_pool(play); - - /* Push out any pending element */ - if (play->pend_element) { - status = seq_midi_send_element(play->ctxp, play->pend_element); - if (status < 0) { - dprintf2("Couldn't send the pending event"); - return; - } - - play->pend_element = NULL; - } - - if (status == 0 && !play->isplaying) { - remove_io_cb(play, GDK_INPUT_WRITE); - return; - } - - /* Try and push out next items in the sequence */ - while ((el = md_seq_next(play->seq)) != NULL) { - - dprintf2("Sending type %d for %d at %ld", el->type, el->device_channel, el->element_time); - status = seq_midi_send_element(play->ctxp, el); - if (status < 0) { - play->pend_element = el; - break; - } - - if (el->type == MD_TYPE_HEAD) { - end = MD_ENDTIME(play->mdroot); - seq_midi_send_echo(play->ctxp, end, ECHO_END_SONG); - } - } - - status = snd_seq_flush_output(seq_handle(play->ctxp)); - - /* - * There could be an empty queue here because all - * channels have been muted. This means that we - * will need to be restarted when a channel is unmuted. - */ - if (status == 0) - remove_io_cb(play, GDK_INPUT_WRITE); - - return; - - ->>function get_events -static void -gpointer vplay; Play object to be used -gint fd; The file descriptor that is ready -GdkInputCondition cond; The condition that matched - ->>description -Get and process the available events. - ->>code - struct play *play = vplay; - snd_seq_event_t *ep; - - /* - * Because events are buffered within the library then we - * must read all available events or arrange to have ourselves - * called by some mechanism other than select(). - */ - while ((ep = seq_read(play->ctxp)) != NULL) { - - switch (ep->type) { - case SND_SEQ_EVENT_ECHO: - do_special(play, ep->data.raw32.d[0]); - break; - default: - dprintf1("Event NOT ECHO type %d revceived\n", ep->type); - break; - } - - snd_seq_free_event(ep); - } - ->>function do_special -static void -struct play *play; The play object -int type; Type of echo event - ->>description -Deal with an echo event, which are used to schedule events within -melys that are related to the song being played. -For example when it ends: this is not an absolute time as -it may be paused, have its tempo changed etc. - ->>code - - switch (type) { - case ECHO_NOOP: - dprintf1("NOOP"); - break; - - case ECHO_END_SONG: - - play->isended = TRUE; - if (!play->isrecording) { - play_stop(play); - - play->isplaying = FALSE; - play->ispaused = FALSE; - } - - dprintf1("ENDSONG"); - break; - - case ECHO_END_PROLOGUE: - /* Reset the timer */ - seq_timer_stop(play->ctxp); - play->isplaying = TRUE; - add_io_cb(play, INPUT_ALL); - dprintf1("END PROLOG"); - break; - - default: - dprintf(0, "Unknown echo event %d\n", type); - break; - } - - ->>function play_to_cb -static gint -gpointer data; - ->>description -Called while playing to update the play position pointer. - ->>code - struct play *play = data; - ticktime_t t; - - t = seq_get_time(play->ctxp); - - if (t > play->posadj->upper) { - play->posadj->upper = t; - gtk_adjustment_changed(play->posadj); - } - - play->lastpos = t; - gtk_adjustment_set_value(play->posadj, t); - - return TRUE; - - ->>function pos_changed_cb -static void -GtkAdjustment *adj; -gpointer data; The play object - ->>code - struct play *play = data; - gboolean wasplaying; - - if (adj->value != play->lastpos) { - /* Somebody else changed it */ - wasplaying = play->isplaying; - - play->lastpos = adj->value; - play_pause(play); - seq_midi_seek(play->ctxp, play->seq, (ticktime_t)adj->value); - if (wasplaying) - play_start(play); - } - - ->>function add_io_cb -static void -struct play *play; The play object -int which; Which callbacks to add - ->>description -Add the io callbacks. - ->>code - /* Set up callbacks for IO activity */ - - if ((which & GDK_INPUT_WRITE) && !play->write_id) - play->write_id = gdk_input_add(seq_descriptor(play->ctxp), - GDK_INPUT_WRITE, run_events_cb, play); - - if ((which & GDK_INPUT_READ) && !play->read_id) - play->read_id = gdk_input_add(seq_descriptor(play->ctxp), - GDK_INPUT_READ, get_events, play); - - ->>function remove_io_cb -static void -struct play *play; The play object -int which; Which callbacks to remove - ->>description -Remove the io callbacks. - ->>code - /* Set up callbacks for IO activity */ - - if ((which & GDK_INPUT_WRITE) && play->write_id) { - dprintf2("Removing write cb"); - gdk_input_remove(play->write_id); - play->write_id = 0; - } - if ((which & GDK_INPUT_READ) && play->read_id) { - dprintf2("Removing read cb"); - gdk_input_remove(play->read_id); - play->read_id = 0; - } - - ->>function debug_pool -static void -struct play *play; - ->>code - snd_seq_client_pool_t poolinfo; - - poolinfo.client = snd_seq_client_id(seq_handle(play->ctxp)); - snd_seq_get_client_pool(seq_handle(play->ctxp), &poolinfo); - - dprintf1("Pool %d, room %d, free %d", - poolinfo.output_pool, - poolinfo.output_room, - poolinfo.output_free); diff -rNu melys-0.1.16/midi/record.m melys-0.1.17/midi/record.m --- melys-0.1.16/midi/record.m Fri Jan 7 10:56:02 2000 +++ melys-0.1.17/midi/record.m Thu Jan 1 01:00:00 1970 @@ -1,573 +0,0 @@ ->>name record.m - Recording midi. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header elements.h ->>header seqlib.h ->>header config.h ->>header md.h ->>header gdk/gdk.h ->>header melmsg.h - ->>headerdef --decl melmidi.h - -/* Opaque type to store all record state */ -struct record; - ->>extern - -struct record { - - int isrecording:1 /* Recording events */ - ; - - seq_context_t *ctxp; /* Record context */ - struct rootElement *mdroot; /* The current song */ - - guint write_id; /* ID of write handler */ - guint read_id; /* ID of read handler */ - - struct trackElement *curtrack; /* Current track */ -}; - -#define INPUT_ALL (GDK_INPUT_READ|GDK_INPUT_WRITE) - ->>function record_new -struct record * -struct seq_context *ctxp; The seq context - ->>description -Allocate and initialise a record state. -A new sequencer context is created that will receive the incoming -midi events. - ->>code - struct record *record; - - if (ctxp == NULL) - return NULL; - - record = g_new0(struct record, 1); - - record->ctxp = seq_add_subcontext(ctxp); - seq_set_client_name(record->ctxp, _("Melys sequencer (record)")); - - snd_seq_block_mode(seq_handle(record->ctxp), 0); - - return record; - ->>function record_free -void -struct record *record; The record state - ->>code - - remove_io_cb(record, INPUT_ALL); - - if (record->ctxp) - seq_context_free(record->ctxp); - - if (record->mdroot) - md_free(MD_ELEMENT(record->mdroot)); - - record->ctxp = NULL; - - g_free(record); - - ->>function record_set_mdroot -void -struct record *record; The record state -struct rootElement *root; Root to set - ->>code - - if (record) - record->mdroot = md_root_inc_ref(root); - - ->>function record_set_ports -void -struct record *record; ->>description -Set the port addresses from the configuration and any -information from the current song. ->>code - int n; - snd_seq_addr_t *addrs; - - if (record == NULL || record->ctxp == NULL) - return; - - n = conf_get_input_ports(&addrs); - seq_set_addresses(record->ctxp, SEQ_ADDR_INPUT, addrs, n); - g_free(addrs); - - n = conf_get_output_ports(&addrs); - seq_set_addresses(record->ctxp, SEQ_ADDR_OUTPUT, addrs, n); - g_free(addrs); - - seq_connect_addresses(record->ctxp, SEQ_ADDR_INPUT); - add_io_cb(record, INPUT_ALL); - - ->>function record_set_track -void -struct record *record; -struct trackElement *track; -int devchan; Channel for this track ->>description -Set the current track that we are recording on. - ->>code - - if (record) - record->curtrack = track; - - ->>function record_start -void -struct record *record; Record state - ->>description -Start recording. -Events are saved and added to the current take. - ->>code - int n; - unsigned long t; - struct trackElement *track; - - if (record == NULL || record->ctxp == NULL) - return; - - record->isrecording = TRUE; - - t = seq_get_time(record->ctxp); - - for (n = 0; n < record->mdroot->tracks; n++) { - track = md_track_nth(record->mdroot, n); - - if (track->record) { - track->newpart = md_container_new(); - track->notes = g_ptr_array_new(); - MD_TIME(track->newpart) = t; - MD_DEVCHAN(track->newpart) = MD_DEVCHAN(track); - } - } - ->>function record_stop -void -struct record *record; Record state - ->>description -Stop recording. - ->>code - unsigned long endtime; - unsigned long duration; - struct trackElement *track; - struct element *el; - int i; - int n; - - if (!record || !record->isrecording) - return; - - record->isrecording = FALSE; - - endtime = seq_get_time(record->ctxp); - - - for (n = 0; n < record->mdroot->tracks; n++) { - track = md_track_nth(record->mdroot, n); - - if (!track->record) - continue; - - if (!track->notes) - continue; /* TEMP */ - - /* - * Must finish off any note that is not released. The pointers - * are just copies pointing to the real saved note events, so - * we just have to adjust the duration. - */ - for (i = 0; i < (int)track->notes->len; i++) { - el = (struct element *)g_ptr_array_index(track->notes, i); - MD_NOTE(el)->length = endtime - el->element_time; - } - - duration = endtime - MD_TIME(track->newpart); - track->newpart->duration = duration; - - md_merge_in(MD_CONTAINER(track), track->newpart, MD_ADD_MERGE); - md_free(MD_ELEMENT(track->newpart)); - track->newpart = NULL; - g_ptr_array_free(track->notes, 1); - - /* - * If the track has been extended by the recording - * then we may need to extend the root. - */ - if (MD_ENDTIME(track) > MD_ENDTIME(record->mdroot)) - MD_SET_DURATION(record->mdroot, MD_ENDTIME(track)); - } - - ->>function run_events -static void -gpointer vrecord; This will be a record object -gint fd; The file descriptor that is ready -GdkInputCondition cond; The condition that matched ->>description -Read and save the incoming events. - ->>code - snd_seq_event_t *ep; - struct record *record = vrecord; - struct trackElement *track; - - while ((ep = seq_read(record->ctxp)) != NULL) { - int n; - int tn; - -#ifdef SND_SEQ_EVENT_SENSING - if (ep->type != SND_SEQ_EVENT_SENSING) -#endif - dprintf2("Got event %d time %ld", ep->type, ep->time.tick); - - /* This is an ALSA bug (reported) keyboard events have the REL bit - * set but they are not relative - * Should be fixed in CVS (19 Nov). - */ - ep->flags &= ~SND_SEQ_TIME_MODE_REL; - - for (tn = 0; tn < record->mdroot->tracks; tn++) { - track = md_track_nth(record->mdroot, tn); - if (!track->record) - continue; - - save_event(track, ep); - - n = seq_sendto_now(record->ctxp, ep, - MD_DEV(track), - MD_CHAN(track)); - - if (n != 0) { - g_message("Mmm n is %d", n); - add_io_cb(record, GDK_INPUT_WRITE); - } - } - snd_seq_free_event(ep); - } - - ->>extern -#define EPTR struct element * - ->>function save_event -static void -struct trackElement *track; -snd_seq_event_t *ep; Event to save ->>description -Save the event in the current part that is being recorded. ->>code - struct element *el; - unsigned long time; - //int devchan; - - if (!track->newpart) - return; - - time = ep->time.tick; /* NB: could be REAL and not TICK */ - //devchan = get_dev_from_addr(record, &ep->source, SEQ_ADDR_INPUT); - //if (devchan < 0) - // return; - - el = NULL; - - switch (ep->type) { - case SND_SEQ_EVENT_NOTE: - /* Don't expect to see this from real midi devices */ - el = (EPTR)md_note_new(ep->data.note.note, ep->data.note.velocity, - ep->data.note.duration); - break; - case SND_SEQ_EVENT_NOTEON: - if (ep->data.note.velocity == 0) - /* Really a note off */ - finish_note(track, time, ep); - else - el = save_note(track, time, ep); - break; - case SND_SEQ_EVENT_NOTEOFF: - finish_note(track, time, ep); - break; - case SND_SEQ_EVENT_KEYPRESS: - el = (EPTR) md_keytouch_new(ep->data.control.param, - ep->data.control.value); - break; - case SND_SEQ_EVENT_CONTROLLER: - el = save_controller(track, ep->data.control.param, - ep->data.control.value); - break; - case SND_SEQ_EVENT_PGMCHANGE: - el = save_program(track, ep->data.control.value); - break; - case SND_SEQ_EVENT_CHANPRESS: - el = (EPTR) md_pressure_new(ep->data.control.value); - break; - case SND_SEQ_EVENT_PITCHBEND: - el = (EPTR) md_pitch_new(ep->data.control.value); - break; - case SND_SEQ_EVENT_SYSEX: - el = (EPTR) md_sysex_new(*(guchar *)ep->data.ext.ptr, - ((guchar *)ep->data.ext.ptr)+1, ep->data.ext.len-1); - break; - -#ifdef SND_SEQ_EVENT_SENSING - case SND_SEQ_EVENT_SENSING: /* New, was HEARTBEAT */ -#endif -#ifdef SND_SEQ_EVENT_HEARTBEAT - case SND_SEQ_EVENT_HEARTBEAT: /* Old, now SENSING */ -#endif - /* Ignore these */ - break; - - case SND_SEQ_EVENT_CONTROL14: - case SND_SEQ_EVENT_NONREGPARAM: - case SND_SEQ_EVENT_REGPARAM: - case SND_SEQ_EVENT_SONGPOS: - case SND_SEQ_EVENT_SONGSEL: - case SND_SEQ_EVENT_CLOCK: - case SND_SEQ_EVENT_START: - case SND_SEQ_EVENT_CONTINUE: - case SND_SEQ_EVENT_STOP: - case SND_SEQ_EVENT_QFRAME: - case SND_SEQ_EVENT_TICK: - case SND_SEQ_EVENT_TEMPO: - case SND_SEQ_EVENT_TIMESIGN: - case SND_SEQ_EVENT_KEYSIGN: - case SND_SEQ_EVENT_SYSTEM: - /* We may want to do something with these or may want to - * ignore them. Will decide when they actually start happening. - */ - g_warning("Event type %d seen in @func_name", ep->type); - break; - } - - if (el) { - el->element_time = time; - el->device_channel = MD_DEVCHAN(track); - - md_save_elem(track->newpart, el); - } - - if (MD_MODIFIED(track)) - mel_view_update(); - - ->>function push_events -static void -gpointer vrecord; This will be a record object -gint fd; The file descriptor that is ready -GdkInputCondition cond; The condition that matched - ->>description -Push out the events waiting to be written to the sequencer. - ->>code - int n; - struct record *record = vrecord; - - n = snd_seq_flush_output(seq_handle(record->ctxp)); - if (n == 0) - remove_io_cb(record, GDK_INPUT_WRITE); - - ->>function add_io_cb -static void -struct record *record; The record object -int which; Which callbacks to add - ->>description -Add the io callbacks. - ->>code - /* Set up callbacks for IO activity */ - - if ((which & GDK_INPUT_WRITE) && !record->write_id) - record->write_id = gdk_input_add(seq_descriptor(record->ctxp), - GDK_INPUT_WRITE, push_events, record); - - if ((which & GDK_INPUT_READ) && !record->read_id) - record->read_id = gdk_input_add(seq_descriptor(record->ctxp), - GDK_INPUT_READ, run_events, record); - - ->>function remove_io_cb -static void -struct record *record; The record object -int which; Which callbacks to remove - ->>description -Remove the io callbacks. - ->>code - /* Remove callbacks for IO activity */ - - if ((which & GDK_INPUT_WRITE) && record->write_id) { - gdk_input_remove(record->write_id); - record->write_id = 0; - } - if ((which & GDK_INPUT_READ) && record->read_id) { - gdk_input_remove(record->read_id); - record->read_id = 0; - } - - ->>function save_note -static struct element * -struct trackElement *track; -unsigned long time; The current song time -snd_seq_event_t *ep; The note event - ->>description -Allocate a note element and save it for when -the off note arrives. -Sorry this is just about a duplicate of routine in midiread.c ->>code - struct element *el; - - el = (struct element *)md_note_new - (ep->data.note.note, ep->data.note.velocity, -1); - - g_ptr_array_add(track->notes, el); - - return el; - - ->>function finish_note -static void -struct trackElement *track; -unsigned long time; The time of the off note -snd_seq_event_t *ep; The off note - ->>description -Called when a note off is seen. -Finds the corresponding note on and constructs a note element. - ->>code - int i; - GPtrArray *notes; - struct noteElement *n; - int len; - - notes = track->notes; - n = NULL; - for (i = notes->len-1; i >= 0; i--) { - n = g_ptr_array_index(notes, i); - if (n->note == ep->data.note.note) { - - len = time - MD_ELEMENT(n)->element_time; - n->offvel = ep->data.note.velocity; - n->length = len; - if (n->length < 0) - n->length = 0; - - g_ptr_array_remove_index_fast(notes, i); - break; - } - } - - ->>function save_controller -static struct element * -struct trackElement *track; -int control; -int value; - ->>description -Save the controller state for the track device. -Note that of course tracks can share devices. - ->>code - struct element *el; - int alloc; - - control = control & 0x7f; - value = value & 0x7f; - track->controllers[control] = value; - - /* - * Some events are not saved as separate events but are combined - * into larger units. - * - * This should probably depend on what mode the song is in (GM etc) - * but currently doesn't. - */ - switch (control) { - case SND_MCTL_MSB_BANK: - case SND_MCTL_LSB_BANK: - MD_SET_MODIFIED(track, TRUE); - alloc = FALSE; - break; - default: - alloc = TRUE; - break; - } - - el = NULL; - if (alloc) - el = (EPTR) md_control_new(control, value); - - return el; - - ->>function save_program -static struct element * -struct trackElement *track; -int val; - ->>description -Save the program number. -We save the program as a single integer that includes in the default -case the bank change commands. -There are various ways of representing banks of instruments and -we are using the controllers 0 and 32 method at present. ->>code - int program; - struct element *el; - - /* Currently never save a program change event */ - el = NULL; - - program = 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 = program; - MD_SET_MODIFIED(track, TRUE); - - return el; diff -rNu melys-0.1.16/pixmaps/balls.m melys-0.1.17/pixmaps/balls.m --- melys-0.1.16/pixmaps/balls.m Fri Aug 13 11:23:50 1999 +++ melys-0.1.17/pixmaps/balls.m Thu Jan 1 01:00:00 1970 @@ -1,215 +0,0 @@ ->>name balls.m - pixmaps for the ball like labels on mute etc buttons. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ZNY WARRANTY; without even the implied warranty of - MERCHZNTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -Some button labels. Feel free to draw some better ones. - ->>headerdef pixmaps.h - -extern char *blueball_xpm[]; -extern char *redball_xpm[]; -extern char *greenball_xpm[]; -extern char *yellowball_xpm[]; - ->>set __escapechar__ "Z" - ->>extern -/* XPM */ -char * blueball_xpm[] = { -"12 11 38 1", -" c None", -". c #F2F1FD", -"+ c #D4D0F9", -"@ c #776BEF", -"# c #5243EB", -"$ c #D3D0F9", -"% c #CECAF9", -"& c #5041EB", -"* c #5F52EC", -"= c #675AED", -"- c #4737EA", -"; c #4535E9", -"> c #F8F7FE", -", c #695CED", -"' c #4C3DEA", -") c #CFCBF9", -"! c #DEDBFA", -"~ c #6D60EE", -"{ c #4435E9", -"] c #4435EA", -"^ c #DBD7FA", -"/ c #4839EA", -"( c #7A6EEF", -"_ c #938AF2", -": c #4535EA", -"< c #DAD7FA", -"[ c #CBC6F8", -"} c #4536EA", -"| c #CAC6F8", -"1 c #DCD9FA", -"2 c #4939EA", -"3 c #F9F8FE", -"4 c #4434E9", -"5 c #5345EB", -"6 c #4434EA", -"7 c #8075F0", -"8 c #5749EB", -"9 c #F6F6FD", -" .. ", -" +@##@$ ", -" %&*=-;&% ", -" >,')!~{],> ", -" ^/-(_#;:/< ", -" [};;;{;:}| ", -" 12{{{{{;21 ", -" 3~{4{{4{~3 ", -" +5:]6:5+ ", -" ^7887^ ", -" 99 "}; - ->>extern -/* XPM */ -char * greenball_xpm[] = { -"12 11 37 1", -" c None", -". c #F2FEFF", -"+ c #D4FEFF", -"@ c #77FDDC", -"# c #52F991", -"$ c #D3FEFF", -"% c #CEFEFF", -"& c #50F891", -"* c #5FFBA1", -"= c #67FCB5", -"- c #47F683", -"; c #45F677", -"> c #F8FEFF", -", c #69FCB5", -"' c #4CF783", -") c #CFFEFF", -"! c #DEFEFF", -"~ c #6DFCC9", -"{ c #44F677", -"] c #44F683", -"^ c #DBFEFF", -"/ c #48F783", -"( c #7AFEDC", -"_ c #93FFFA", -": c #45F683", -"< c #DAFEFF", -"[ c #CBFFFF", -"} c #CAFFFF", -"| c #DCFEFF", -"1 c #49F783", -"2 c #F9FEFF", -"3 c #44F577", -"4 c #53F991", -"5 c #44F583", -"6 c #80FEEA", -"7 c #57FA91", -"8 c #F6FEFF", -" .. ", -" +@##@$ ", -" %&*=-;&% ", -" >,')!~{],> ", -" ^/-(_#;:/< ", -" [:;;;{;::} ", -" |1{{{{{;1| ", -" 2~{3{{3{~2 ", -" +4:]5:4+ ", -" ^6776^ ", -" 88 "}; - ->>extern -/* XPM */ -char * redball_xpm[] = { -"12 11 32 1", -" c None", -". c #FEF1FF", -"+ c #FDD0FF", -"@ c #F96BCE", -"# c #F44369", -"$ c #FDCAFF", -"% c #F44169", -"& c #F65279", -"* c #F85A91", -"= c #F1375D", -"- c #F13553", -"; c #FEF7FF", -"> c #F85C91", -", c #F33D5D", -"' c #FDCBFF", -") c #FDDBFF", -"! c #F860B3", -"~ c #F1355D", -"{ c #FDD7FF", -"] c #F2395D", -"^ c #FA6ECE", -"/ c #FB8AE9", -"( c #FDC6FF", -"_ c #F1365D", -": c #FDD9FF", -"< c #FEF8FF", -"[ c #F13453", -"} c #F44569", -"| c #F1345D", -"1 c #FA75DC", -"2 c #F54969", -"3 c #FEF6FF", -" .. ", -" +@##@+ ", -" $%&*=-%$ ", -" ;>,')!-~>; ", -" {]=^/#-~]{ ", -" (_-----~_( ", -" :]------]: ", -" >extern -/* XPM */ -char * yellowball_xpm[] = { -"12 11 21 1", -" c None", -". c #FDF6BC", -"+ c #F9EE6A", -"@ c #F9ED6A", -"# c #FBF177", -"$ c #FBF387", -"% c #F7EA60", -"& c #F7E958", -"* c #FCF387", -"= c #F8EC60", -"- c #FEFCFF", -"; c #FEFDFF", -"> c #FCF49E", -", c #F6E958", -"' c #F6E960", -") c #FEF9E7", -"! c #F7E960", -"~ c #F6E858", -"{ c #F6E860", -"] c #FDF7D2", -"^ c #FAEF6A", -" ", -" .++. ", -" @#$%&@ ", -" *=-;>,'* ", -" %%.)+&!% ", -" !&&&,&!! ", -" %,,,,,&% ", -" >,~,,~,> ", -" +!'{!+ ", -" ]^^] ", -" "}; diff -rNu melys-0.1.16/pixmaps/mag.m melys-0.1.17/pixmaps/mag.m --- melys-0.1.16/pixmaps/mag.m Thu Oct 14 17:39:39 1999 +++ melys-0.1.17/pixmaps/mag.m Thu Jan 1 01:00:00 1970 @@ -1,25 +0,0 @@ ->>name mag.m - magnifying glasses - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ZNY WARRANTY; without even the implied warranty of - MERCHZNTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -Some magnigying glass icons. Feel free to draw some better ones. - ->>headerdef pixmaps.h - -extern char *plus_xpm[]; -extern char *minus_xpm[]; - - ->>extern - -#include "./plus.xpm" -#include "./minus.xpm" diff -rNu melys-0.1.16/pixmaps/menu_icons.m melys-0.1.17/pixmaps/menu_icons.m --- melys-0.1.16/pixmaps/menu_icons.m Fri Aug 20 17:36:40 1999 +++ melys-0.1.17/pixmaps/menu_icons.m Thu Jan 1 01:00:00 1970 @@ -1,26 +0,0 @@ ->>name menu_icons.m - Icons that go on the menus. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>headerdef pixmaps.h - -extern char *mrec_xpm[]; -extern char *mplay_xpm[]; -extern char *mpause_xpm[]; -extern char *mstop_xpm[]; - ->>extern - -#include "mrec.xpm" -#include "mplay.xpm" -#include "mpause.xpm" -#include "mstop.xpm" diff -rNu melys-0.1.16/programs/mdmlconv.m melys-0.1.17/programs/mdmlconv.m --- melys-0.1.16/programs/mdmlconv.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.17/programs/mdmlconv.m Thu Jan 1 01:00:00 1970 @@ -1,237 +0,0 @@ ->>name mdmlconv.m - convert between midi and mdml files. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ---- -Program to convert between midi and MDML files. - ->>target mdmlconv ->>make --objects mdmlconv.o ->>make --objects ../files/midiread.o ../files/midiwrite.o ../files/mdmlread.o ->>make --objects ../files/mdmlwrite.o ../files/file.o ->>make --objects ../md/elements.o ../md/mdutil.o ->>make --objects ../util/except.o ../util/util.o ../util/gxstack.o ->>make --objects ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o ../md/mdconv.o - ->>extern ->>header ->>header ->>header ->>header util.h ->>header elements.h ->>header melfile.h ->>header md.h - -/* Options for the command */ -#define HAS_ARG 1 -static struct option long_opts[] = { - {"input-type", HAS_ARG, NULL, 'I'}, - {"output-type", HAS_ARG, NULL, 'O'}, - {"output-file", HAS_ARG, NULL, 'o'}, - {"new", 0, NULL, 'n'}, - {0, 0, 0, 0}, -}; - - ->>function main -int -int argc; number of arguments -char **argv; argument vector - ->>description -Usage: - - mdmlconv [-I input-type] [-O output-type] -o out-file input-file - mdmlconv -n -o out-file - Recognised types are: - midi midi - midi0 midi format 0 - midi1 midi format 1 - mdml mdml format - -If you do not specify a type it defaults by guessing from the file -extension or by looking for magic numbers in the file. - -The -n flag creates a new empty file with some basic initialisation. - ->>code - int c; - char *cp; - char opts[NELEM(long_opts) * 2 + 1]; - struct option *op; - volatile int newfile = 0; - char *volatile outputfile = NULL; - char *volatile inputfile = NULL; - char *volatile inputtype = NULL; - char *volatile outputtype = NULL; - struct File *volatile fin = NULL; - struct File *fout = NULL; - struct rootElement *root; - - - /* Build up the short option string */ - cp = opts; - for (op = long_opts; op < &long_opts[NELEM(long_opts)]; op++) { - *cp++ = op->val; - if (op->has_arg) - *cp++ = ':'; - } - - /* Deal with the options */ - for (;;) { - c = getopt_long(argc, argv, opts, long_opts, NULL); - if (c == -1) - break; - - switch(c) { - case 'I': - inputtype = optarg; - break; - case 'O': - outputtype = optarg; - break; - case 'o': - outputfile = optarg; - break; - case 'n': - newfile = 1; - break; - case '?': - show_usage(); - break; - } - } - - - if (outputfile == NULL) { - fprintf(stderr, "No output filename supplied\n"); - exit(1); - } - - if (CATCH(debugError)) { - fprintf(stderr, "Error: %s\n", debugError->message); - return 1; - } - - if (!newfile) { - if (argc - optind != 1) { - fprintf(stderr, "One input file name must be supplied\n"); - exit(1); - } - - inputfile = argv[optind]; - - fin = file_new(inputfile); - } - - fout = file_new(outputfile); - - if (fin && inputtype) - file_set_type(fin, inputtype); - if (outputtype) - file_set_type(fout, outputtype); - - /* Read in, or create the file */ - if (newfile) { - root = new_file(); - } else { - root = file_read(fin); - if (file_get_status(fin) != FILE_SUCCESS) { - fprintf(stderr, _("Reading %s: %s\n"), - inputfile, file_get_message(fin)); - return 1; - } - } - - /* Get and call function to write out file */ - file_write(fout, root); - if (file_get_status(fout) != FILE_SUCCESS) { - fprintf(stderr, _("Reading %s: %s\n"), - inputfile, file_get_message(fout)); - return 1; - } - - md_free(MD_ELEMENT(root)); - - if (fin) - file_close(fin); - if (fout) - file_close(fout); - - UNCATCH(debugError); - - return 0; - ->>function new_file -static struct rootElement * ->>description -Create a new file template. -Many of the possible fields are present so they can -easily be filled in by hand. ->>code - struct rootElement *root; - struct trackElement *track; - struct partElement *part; - struct takeElement *take; - struct sysexElement *gm; - static unsigned char gminit[] = { - 0xf0, 0x7e, 0x7f, 0x09, 0x01, 0xf7 - }; - - root = md_empty(); - track = md_track_new(); - part = md_part_new(); - take = md_take_new(); - gm = md_sysex_new(0xf0, gminit+1, NELEM(gminit)-1); - - md_add(MD_CONTAINER(root), MD_ELEMENT(track)); - md_add(MD_CONTAINER(track), MD_ELEMENT(part)); - md_add(MD_CONTAINER(part), MD_ELEMENT(take)); - md_add(MD_CONTAINER(take), MD_ELEMENT(gm)); - - root->head->copyright = "Copyright (c) ..."; - root->head->author = "author"; - root->head->title = "Sweet song"; - root->head->comment = "This template was created with mdmlconv"; - MD_SET_SELECTED(take, TRUE); - track->name = "Track 1"; - part->name = "part1"; - - return root; - ->>function show_usage -static void - ->>description -Print a usage message and exit. - ->>code ->>header -char **cpp; -static char *msg[] = { -"Usage:", -"", -" mdmlconv [-I input-type] [-O output-type] -o out-file input-file", -" Recognised types are:", -" midi midi", -" midi0 midi format 0 (notyet)", -" midi1 midi format 1 (notyet)", -" mdml mdml format", -"", -"If you do not specify a type it defaults by guessing from the file", -"extension [or by looking for magic numbers in the file. (not implemented)]", -}; - - for (cpp = msg; cpp < msg+NELEM(msg); cpp++) { - fprintf(stderr, "%s\n", *cpp); - } - exit(1); diff -rNu melys-0.1.16/programs/melplay.m melys-0.1.17/programs/melplay.m --- melys-0.1.16/programs/melplay.m Mon Dec 20 13:39:54 1999 +++ melys-0.1.17/programs/melplay.m Thu Jan 1 01:00:00 1970 @@ -1,361 +0,0 @@ ->>name melplay.m A play midi program - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>extern -/* - * Play a melys file (midi, mdml, whatever melys supports). - * melplay [-p client:port,... ] [-l] [-d delay] file ... - * - * -p client:port - A alsa client and port number to send midi to - * -l - List possible output ports that could be used - * -d delay - Delay after song ends (default 2 sec) - * -b time - Time to begin playing - */ ->>header ->>header ->>header ->>header ->>header ->>header elements.h ->>header md.h ->>header seqlib.h ->>header seqplay.h ->>header melfile.h ->>header melmidi.h ->>header midi.h - ->>target melplay ->>make --objects melplay.o ->>make --objects ../files/midiread.o ../files/midiwrite.o ../files/mdmlread.o ->>make --objects ../files/mdmlwrite.o ../files/file.o ->>make --objects ../md/elements.o ../md/mdutil.o ->>make --objects ../util/except.o ../util/util.o ../util/gxstack.o ->>make --objects ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o ../md/mdseq.o ->>make --objects ../md/mdconv.o ->>make --objects ../seq/seqlib.o ../seq/seqmidi.o ->>make --objects ../seq/seqplay.o - ->>extern -/* Options for the command */ -#define HAS_ARG 1 -static struct option long_opts[] = { - {N_("port"), HAS_ARG, NULL, 'p'}, - {N_("list"), 0, NULL, 'l'}, - {N_("delay"), HAS_ARG, NULL, 'd'}, - {N_("begin"), HAS_ARG, NULL, 'b'}, - {0, 0, 0, 0}, -}; - -/* Delay at the end of a song */ -static int delay = 2; -static long beginat = 0; - -#define ADDR_PARTS 4 /* Number of part in a port description addr 1:2:3:4 */ -#define SEP ", \t" /* Separators for port description */ - ->>function main -int -int argc; arg count -char **argv; arg vector - ->>description -Play a midi file - melplay [-p client:port ...] [-l] [-d delay] file ... - - -p, --port=client:port - An ALSA client and port number to use - -l, --list - List possible output ports that could be used - -d, --delay=SECS - Delay after song ends (default 2 sec) - -b, --begin=TIME - Begin time to start at ->>code - char opts[NELEM(long_opts) * 2 + 1]; - seq_context_t *ctxp; - char *portdesc; - char *cp; - int c; - struct option *op; - - /* Build up the short option string */ - cp = opts; - for (op = long_opts; op < &long_opts[NELEM(long_opts)]; op++) { - *cp++ = op->val; - if (op->has_arg) - *cp++ = ':'; - } - - if (CATCH(debugError)) { - fprintf(stderr, "A fatal debugging error occurred\n"); - fprintf(stderr, "The message was: %s\n", debugError->message); - return 1; - } - - portdesc = NULL; - - /* Deal with the options */ - for (;;) { - c = getopt_long(argc, argv, opts, long_opts, NULL); - if (c == -1) - break; - - switch(c) { - case 'p': - portdesc = optarg; - break; - case 'd': - delay = atoi(optarg); - break; - case 'b': - beginat = atol(optarg); - break; - case 'l': - showlist(); - exit(0); - break; - case '?': - showusage(); - exit(1); - } - } - - - if (portdesc == NULL) { - portdesc = getenv("ALSA_OUTPUT_PORTS"); - if (portdesc == NULL) { - fprintf(stderr, "No client/port specified.\n" - "You must supply one with the -p option or with the\n" - "environment variable ALSA_OUTPUT_PORTS\n" - ); - exit(1); - } - } - - ctxp = openports(portdesc); - if (ctxp == NULL) - return 1; - - /* Now play all the files */ - for (; optind < argc; optind++) - playfile(ctxp, argv[optind]); - - seq_context_free(ctxp); - - UNCATCH(debugError); - - return 0; - ->>header ->>function openports -static seq_context_t * -char *portdesc; - ->>description -Read a list of client/port specifications and return an array of -.M snd_seq_addr_t -that describes them. - ->>code - char *astr; - char *cp; - seq_context_t *ctxp; - snd_seq_addr_t *addr; - snd_seq_addr_t *ap; - int a[ADDR_PARTS]; - int count, naddr; - - if (portdesc == NULL) - return NULL; - - ctxp = seq_context_new("melplay"); - - addr = g_new(snd_seq_addr_t, strlen(portdesc)); - - naddr = 0; - ap = addr; - - for (astr = strtok(portdesc, SEP); astr; astr = strtok(NULL, SEP)) { - for (cp = astr, count = 0; cp && *cp; cp++) { - if (count < ADDR_PARTS) - a[count++] = atoi(cp); - cp = strchr(cp, ':'); - if (cp == NULL) - break; - } - - switch (count) { - case 2: - ap->client = a[0]; - ap->port = a[1]; - break; - default: - printf("Addresses in %d parts not supported yet\n", count); - break; - } - ap++; - naddr++; - } - - seq_set_addresses(ctxp, SEQ_ADDR_OUTPUT, addr, naddr); - seq_connect_addresses(ctxp, SEQ_ADDR_OUTPUT); - - g_free(addr); - - if (naddr == 0) { - fprintf(stderr, "Could not set up any output sequencer ports\n"); - seq_context_free(ctxp); - return NULL; - } - - return ctxp; - ->>function playfile -static void -seq_context_t *ctxp; -char *filename; ->>description -Play a single file. ->>code - struct rootElement *root; - struct sequenceState *seq; - struct element *el; - ticktime_t end; - snd_seq_event_t *ep; - struct File *file; - - file = file_new(filename); - root = file_read(file); - if (file_get_status(file) != FILE_SUCCESS) { - fprintf(stderr, "%s\n", file_get_message(file)); - return; - } - if (!root) - return; - - midi_play_prologue(ctxp, root); - for (;;) { - ep = seq_read(ctxp); - if (ep->type == SND_SEQ_EVENT_ECHO) - if (ep->data.raw32.d[0] == ECHO_END_PROLOGUE) - break; - } - seq_timer_stop(ctxp); - - /* Loop through all the elements in the song and play them */ - seq = md_seq_init_merge(root, FALSE); - -#ifdef notyet /* Completly non-working */ - if (beginat) { - for (tr = 0; ; tr++) { - track = md_track_nth(root, tr); - if (track == NULL) - break; - md_elem_seek(MD_CONTAINER(track), beginat); - } - } -#endif - - while ((el = md_seq_next(seq)) != NULL) { - seq_midi_send_element(ctxp, el); - } - - /* Get the end time for the tracks and echo an event to - * wake us up at that time - */ - end = MD_ENDTIME(root); - seq_midi_send_echo(ctxp, end, 0); - - /* Wait for all the events to be played */ - snd_seq_event_input(seq_handle(ctxp), &ep); - snd_seq_free_event(ep); - - /* Wait some extra time to allow for note to decay etc */ - sleep(delay); - seq_timer_stop(ctxp); - - md_seq_end(seq); - - md_free(MD_ELEMENT(root)); - file_close(file); - - ->>function showlist -static void - ->>description -Show a list of possible output ports that midi could -be sent to. - ->>header ->>code - snd_seq_client_info_t cinfo; - snd_seq_port_info_t pinfo; - snd_seq_system_info_t sysinfo; - int client; - int port; - int err; - snd_seq_t *handle; - - err = snd_seq_open(&handle, SND_SEQ_OPEN); - if (err < 0) { - fprintf(stderr, _("Could not open sequencer %s"), snd_strerror(errno)); - exit(1); - } - - err = snd_seq_system_info(handle, &sysinfo); - if (err < 0) { - fprintf(stderr, _("Could not get sequencer information %s"), - snd_strerror(err)); - exit(1); - } - - printf(_(" Port %-30.30s %s\n"), _("Client name"), _("Port name")); - for (client = 0; client < sysinfo.clients; client++) { - err = snd_seq_get_any_client_info(handle, client, &cinfo); - if (err < 0) - continue; - - for (port = 0; port < sysinfo.ports; port++) { - unsigned cap; - - err = snd_seq_get_any_port_info(handle, client, port, &pinfo); - if (err < 0) - continue; - - cap = (SND_SEQ_PORT_CAP_SUBSCRIPTION|SND_SEQ_PORT_CAP_OUT); - if ((pinfo.capability & cap) == cap) { - printf("%3d:%-3d %-30.30s %s\n", - pinfo.client, pinfo.port, cinfo.name, pinfo.name); - } - } - } - - snd_seq_close(handle); - ->>function showusage -static void ->>description -Show a usage message ->>code ->>header -char **cpp; -static char *msg[] = { -N_("Usage: melplay [-p client:port ...] [-l] [-d delay] file ..."), -"", -N_(" -p client:port - A alsa client and port number to send midi to"), -N_(" -l - List possible output ports that could be used"), -N_(" -d delay - Delay after song ends (default 2 sec)"), -N_(" -b time - Begin time"), -}; - - for (cpp = msg; cpp < msg+NELEM(msg); cpp++) { - fprintf(stderr, "%s\n", _(*cpp)); - } - diff -rNu melys-0.1.16/programs/melys.m melys-0.1.17/programs/melys.m --- melys-0.1.16/programs/melys.m Thu Jan 6 16:54:56 2000 +++ melys-0.1.17/programs/melys.m Thu Jan 1 01:00:00 1970 @@ -1,178 +0,0 @@ ->>name melys.m A sequencer program - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. ->>target melys ->>make --objects melys.o ->>make --objects ../files/midiread.o ../files/midiwrite.o ->>make --objects ../files/mdmlread.o ../files/mdmlwrite.o ->>make --objects ../files/file.o ->>make --objects ../seq/seqlib.o ../seq/seqmidi.o ../seq/sequtil.o ->>make --objects ../seq/seqplay.o ->>make --objects ../util/except.o ../util/util.o ../util/gxstack.o ->>make --objects ../md/elements.o ../md/mdutil.o ../md/mdseq.o ->>make --objects ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o ../md/mdtools.o ->>make --objects ../md/mdconv.o ->>make --objects ../gui/main.o ../gui/menus.o ../gui/trackprop.o ->>make --objects ../gui/help.o ../gui/partprop.o ../gui/propbox.o ->>make --objects ../widgets/register.o ../widgets/misc.o ->>make --objects ../midi/play.o ../midi/record.o ->>make --objects ../song/song.o ->>make --objects ../config/ports.o ->>make --objects ../widgets/melystrack.o ../widgets/melystrackinfo.o ->>make --objects ../widgets/melystrackdisplay.o ../widgets/melyspartitem.o ->>make --objects ../widgets/melysrule.o ../widgets/melyspos.o ->>make --objects ../widgets/viewcontrol.o ../widgets/melysview.o ->>make --objects ../widgets/melyspiano.o ../widgets/melyskeys.o ->>make --objects ../widgets/melystempo.o ../widgets/melysscale.o ->>make --objects ../widgets/melysscroll.o ../widgets/melysgrid.o ->>make --objects ../widgets/melyssig.o ../widgets/melystimesig.o ->>make --objects ../widgets/melyskeysig.o ->>make --objects ../pixmaps/balls.o ../pixmaps/menu_icons.o ../pixmaps/mag.o - ->>header ->>header ->>header ->>header ->>header ->>header gtk/gtkmain.h ->>header melmsg.h - ->>headerdef melys.h - -#define PACKAGE "melys" -#define LOCALEDIR "foo" -#include "../version" - ->>extern -/* - * Start the melys sequencer - * melys [options (none yet)] - * - */ - -/* Options for the command */ -#define HAS_ARG 1 -static struct option long_opts[] = { - {"debug", 1, NULL, 'x'}, - {0, 0, 0, 0}, -}; - -extern int melys_app(int argc, char **argv, int optind); - ->>function main -int -int argc; arg count -char **argv; arg vector - ->>description ->>code - char opts[NELEM(long_opts) * 2 + 1]; - char *cp; - int c; - struct option *op; - extern struct except *noActiveChildError; - - setlocale(LC_ALL, ""); - //bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); - - - /* Build up the short option string */ - cp = opts; - for (op = long_opts; op < &long_opts[NELEM(long_opts)]; op++) { - *cp++ = op->val; - if (op->has_arg) - *cp++ = ':'; - } - - /* Deal with the options */ - for (;;) { - c = getopt_long(argc, argv, opts, long_opts, NULL); - if (c == -1) - break; - - switch(c) { - case 'x': -#ifdef DEBUG - DBlevel = atoi(optarg); -#endif - break; - case '?': - showusage(); - exit(1); - } - } - - melys_app(argc, argv, optind); - - if (CATCH(debugError)) { - - /* - * It may or may not be safe to resume. Lets try anyway. - * If you see the message things are probably alright... - */ - mel_error( - _("A debugging error occurred\n" - "Melys may now crash unexpectedly\n" - "Please save your work and exit\n" - "the application as soon as possible\n" - "MESSAGE: %s" - ), debugError->message); - } - - if (CATCH(noActiveChildError)) { - - /* - * When there is no active child then most operations - * are invalid. - */ - mel_error( - _("This operation is not possible\n" - "because there are no open files\n" - )); - } - - gtk_main(); - -#ifdef DEBUG - { - void *p; - - p = malloc(1); /* Only used to get db malloc package linked in */ - free(p); - } -#endif - - UNCATCH(debugError); - - return 0; - - ->>function showusage -static void - ->>description -Show a usage message. - ->>code - char **cpp; - static char *msg[] = { - - N_("Usage: melys [-x level]"), - "", - N_(" -x, --debug=LEVEL Set debuging level"), - - }; - - for (cpp = msg; cpp < ENDOF(msg); cpp++) - fprintf(stderr, "%s\n", _(*cpp)); - diff -rNu melys-0.1.16/programs/showseq.m melys-0.1.17/programs/showseq.m --- melys-0.1.16/programs/showseq.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.17/programs/showseq.m Thu Jan 1 01:00:00 1970 @@ -1,170 +0,0 @@ ->>name showseq.m - Print out the ALSA ports - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>target showseq ->>make --objects showseq.o ->>make --objects ../seq/seqlib.o ->>make --objects ../util/except.o - ->>extern ->>header ->>header ->>header ->>header ->>header ->>header elements.h ->>header seqlib.h - -/* Options for the command */ -#define HAS_ARG 1 -static struct option long_opts[] = { - {0, 0, 0, 0}, -}; - -#define ADDR_PARTS 4 /* Number of part in a port description addr 1:2:3:4 */ -#define SEP ", \t" /* Separators for port description */ - ->>function main -int -int argc; arg count -char **argv; arg vector - ->>description -Show all ALSA sequencer ports. - showseq - ->>code - char opts[NELEM(long_opts) * 2 + 1]; - char *portdesc; - char *cp; - int c; - struct option *op; - - /* Build up the short option string */ - cp = opts; - for (op = long_opts; op < &long_opts[NELEM(long_opts)]; op++) { - *cp++ = op->val; - if (op->has_arg) - *cp++ = ':'; - } - - portdesc = NULL; - - /* Deal with the options */ - for (;;) { - c = getopt_long(argc, argv, opts, long_opts, NULL); - if (c == -1) - break; - - switch(c) { - case '?': - showusage(); - exit(1); - } - } - - showlist(); - return 0; - - ->>function showlist -static void - ->>description -Show a list of possible output ports that midi could -be sent to. - ->>header ->>code - snd_seq_client_info_t cinfo; - snd_seq_port_info_t pinfo; - snd_seq_system_info_t sysinfo; - int client; - int port; - int err; - snd_seq_t *handle; - - err = snd_seq_open(&handle, SND_SEQ_OPEN); - if (err < 0) { - fprintf(stderr, _("Could not open sequencer %s"), snd_strerror(errno)); - exit(1); - } - - err = snd_seq_system_info(handle, &sysinfo); - if (err < 0) { - fprintf(stderr, _("Could not get sequencer information %s"), - snd_strerror(err)); - exit(1); - } - - for (client = 0; client < sysinfo.clients; client++) { - err = snd_seq_get_any_client_info(handle, client, &cinfo); - if (err < 0) - continue; - - printf("%d: %s ", cinfo.client, cinfo.name); - switch (cinfo.type) { - case NO_CLIENT: - printf("[none] "); - break; - case USER_CLIENT: - printf("[user] "); - break; - case KERNEL_CLIENT: - printf("[kernel] "); - break; - } - printf("\n"); - for (port = 0; port < sysinfo.ports; port++) { - - err = snd_seq_get_any_port_info(handle, client, port, &pinfo); - if (err < 0) - continue; - - printf(" %d:%-3d %-30.30s ", - pinfo.client, pinfo.port, pinfo.name); - if (pinfo.capability & SND_SEQ_PORT_CAP_IN) - printf("read "); - if (pinfo.capability & SND_SEQ_PORT_CAP_OUT) - printf("write "); - if (pinfo.capability & SND_SEQ_PORT_CAP_SUBSCRIPTION) - printf("sub "); - if (pinfo.capability & SND_SEQ_PORT_CAP_SYNC_IN) - printf("sync-read "); - if (pinfo.capability & SND_SEQ_PORT_CAP_SYNC_OUT) - printf("sync-write "); - if (pinfo.capability & SND_SEQ_PORT_CAP_DUPLEX) - printf("duplex "); - printf("\n"); - } - printf("\n"); - } - - ->>function showusage -static void ->>description -Show a usage message ->>code ->>header -char **cpp; -static char *msg[] = { -N_("Usage: showseq"), -"", -}; - - for (cpp = msg; cpp < msg+NELEM(msg); cpp++) { - fprintf(stderr, "%s\n", _(*cpp)); - } - - diff -rNu melys-0.1.16/seq/seqlib.c melys-0.1.17/seq/seqlib.c --- melys-0.1.16/seq/seqlib.c Fri Jan 7 11:13:45 2000 +++ melys-0.1.17/seq/seqlib.c Wed Feb 9 21:03:30 2000 @@ -681,8 +681,14 @@ #endif /* SEQ_API_2 */ ev.flags = SND_SEQ_TIME_STAMP_REAL | SND_SEQ_TIME_MODE_REL; +#if !defined(SEQ_API_2) && !defined(SND_SEQ_EVENT_KERNEL_ERROR) + /* Happened to be added at the same time */ ev.time.real.tv_sec = 0; ev.time.real.tv_nsec = 0; +#else + ev.time.time.tv_sec = 0; + ev.time.time.tv_nsec = 0; +#endif ev.type = cmd; diff -rNu melys-0.1.16/seq/seqlib.m melys-0.1.17/seq/seqlib.m --- melys-0.1.16/seq/seqlib.m Fri Jan 7 10:56:06 2000 +++ melys-0.1.17/seq/seqlib.m Thu Jan 1 01:00:00 1970 @@ -1,1001 +0,0 @@ ->>name seqlib.m -File: seqlib.m - Interface to the alsa sequencer library. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - ---------- -This file is a set of interfaces to provide a little -higher level view of the sequencer. It is mainly experimental -to investigate new approaches. If successful they will be proposed -as additions/replacements to the existing seq lib. - ->>header ->>header ->>header - ->>header elements.h - ->>headerdef --decl seqlib.h -#include - -#if SND_SEQ_VERSION >= SND_PROTOCOL_VERSION(1, 0, 0) -#define SEQ_API_2 -#endif - -/* Forward compatibility defines */ -#ifndef SND_SEQ_PORT_CAP_OUT - -#define SND_SEQ_PORT_CAP_OUT SND_SEQ_PORT_CAP_WRITE -#define SND_SEQ_PORT_CAP_IN SND_SEQ_PORT_CAP_READ -#define SND_SEQ_PORT_CAP_SYNC_IN SND_SEQ_PORT_CAP_SYNC_READ -#define SND_SEQ_PORT_CAP_SYNC_OUT SND_SEQ_PORT_CAP_SYNC_WRITE -#define SND_SEQ_PORT_CAP_SUBSCRIPTION SND_SEQ_PORT_CAP_SUBS_WRITE - -#define in_use read_use -#define out_use write_use - -#endif - -/* Defines for dealing with nano-second timestamps */ -#define NS_TO_MICRO_SECOND 1000 -#define NS_TO_MILI_SECOND 1000000 -#define NS_TO_SECOND 1000000000 - -typedef struct seq_context seq_context_t; - -/* The device part of a devchan */ -#define DEV(devchan) ((devchan)>>4) - -/* The channel part of a devchan */ -#define CHAN(devchan) ((devchan) & 0xf) - ->>headerdef --local seqpriv.h - -struct seq_context { - snd_seq_t *handle; /* The snd_seq handle to /dev/snd/seq */ - int client;/* The client associated with this context */ - int queue; /* The queue to use for all operations */ - snd_seq_addr_t source; /* Source for events */ - - GArray *destlist; /* Destination list */ - GArray *srclist; /* Source address list */ - - char timer_started; /* True if timer is running */ - int port_count; /* Ports allocated */ - - struct seq_context *main; /* Pointer to the main context */ - struct seq_context *control; /* Pointer to the control context */ - - struct seq_context *next; /* Next context in chain */ - - /* Flags */ - unsigned int inconnected:1, - outconnected:1 - ; -}; - ->>extern - -#define save_msg - -#define POOL_LARGE 200 /* Making this quite small */ -#define POOL_SMALL 80 /* This does need to be fairly large */ - ->>function seq_context_new -seq_context_t * -char *name; Name of the client. ->>description -Create a main client for an application. -A queue is allocated and a client is created. ->>code - seq_context_t *ctxp; - snd_seq_queue_client_t qclient; - int q; - - ctxp = g_new0(seq_context_t, 1); - ctxp->main = ctxp; /* This is the main context */ - ctxp->next = NULL; - - /* Allocate client */ - if (snd_seq_open(&ctxp->handle, SND_SEQ_OPEN) < 0) { - save_msg(_("Could not open sequencer: %s"), snd_strerror(errno)); - g_free(ctxp); - return NULL; - } - - ctxp->client = snd_seq_client_id(ctxp->handle); - fix_output_pool(ctxp->handle, ctxp->client, POOL_LARGE); - - ctxp->destlist = g_array_new(0, 0, sizeof(snd_seq_addr_t)); - ctxp->srclist = g_array_new(0, 0, sizeof(snd_seq_addr_t)); - - /* Fill in source address */ - ctxp->source.client = ctxp->client; - ctxp->source.port = 0; -#ifndef SEQ_API_2 - ctxp->source.channel = 0; -#endif /* not SEQ_API_2 */ - - /* Create a control client for important messages */ - ctxp->control = seq_add_subcontext(ctxp); - - /* Control port is always in non-blocking mode, but it never should */ - snd_seq_block_mode(ctxp->control->handle, 0); - - /* - * Allocate the application queue. The control client has - * to own it as only the owner can start stop the queue - */ - q = snd_seq_alloc_queue(ctxp->control->handle); - ctxp->queue = q; -#ifndef SEQ_API_2 - ctxp->source.queue = q; -#endif /* not SEQ_API_2 */ - - ctxp->control->queue = q; -#ifndef SEQ_API_2 - ctxp->control->source.queue = q; -#endif /* not SEQ_API_2 */ - - snd_seq_get_queue_client(ctxp->control->handle, q, &qclient); - snd_seq_set_queue_client(ctxp->handle, q, &qclient); - - ctxp->inconnected = 0; - ctxp->outconnected = 0; - - /* Always need at least one port */ - seq_new_port(ctxp); - - seq_set_client_name(ctxp, name); - - return ctxp; - - ->>function seq_add_subcontext -seq_context_t * -seq_context_t *ctxp; - ->>description -Create another client context based on the specified context. -The same queue will be used for both clients. - ->>code - seq_context_t *nctxp; - snd_seq_queue_client_t qclient; - - nctxp = g_new(seq_context_t, 1); - - /* Most members need to be copied */ - *nctxp = *ctxp; - - if (snd_seq_open(&nctxp->handle, SND_SEQ_OPEN) < 0) { - save_msg(_("Could not open sequencer: %s"), snd_strerror(errno)); - g_free(nctxp); - return NULL; - } - - /* Link in */ - nctxp->main = ctxp; /* Back link to the main context */ - nctxp->next = ctxp->next; - ctxp->next = nctxp; - - nctxp->client = snd_seq_client_id(nctxp->handle); - nctxp->source.client = nctxp->client; - - fix_output_pool(nctxp->handle, nctxp->client, POOL_SMALL); - - /* Get qclient info from control and set it on the new client */ - if (ctxp->control) { - snd_seq_get_queue_client(ctxp->control->handle, ctxp->queue, &qclient); - snd_seq_set_queue_client(nctxp->handle, ctxp->queue, &qclient); - } - - seq_new_port(nctxp); - - return nctxp; - - ->>function seq_context_free -void -seq_context_t *ctxp; ->>description -Free a context and any associated data and resources. -If the main context is freed then the sequencer is closed. -TODO: link all together so can all be closed at once. ->>code - seq_context_t *ncp, *ncp2; - - if (ctxp == NULL) - return; - - /* Freeing a sub-context just closes the seq connection */ - if (ctxp->handle) - snd_seq_close(ctxp->handle); - ctxp->handle = NULL; - - if (ctxp->main == ctxp) { - /* This is the main context */ - snd_seq_free_queue(ctxp->control->handle, ctxp->queue); - - g_array_free(ctxp->destlist, 1); - g_array_free(ctxp->srclist, 1); - ctxp->destlist = NULL; - ctxp->srclist = NULL; - - /* Free all subcontext's */ - for (ncp = ctxp->next; ncp; ncp = ncp2) { - ncp2 = ncp->next; - - seq_context_free(ncp); - g_free(ncp); - } - - g_free(ctxp); - } - - - ->>function seq_new_port -int -seq_context_t *ctxp; // Context to create the port for ->>description -Creates a new port on the specified context and returns the port -number. ->>code - snd_seq_port_info_t info; - int ret; - - memset(&info, 0, sizeof(info)); - info.capability = SND_SEQ_PORT_CAP_OUT - | SND_SEQ_PORT_CAP_SUBSCRIPTION | SND_SEQ_PORT_CAP_IN; - info.type = SND_SEQ_PORT_TYPE_MIDI_GENERIC; - info.midi_channels = 16; - info.out_use = 1; - info.in_use = 1; - info.kernel = NULL; - - ret = snd_seq_create_port(ctxp->handle, &info); - if (ret < 0) { - save_msg(_("Error (%s) creating sequencer port\n"), - snd_strerror(errno)); - return -1; - } - ctxp->port_count++; - ctxp->source.port = info.port; - - return info.port; - - ->>function seq_destroy_port -void -seq_context_t *ctxp; // Application context -int port; // Port number to destroy - ->>code - - g_warning("@func_name is not implemented yet"); - - ->>function seq_set_client_name -void -seq_context_t *ctxp; -char *name; The client name to set - ->>description -The name of the directly associated client on the context is set. - ->>code - snd_seq_client_info_t info; -#define INFO_NAME_LEN 64 /* Hard coded in the header file */ - - if (name == NULL) - return; - - snd_seq_get_client_info(ctxp->handle, &info); - memset(info.name, '\0', INFO_NAME_LEN); - strncpy(info.name, name, INFO_NAME_LEN-1); - snd_seq_set_client_info(ctxp->handle, &info); - - if (ctxp->main == ctxp) { - gchar *ctlname; - - ctlname = g_strconcat(name, " (control)", NULL); - seq_set_client_name(ctxp->control, ctlname); - g_free(ctlname); - } - ->>headerdef seqlib.h - -/* - * Defines to indicate whether input or output address are - * to be dealt with. - */ -enum addrtype { - SEQ_ADDR_INPUT, - SEQ_ADDR_OUTPUT -}; - ->>function seq_set_addresses -void -seq_context_t *ctxp; -enum addrtype inout; Whether in or out -snd_seq_addr_t *addrlist; The list of addresses -int n; The size of the list - ->>description -Set one of the address lists on the context. -This will define the logical devices for this context. -In other words the first address in the list is logical device 0. -A copy is made of the list. - ->>code - GArray *list; -#ifndef SEQ_API_2 - int i; -#endif /* not SEQ_API_2 */ - - list = get_addr_list(ctxp, inout); - if (!list) - return; - -#ifndef SEQ_API_2 - for (i = 0; i < n; i++) { - addrlist[i].queue = ctxp->queue; - } - -#endif /* not SEQ_API_2 */ - g_array_set_size(list, 0); - g_array_append_vals(list, addrlist, n); - - ->>function seq_connect_addresses -int -seq_context_t *ctxp; -int inout; Whether in or out - ->>description -Actually connect the addresses in one of the address lists. -Its not esential to connect the output list, but has the advantage -that disconnecting will disable the device. - ->>code - snd_seq_port_subscribe_t subs; - snd_seq_addr_t addr; - GArray *list; - int ret = 0; - unsigned i; - - list = get_addr_list(ctxp, inout); - if (!list) - return -EINVAL; - - if (inout == SEQ_ADDR_INPUT && ctxp->inconnected) - return 0; - if (inout == SEQ_ADDR_OUTPUT && ctxp->outconnected) - return 0; - - memset(&subs, 0, sizeof(subs)); - for (i = 0; i < list->len; i++) { - - addr = g_array_index(list, snd_seq_addr_t, i); - -#ifdef SEQ_API_2 - subs.queue = ctxp->queue; -#else - addr.queue = ctxp->queue; -#endif /* not SEQ_API_2 */ - - if (inout == SEQ_ADDR_INPUT) { - ctxp->inconnected = 1; - subs.dest = ctxp->source; - subs.sender = addr; - } else { - ctxp->outconnected = 1; - subs.sender = ctxp->source; - subs.dest = addr; - } - -#if 0 -printf("Connect from %s to %s\n", - seq_addr_string(&subs.sender), - seq_addr_string(&subs.dest)); -#endif - - subs.realtime = 0; - subs.exclusive = 0; -#ifdef SND_SEQ_CLIENT_DUMMY - /* TEMP this about identifies when this thing was added - * Unfortunately the old and desired behaviour is not default - */ - subs.convert_time = 1; -#endif - ret = snd_seq_subscribe_port(ctxp->handle, &subs); - if (ret < 0) - g_warning("subscribe failed %s", snd_strerror(ret)); - } - return ret; - - ->>function seq_disconnect_addresses -int -seq_context_t *ctxp; -int inout; Whether in or out - ->>description -Disconnect either input or output. -For input this means that no more events will be received -from those addresses. - ->>code - snd_seq_port_subscribe_t subs; - snd_seq_addr_t addr; - GArray *list; - int ret = 0; - int i; - - list = get_addr_list(ctxp, inout); - if (!list) - return -EINVAL; - - for (i = 0; i < (int)list->len; i++) { - - addr = g_array_index(list, snd_seq_addr_t, i); - -#ifndef SEQ_API_2 - addr.queue = ctxp->queue; - -#endif /* not SEQ_API_2 */ - if (inout == SEQ_ADDR_INPUT) { - ctxp->inconnected = 0; - subs.dest = ctxp->source; - subs.sender = addr; - } else { - ctxp->outconnected = 0; - subs.sender = ctxp->source; - subs.dest = addr; - } - -#if 0 -printf("disconnect from %s to %s\n", - seq_addr_string(&subs.sender), - seq_addr_string(&subs.dest)); -#endif - - subs.realtime = 0; /* XXX */ - subs.exclusive = 0; - ret = snd_seq_unsubscribe_port(ctxp->handle, &subs); - } - - return ret; - - ->>function seq_dev_addr -snd_seq_addr_t * -seq_context_t *ctxp; -int dev; Device to get the address of. -int inout; Input or output device - ->>description -Return the address corresponding to the specified -logical device. - ->>code - GArray *list; - snd_seq_addr_t *addr; - - list = get_addr_list(ctxp, inout); - - if (dev >= (int)list->len) - return NULL; - - addr = &g_array_index(list, snd_seq_addr_t, dev); - - return addr; - - ->>function seq_init_tempo -int -seq_context_t *ctxp; // Application context -int resolution; // Ticks per quarter note or realtime resolution -int tempo; // Beats per minute -int realtime; // True if absolute time base - ->>description -Set the initial time base and tempo. -This should only be used for initialisation when there is nothing -playing. -To change the tempo during a song tempo change events are used. -If -.A realtime -is false the resolution is in ticks per quarter note. -If true, the the resolution is microseconds. -There is a macro XXX to convert from SMPTE codes. - ->>code - snd_seq_queue_tempo_t qtempo; - int ret; - - qtempo.queue = ctxp->queue; - qtempo.ppq = resolution; - qtempo.tempo = 60*1000000/tempo; - - ret = snd_seq_set_queue_tempo(ctxp->control->handle, ctxp->queue, &qtempo); - - return ret; - - ->>function seq_set_queue -void -seq_context_t *ctxp; Context to modify -int q; The queue number - ->>description -Set the context to use the specified queue. -All events sent on this context will now use this queue. -The special values SND_SEQ_ADDRESS_SUBSCRIBERS can be used to -send to all subscribed clients. - ->>code - - ctxp->queue = q; - - ->>function set_channel -static void -snd_seq_event_t *ep; -int chan; ->>code - -#ifdef SEQ_API_2 - switch (ep->type) { - case SND_SEQ_EVENT_NOTE: - case SND_SEQ_EVENT_NOTEON: - case SND_SEQ_EVENT_NOTEOFF: - ep->data.note.channel = chan; - break; - case SND_SEQ_EVENT_KEYPRESS: - case SND_SEQ_EVENT_PGMCHANGE: - case SND_SEQ_EVENT_CHANPRESS: - case SND_SEQ_EVENT_PITCHBEND: - case SND_SEQ_EVENT_CONTROL14: - case SND_SEQ_EVENT_NONREGPARAM: - case SND_SEQ_EVENT_REGPARAM: - case SND_SEQ_EVENT_CONTROLLER: - ep->data.control.channel = chan; - break; - default: - if (snd_seq_ev_is_channel_type(ep)) - g_warning("Missed a case in @func_name"); - break; - } -#else - ep->dest.channel = chan; -#endif - - ->>function seq_sendto -int -seq_context_t *ctxp; Client context -snd_seq_event_t *ep; Event to send -int dev; Logical device to send to -int chan; Channel on device - ->>description -Send the event to the specified client and port. - ->>code - snd_seq_addr_t *addr; - - ep->source = ctxp->source; -#ifdef SEQ_API_2 - ep->queue = ctxp->queue; -#endif - addr = seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); - if (!addr) - return -EINVAL; - - ep->dest = *addr; - set_channel(ep, chan); - return seq_write(ctxp, ep); - ->>function seq_sendto_now -int -seq_context_t *ctxp; Client context -snd_seq_event_t *ep; Event to send -int dev; Logical device to send to -int chan; Channel on device ->>description -Just like -.F seq_sendto -but zeros the time field first so that the event will be -processed straight away even if the timer is stopped. -As long as the file descriptor is not blocked that is... -Queue is flushed out. ->>code - - ep->time.tick = 0; - (void) seq_sendto(ctxp, ep, dev, chan); - return snd_seq_flush_output(ctxp->handle); - ->>function seq_send_to_all_now -int -seq_context_t *ctxp; Client context -snd_seq_event_t *ep; Event prototype to be sent - ->>description -Send the event to all the connected devices across -all possible channels. -The messages are sent to the blocking control port and -so should not have timestamps in the future. -This function is intended for all-sounds-off type controls etc. - ->>code - int dev; - int chan; - snd_seq_addr_t *addr; - - for (dev = 0; ; dev++) { - addr = seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); - if (addr == NULL) - break; /* No more */ - -#ifdef SEQ_API_2 - ep->queue = ctxp->queue; -#endif /* SEQ_API_2 */ - ep->dest = *addr; - for (chan = 0; chan < 16; chan++) { - set_channel(ep, chan); - (void)seq_control_write(ctxp, ep); - } - } - - return 0;/* XXX */ - ->># ----- Timer functions ->>function seq_timer_start -void -seq_context_t *ctxp; ->>description -Start the timer. -(What about timers other than the system one?) ->>code - - seq_control_timer(ctxp, SND_SEQ_EVENT_START, 0); - ->>function seq_timer_stop -void -seq_context_t *ctxp; ->>description -Stop the timer. -(What about timers other than the system one?) ->>code - - seq_control_timer(ctxp, SND_SEQ_EVENT_STOP, 0); - ->>function seq_timer_continue -void -seq_context_t *ctxp; ->>description -Continue the timer after pausing. ->>code - - seq_control_timer(ctxp, SND_SEQ_EVENT_CONTINUE, 0); - - ->>function seq_timer_seek -void -seq_context_t *ctxp; -ticktime_t tick; - ->>code -#ifdef SND_SEQ_EVENT_SETPOS_TICK - seq_control_timer(ctxp, SND_SEQ_EVENT_SETPOS_TICK, tick); -#else - /* We should not be called if this not set */ - g_warning("SND_SEQ_EVENT_SETPOS_TICK is not defined"); -#endif - - ->>function seq_control_timer -void -seq_context_t *ctxp; // The seq context -int cmd; // SND_SEQ_EVENT_START or ...STOP -ticktime_t tick; - ->>code - snd_seq_event_t ev; - - ev.source = ctxp->source; - -#ifndef SEQ_API_2 - ev.dest.queue = ctxp->queue; -#else /* SEQ_API_2 */ - ev.queue = ctxp->queue; -#endif /* SEQ_API_2 */ - ev.dest.client = SND_SEQ_CLIENT_SYSTEM; /* system */ - ev.dest.port = SND_SEQ_PORT_SYSTEM_TIMER; /* timer */ -#ifndef SEQ_API_2 - ev.dest.channel = 0; /* don't care */ -#endif /* not SEQ_API_2 */ - -#ifndef SEQ_API_2 - /* Will be: ev.data.queue.addr.queue = ctxp->queue; */ - ((snd_seq_addr_t *)&ev.data.control)->queue = ctxp->queue; -#else /* SEQ_API_2 */ - ev.data.queue.queue = ctxp->queue; -#endif /* SEQ_API_2 */ - - ev.flags = SND_SEQ_TIME_STAMP_REAL | SND_SEQ_TIME_MODE_REL; - ev.time.real.tv_sec = 0; - ev.time.real.tv_nsec = 0; - - ev.type = cmd; - -#ifdef SND_SEQ_EVENT_SETPOS_TICK - if (cmd == SND_SEQ_EVENT_SETPOS_TICK) - ev.data.queue.param.time.tick = tick; -#endif - - snd_seq_event_output(ctxp->control->handle, &ev); - snd_seq_flush_output(ctxp->control->handle); - - ->>function seq_get_time -ticktime_t -seq_context_t *ctxp; ->>description -Get the current song time in ticks. ->>code - snd_seq_queue_status_t qstatus; - - snd_seq_get_queue_status(ctxp->handle, ctxp->queue, &qstatus); - - return qstatus.tick; - - ->>function seq_write -int -seq_context_t *ctxp; Application context -snd_seq_event_t *ep; Event to be written - ->>description -Write out the event. -Returns zero if the event could be written without any -blocking. -Non zero if there is a queue inside the library. - ->>code - int n; - - 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; - - ->>function seq_control_write -int -seq_context_t *ctxp; Application context -snd_seq_event_t *ep; Event to be written - ->>description -Write out the event, on the control client. -This is used as a way of ensuring that we can always send important -events like all-notes-off even when the main client would block. -Returns zero if the event could be written without any -blocking. -Non zero if there is a queue inside the library. - ->>code - int n; - - n = snd_seq_event_output(ctxp->control->handle, ep); - if (n < 0) - return n; - - n = snd_seq_flush_output(ctxp->control->handle); - - /* - * The whole point of using the control port is so that it is always - * available for use and never blocked. Therefore if it would block - * then you are doing something wrong. Find out what it is and stop it. - */ - if (n == -EAGAIN) - ethrow(debugError, "Control port would have blocked"); - - return n; - - ->>function seq_read -snd_seq_event_t * -seq_context_t *ctxp; The application context - ->>description -Return the next event. -Returns NULL if none. - ->>code - snd_seq_event_t *ep; - int ret; - - ret = snd_seq_event_input(ctxp->handle, &ep); - - if (ret < 0) - ep = NULL; - - return ep; - - ->>function seq_drain_output -void -seq_context_t *ctxp; - ->>description -Flush all output queues across -all output devices so that there are no events left in them. - ->>code -#ifdef SND_SEQ_REMOVE_DEST - - snd_seq_drain_output(ctxp->handle); - snd_seq_drain_output(ctxp->control->handle); - /* What about sub contexts? */ -#else - snd_seq_queue_client_t qclient; - - /* Since there is not yet a proper flush call we will just - * close and re-open. Not ideal... - */ - if (ctxp->handle) - snd_seq_close(ctxp->handle); - snd_seq_open(&ctxp->handle, SND_SEQ_OPEN); - ctxp->client = snd_seq_client_id(ctxp->handle); - fix_output_pool(ctxp->handle, ctxp->client, POOL_LARGE); - snd_seq_block_mode(ctxp->handle, 0); /* XXX */ - - if (ctxp->inconnected) - seq_connect_addresses(ctxp, SEQ_ADDR_INPUT); - if (ctxp->outconnected) - seq_connect_addresses(ctxp, SEQ_ADDR_OUTPUT); - - snd_seq_get_queue_client(ctxp->control->handle, ctxp->queue, &qclient); - snd_seq_set_queue_client(ctxp->handle, ctxp->queue, &qclient); - - /* Always need at least one port */ - seq_new_port(ctxp); -#endif - ->>function seq_event_data_free -void -snd_seq_event_t *ep; - ->>description -Free any variable length extension data that may be on the -event. -The event itself is not freed. -Assume data allocated with g_malloc. - ->>code - - if ((ep->flags & SND_SEQ_EVENT_LENGTH_MASK) == SND_SEQ_EVENT_LENGTH_VARIABLE) { - g_free(ep->data.ext.ptr); - ep->data.ext.ptr = 0; - ep->data.ext.len = 0; - - ep->flags &= ~SND_SEQ_EVENT_LENGTH_MASK; - } - - ->>function seq_handle -void * -seq_context_t *ctxp; // Application context - ->>description -Return the handle to the underlying snd_seq stream. - ->>code - - return ctxp? ctxp->handle: NULL; - ->>function seq_descriptor -int -seq_context_t *ctxp; Application context - ->>description -Return the underlying file descriptor. - ->>code - - return snd_seq_file_descriptor(ctxp->handle); - - ->>function seq_addr_string -char * -snd_seq_addr_t *addr; Address to convert to string - ->>description -Convert an address to a string. -The string should be freed after use. - ->>code - char *str; - -#ifndef SEQ_API_2 - str = g_strdup_printf("%d:%d:%d:%d", addr->queue, addr->client, - addr->port, addr->channel); -#else /* SEQ_API_2 */ - str = g_strdup_printf("%d:%d", addr->client, addr->port); -#endif /* SEQ_API_2 */ - - return str; - - ->>function get_addr_list -static GArray * -seq_context_t *ctxp; -int inout; ->>description -Get the correct list to use from the type. ->>code - GArray *list = NULL; - - if (inout == SEQ_ADDR_INPUT) - list = ctxp->srclist; - else if (inout == SEQ_ADDR_OUTPUT) - list = ctxp->destlist; - else - ethrow(debugError, "Unrecognised type to @func_name"); - - return list; - ->>function fix_output_pool -static void -snd_seq_t *seq; Sequencer handle -int client; Client number -int size; Size for pool - ->>description -The defaults on the pool size behaviour are fine for simple playback -but need adjusting for this application. -In particular the default only wake you from select when the pool is -more than half empty, we need to know much earlier than that. - ->>code - snd_seq_client_pool_t pool; - int n; - - snd_seq_get_client_pool(seq, &pool); - - pool.output_pool = size; - - n = (10 * size)/100; - pool.output_room = n; - - snd_seq_set_client_pool(seq, &pool); - ->>function seq_xxx_get_queue -int -seq_context_t *ctxp; ->>code - return ctxp->queue; diff -rNu melys-0.1.16/seq/seqmidi.c melys-0.1.17/seq/seqmidi.c --- melys-0.1.16/seq/seqmidi.c Fri Jan 7 11:13:46 2000 +++ melys-0.1.17/seq/seqmidi.c Wed Feb 9 21:03:31 2000 @@ -74,8 +74,13 @@ if (real) { ep->flags |= SND_SEQ_TIME_STAMP_TICK; +#if !defined(SEQ_API_2) && !defined(SND_SEQ_EVENT_KERNEL_ERROR) ep->time.real.tv_sec = time.real.tv_sec; ep->time.real.tv_nsec = time.real.tv_nsec; +#else + ep->time.time.tv_sec = time.real.tv_sec; + ep->time.time.tv_nsec = time.real.tv_nsec; +#endif } else { ep->flags |= SND_SEQ_TIME_STAMP_TICK; ep->time.tick = time.tick; diff -rNu melys-0.1.16/seq/seqmidi.m melys-0.1.17/seq/seqmidi.m --- melys-0.1.16/seq/seqmidi.m Thu Dec 16 21:04:03 1999 +++ melys-0.1.17/seq/seqmidi.m Thu Jan 1 01:00:00 1970 @@ -1,338 +0,0 @@ ->>name seqmidi.m - Routines to write midi events. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header ->>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 -gboolean real; True if real (not tick) time -union un_time time; Midi time -int devchan; Midi channel - ->>description -Initialize a midi event from the context. -The source and destination addresses will be set from -the information stored in the context, which depends on the -previous connection calls. -In addition the time and channel are set. -This should be called first before any of the following functions. - ->>code - int dev; - int channel; - snd_seq_addr_t *addr; - static snd_seq_addr_t zeroaddr; - - dev = DEV(devchan); - channel = CHAN(devchan); - - addr = seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); - - /* If there is no device available send it elsewhere */ - /* Other ideas welcome... */ - if (!addr) { - addr = &zeroaddr; -#ifndef SEQ_API_2 - addr->queue = ctxp->queue; -#else /* SEQ_API_2 */ - ep->queue = ctxp->queue; -#endif /* SEQ_API_2 */ - } - - memset(ep, '\0', sizeof(*ep)); - 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; - } -#ifdef SEQ_API_2 - ep->queue = ctxp->queue; -#endif /* SEQ_API_2 */ - ep->source = ctxp->source; - if (addr) - ep->dest = *addr; -#ifndef SEQ_API_2 - ep->dest.channel = channel; -#endif /* not SEQ_API_2 */ - ->>function seq_midi_note -void -seq_context_t *ctxp; Client context -snd_seq_event_t *ep; Event template -int chan; -int note; -int vel; -int offvel; -int length; ->>description -Initialize a note event. ->>code - - ep->type = SND_SEQ_EVENT_NOTE; - -#ifdef SEQ_API_2 - ep->data.note.channel = chan; -#endif /* SEQ_API_2 */ - ep->data.note.note = note; - ep->data.note.velocity = vel; -#ifdef SEQ_API_2 - ep->data.note.off_velocity = offvel; -#endif /* SEQ_API_2 */ - ep->data.note.duration = length; - - ->>function seq_midi_note_on -void -seq_context_t *ctxp; Client context -snd_seq_event_t *ep; Event template -int chan; -int note; -int vel; - ->>description -Initialize a note on event. ->>code - - ep->type = SND_SEQ_EVENT_NOTEON; - -#ifdef SEQ_API_2 - ep->data.note.channel = chan; -#endif /* SEQ_API_2 */ - ep->data.note.note = note; - ep->data.note.velocity = vel; - - ->>function seq_midi_note_off -void -seq_context_t *ctxp; Client context -snd_seq_event_t *ep; Event template -int chan; -int note; -int vel; - ->>description -Initialize a note off event. ->>code - - ep->type = SND_SEQ_EVENT_NOTEOFF; -#ifdef SEQ_API_2 - ep->data.note.channel = chan; -#endif /* SEQ_API_2 */ - ep->data.note.note = note; - ep->data.note.velocity = vel; - - ->>function seq_midi_keypress -void -seq_context_t *ctxp; Application context -snd_seq_event_t *ep; Event template -int chan; Channel to send on -int note; Note to be altered -int value; Pressure value ->>description -Initialize a key pressure event. ->>code - - ep->type = SND_SEQ_EVENT_KEYPRESS; - -#ifdef SEQ_API_2 - ep->data.control.channel = chan; -#endif /* SEQ_API_2 */ - ep->data.control.param = note; - ep->data.control.value = value; - - ->>function seq_midi_control -void -seq_context_t *ctxp; Application context -snd_seq_event_t *ep; Event template -int chan; Channel to send on -int control; Controller to change -int value; Value to set it to ->>description -Initialize a control event. ->>code - - ep->type = SND_SEQ_EVENT_CONTROLLER; - -#ifdef SEQ_API_2 - ep->data.control.channel = chan; -#endif /* SEQ_API_2 */ - ep->data.control.param = control; - ep->data.control.value = value; - - ->>function seq_midi_program -void -seq_context_t *ctxp; Application context -snd_seq_event_t *ep; Event template -int chan; Channel to send on -int program; Program to set ->>description -Initialize a program change event. ->>code - - ep->type = SND_SEQ_EVENT_PGMCHANGE; - -#ifndef SEQ_API_2 - ((snd_seq_addr_t *)&ep->data.control)->queue = ctxp->queue; -#else /* SEQ_API_2 */ - ep->data.control.channel = chan; -#endif /* SEQ_API_2 */ - ep->data.control.value = program; - - ->>function seq_midi_chanpress -void -seq_context_t *ctxp; Application context -snd_seq_event_t *ep; Event template -int chan; Midi channel -int pressure; Pressure value ->>description -Initialize a channel pressure event. ->>code - - ep->type = SND_SEQ_EVENT_CHANPRESS; - -#ifdef SEQ_API_2 - ep->data.control.channel = chan; -#endif /* SEQ_API_2 */ - ep->data.control.value = pressure; - - ->>function seq_midi_pitchbend -void -seq_context_t *ctxp; Application context -snd_seq_event_t *ep; Event template -int chan; Midi channel -int bend; Bend value, centered on zero. ->>description -Initialize a pitchbend message. The -.A bend -parameter is centered on zero, negative values mean a lower pitch. ->>code - - ep->type = SND_SEQ_EVENT_PITCHBEND; - -#ifdef SEQ_API_2 - ep->data.control.channel = chan; -#endif /* SEQ_API_2 */ - ep->data.control.value = bend; - - ->>function seq_midi_tempo -void -seq_context_t *ctxp; Application context -snd_seq_event_t *ep; Event template -int tempo; New tempo in usec per beat ->>description -Initialize a tempo event. -The tempo parameter is in microseconds per beat. ->>code - - ep->type = SND_SEQ_EVENT_TEMPO; - -#ifndef SEQ_API_2 - ((snd_seq_addr_t *)&ep->data.control)->queue = ctxp->queue; - ep->data.control.value = tempo; -#else /* SEQ_API_2 */ - ep->data.queue.queue = ctxp->queue; - ep->data.queue.param.value = tempo; -#endif /* SEQ_API_2 */ - ep->dest.client = SND_SEQ_PORT_SYSTEM_TIMER; - - ->>function seq_midi_sysex -void -seq_context_t *ctxp; Application context -snd_seq_event_t *ep; Event template -int status; Status byte for sysex -unsigned char *data; Data to send -int length; Length of data ->>description -Prepare a sysex event. -The status byte is to distiguish continuation sysex messages. ->>code - unsigned char *ndata; - int nlen; - - ep->type = SND_SEQ_EVENT_SYSEX; - ep->flags &= ~SND_SEQ_EVENT_LENGTH_MASK; - ep->flags |= SND_SEQ_EVENT_LENGTH_VARIABLE; - - ndata = g_malloc(length + 1); - nlen = length +1; - - ndata[0] = status; - memcpy(ndata+1, data, length); - - ep->data.ext.ptr = ndata; - ep->data.ext.len = nlen; - - ->>function seq_midi_echo -void -seq_context_t *ctxp; Application context -snd_seq_event_t *ep; Event template -int val; Echo event type ->>description -Initialise an echo event. ->>code - - ep->type = SND_SEQ_EVENT_ECHO; - - ep->dest = ctxp->source; - ep->data.raw32.d[0] = val; - ->>function seq_midi_send_echo -void -seq_context_t *ctxp; Application context -ticktime_t time; Time of event -int type; A piece of data that will be placed in the event ->>description -Send an echo event back to the source client at the specified time. -You can use the type parameter to destinguish between different -echo events. -This is not supposed to be overused. - ->>code - snd_seq_event_t ev; - union un_time t; - int n; - - t.tick = time; - seq_midi_event_init(ctxp, &ev, 0, t, 0); - ev.type = SND_SEQ_EVENT_ECHO; - - /* Loop back */ - ev.dest = ctxp->source; - ev.data.raw32.d[0] = type; - - n = seq_write(ctxp, &ev); - n = snd_seq_flush_output(ctxp->handle); - - diff -rNu melys-0.1.16/seq/seqplay.c melys-0.1.17/seq/seqplay.c --- melys-0.1.16/seq/seqplay.c Fri Jan 7 11:13:46 2000 +++ melys-0.1.17/seq/seqplay.c Wed Feb 9 21:03:31 2000 @@ -272,8 +272,13 @@ ep->flags |= SND_SEQ_TIME_MODE_ABS; ep->flags |= SND_SEQ_TIME_STAMP_REAL; +#if !defined(SEQ_API_2) && !defined(SND_SEQ_EVENT_KERNEL_ERROR) ep->time.real.tv_sec = time.real.tv_sec; - ep->time.real.tv_sec = time.real.tv_sec; + ep->time.real.tv_nsec = time.real.tv_nsec; +#else + ep->time.time.tv_sec = time.real.tv_sec; + ep->time.time.tv_nsec = time.real.tv_nsec; +#endif switch (ep->type) { /* XXX set the delay according to type */ diff -rNu melys-0.1.16/seq/seqplay.m melys-0.1.17/seq/seqplay.m --- melys-0.1.16/seq/seqplay.m Thu Jan 6 16:56:13 2000 +++ melys-0.1.17/seq/seqplay.m Thu Jan 1 01:00:00 1970 @@ -1,326 +0,0 @@ ->>name seqplay.m - routines for playing - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>extern - ->>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; - int chan; - - seq_midi_event_init(ctxp, ep, el->realtime, el->time, el->device_channel); - chan = CHAN(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, chan, MD_NOTE(el)->note, MD_NOTE(el)->vel, - MD_NOTE(el)->offvel, MD_NOTE(el)->length); - break; - case MD_TYPE_CONTROL: - seq_midi_control(ctxp, ep, chan, MD_CONTROL(el)->control, - MD_CONTROL(el)->value); - break; - case MD_TYPE_PROGRAM: - send_program(ctxp, MD_PROGRAM(el), CHAN(MD_DEVCHAN(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, chan, MD_PITCH(el)->pitch); - break; - case MD_TYPE_PRESSURE: - seq_midi_chanpress(ctxp, ep, chan, MD_PRESSURE(el)->velocity); - break; - case MD_TYPE_KEYTOUCH: - seq_midi_keypress(ctxp, ep, chan, 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 -int chan; Midi channel -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, chan, prg->program); - seq_write(ctxp, ep); - - MD_FREE(ctl); - - ->>function midi_play_prologue -void -struct seq_context *ctxp; -struct rootElement *root; - ->>description -Send all events to setup the midi state for this root. -This could include sysex commands controller setup and nprn's etc. - -After calling this routine you should read an event and wait -for the ECHO_END_PROLOGUE event. -Then stop the timer and restart it and play the reset of the song. - -This is a temporary algorithm. -A better one would be to calculate how much time is available -before notes are played on each channel and send the setup -in order so as to not have to have any additional time at all. - -We could also schedule program changes to cope with the situation -where one channel uses different instruments at different times. - ->>code - struct trackElement *track; - union un_time time; - snd_seq_event_t ev; - int chan; - 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); - chan = CHAN(MD_DEVCHAN(track)); - - /* Reset all controllers */ - seq_midi_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); - seq_midi_control(ctxp, &ev, chan, SND_MCTL_RESET_CONTROLLERS, 0); - time = set_time(&ev, time); - seq_write(ctxp, &ev); - - /* Set to initial volume */ - seq_midi_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); - seq_midi_control(ctxp, &ev, chan, - SND_MCTL_MSB_MAIN_VOLUME, MD_VOL_TO_MIDI(track->volume)); - time = set_time(&ev, time); - seq_write(ctxp, &ev); - - /* Set initial pan position */ - if (track->pan != 0) { - seq_midi_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); - seq_midi_control(ctxp, &ev, chan, - SND_MCTL_MSB_PAN, MD_PAN_TO_MIDI(track->pan)); - time = set_time(&ev, time); - seq_write(ctxp, &ev); - } - - /* Send the patch */ - time = set_time(&ev, time); - send_program(ctxp, track->program, chan, &ev); - } - - 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); - - do { - n = snd_seq_flush_output(seq_handle(ctxp)); - } while (n != 0); - - - ->>function set_time -static union un_time -snd_seq_event_t *ep; Event that was sent -union un_time time; Current time - ->>description -Return the new time, based on the event just sent. - ->>code - - /* Simple for now */ - - ep->flags &= ~(SND_SEQ_TIME_STAMP_MASK | SND_SEQ_TIME_MODE_MASK); - ep->flags |= SND_SEQ_TIME_MODE_ABS; - ep->flags |= SND_SEQ_TIME_STAMP_REAL; - - ep->time.real.tv_sec = time.real.tv_sec; - ep->time.real.tv_sec = time.real.tv_sec; - - switch (ep->type) { - /* XXX set the delay according to type */ - default: - time.real.tv_nsec += 1 * NS_TO_MILI_SECOND; - break; - } - - while (time.real.tv_nsec > 1000000000) { - time.real.tv_nsec -= 1000000000; - time.real.tv_sec++; - } - - return time; - - ->>function seq_midi_seek -void -seq_context_t *ctxp; The sequencer context. -struct sequenceState *seq; The sequence to be seeked -ticktime_t tick; The tick to seek to - ->>description -Seek to another place in the song. -This involves changing our place in the md tree and also setting -the queue timer in the sequencer. - ->>code -#ifdef SND_SEQ_EVENT_SETPOS_TICK -#if 0 - int curtick; - gboolean forward; - - curtick = seq_get_time(ctxp); - if (tick == curtick) - return; - else if (tick > curtick) - forward = TRUE; - else - forward = FALSE; - - if (forward) { - snd_seq_remove_events_t fqueue; - - fqueue.output = 1; - fqueue.remove_mode = SND_SEQ_REMOVE_TIME_BEFORE; - fqueue.tick = 1; - fqueue.time.tick = tick; - - snd_seq_remove_events(seq_handle(ctxp), &fqueue); - } else { -#endif - - seq_drain_output(ctxp); - - if (seq) - md_elem_all_seek(seq, tick); - seq_timer_seek(ctxp, tick); -#endif diff -rNu melys-0.1.16/seq/sequtil.m melys-0.1.17/seq/sequtil.m --- melys-0.1.16/seq/sequtil.m Thu Jul 29 14:21:42 1999 +++ melys-0.1.17/seq/sequtil.m Thu Jan 1 01:00:00 1970 @@ -1,96 +0,0 @@ ->>name sequtil.m - Sequencer based utility routines. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header ->>header ->>header ->>header elements.h ->>headerdef --decl seqlib.h - -struct rootElement; ->>extern -#define ADDR_PARTS 4 /* Number of parts in an address */ -#define SEP " ,\t\n" /* Separators between addresses */ - ->>function seq_get_ports_from_desc -int -char *portdesc; String containing port descriptions -snd_seq_addr_t **addrp; Returned array - ->>description -Parse the client/port description given in -.A portdesc -and construct an array of addresses. -The array is returned -into the argument -.A addrp -and should be freed by the caller. -The number of valid elements in the array is returned. - ->>code - char *astr; - char *cp; - snd_seq_addr_t *addr; - snd_seq_addr_t *ap; - gchar **plist; - int a[ADDR_PARTS]; - int count, naddr; - int i; - - if (portdesc == NULL) - return 0; - - addr = g_new(snd_seq_addr_t, strlen(portdesc)); - naddr = 0; - ap = addr; - - /* - * Loop though all the ports given in portdesc. - */ - portdesc = g_strdelimit(portdesc, SEP, ' '); - plist = g_strsplit(portdesc, " ", 0); - for (i = 0, astr = plist[0]; astr; i++, astr = plist[i]) { - - for (cp = astr, count = 0; cp && *cp; cp++) { - if (count < ADDR_PARTS) - a[count++] = atoi(cp); - cp = strchr(cp, ':'); - if (cp == NULL) - break; - } - - /* Depending on how many colons were present, we split up the address */ - switch (count) { - case 1: - ap->client = a[0]; - ap->port = 0; - break; - case 2: - ap->client = a[0]; - ap->port = a[1]; - break; - default: - printf("Addresses in %d parts not supported yet\n", count); - break; - } - ap++; - naddr++; - } - - g_strfreev(plist); - - *addrp = addr; - return naddr; - - - diff -rNu melys-0.1.16/song/song.m melys-0.1.17/song/song.m --- melys-0.1.16/song/song.m Sat Dec 4 00:16:16 1999 +++ melys-0.1.17/song/song.m Thu Jan 1 01:00:00 1970 @@ -1,407 +0,0 @@ ->>name song.m - Functions to deal with a complete song midi/audio - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. ->>extern - ->>header gtk/gtk.h ->>header elements.h ->>header md.h ->>header melreg.h ->>header melystrack.h - ->>header ->>header melfile.h ->>header mdrw.h ->>header melmidi.h ->>header melmsg.h - ->>headerdef --decl song.h - -/* - * Properties for the parent MDI - */ -#define MEL_MDI_CHILD_COUNT "MDI_CHILD_COUNT" -#define MEL_OPEN_DIALOG "OPEN_DIALOG" - -/* - * The following are properties that can be set on the mdi child - */ -#define MEL_SONG_DATA "SONG_DATA" -#define MEL_NEW_VIEW "NEW_VIEW" - - -/* - * A structure that contains all the information that is particular to - * a song. It is placed as a property on the MDI child. - */ -struct song { - struct rootElement *mdroot; /* MD root */ - char *filename; /* File that this song is associated with */ - - GtkObject *mdi; /* Back pointer to the parent MDI */ - GtkObject *child; /* Back pointer to the MDI child */ - - int save_dialog; /* Save dialog box */ - int dialog; /* Set if a dialog is in action */ - - struct play *play; /* Play data */ - struct record *record; /* Record data */ - - GtkAdjustment *posadj; /* Song position adjustment */ - - /* Somewhat temporary recording of track */ - struct trackElement *newtrack; /* Track being recorded */ - int tracknum; /* The output dev/channel */ - - /* Here are all the views on this file */ - GSList *viewlist; - - /* Not sure if we should really have this... */ - GtkWidget *trackview; /* The main view */ - - int redrawing; /* True if redrawing (the id of the idle task) */ - int unused:1; /* This song has not been used (no file etc) */ -}; - ->>header melgui.h - ->>function song_set_view -void -struct song *song; -GtkWidget *view; - ->>code - regid_t id; - - id = reg_object(GTK_OBJECT(view), NULL); - song->viewlist = g_slist_prepend(song->viewlist, GINT_TO_POINTER(id)); - - if (IS_MELYS_TRACK(view)) { - song->trackview = view; - gtk_signal_connect((GtkObject *)((MelysTrack *)view)->info, - "mute_track", song_mute_track, song); - gtk_signal_connect((GtkObject *)((MelysTrack*)view)->info, - "unmute_track", song_unmute_track, song); - } - - ->>function song_setup -void -struct song *song; -char *filename; -struct rootElement *root; - ->>description -Open the file specified by -.A filename -and read it into the song structure as an MD tree. -If filename is NULL, then an empty new song is created. - ->>code - - g_return_if_fail(root != NULL); - - if (song->play == NULL) - return; - - if (song->mdroot) - md_free(MD_ELEMENT(song->mdroot)); - song->mdroot = root; - - song->posadj->lower = 0.0; - song->posadj->upper = MD_ENDTIME(root); - gtk_adjustment_set_value(song->posadj, 0.0); - gtk_adjustment_changed(song->posadj); - - play_set_mdroot(song->play, root); - record_set_mdroot(song->record, root); - - play_set_ports(song->play); - record_set_ports(song->record); - - song->newtrack = md_track_new(); - song->tracknum = MD_CONTAINER(root)->elements->len - 2; /* xxx temp */ - - ->>function song_play_start -void -struct song *song; ->>description -Start up audio and midi streams to start playing. ->>code - - if (!song) - return; - - if (play_get_context(song->play) == NULL) { - mel_song_error(song, NULL, - _("Could not open ALSA sequencer\n" - "Perhaps modules are not loaded\n" - )); - return; - } - - play_start(song->play); - - ->>function song_play_pause -void -struct song *song; ->>description -Pause the audio and midi streams. -The next play will resume playing from the same point. ->>code - - if (song) - play_pause(song->play); - - ->>function song_play_stop -void -struct song *song; ->>description -Stop and rewind the audio and midi streams. -Also stop recording if recording is active. -The next play will start playing from the beginning. ->>code - - if (!song) - return; - - record_stop(song->record); - md_shrink(song->mdroot); - - play_set_record(song->play, FALSE); - play_stop(song->play); - - /* - * This is all temporary. If events have been recorded on the - * newtrack then add the track to the song. - */ - if (MD_CONTAINER(song->newtrack)->elements->len) { - g_message("adding the new track"); - md_add(MD_CONTAINER(song->mdroot), MD_ELEMENT(song->newtrack)); - - /* Set the new tracks channel to the track number TEMP */ - MD_SET_DEVCHAN(song->newtrack, MD_TRACKLIKE(song->newtrack)->number); - - song->newtrack = md_track_new(); - song->tracknum++; - - } - song_view_update(song); - - ->>function song_record_start -void -struct song *song; ->>description -Start recording. -This may be called while already playing, -or while not playing, in which case playing must be started -as well. - ->>code - - if (!song) - return; - - if (song->record == NULL) { - mel_song_error(song, NULL, - _("Could not open ALSA sequencer\n" - "Perhaps modules are not loaded\n" - )); - } - - /* Depends on what kind of track we have selected audio/midi */ - /* Only midi exists at present... */ - play_set_record(song->play, TRUE); - play_start(song->play); - - record_set_track(song->record, song->newtrack, song->tracknum); - record_start(song->record); - - ->>function song_record_stop -void -struct song *song; - ->>description -Stop recording only. -If the song is playing (as it will be if not -ended) then it will carry on playing. - ->>code - - if (!song) - return; - - record_stop(song->record); - - song_view_update(song); - - ->>function song_get_data -struct song * -GtkObject *child; Child to get data from ->>description -Get the child info data from the specified child. -If it does not exist then this is an error, you are meant -to access it from the parent mdi first. ->>code - struct song *sd; - - sd = gtk_object_get_data(child, MEL_SONG_DATA); - if (sd == NULL) - ethrow(debugError, "No child data in @func_name"); - - return sd; - - ->>function song_new -struct song * -GtkObject *mdi; The parent MDI -GtkObject *child; Child on which to create the data - ->>description -Create and initialise the child data. -The newly created data is returned. - ->>code - struct song *sd; - - sd = g_new0(struct song, 1); - sd->mdi = mdi; - sd->child = child; - sd->filename = NULL; - sd->mdroot = NULL; - sd->save_dialog = 0; - sd->dialog = 0; - sd->play = play_new(); - sd->record = record_new(play_get_context(sd->play)); - sd->posadj = (GtkAdjustment *)gtk_adjustment_new(0.0, - 0.0, 0.0, - 1.0, 1.0, - 1.0 - ); - gtk_object_ref((GtkObject *)sd->posadj); - gtk_object_sink((GtkObject *)sd->posadj); - play_set_pos_adj(sd->play, sd->posadj); - - gtk_object_set_data_full(GTK_OBJECT(child), MEL_SONG_DATA, - sd, song_destroy); - - return sd; - - ->>function song_destroy -void -gpointer data; - ->>description -Destroy the child data structure and any resourse allocated off it. -This will be called automatically when the child is destroyed. - ->>code - struct song *sd; - - dprintf1("Destroy @func_name %p", data); - - sd = data; - - /* Destroy all resources */ - - gtk_object_unref((GtkObject *)sd->posadj); - - if (sd->mdroot) { - md_free(MD_ELEMENT(sd->mdroot)); - sd->mdroot = NULL; - } - - /* Record (and any other subcontext) must be freed first */ - if (sd->record) - record_free(sd->record); - - if (sd->play) - play_free(sd->play); - - if (sd->newtrack) - md_free(MD_ELEMENT(sd->newtrack)); - - /* Free the data itself */ - g_free(sd); - - ->>function song_view_update -void -struct song *song; - ->>description -Update all views. -This is called after a change has been made to the mdroot -and you want to redisplay every thing. -The view widgets could optimise and check what has changed. - ->>code - GSList *list; - GtkWidget *w; - - list = song->viewlist; - while (list) { - w = reg_get_widget(GPOINTER_TO_INT(list->data)); - if (w) - gtk_widget_queue_draw(w); - list = list->next; - } - - /* After all drawing is done we want to clear all modified bits */ - if (!song->redrawing) - song->redrawing = gtk_idle_add(song_clear_mod, song); - - ->>function song_clear_mod -static int -void *s; ->>code - struct song *song = s; - - md_clear_all_mod(MD_ELEMENT(song->mdroot)); - song->redrawing = 0; - - return FALSE; - ->>function song_mute_track -static void -gpointer notused; -struct trackElement *track; -struct song *song; ->>code - - /* Determine if this is an audio or midi track */ - /* Mmm, yes its a midi track.... */ - - play_mute(song->play, track); - - ->>function song_unmute_track -static void -GtkObject *notused; -struct trackElement *track; -struct song *song; - ->>code - - /* Determine if this is an audio or midi track */ - /* Its a midi track.... */ - - play_unmute(song->play, track); - diff -rNu melys-0.1.16/util/except.m melys-0.1.17/util/except.m --- melys-0.1.16/util/except.m Sun Oct 3 12:24:46 1999 +++ melys-0.1.17/util/except.m Thu Jan 1 01:00:00 1970 @@ -1,146 +0,0 @@ ->>name except.m - -except.m - XXX - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>extern ->>header ->>header ->>header stdio.h - ->>headerdef --decls except.h - -#include - -/* - * Some macros and routines to emulate exceptions. - * Do not use this too much... - * Take care to consider memory freeing issues and re-entrency. - * Should only be used where errors are really not expected, certainly - * not for user input, where errors are to be expected and should be - * dealt with properly. - */ -#define CATCH_MAX 4 -struct except { - int set; /* Flag to say if set up correctly */ - int level; /* Catch nesting depth */ - sigjmp_buf buf[CATCH_MAX]; /* The return point */ - char *message; /* The error message */ - gpointer private; /* Pointer for application use */ -}; - -/* Usage: if CATCH(&xError) { .. } */ -#define CATCH(e) (ethrow_setup(e), setjmp((e)->buf[(e)->level])) -#define UNCATCH(e) ethrow_unsetup(e) - -/* - * This is available from everywhere, it is for errors that - * can only happen because of a bug in the program, such as - * an assumption that turns out to be wrong. - */ -extern struct except *debugError; /* Debugging 'shouldn't happen' errors */ - - ->>extern - -static struct except format; -static struct except io; -static struct except value; -static struct except debug; - -/* Do not use these */ -struct except *formatError = &format; /* Bad file format */ -struct except *ioError = &io; /* I/o error to file */ -struct except *valueError = &value; /* Value type error */ -struct except *debugError = &debug; /* Debugging 'shouldn't happen' errors */ - -#define ETHROW_MAGIC 0x671299AB - ->>function ethrow -void -struct except *e; // Exception thrown -char *fmt; // Reason message format -... // Takes variable number of arguments printf like - ->>description -This routine was a bad idea. -It allows a limited emulation of exceptions, but if not used -with care it is going to leave memory unfree'd all over the place. - -Use it only for debugging situations where you don't want to -continue because you don't know how you got there, or -for well defined cases that are not expected to happen often. - ->>code - va_list ap; - char *msg; - - va_start(ap, fmt); - msg = g_strdup_vprintf(fmt, ap); - va_end(ap); - - e->message = msg; - if (e->set == ETHROW_MAGIC) { - longjmp(e->buf[e->level], 1); - } else { - g_warning(_("@func_name called without being set up")); - g_warning(msg); - if (debugError->set == ETHROW_MAGIC) { - debugError->message = msg; - longjmp(debugError->buf[0], 1); - } - } - - /* Dont normally reach here, but it can happen */ - g_free(msg); - e->message = NULL; - - ->>function ethrow_setup -void -struct except *ep; - ->>description -Setup for catching from ethrow. - ->>code - - if (ep->set == ETHROW_MAGIC) { - ep->level++; - } else { - memset(ep, 0, sizeof(*ep)); - ep->set = ETHROW_MAGIC; - } - if (ep->message) - g_free(ep->message); - ep->message = NULL; - - if (ep->level >= CATCH_MAX) { - g_error("Too many nested catches"); - ep->set = 0; - return; - } - - ->>function ethrow_unsetup -void -struct except *ep; - ->>code - - if (ep->level-- == 0) - ep->set = 0; - if (ep->message) - g_free(ep->message); - - ep->message = NULL; diff -rNu melys-0.1.16/util/gxstack.m melys-0.1.17/util/gxstack.m --- melys-0.1.16/util/gxstack.m Sun Oct 10 19:11:04 1999 +++ melys-0.1.17/util/gxstack.m Thu Jan 1 01:00:00 1970 @@ -1,286 +0,0 @@ ->>name gxstack.m - a stack data structure - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -There doesn't appear to be a stack in glib. So here is one. -Replace if glib ever gets one. - ->>headerdef --decl util.h - -typedef struct _GXStack { - gint level; - gint elemsize; - GArray *array; -} GXStack; - -typedef struct _GXPtrStack { - GXStack stack; -} GXPtrStack; - ->>function gx_stack_new -GXStack * -gint elemsize; Size of each element - ->>description -Creates a new stack. -The element size must be greater than zero. - ->>code - GXStack *stack; - - if (elemsize <= 0) - return NULL; - - stack = g_new(GXStack, 1); - stack->level = 0; - stack->elemsize = elemsize; - stack->array = g_array_new(0, 0, elemsize); - - return stack; - - ->>function gx_stack_free -void -GXStack *stack; The stack to free - ->>description -Free the stack and its data. - ->>code - - g_array_free(stack->array, 1); - g_free(stack); - - ->>function gx_stack_push -void -GXStack *stack; The stack to push item onto -void *item; The item to copy onto the stack - ->>description -Copy the item pointed to by -.A item -onto the stack. - ->>code - - g_return_if_fail(stack && stack->array); - g_return_if_fail(item); - - g_array_append_vals(stack->array, item, 1); - stack->level++; - - ->>function gx_stack_pop -gboolean -GXStack *stack; The stack -void *item; Item is returned here - ->>description -Copy the top most item in the stack into the memory area pointed -to by -.A item . -The item is removed from the stack. -If there are no items on the stack then FALSE is returned -and -.A item -is unchanged. -The -.A item -can be NULL; the stack is just popped. - ->>code - void *p; - - g_return_val_if_fail(stack && stack->array, FALSE); - - if (stack->level < 1) - return FALSE; - - stack->level--; - - /* If we want the item save it now */ - if (item) { - p = stack->array->data + stack->level * stack->elemsize; - memcpy(item, p, stack->elemsize); - } - - /* Remove the item from the array */ - g_array_remove_index_fast(stack->array, stack->level); - - return TRUE; - ->>function gx_stack_top -void * -GXStack *stack; The stack - ->>description -Return a pointer to the top item on the stack. -It is not popped off. -Returns NULL if stack is emtpy. - ->>code - void *p; - - g_return_val_if_fail(stack && stack->array, NULL); - - if (stack->level < 1) - return NULL; - - p = stack->array->data + (stack->level - 1) * stack->elemsize; - return p; - - ->>function gx_stack_empty -gboolean -GXStack *stack; - ->>description -Returns true if the stack is empty. - ->>code - - return (stack->level == 0)? TRUE: FALSE; - ->># ----- Pointer stack ----- ->># A pointer stack is useful when you want to stack pointers ->># to things rather than structures. - ->>function gx_ptr_stack_new -GXPtrStack * - ->>description -A pointer stack is just a special case of a stack -where each item is a pointer. -The interface is easier to use. - ->>code - return (GXPtrStack *)gx_stack_new(sizeof(void *)); - - ->>function gx_ptr_stack_push -void -GXPtrStack *stack; The pointer array stack -void *ptr; The pointer to push - ->>description -The pointer is pushed onto the stack. -Note how this differs from gx_stack_push, in that case -the pointed to is copied onto the stack. -In this case it is the value of the pointer itself that -is copied onto the stack. - ->>code - - gx_stack_push((GXStack *)stack, &ptr); - - ->>function gx_ptr_stack_pop -void * -GXPtrStack *stack; The pointer stack - ->>description -The top item on the stack is popped and returned. -Again this differs from the gx_stack_pop in that a pointer value -is returned. -If the stack is empty then NULL is returned. - ->>code - void *ptr; - gboolean ok; - - ok = gx_stack_pop((GXStack *)stack, &ptr); - if (!ok) - ptr = NULL; - - return ptr; - ->>function gx_ptr_stack_top -void * -GXPtrStack *stack; The pointer stack - ->>code - void **pp; - void *ptr; - - pp = gx_stack_top((GXStack *)stack); - if (pp) - ptr = *pp; - else - ptr = NULL; - - return ptr; - - -/* - *Test program. uncomment the two header lines as well - */ -#if 0 ->>#header string.h ->>#header stdio.h ->>function main -int -int argc; -char **argv; - ->>code - struct two { - char s1[40]; - char s2[40]; - }; - GXStack *stack; - int ret; - - struct two first, second, third; - struct two item; - struct two *ip; - - strcpy(first.s1, "hello"); - strcpy(first.s2, "hello2"); - strcpy(second.s1, "second hello"); - strcpy(second.s2, "second hello2"); - strcpy(third.s1, "third hello"); - strcpy(third.s2, "third hello2"); - - stack = gx_stack_new(sizeof(struct two)); - - gx_stack_push(stack, (void *)&first); - gx_stack_push(stack, (void *)&second); - gx_stack_push(stack, (void *)&third); - - memset(&first, 0, sizeof(first)); - memset(&second, 0, sizeof(first)); - memset(&third, 0, sizeof(first)); - - memset(&item, 0, sizeof(item)); - ip = gx_stack_top(stack); - printf("peek should be third 1: %s 2:%s\n", ip->s1, ip->s2); - - gx_stack_pop(stack, (void *)&item); - printf("1: %s 2:%s\n", item.s1, item.s2); - - ip = gx_stack_top(stack); - printf("peek should be second 1: %s 2:%s\n", ip->s1, ip->s2); - - gx_stack_pop(stack, (void *)&item); - printf("1: %s 2:%s\n", item.s1, item.s2); - - gx_stack_push(stack, (void *)&first); - gx_stack_pop(stack, (void *)&item); - printf("1: %s 2:%s\n", item.s1, item.s2); - ret = gx_stack_pop(stack, (void *)&item); - printf("ret%d 1: %s 2:%s\n", ret, item.s1, item.s2); - ret = gx_stack_pop(stack, (void *)&item); - printf("ret%d 1: %s 2:%s\n", ret, item.s1, item.s2); - - return 0; -#endif diff -rNu melys-0.1.16/util/util.m melys-0.1.17/util/util.m --- melys-0.1.16/util/util.m Sun Dec 19 22:20:32 1999 +++ melys-0.1.17/util/util.m Thu Jan 1 01:00:00 1970 @@ -1,198 +0,0 @@ ->>name util.m Useful utility functions and macros - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - ->>header ->>header ->>headerdef --decl util.h - -/* Useful macros */ - -/* The number of elements in an array */ -#define NELEM(a) ((int)( sizeof(a)/ sizeof((a)[0]))) - -/* End of an array for use in loops */ -#define ENDOF(a) ((a) + NELEM(a)) - -/* Typedef for the affine transformations */ -typedef double affine_t[6]; - -/* Typedef for times */ -typedef long ticktime_t; - -/* - * Snap to grid types. - */ -enum snap_type { - SNAP_NONE, - SNAP_BAR, - SNAP_1, - SNAP_1_2, - SNAP_1_4, - SNAP_1_8, - SNAP_1_16, - SNAP_1_32, - SNAP_1_64, - SNAP_1_3, - SNAP_1_6, - SNAP_1_24, - SNAP_1_48, - SNAP_1_96, - SNAP_1_192, - /* ETC */ -}; - - -#ifdef DEBUG -/* - * Debugging stuff. - */ - -extern int DBlevel; - -#ifdef __GNUC__ -#define dprintf(level, format, args...) mel_debug_printf(level, format, ##args) -#define dprintf1(format, args...) mel_debug_printf(1, format, ##args) -#define dprintf2(format, args...) mel_debug_printf(2, format, ##args) - -#else /* !__GNUC__ */ - -/* Sorry, this doesn't look too good */ -static void -dprintf(int level, const gchar *format, ...) -{ - va_list args; - if (DBlevel < level) - return; - - va_start (args, format); - fvprintf(stderr, format, args); - va_end (args); - fprintf(stderr, "\n"); -} -static void -dprintf1(const gchar *format, ...) -{ - va_list args; - if (DBlevel < 1) - return; - - va_start (args, format); - fvprintf(stderr, format, args); - va_end (args); - fprintf(stderr, "\n"); -} -static void -dprintf2(const gchar *format, ...) -{ - va_list args; - if (DBlevel < 2) - return; - - va_start (args, format); - fvprintf(stderr, format, args); - va_end (args); - fprintf(stderr, "\n"); -} - -#endif - -#else /* !DEBUG */ - -#ifdef __GNUC__ -#define dprintf(level, format, args...) -#define dprintf1(format, args...) -#define dprintf2(format, args...) - -#else /* !__GNUC__ */ - -/* NB: expression may still be evaluated */ -#define dprintf (void) -#define dprintf1 (void) -#define dprintf2 (void) - -#endif - -#endif /* DEBUG */ - - ->>extern - -#ifdef DEBUG - -int DBlevel = 0; - -#endif - ->>function mel_debug_printf -void -int level; Debuging level to print at -char *fmt; Printf format -... - ->>description -A routine for conditionally printing out debugging information. -If the -.A level -argument is greater than or equal to the debugging level, the message -will be printed. - ->>code -#ifdef DEBUG - va_list args; - - if (DBlevel < level) - return; - - fprintf(stderr, "DEBUG %d: ", level); - va_start (args, fmt); - vfprintf(stderr, fmt, args); - va_end (args); - fprintf(stderr, "\n"); -#endif - - ->>function note_name -char * -int note; // Note number ->>description -Return a text representation of a note given the midi note -number. -There are different naming schemes around, this one gives C0 for note 0. -This result will be of the form G4, C#3 etc. ->>code - char *note_names = "CCDDEFFGGAAB"; - char *sharps = " # # # # # "; - GString *s; - char ch; - char *octave; - char *ret; - - /* Base note */ - s = g_string_new(""); - g_string_append_c(s, note_names[note % 12]); - - /* Add a sharp sign if needed */ - ch = sharps[note % 12]; - if (ch == '#') - g_string_append_c(s, '#'); - - /* Add the octave number */ - octave = g_strdup_printf("%d", note/12); - g_string_append(s, octave); - g_free(octave); - - ret = s->str; - g_string_free(s, 0); - - return ret; diff -rNu melys-0.1.16/version melys-0.1.17/version --- melys-0.1.16/version Fri Jan 7 11:06:43 2000 +++ melys-0.1.17/version Wed Feb 9 20:54:13 2000 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.1.16" +#define MELYS_VERSION_STRING "0.1.17" diff -rNu melys-0.1.16/widgets/melysgrid.c melys-0.1.17/widgets/melysgrid.c --- melys-0.1.16/widgets/melysgrid.c Fri Jan 7 11:13:53 2000 +++ melys-0.1.17/widgets/melysgrid.c Wed Feb 9 21:03:38 2000 @@ -11,7 +11,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * A grid widget. You can specify major and minor rulings, the frequency + * A grid widget, conceptually it is infinite in size like the + * canvas. You can specify major and minor rulings, the frequency * of the rulings etc. * * @@ -167,14 +168,6 @@ mgrid->vcp = vcp; gtk_object_ref((GtkObject *) vcp); -#if 0 - gnome_canvas_update_bbox(GNOME_CANVAS_ITEM(mgrid), - 0, 0, - view_control_tick_to_x(vcp, vcp->hadj->upper), - view_control_thing_to_y(vcp, vcp->vadj->upper) - ); -#endif - gtk_signal_connect(GTK_OBJECT(vcp), "scale-changed", scale_changed, mgrid); } @@ -284,12 +277,6 @@ width, height ); -#if 0 - gnome_canvas_request_redraw(item->canvas, - 0, 0, - 1000000, 100000 - ); -#endif } static void @@ -344,16 +331,21 @@ static void scale_changed(GtkObject *obj, gpointer data) { - MelysGrid *mgrid = data; + GnomeCanvasItem *item = data; ViewControl *vcp = VIEW_CONTROL(obj); + int width; + int height; - if (!GTK_WIDGET_REALIZED(mgrid)) - return; - - gnome_canvas_update_bbox(data, + width = view_control_tick_to_x(vcp, vcp->hadj->upper); + if (width < GTK_WIDGET(item->canvas)->allocation.width) + width = GTK_WIDGET(item->canvas)->allocation.width; + height = view_control_thing_to_y(vcp, vcp->vadj->upper); + if (height < GTK_WIDGET(item->canvas)->allocation.height) + height = GTK_WIDGET(item->canvas)->allocation.height; + gnome_canvas_update_bbox(item, 0, 0, - view_control_tick_to_x(vcp, vcp->hadj->upper), - view_control_thing_to_y(vcp, vcp->vadj->upper) + width, + height ); - gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(mgrid)); + gnome_canvas_item_request_update(item); } diff -rNu melys-0.1.16/widgets/melysgrid.m melys-0.1.17/widgets/melysgrid.m --- melys-0.1.16/widgets/melysgrid.m Thu Jan 6 18:50:05 2000 +++ melys-0.1.17/widgets/melysgrid.m Thu Jan 1 01:00:00 1970 @@ -1,362 +0,0 @@ ->>name melysgrid.m - A grid widget for Melys. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -A grid widget. You can specify major and minor rulings, the frequency -of the rulings etc. - ->>header gtk/gtksignal.h ->>header gtk/gtkwidget.h - ->>header libgnomeui/gnome-canvas.h ->>header libgnomeui/gnome-canvas-util.h - ->>header elements.h ->>header md.h ->>header viewcontrol.h ->>gtkobject melys_grid gnome_canvas_item - ->>headerdef @header - -/* - * The MelysGrid structure. Each instance of the class is - * allocated one of these structures. - */ -struct _MelysGrid { - GnomeCanvasItem gnome_canvas_item; - - ViewControl *vcp; - struct tempomapElement *tempomap; - - /* Grid spacings in tick and thing directions */ - int tick_major; - int tick_minor; - int thing_major; - int thing_minor; - - /* GC for drawing */ - GdkGC *majgc; /* Darker for major ruling */ - GdkGC *mingc; /* lighter for minor ruling */ - - int maj_dash_offset; - int min_dash_offset; -}; - -/* - * The MelysGridClass structure. There is only one of these - * allocated for the class. - */ -struct _MelysGridClass { - GnomeCanvasItemClass parent_class; -}; - ->>extern - -/* The list of signal id's that are being added for MelysGrid. */ -enum { - LAST_SIGNAL -}; - -/* Argument numbers */ -enum { - ARG_0, -}; - - -#define x_to_tick(g, x) view_control_x_to_tick(MELYS_GRID(g)->vcp, (x)) -#define tick_to_x(g, t) view_control_tick_to_x(MELYS_GRID(g)->vcp, (t)) - -static gchar maj_dash[] = { 1, 1 }; -static gchar min_dash[] = { 1, 3 }; -static const int max_dash_offset = 4; - - ->>function melys_grid_new -GtkWidget * -ViewControl *vcp; - ->>description -Create a new MelysGrid object. ->>code - GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_grid_get_type())); - MelysGrid *mgrid = MELYS_GRID(w); - - if (vcp) - melys_grid_set_adj(mgrid, vcp); - - return w; - - ->>function melys_grid_init -static void -MelysGrid *mgrid; The MelysGrid to init ->>description -Initialise the MelysGrid. ->>code - - mgrid->vcp = NULL; - mgrid->tick_major = SNAP_BAR; - mgrid->tick_minor = 0; - mgrid->thing_major = 1; - mgrid->thing_minor = 0; - - - ->>function melys_grid_class_init -static void -MelysGridClass *klass; The class to initialise - ->>description -Initialize the class. - ->>code - GtkObjectClass *object_class; - GnomeCanvasItemClass *gnome_canvas_item_class; - - object_class = (GtkObjectClass *)klass; - gnome_canvas_item_class = (GnomeCanvasItemClass *)klass; - - parent_class = gtk_type_class(gnome_canvas_item_get_type()); - - gtk_object_class_add_signals(object_class, melys_grid_signals, LAST_SIGNAL); - - object_class->destroy = grid_destroy; - - gnome_canvas_item_class->realize = grid_realize; - gnome_canvas_item_class->unrealize = grid_unrealize; - gnome_canvas_item_class->point = grid_point; - gnome_canvas_item_class->update = grid_update; - gnome_canvas_item_class->draw = grid_draw; - - - ->>function melys_grid_set_adj -void -MelysGrid *mgrid; -ViewControl *vcp; - ->>code - - if (vcp) { - if (mgrid->vcp) - gtk_object_unref((GtkObject *) mgrid->vcp); - mgrid->vcp = vcp; - gtk_object_ref((GtkObject *) vcp); - -#if 0 - gnome_canvas_update_bbox(GNOME_CANVAS_ITEM(mgrid), - 0, 0, - view_control_tick_to_x(vcp, vcp->hadj->upper), - view_control_thing_to_y(vcp, vcp->vadj->upper) - ); -#endif - - gtk_signal_connect(GTK_OBJECT(vcp), "scale-changed", - scale_changed, mgrid); - } - - ->>function melys_grid_set_tempomap -void -MelysGrid *mgrid; -struct tempomapElement *tmap; - ->>code - - if (mgrid->tempomap) - md_free(MD_ELEMENT(mgrid->tempomap)); - - MD_REF(tmap); - mgrid->tempomap = tmap; - gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(mgrid)); - - ->>function grid_realize -static void -GnomeCanvasItem *item; - ->>code - MelysGrid *mgrid = MELYS_GRID(item); - - if (parent_class->realize) - (*parent_class->realize)(item); - - mgrid->majgc = gdk_gc_new(item->canvas->layout.bin_window); - mgrid->mingc = gdk_gc_new(item->canvas->layout.bin_window); - - gdk_gc_set_line_attributes(mgrid->majgc, 1, GDK_LINE_ON_OFF_DASH, - GDK_CAP_BUTT, GDK_JOIN_MITER); - gdk_gc_set_dashes(mgrid->majgc, 0, maj_dash, NELEM(maj_dash)); - - gdk_gc_set_line_attributes(mgrid->mingc, 1, GDK_LINE_ON_OFF_DASH, - GDK_CAP_BUTT, GDK_JOIN_MITER); - gdk_gc_set_dashes(mgrid->mingc, 0, min_dash, NELEM(min_dash)); - - ->>function grid_unrealize -static void -GnomeCanvasItem *item; - ->>code - MelysGrid *mgrid = MELYS_GRID(item); - - gdk_gc_unref(mgrid->majgc); - gdk_gc_unref(mgrid->mingc); - mgrid->majgc = NULL; - mgrid->mingc = NULL; - - if (parent_class->unrealize) - (*parent_class->unrealize)(item); - - ->>function grid_destroy -static void -GtkObject *obj; ->>code - MelysGrid *mgrid = MELYS_GRID(obj); - - g_assert(mgrid->majgc == 0); - - if (mgrid->vcp) - gtk_object_unref((GtkObject *) mgrid->vcp); - - if (mgrid->tempomap) - MD_UNREF(mgrid->tempomap); - - ->>function grid_point -static double -GnomeCanvasItem *item; The mgrid -double x; Point to test -double y; Point to test -int cx; Point to test in canvas co-ords -int cy; Point to test in canvas co-ords -GnomeCanvasItem **actual; Return of top most item in group - ->>description -As this item covers the whole of the canvas all points are "inside" -so this routine always returns 0. - ->>code - - *actual = item; - return 0.0; - ->>function grid_update -static void -GnomeCanvasItem *item; -double *affine; -ArtSVP *clip; -int flags; - ->>code - ViewControl *vcp; - int width; - int height; - - if (parent_class->update) - (*parent_class->update)(item, affine, clip, flags); - - vcp = MELYS_GRID(item)->vcp; - - width = view_control_tick_to_x(vcp, vcp->hadj->upper); - if (width < GTK_WIDGET(item->canvas)->allocation.width) - width = GTK_WIDGET(item->canvas)->allocation.width; - height = view_control_thing_to_y(vcp, vcp->vadj->upper); - if (height < GTK_WIDGET(item->canvas)->allocation.height) - height = GTK_WIDGET(item->canvas)->allocation.height; - gnome_canvas_update_bbox(item, - 0, 0, - width, - height - ); -#if 0 - gnome_canvas_request_redraw(item->canvas, - 0, 0, - 1000000, 100000 - ); -#endif - - ->>function grid_draw -static void -GnomeCanvasItem *item; The mgrid -GdkDrawable *drawable; Something to draw upon -int x; The buffer x offset -int y; The buffer y offset -int width; The buffer width -int height; The buffer height - ->>code - MelysGrid *mgrid = MELYS_GRID(item); - struct mbt mbt; - ticktime_t tick; - int xoff; - - if (parent_class->draw) - (*parent_class->draw)(item, drawable, x, y, width, height); - - if (x < mgrid->vcp->hbase) - tick = 0; - else - tick = x_to_tick(item, x - mgrid->vcp->hbase); - md_tick_to_mbt(mgrid->tempomap, tick, &mbt); - tick = md_snap_tick(mgrid->tempomap, mgrid->tick_major, tick); - - xoff = mgrid->vcp->hbase + tick_to_x(item, tick) - x; - - /* - * Do the vertical rulings. First the major ruling. - * First need to set the dash offset (perhaps dashes are not a good - * idea?) - */ - if (mgrid->maj_dash_offset != y % max_dash_offset) { - mgrid->maj_dash_offset = y % max_dash_offset; - gdk_gc_set_dashes(mgrid->majgc, y % max_dash_offset, - maj_dash, NELEM(maj_dash)); - } - - while (xoff < width) { - - if (xoff >= 0) - gdk_draw_line(drawable, mgrid->majgc, - xoff, 0, - xoff, height); - - /* TEMP */ - mbt.bars++; - mbt.beats = 0; - mbt.ticks = 0; - tick = md_mbt_to_tick(mgrid->tempomap, &mbt); - - xoff = mgrid->vcp->hbase + tick_to_x(mgrid, tick) - x; - } - - ->>function scale_changed -static void -GtkObject *obj; The view control -gpointer data; Our mgrid info - ->>code - MelysGrid *mgrid = data; - ViewControl *vcp = VIEW_CONTROL(obj); - - if (!GTK_WIDGET_REALIZED(mgrid)) - return; - - gnome_canvas_update_bbox(data, - 0, 0, - view_control_tick_to_x(vcp, vcp->hadj->upper), - view_control_thing_to_y(vcp, vcp->vadj->upper) - ); - gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(mgrid)); diff -rNu melys-0.1.16/widgets/melyskeys.m melys-0.1.17/widgets/melyskeys.m --- melys-0.1.16/widgets/melyskeys.m Tue Dec 14 16:51:29 1999 +++ melys-0.1.17/widgets/melyskeys.m Thu Jan 1 01:00:00 1970 @@ -1,316 +0,0 @@ ->>name melyskeys.m - A keyboard widget for the piano roll - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. ->>extern - ->>header gtk/gtksignal.h ->>header libgnomeui/gnome-canvas.h ->>header libgnomeui/gnome-canvas-rect-ellipse.h ->>header libgnomeui/gnome-canvas-text.h - ->>header viewcontrol.h ->>header melysscroll.h - ->>gtkobject melys_keys melys_scroll - ->>headerdef @header - - -/* - * State for each key on the board. - */ -struct keystate { - GtkObject *item; /* The canvas item */ - GtkObject *label; /* Some keys have a label */ -}; - -#define NKEYS 128 /* The number of keys */ -#define WHITE_LEN 60 /* The length of a white key */ -#define BLACK_LEN 36 /* The length of a black key */ -#define MELYS_KEYS_WIDTH 80 /* The width of the widget */ -#define TEXT_OFF 64 - -#define NLABELS ((NKEYS+12)/12) - -/* - * The MelysKeys structure. Each instance of the class is - * allocated one of these structures. - */ -struct _MelysKeys { - MelysScroll melys_scroll; - - int highlight; /* The highlighted key */ - struct keystate keys[NKEYS]; /* Individual key state */ -}; - -/* - * The MelysKeysClass structure. There is only one of these - * allocated for the class. - */ -struct _MelysKeysClass { - MelysScrollClass parent_class; - - void (*key_pressed)(MelysKeys *, int); -}; - ->>extern - -/* The list of signal id's that are being added for MelysKeys. */ -enum { - KEY_PRESSED, - LAST_SIGNAL -}; - -/* Argument numbers */ -enum { - ARG_0, -}; - -/* Defines to scale between y-coords and key values */ -#define y_to_key(mkeys, y) view_control_y_to_thing( \ - MELYS_SCROLL(mkeys)->vcp, y) - -#define key_to_y(mkeys, key) view_control_thing_to_y( \ - MELYS_SCROLL(mkeys)->vcp, key) - ->>extern -#define WHITE 0 -#define BLACK 1 - -/* Starting at C if you walk along the back of the keyboard - * this is the pattern that you get */ -static int ktype[] = { - WHITE, BLACK, WHITE, BLACK, WHITE, WHITE, - BLACK, WHITE, BLACK, WHITE, BLACK, WHITE, -}; - -/* Colours */ -#define COLOUR_WHITE 0xffffffff -#define COLOUR_WHITE_HL 0xf2f288ff -#define COLOUR_BLACK 0x000000ff -#define COLOUR_BLACK_HL 0xc0c070ff - - ->>function melys_keys_new -GtkWidget * -ViewControl *vcp; - ->>description -Create a new MelysKeys object. ->>code - MelysKeys *mkeys = MELYS_KEYS(gtk_type_new(melys_keys_get_type())); - - g_return_val_if_fail(vcp, GTK_WIDGET(mkeys)); - - melys_scroll_set_control(MELYS_SCROLL(mkeys), vcp, - VC_VERTICAL, MELYS_KEYS_WIDTH, 0); - - return GTK_WIDGET(mkeys); - - ->>function melys_keys_init -static void -MelysKeys *mkeys; The MelysKeys to init ->>description -Initialise the MelysKeys. ->>code - int i; - - for (i = 0; i < NKEYS; i++) { - mkeys->keys[i].item = NULL; - mkeys->keys[i].label = NULL; - } - - ->>function melys_keys_class_init -static void -MelysKeysClass *klass; The class to initialise - ->>description -Initialize the class. - ->>code - GtkObjectClass *object_class; - MelysScrollClass *melys_scroll_class; - - object_class = (GtkObjectClass *)klass; - melys_scroll_class = (MelysScrollClass *)klass; - - parent_class = gtk_type_class(melys_scroll_get_type()); - - melys_keys_signals[KEY_PRESSED] = gtk_signal_new("key-pressed", - GTK_RUN_FIRST, - object_class->type, - GTK_SIGNAL_OFFSET(MelysKeysClass, key_pressed), - gtk_marshal_NONE__INT, - GTK_TYPE_NONE, 1, - GTK_TYPE_INT); - - gtk_object_class_add_signals(object_class, melys_keys_signals, LAST_SIGNAL); - - melys_scroll_class->scale_changed = scale_changed; - - ->>function scale_changed -static void -MelysScroll *mscroll; This is the view control - ->>description -Draw or redraw all the piano keys. -It is drawn like a real keyboard so that the semitones are -equally spaced. - ->>code - MelysKeys *mkeys = MELYS_KEYS(mscroll); - int len; - int colour; - double width; - int octpos; /* position at octave */ - int pos; - int key; - int nwhite; - char *outline; - GnomeCanvasGroup *rgroup; - - rgroup = gnome_canvas_root(GNOME_CANVAS(mkeys)); - - nwhite = 0; - octpos = 0; - for (key = 0; key < NKEYS; key++) { - if (mkeys->keys[key].item == NULL) { - - mkeys->keys[key].item = (GtkObject *)gnome_canvas_item_new(rgroup, - GNOME_TYPE_CANVAS_RECT, - "x1", (double) 0.0, - "width_pixels", 1, - NULL); - } - - if ((key % 12) == 0) { - octpos = (NKEYS - key) * mscroll->vcp->vscale; - nwhite = 0; - - /* - * Now add the labels for the octaves. We label each C key and - * we start at C0. Sometimes people start with C-2 or - * something strange. - */ - if (mkeys->keys[key].label == NULL) { - char *str; - - /* - * For the first time, we create the label - */ - str = g_strdup_printf("C%d", key/12); - mkeys->keys[key].label = (GtkObject*)gnome_canvas_item_new( - rgroup, GNOME_TYPE_CANVAS_TEXT, - "text", str, - "anchor", GTK_ANCHOR_SOUTH_WEST, - "font_gdk", GTK_WIDGET(mkeys)->style->font, - "fill_color_gdk", - >K_WIDGET(mkeys)->style->fg[GTK_STATE_NORMAL], - NULL); - g_free(str); - } - - /* Update the label position */ - gnome_canvas_item_set((GnomeCanvasItem *)mkeys->keys[key].label, - "x", (double) TEXT_OFF, - "y", (double) octpos + 4, - NULL); - } - - if (ktype[key % 12] == WHITE) { - /* - * A white key has a width of 1/7 of an octave. - */ - len = WHITE_LEN; - width = ((double)mscroll->vcp->vscale*12 / 7); - colour = COLOUR_WHITE; - outline = "black"; - pos = octpos - nwhite * width + 0.5; - nwhite++; - } else { - /* - * A black key has a width of 1/12 of an octave. - */ - len = BLACK_LEN; - width = mscroll->vcp->vscale; - colour = COLOUR_BLACK; - outline = "black"; - pos = (NKEYS - key) * mscroll->vcp->vscale; - } - - gnome_canvas_item_set(GNOME_CANVAS_ITEM(mkeys->keys[key].item), - "x2", (double) len, - "y1", (double) pos - (int)(width+0.5), - "y2", (double) pos, - "fill_color_rgba", colour, - "outline_color", outline, - NULL); - - if (ktype[key % 12] == WHITE) - gnome_canvas_item_lower_to_bottom - (GNOME_CANVAS_ITEM(mkeys->keys[key].item)); - } - - - ->>function melys_keys_highlight -void -GtkWidget *mview; -int tick; -int thing; The key to highlight -gpointer _mkeys; This will be our widget - ->>description -This routine is designed to be connected to the "thing-position" signal of -the melys_view. -It will highlight the keys as you move the mouse around. - ->>code - MelysKeys *mkeys = _mkeys; - struct keystate *ksp; - int colour; - int key; - int oldkey; - - /* Reset old highlight */ - oldkey = mkeys->highlight; - ksp = &mkeys->keys[oldkey]; - if (ktype[oldkey % 12] == WHITE) - colour = COLOUR_WHITE; - else - colour = COLOUR_BLACK; - gnome_canvas_item_set((GnomeCanvasItem *) ksp->item, - "fill_color_rgba", colour, - NULL); - - /* We get thing as -1 if the mouse has left */ - if (thing < 0 || thing >= NKEYS) - return; - - key = NKEYS - 1 - thing; - - /* Set new hightlight */ - ksp = &mkeys->keys[key]; - if (ktype[key % 12] == WHITE) - colour = COLOUR_WHITE_HL; - else - colour = COLOUR_BLACK_HL; - gnome_canvas_item_set((GnomeCanvasItem *) ksp->item, - "fill_color_rgba", colour, - NULL); - - mkeys->highlight = key; - - diff -rNu melys-0.1.16/widgets/melyskeysig.m melys-0.1.17/widgets/melyskeysig.m --- melys-0.1.16/widgets/melyskeysig.m Thu Dec 2 17:19:52 1999 +++ melys-0.1.17/widgets/melyskeysig.m Thu Jan 1 01:00:00 1970 @@ -1,194 +0,0 @@ ->>name melyskeysig.m - Key signature display widget - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. ->>extern - ->>header libgnomeui/gnome-canvas.h - ->>header elements.h ->>header md.h ->>header melwidgets.h ->>header viewcontrol.h ->>header melysscroll.h ->>header melyssig.h - ->>set nosignals ->>gtkobject melys_keysig melys_sig - ->>headerdef @header - -/* - * The MelysKeysig structure. Each instance of the class is - * allocated one of these structures. - */ -struct _MelysKeysig { - MelysSig melys_sig; -}; - -/* - * The MelysKeysigClass structure. There is only one of these - * allocated for the class. - */ -struct _MelysKeysigClass { - MelysSigClass parent_class; - -}; - ->>extern - -#define tick_to_x(ms, tick) ( view_control_tick_to_x( \ - MELYS_SCROLL(ms)->vcp, (tick)) ) - -/* - * Tables to convert from the keysignature as stored in Midi to - * a string representation. - * To use the tables use the index: - * keysig->key * 2 + keysig->minor - * The sharp key table applies when keysig->key is greater than or - * equal to zero, the flat table otherwise. - */ -static char *sharp_key_to_string[] = { - "C", "A", - "G", "E", - "D", "B", - "A", "F#", - "E", "C#", - "B", "G#", - "F#", "D#", - "C#", "A#", - }; -static char *flat_key_to_string[] = { - "F", "D", - "Bb", "G", - "Eb", "C", - "Ab", "F", - "Db", "Bb", - "Gb", "Eb", - "Cb", "Ab", - }; - ->>function melys_keysig_new -GtkWidget * -ViewControl *vcp; ->>description -Create a new MelysKeysig object. ->>code - MelysKeysig *mksig = MELYS_KEYSIG(gtk_type_new(melys_keysig_get_type())); - - melys_scroll_set_control(MELYS_SCROLL(mksig), vcp, - VC_HORIZONTAL, 0, vcp->vtitle); - - return GTK_WIDGET(mksig); - - ->>function melys_keysig_init -static void -MelysKeysig *mksig; The MelysKeysig to init ->>description -Initialise the MelysKeysig. ->>code - - MELYS_SIG(mksig)->type = MD_TYPE_KEYSIG; - ->>function melys_keysig_class_init -static void -MelysKeysigClass *klass; The class to initialise - ->>description -Initialize the class. - ->>code - MelysSigClass *melys_sig_class; - - parent_class = gtk_type_class(melys_sig_get_type()); - - melys_sig_class = (MelysSigClass *)klass; - melys_sig_class->update_item = ksig_update_item; - - ->>function ksig_update_item -static void -MelysSig *msig; -struct edisplay_info *einfo; -struct tempomapElement *tmap; -struct mapElement *map1; -struct mapElement *map2; -gboolean force; - ->>code - struct keysigElement *ks1 = MD_KEYSIG(map1); - struct keysigElement *ks2 = MD_KEYSIG(map2); - char *str; - char *name; - ticktime_t end; - int state; - - if (MD_SELECTED(ks1)) - state = GTK_STATE_SELECTED; - else - state = GTK_STATE_NORMAL; - - /* Get the end time which is either the start of the next change - * or the end of the song. - */ - if (ks2) - end = MD_TIME(ks2); - else - end = MD_ENDTIME(tmap); - - /* - * We know that the common routine created any needed einfo - * for us. - */ - g_return_if_fail(einfo); - - canvas_item_move_abs(GNOME_CANVAS_ITEM(einfo->std.item), - tick_to_x(msig, MD_TIME(ks1)), 0); - - /* - * This will produce something like C, Cm, Bbm etc. - */ - name = keysig_to_string(ks1); - - str = g_strdup_printf("%s%s", name, ks1->minor? _("m"): ""); - gnome_canvas_item_set(GNOME_CANVAS_ITEM(einfo->text), - "text", str, "fill_color_gdk", - >K_WIDGET(msig)->style->fg[state], NULL); - g_free(str); - - gnome_canvas_item_set(GNOME_CANVAS_ITEM(einfo->rect), - "x2", (double) tick_to_x(msig, end), - NULL); - - ->>function keysig_to_string -char * -struct keysigElement *ks; - ->>description -Convert keysignature to a string. ->>code - int key; - int minor; - char **table; - - key = CLAMP(ks->key, -7, 7); - minor = CLAMP(ks->minor, 0, 1); - - if (key < 0) { - table = flat_key_to_string; - key = - key - 1; - } else { - table = sharp_key_to_string; - } - - return table[2 * key + minor]; diff -rNu melys-0.1.16/widgets/melyspartitem.m melys-0.1.17/widgets/melyspartitem.m --- melys-0.1.16/widgets/melyspartitem.m Tue Oct 12 00:31:59 1999 +++ melys-0.1.17/widgets/melyspartitem.m Thu Jan 1 01:00:00 1970 @@ -1,199 +0,0 @@ ->>name melyspartitem.m - represents track parts in the track display - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -This wiget is a slight modification to the rectangle item. -We want to be able to have a dashed border. -Also may want to draw squigles to mark midi events, and it -may be better to have this item draw the text rather -than the complicated group that I am currently using. - ->>header gtk/gtk.h - ->>header libgnomeui/gnome-canvas.h ->>header libgnomeui/gnome-canvas-rect-ellipse.h - ->>header elements.h ->>header md.h - ->>gtkobject melys_part_item gnome_canvas_rect - ->>headerdef @header - -struct _MelysPartItem { - GnomeCanvasRect gnome_canvas_rect; - - int dotted; - -}; - -struct _MelysPartItemClass { - GnomeCanvasRectClass parent_class; -}; - ->>extern - -/* Signal id numbers */ -enum { - LAST_SIGNAL -}; - -/* Argument numbers */ -enum { - ARG_0, - ARG_DOTTED_BORDER -}; - - ->>function melys_part_item_new -GnomeCanvasItem * ->>description -Create a new MelysPartItem object. ->>code - GnomeCanvasItem *item = - GNOME_CANVAS_ITEM(gtk_type_new(melys_part_item_get_type())); - - return item; - ->>function melys_part_item_init -static void -MelysPartItem *pitem; The MelysPartItem to init ->>description -Initialise the MelysPartItem. ->>code - - ->>function melys_part_item_class_init -static void -MelysPartItemClass *klass; The class to initialise - ->>description -Initialize the class. - ->>code - GtkObjectClass *object_class; - GnomeCanvasRectClass *gnome_canvas_rect_class; - GnomeCanvasItemClass *item_class; - - object_class = (GtkObjectClass *)klass; - item_class = (GnomeCanvasItemClass *)klass; - gnome_canvas_rect_class = (GnomeCanvasRectClass *)klass; - - parent_class = gtk_type_class(gnome_canvas_rect_get_type()); - - gtk_object_add_arg_type ("MelysPartItem::dotted_border", GTK_TYPE_INT, - GTK_ARG_READWRITE, ARG_DOTTED_BORDER); - - gtk_object_class_add_signals(object_class, melys_part_item_signals, - LAST_SIGNAL); - - object_class->set_arg = part_set_arg; - object_class->get_arg = part_get_arg; - item_class->update = part_item_update; - - ->>function part_item_update -static void -GnomeCanvasItem *item; -affine_t affine; -ArtSVP *clip_path; -gint flags; - ->>description -We intercept the update routine to set up the dashed outline. - ->>code - GnomeCanvasRE *re; - MelysPartItem *pitem; - - re = GNOME_CANVAS_RE(item); - pitem = MELYS_PART_ITEM(item); - - /* First chain up to do most of the real work */ - GNOME_CANVAS_ITEM_CLASS(parent_class)->update(item, affine, clip_path, - flags); - - if (!item->canvas->aa) { - set_outline(re->outline_gc, pitem->dotted); - } - - ->>function part_get_arg -static void -GtkObject *object; -GtkArg *arg; -guint arg_id; - ->>code - MelysPartItem *pitem; - GnomeCanvasRE *re; - GnomeCanvasItem *item; - - pitem = MELYS_PART_ITEM(object); - re = GNOME_CANVAS_RE(object); - item = GNOME_CANVAS_ITEM(object); - - switch (arg_id) { - case ARG_DOTTED_BORDER: - GTK_VALUE_INT(*arg) = pitem->dotted; - break; - default: - arg->type = GTK_TYPE_INVALID; - break; - } - - ->>function part_set_arg -static void -GtkObject *object; -GtkArg *arg; -guint arg_id; - ->>code - MelysPartItem *pitem; - GnomeCanvasRE *re; - GnomeCanvasItem *item; - - pitem = MELYS_PART_ITEM(object); - re = GNOME_CANVAS_RE(object); - item = GNOME_CANVAS_ITEM(object); - - - switch (arg_id) { - case ARG_DOTTED_BORDER: - pitem->dotted = GTK_VALUE_INT(*arg); - gnome_canvas_item_request_update(item); - break; - default: - break; - } - - ->>function set_outline -static void -GdkGC *gc; -int dotted; - ->>code - gchar dash_list[] = { - 3, 3 - }; - int type; - - if (dotted) - type = GDK_LINE_ON_OFF_DASH; - else - type = GDK_LINE_SOLID; - - gdk_gc_set_line_attributes(gc, 1, type, - GDK_CAP_BUTT, GDK_JOIN_MITER); - gdk_gc_set_dashes(gc, 0, dash_list, NELEM(dash_list)); diff -rNu melys-0.1.16/widgets/melyspiano.m melys-0.1.17/widgets/melyspiano.m --- melys-0.1.16/widgets/melyspiano.m Sun Dec 19 16:36:26 1999 +++ melys-0.1.17/widgets/melyspiano.m Thu Jan 1 01:00:00 1970 @@ -1,471 +0,0 @@ ->>name melyspiano.m - Piano roll container widget. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -This is the top level widget for the piano roll. It -is mainly a container for other widgets that combine -to make the piano roll. - ->>header gtk/gtksignal.h ->>header gtk/gtkwidget.h ->>header gtk/gtkvbox.h ->>header gtk/gtktable.h ->>header gtk/gtkframe.h ->>header gtk/gtklabel.h - ->>header libgnomeui/gnome-canvas.h ->>header libgnomeui/gnome-canvas-rect-ellipse.h ->>header libgnomeui/gnome-canvas-util.h - ->>header melmsg.h ->>header elements.h ->>header md.h - ->>header viewcontrol.h ->>header melwidgets.h ->>header melysscroll.h ->>header melysview.h ->>header melyskeys.h - ->>set nosignals ->>gtkobject melys_piano melys_view - ->>headerdef @header - -struct _MelysPiano { - MelysView melys_view; - -}; - -struct _MelysPianoClass { - MelysViewClass parent_class; -}; - ->>extern - - -#define tick_to_x(mp, t) view_control_tick_to_x( \ - MELYS_VIEW(mp)->vcp, t) - -/* Notes are numbered 0-NKEYS from the bottom where our y-coords go in - * the other direction - */ -#define note_to_y(mp, n) view_control_thing_to_y( \ - MELYS_VIEW(mp)->vcp, (NKEYS-1 - (n))) -#define note_to_thing(n) (NKEYS-1 - (n)) -#define thing_to_note(n) (NKEYS-1 - (n)) - - - ->>function melys_piano_new -GtkWidget * -struct containerElement *con; - ->>description -Create a new MelysPiano object. -It is always created based on a particular element to -be displayed. -You can have several of these views on -the same song if you want. - ->>code - GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_piano_get_type())); - MelysView *mview = MELYS_VIEW(w); - - mview->viewcon = con; - MD_REF(con); - - return w; - - ->>function melys_piano_init -static void -MelysPiano *mpiano; The MelysPiano to init ->>description -Initialise the MelysPiano. ->>code - GtkTable *tab; - GtkTable *tab2; - MelysView *mview = MELYS_VIEW(mpiano); - GtkWidget *frame1; - GtkWidget *frame2; - GtkBox *vbox1; - GtkWidget *mkeys; - GtkWidget *invis; - - mview->type = MD_TYPE_NOTE; - view_control_set_snap(mview->vcp, SNAP_1_16); - view_control_set_vertical(mview->vcp, 8); - view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE/2); - view_control_set_limits(mview->vcp, 1, 0, 4, 0); - - tab = (GtkTable *)gtk_table_new(2, 2, 0); - tab2 = (GtkTable *)gtk_table_new(2, 2, 0); - - gtk_box_pack_start(GTK_BOX(mpiano), GTK_WIDGET(tab), 1, 1, 0); - - /* - * Attach everything in the correct place, see the diagram - */ - - /* The vert scrollbar group */ - gtk_table_attach(tab, mview->vcp->vsb, 1, 2, 0, 1, - 0, - GTK_FILL|GTK_SHRINK|GTK_EXPAND, - 0, 0 - ); - gtk_table_attach(tab, mview->vcp->hsb, 0, 1, 1, 2, - GTK_FILL|GTK_SHRINK|GTK_EXPAND, - 0, - 0, 0 - ); - - /* The main canvas and ruler */ - - vbox1 = (GtkBox *)gtk_vbox_new(0, 0); - frame1 = gtk_frame_new(NULL); - gtk_frame_set_shadow_type(GTK_FRAME(frame1), GTK_SHADOW_IN); - - /* Pack the canvas and ruler in a box */ - gtk_box_pack_start(vbox1, mview->ruler, 0, 0, 0); - gtk_box_pack_start(vbox1, mview->canvas, 1, 1, 0); - - /* Put the lot in a frame */ - gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(vbox1)); - - /* And add the frame */ - gtk_table_attach(tab2, frame1, 1, 2, 0, 2, - GTK_SHRINK|GTK_EXPAND|GTK_FILL, - GTK_SHRINK|GTK_EXPAND|GTK_FILL, - 0, 0 - ); - - /* The keyboard */ - mkeys = melys_keys_new(mview->vcp); - melys_view_add_scroll(mview, MELYS_SCROLL(mkeys)); - invis = gtk_label_new(""); - - frame2 = gtk_frame_new(NULL); - gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_IN); - gtk_container_add(GTK_CONTAINER(frame2), mkeys); - - gtk_table_attach(tab2, invis, 0, 1, 0, 1, - 0, - 0, - 0, 0 - ); - gtk_table_attach(tab2, frame2, 0, 1, 1, 2, - 0, - GTK_SHRINK|GTK_EXPAND|GTK_FILL, - 0, 0 - ); - - gtk_table_attach(tab, GTK_WIDGET(tab2), 0, 1, 0, 1, - GTK_SHRINK|GTK_EXPAND|GTK_FILL, - GTK_SHRINK|GTK_EXPAND|GTK_FILL, - 0, 0 - ); - - gtk_widget_set_usize(invis, 0, mview->vcp->vtitle); - gtk_widget_set_usize(mview->ruler, 0, mview->vcp->vtitle); - gtk_widget_show_all(GTK_WIDGET(tab)); - - mview->vthings = NKEYS; /* There are NKEYS midi notes */ - - gtk_signal_connect(GTK_OBJECT(mview), "position-change", - melys_keys_highlight, mkeys); - - ->>function melys_piano_class_init -static void -MelysPianoClass *klass; The class to initialise - ->>description -Initialize the class. - ->>code - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - MelysViewClass *melys_view_class; - - object_class = (GtkObjectClass *)klass; - widget_class = (GtkWidgetClass *)klass; - melys_view_class = (MelysViewClass *)klass; - - parent_class = gtk_type_class(melys_view_get_type()); - - widget_class->draw = piano_draw; - widget_class->realize = piano_realize; - - melys_view_class->scale_changed = piano_scale_changed; - melys_view_class->get_nthing = get_nthing; - melys_view_class->drop_elem = drop_elem; - melys_view_class->position_change = piano_pos_changed; - - ->>function piano_scale_changed -static void -MelysView *mview; - ->>description -There is nothing to draw on the canvas, we just make sure that -the items are configured correctly and let the canvas -draw them. - ->>code - - g_return_if_fail(mview->viewcon); - - if (MELYS_VIEW_CLASS(parent_class)->scale_changed) - MELYS_VIEW_CLASS(parent_class)->scale_changed(mview); - - piano_con_draw(MELYS_PIANO(mview), mview->viewcon, TRUE); - - ->>function piano_draw -static void -GtkWidget *w; -GdkRectangle *area; - ->>code - MelysPiano *mpiano = MELYS_PIANO(w); - - piano_con_draw(mpiano, MELYS_VIEW(mpiano)->viewcon, FALSE); - - GTK_WIDGET_CLASS(parent_class)->draw(w, area); - - ->>function piano_con_draw -static void -MelysPiano *mpiano; -struct containerElement *con; -int force; - ->>description -Draw the notes within this container. -If there are sub containers then this routine is called recursively -until the notes are found and drawn. -The -.A area -parameter may be useful to optimise the display but on the whole -we have to check the whole lot. - ->>code - int n; - int maxnote = 0; - int minnote = NKEYS; - struct element *el; - struct noteElement *note; - - g_assert(iscontainer(con)); - - if (!GTK_WIDGET_REALIZED(mpiano)) - return; - - for (n = 0; n < MD_CONTAINER_LEN(con); n++) { - el = MD_GET_INDEX(con, n); - if (iscontainer(el)) - piano_con_draw(mpiano, MD_CONTAINER(el), force); - else if (el->type == MD_TYPE_NOTE) { - note = MD_NOTE(el); - maxnote = MAX(note->note, maxnote); - minnote = MIN(note->note, minnote); - update_note(mpiano, con, note, force); - } - } - - if (maxnote) { - GtkAdjustment *adj; - - minnote -= 8; - minnote = MAX(0, minnote); - - /* - * If the slider is right at the top, then we try to adjust - * it so that all the notes are in view. The highest note - * will be set at the top of the visible display. - * - * If the slider is not at the top then we leave alone, as - * you may have set it somewhere in particular and done want - * to see it jumping about. - */ - adj = MELYS_VIEW(mpiano)->vcp->vadj; - if (adj->value == 0) - gtk_adjustment_clamp_page(adj, - (gfloat) note_to_thing(maxnote), - (gfloat) note_to_thing(minnote)); - - gtk_adjustment_value_changed(adj); - } - - ->>function update_note -static void -MelysPiano *mpiano; -struct containerElement *con; -struct noteElement *note; -int force; - ->>description -Update the dimensions of the item representing the note. - ->>code - MelysView *mview; - GnomeCanvasItem *item; - struct display_info *dinfo; - int state; - - g_return_if_fail(note != NULL); - - /* If elements are destroyed then we can't touch them */ - if (MD_IS_DESTROYED(note) || MD_IS_DESTROYED(con)) - return; - - /* If the element is not modified then there is no need to do anything */ - if (!force && !MD_MODIFIED(con) && !MD_MODIFIED(note)) - return; - - if (GTK_OBJECT_DESTROYED(mpiano)) - return; - - mview = MELYS_VIEW(mpiano); - - /* See if this note is selected or not */ - if (MD_SELECTED(note)) - state = GTK_STATE_SELECTED; - else - state = GTK_STATE_NORMAL; - - dinfo = g_dataset_get_data(note, mview->infostr); - if (dinfo == NULL) { - GnomeCanvasGroup *rgroup; - - rgroup = gnome_canvas_root((GnomeCanvas*)mview->canvas); - - item = gnome_canvas_item_new(rgroup, - GNOME_TYPE_CANVAS_RECT, - "x1", (double) 0.0, - "y1", (double) 0.0, - "width_pixels", 1, - "outline_color", "black", - NULL); - - dinfo = g_new(struct display_info, 1); - gtk_object_ref((GtkObject *) item); - dinfo->item = (GtkObject *)item; - - MD_WREF(note); - dinfo->elem = MD_ELEMENT(note); - - MD_WREF(con); - dinfo->con = con; - - g_dataset_set_data_full(note, mview->infostr, - dinfo, display_info_free); - gtk_object_set_data(GTK_OBJECT(item), mview->infostr, dinfo); - - gtk_signal_connect(GTK_OBJECT(item), "event", - GTK_SIGNAL_FUNC(melys_view_item_event), mpiano); - } - - g_assert(dinfo != NULL); - item = GNOME_CANVAS_ITEM(dinfo->item); - - canvas_item_move_abs(item, - tick_to_x(mpiano, MD_TIME(note)), note_to_y(mpiano, note->note)); - - gnome_canvas_item_set(item, - "x2", (double) tick_to_x(mpiano, note->length), - "y2", (double) mview->vcp->vheight, - "fill_color_gdk", >K_WIDGET(mpiano)->style->light[state], - NULL); - ->>function piano_realize -static void -GtkWidget *w; - ->>code - MelysPiano *mpiano = MELYS_PIANO(w); - - if (GTK_WIDGET_CLASS(parent_class)->realize) - GTK_WIDGET_CLASS(parent_class)->realize(w); - - piano_scale_changed(MELYS_VIEW(mpiano)); - - ->>function get_nthing -static int -MelysView *mview; -struct element *el; - ->>code - - return note_to_thing(MD_NOTE(el)->note); - - ->>function drop_elem -static gboolean -MelysView *mview; -struct element *elem; -int nthing; - ->>description -Deal with dropping an element on to us. -We only allow notes to be dropped, if we get some container -element then we try to find the notes in it. - ->>code - int n; - struct element *el; - - if (iscontainer(elem)) { - md_ensure_parts(mview->viewcon, MD_TIME(elem), MD_ENDTIME(elem)+1); - for (n = 0; n < MD_CONTAINER_LEN(elem); n++) { - el = MD_GET_INDEX(elem, n); - MD_REF(el); - md_remove(el->con, el); - n--; - if (MD_TYPE(el) == MD_TYPE_NOTE) - drop_elem(mview, el, note_to_thing(MD_NOTE(el)->note)); - MD_UNREF(el); - } - } else if (elem->type == MD_TYPE_NOTE) { - - /* Make sure that parts exist. This leads to bitty parts XXX */ - md_ensure_parts(mview->viewcon, - MD_TIME(elem), MD_TIME(elem) + MD_NOTE(elem)->length); - - MD_NOTE(elem)->note = thing_to_note(nthing); - MELYS_VIEW_CLASS(parent_class)->drop_elem(mview, elem, nthing); - } - - return TRUE; - - ->>function piano_pos_changed -static void -MelysView *mview; -int tick; -int thing; - ->>code - char *msg; - struct mbt mbt; - - if (tick < 0) - return; - md_tick_to_mbt(mview->tempomap, tick, &mbt); - msg = g_strdup_printf(_("Note: %3s Time: %3d:%02d:%03d"), - note_name(thing_to_note(thing)), mbt.bars+1, mbt.beats+1, mbt.ticks); - mel_status_msg(mview->song, msg); - - g_free(msg); diff -rNu melys-0.1.16/widgets/melyspos.m melys-0.1.17/widgets/melyspos.m --- melys-0.1.16/widgets/melyspos.m Sat Nov 27 11:43:23 1999 +++ melys-0.1.17/widgets/melyspos.m Thu Jan 1 01:00:00 1970 @@ -1,177 +0,0 @@ ->>name melyspos.m - Position indicator - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -A meters, beats and ticks indicator. -It is currently essentially a label that updates itself based on -the supplied adjustment. - ->>header gtk/gtksignal.h ->>header gtk/gtkadjustment.h ->>header gtk/gtklabel.h - ->>header elements.h ->>header md.h - ->>set nosignals ->>gtkobject melys_pos gtk_label - ->>headerdef @header - -struct _MelysPos { - GtkLabel label; - - GtkAdjustment *posadj; - struct tempomapElement *tempomap; - - int sig_id; /* Connection to posadj */ - - ticktime_t lasttime; -}; - -struct _MelysPosClass { - GtkLabelClass parent_class; -}; - ->>extern - -/* Position label defines */ -#define POS_FORMAT "%3d:%02d:%03d" -#define POS_LABEL_LEN 12 /* Max text length */ - ->>function melys_pos_new -GtkWidget * - ->>description -Create a new MelysPos object. ->>code - GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_pos_get_type())); - char buf[POS_LABEL_LEN]; - - g_snprintf(buf, POS_LABEL_LEN, POS_FORMAT, 1, 1, 0); - gtk_label_set_text(GTK_LABEL(w), buf); - return w; - ->>function melys_pos_init -static void -MelysPos *mpos; The MelysPos to init ->>description -Initialise the MelysPos. ->>code - - ->>function melys_pos_class_init -static void -MelysPosClass *klass; The class to initialise - ->>description -Initialize the class. - ->>code - GtkObjectClass *object_class; - GtkLabelClass *label_class; - - object_class = (GtkObjectClass *)klass; - label_class = (GtkLabelClass *)klass; - - parent_class = gtk_type_class(gtk_label_get_type()); - - object_class->destroy = pos_destroy; - - ->>function melys_pos_set_controls -void -MelysPos *mpos; -struct tempomapElement *tmap; The tempomap for the song -GtkAdjustment *posadj; The song position adjustment ->>code - - g_return_if_fail(tmap != NULL); - g_return_if_fail(posadj != NULL); - g_return_if_fail(MD_TYPE(tmap) == MD_TYPE_TEMPOMAP); - - dprintf1("@func_name %p %p", tmap, posadj); - melys_pos_clear(mpos); - - MD_REF(tmap); - mpos->tempomap = tmap; - - gtk_object_ref(GTK_OBJECT(posadj)); - mpos->posadj = posadj; - - mpos->sig_id = gtk_signal_connect(GTK_OBJECT(posadj), - "value_changed", pos_update, mpos); - - pos_update(GTK_OBJECT(posadj), mpos); - - - ->>function pos_destroy -static void -GtkObject *obj; - ->>code - - melys_pos_clear(MELYS_POS(obj)); - - if (GTK_OBJECT_CLASS(parent_class)->destroy) - GTK_OBJECT_CLASS(parent_class)->destroy(obj); - ->>function melys_pos_clear -void -MelysPos *mpos; - ->>code - - dprintf1("@func_name"); - - if (mpos->sig_id) { - gtk_signal_disconnect(GTK_OBJECT(mpos->posadj), mpos->sig_id); - mpos->sig_id = 0; - } - - if (mpos->tempomap) { - md_free(MD_ELEMENT(mpos->tempomap)); - mpos->tempomap = NULL; - } - - if (mpos->posadj) { - gtk_object_unref(GTK_OBJECT(mpos->posadj)); - mpos->posadj = NULL; - } - - - ->>function pos_update -static void -GtkObject *obj; The adjustment -gpointer data; The mpos - ->>code - MelysPos *mpos = data; - struct mbt mbt; - ticktime_t t; - char buf[POS_LABEL_LEN]; - - g_return_if_fail(mpos->tempomap != NULL); - g_return_if_fail(mpos->posadj != NULL); - - t = (ticktime_t) mpos->posadj->value; - if (t != mpos->lasttime) { - mpos->lasttime = t; - - md_tick_to_mbt(mpos->tempomap, t, &mbt); - g_snprintf(buf, POS_LABEL_LEN, POS_FORMAT, - mbt.bars+1, mbt.beats+1, mbt.ticks); - - gtk_label_set_text(GTK_LABEL(mpos), buf); - } diff -rNu melys-0.1.16/widgets/melysrule.m melys-0.1.17/widgets/melysrule.m --- melys-0.1.16/widgets/melysrule.m Thu Jan 6 16:43:14 2000 +++ melys-0.1.17/widgets/melysrule.m Thu Jan 1 01:00:00 1970 @@ -1,392 +0,0 @@ ->>name melysrule.m - a ruler that displays bars/beats/markers etc. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header gtk/gtkwidget.h ->>header gtk/gtkvbox.h ->>header gtk/gtksignal.h - ->>header elements.h ->>header md.h - ->>header viewcontrol.h ->>header melystrack.h - ->>gtkobject melys_rule gtk_drawing_area - ->>headerdef @header - -#include "gtk/gtkdrawingarea.h" - -struct _MelysRule { - GtkDrawingArea drawing_area; - - ViewControl *vcp; /* Horizontal adj for this rule */ - - int hoffset; /* Previous horizontal adjustment */ - - struct tempomapElement *tempomap; - - GdkPixmap *pixmap; /* For double buffering */ -}; - -struct _MelysRuleClass { - GtkDrawingAreaClass parent_class; -}; - ->>extern - -/* The list of signal id's that are being added for MelysRule. */ -enum { - LAST_SIGNAL -}; - -/* Defines to scale between x-coords and tick values */ -#define x_to_tick(mrule, x) view_control_x_to_tick( \ - MELYS_RULE(mrule)->vcp, x) - -#define tick_to_x(mrule, tick) view_control_tick_to_x( \ - MELYS_RULE(mrule)->vcp, tick) - - ->>function melys_rule_new -GtkWidget * -ViewControl *vcp; ->>description -Create a new MelysRule object. ->>code - GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_rule_get_type())); - MelysRule *mrule = MELYS_RULE(w); - - if (vcp) - melys_rule_set_adj(mrule, vcp); - - return w; - ->>function melys_rule_init -static void -MelysRule *mrule; The MelysRule to init ->>description -Initialise the MelysRule. ->>code - - mrule->hoffset = 0; - mrule->vcp = NULL; - ->>function melys_rule_class_init -static void -MelysRuleClass *klass; The class to initialise - ->>description -Initialize the class. - ->>code - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkDrawingAreaClass *drawing_area_class; - - object_class = (GtkObjectClass *)klass; - widget_class = (GtkWidgetClass *)klass; - drawing_area_class = (GtkDrawingAreaClass *)klass; - - parent_class = gtk_type_class(gtk_drawing_area_get_type()); - - gtk_object_class_add_signals(object_class, melys_rule_signals, LAST_SIGNAL); - - widget_class->draw = rule_draw; - widget_class->expose_event = rule_expose; - widget_class->button_press_event = rule_button_press; - widget_class->motion_notify_event = rule_motion; - widget_class->configure_event = rule_configure; - object_class->destroy = rule_destroy; - - ->>function melys_rule_set_adj -void -MelysRule *mrule; -ViewControl *vcp; ->>description -Set the horizontal adjustment control for this widget. ->>code - - if (vcp) { - if (mrule->vcp) - gtk_object_unref((GtkObject *) mrule->vcp); - mrule->vcp = vcp; - gtk_object_ref((GtkObject *) vcp); - - gtk_signal_connect(GTK_OBJECT(vcp), "scale-changed", - scale_changed, mrule); - gtk_signal_connect((GtkObject *)vcp->hadj, "value-changed", - GTK_SIGNAL_FUNC(rule_scroll), mrule); - } - - ->>function melys_rule_set_tempomap -void -MelysRule *mrule; -struct tempomapElement *tempomap; ->>code - if (mrule->tempomap) - md_free((struct element *)mrule->tempomap); - - MD_REF(tempomap); - mrule->tempomap = tempomap; - gtk_widget_queue_draw((GtkWidget *) mrule); - - ->>function scale_changed -static void -GtkObject *obj; This will be the view control -gpointer data; Our mrule info ->>code - MelysRule *mrule = data; - - if (!GTK_WIDGET_REALIZED(mrule)) - return; - - gdk_window_clear(((GtkWidget *)mrule)->window); - gtk_widget_queue_draw((GtkWidget *)mrule); - - ->>function rule_configure -static gint -GtkWidget *widget; -GdkEventConfigure *event; - ->>description -The size has changed, reallocate our backing pixmap. - ->>code - MelysRule *mrule = MELYS_RULE(widget); - GdkRectangle area; - - if (mrule->pixmap) - gdk_pixmap_unref(mrule->pixmap); - - mrule->pixmap = gdk_pixmap_new(widget->window, - widget->allocation.width, widget->allocation.height, -1); - - gtk_widget_add_events(widget, - GDK_BUTTON_PRESS_MASK|GDK_BUTTON_MOTION_MASK); - - gdk_draw_rectangle(mrule->pixmap, - widget->style->bg_gc[widget->state], - TRUE, - 0, 0, - widget->allocation.width, widget->allocation.height); - - area.x = 0; - area.y = 0; - area.width = widget->allocation.width; - area.height = widget->allocation.height; - rule_draw(widget, &area); - - return TRUE; - - ->>function rule_draw -static void -GtkWidget *widget; -GdkRectangle *ap; - ->>description -Draw the ruler markings. - ->>code - MelysRule *mrule; - struct tempomapElement *tempomap; - char numbuf[20]; - struct mbt mbt; - int x; - int tick; - int yoff; - - mrule = MELYS_RULE(widget); - if (!mrule->tempomap) - return; - - tempomap = mrule->tempomap; - - x = ap->x; - - /* Start on the first visible bar boundry */ - tick = mrule->hoffset + x_to_tick(mrule, x); - md_tick_to_mbt(tempomap, tick, &mbt); - /* Step to next if begin part way through */ - if (mbt.beats > 0 || mbt.ticks > 0) - mbt.bars++; - mbt.beats = 0; - mbt.ticks = 0; - - tick = md_mbt_to_tick(tempomap, &mbt); - x = tick_to_x(mrule, tick - mrule->hoffset); - - gdk_draw_rectangle(mrule->pixmap, - widget->style->bg_gc[widget->state], - TRUE, - 0, 0, - widget->allocation.width, widget->allocation.height); - - for (; x < ap->x + ap->width; ) { - x += mrule->vcp->hbase; - if ((mbt.bars % 4) == 0) { - yoff = 10; - g_snprintf(numbuf, 20, "%d", mbt.bars+1); - gdk_draw_string(mrule->pixmap, - widget->style->font, - widget->style->fg_gc[widget->state], - x+2, yoff, numbuf); - } else - yoff = 18; - - gdk_draw_line(mrule->pixmap, widget->style->fg_gc[widget->state], - x, yoff, x, mrule->vcp->vtitle - VIEW_TITLE_RULE); - - /* Increment to the next one */ - mbt.bars++; - tick = md_mbt_to_tick(tempomap, &mbt); - x = tick_to_x(mrule, tick - mrule->hoffset); - } - - gdk_draw_line(mrule->pixmap, widget->style->fg_gc[widget->state], - 0, mrule->vcp->vtitle - VIEW_TITLE_RULE, - widget->allocation.width, mrule->vcp->vtitle - VIEW_TITLE_RULE); - - if (!GTK_WIDGET_DRAWABLE(widget)) - return; - - gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], ap); - gdk_draw_pixmap(widget->window, - widget->style->fg_gc[GTK_WIDGET_STATE(widget)], - mrule->pixmap, - 0, 0, - 0, 0, - widget->allocation.width, widget->allocation.height); - gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], NULL); - - return; - - ->>function rule_expose -static int -GtkWidget *widget; -GdkEventExpose *event; ->>code - MelysRule *mrule; - - if (!GTK_WIDGET_DRAWABLE(widget)) - return FALSE; - - mrule = MELYS_RULE(widget); - - gdk_draw_pixmap(widget->window, - widget->style->fg_gc[GTK_WIDGET_STATE(widget)], - mrule->pixmap, - event->area.x, event->area.y, - event->area.x, event->area.y, - event->area.width, event->area.height); - - return FALSE; - - ->>function rule_scroll -static void -GtkAdjustment *adj; -gpointer data; ->>description -A scrollbar has been moved. -So we have to set our current position and redraw. - ->>code - MelysRule *mrule = data; - GtkWidget *widget = data; - int val; - int xchanged = 0; - - if (adj == mrule->vcp->hadj) { - /* Need to do this to get a consistant scale */ - /* (Avoids the marking jiggling around as you scroll at low mag) */ - val = adj->value; - val = (val + mrule->vcp->hscale/2) / mrule->vcp->hscale; - val *= mrule->vcp->hscale; - if (val != mrule->hoffset) { - if (val >= 0) { - xchanged = 1; - mrule->hoffset = val; - } - } - } - - if (xchanged) - gtk_widget_queue_draw(widget); - - ->>function rule_button_press -static int -GtkWidget *widget; -GdkEventButton *event; - ->>code - MelysRule *mrule = MELYS_RULE(widget); - ticktime_t tick; - - switch (event->button) { - case 1: - if (event->state & GDK_SHIFT_MASK) { - tick = mrule->hoffset - + x_to_tick(mrule, (int) event->x - mrule->vcp->hbase); - gtk_adjustment_set_value(mrule->vcp->posadj, tick); - } - break; - } - - return FALSE; - - ->>function rule_motion -static int -GtkWidget *widget; -GdkEventMotion *event; - ->>code - MelysRule *mrule = MELYS_RULE(widget); - ticktime_t tick; - - if ((event->state & (GDK_BUTTON1_MASK|GDK_SHIFT_MASK)) - == (GDK_BUTTON1_MASK|GDK_SHIFT_MASK)) { - - tick = mrule->hoffset + x_to_tick(mrule, (int) event->x); -#ifdef notyet - gtk_adjustment_set_value(mrule->vcp->posadj, tick); -#endif - return TRUE; - } - - return FALSE; - ->>function rule_destroy -static void -GtkObject *obj; - ->>code - MelysRule *mrule = MELYS_RULE(obj); - - dprintf1("@func_name"); - if (mrule->vcp) - gtk_object_unref((GtkObject *) mrule->vcp); - if (mrule->tempomap) - md_free((struct element *) mrule->tempomap); - - if (mrule->pixmap) - gdk_pixmap_unref(mrule->pixmap); - diff -rNu melys-0.1.16/widgets/melysscale.m melys-0.1.17/widgets/melysscale.m --- melys-0.1.16/widgets/melysscale.m Mon Nov 29 01:22:23 1999 +++ melys-0.1.17/widgets/melysscale.m Thu Jan 1 01:00:00 1970 @@ -1,196 +0,0 @@ ->>name melysscale.m - A vertical scale with limited marks. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -This is intended for vertical scales of limited range. - ->>extern - ->>header libgnomeui/gnome-canvas.h ->>header libgnomeui/gnome-canvas-util.h ->>header libgnomeui/gnome-canvas-line.h ->>header libgnomeui/gnome-canvas-text.h ->>header viewcontrol.h ->>header melysscroll.h - ->>set nosignals ->>gtkobject melys_scale melys_scroll - ->>headerdef @header - -/* - * The MelysScale structure. Each instance of the class is - * allocated one of these structures. - */ -struct _MelysScale { - MelysScroll melys_scroll; - - int low; - int high; - int step; - - GSList *itemlist; -}; - -/* - * The MelysScaleClass structure. There is only one of these - * allocated for the class. - */ -struct _MelysScaleClass { - MelysScrollClass parent_class; - // XXX class definition here -}; - ->>extern - -#define MELYS_SCALE_WIDTH 40 - -/* The list of signal id's that are being added for MelysScale. */ -enum { - // XXX symbols for all signals here - LAST_SIGNAL -}; - -/* Argument numbers */ -enum { - ARG_0, - // XXX argument names go here -}; - - ->>function melys_scale_new -GtkWidget * -ViewControl *vcp; The control widget -int low; Low point of the range -int high; High point of the range -int step; Step size for markings. - ->>description -Create a new MelysScale object. ->>code - MelysScale *mscale = MELYS_SCALE(gtk_type_new(melys_scale_get_type())); - - g_return_val_if_fail(vcp, GTK_WIDGET(mscale)); - - mscale->low = low; - mscale->high = high; - mscale->step = step; - melys_scroll_set_control(MELYS_SCROLL(mscale), vcp, - VC_VERTICAL, MELYS_SCALE_WIDTH, 0); - - return GTK_WIDGET(mscale); - - ->>function melys_scale_init -static void -MelysScale *mscale; The MelysScale to init ->>description -Initialise the MelysScale. ->>code - - mscale->itemlist = NULL; - - ->>function melys_scale_class_init -static void -MelysScaleClass *klass; The class to initialise - ->>description -Initialize the class. - ->>code - GtkObjectClass *object_class; - MelysScrollClass *melys_scroll_class; - - object_class = (GtkObjectClass *)klass; - melys_scroll_class = (MelysScrollClass *)klass; - - parent_class = gtk_type_class(melys_scroll_get_type()); - - melys_scroll_class->scale_changed = scale_scale_changed; - - ->>function scale_scale_changed -static void -MelysScroll *mscroll; - ->>code - MelysScale *mscale; - GnomeCanvasGroup *rgroup; - GnomeCanvasItem *item; - GnomeCanvasPoints *points; - GSList *list; - int n; - - mscale = MELYS_SCALE(mscroll); - - if (mscale->itemlist == NULL) { - - for (n = mscale->low; n < mscale->high; n += mscale->step) { - char *str; - - rgroup = gnome_canvas_root(GNOME_CANVAS(mscroll)); - item = gnome_canvas_item_new(rgroup, - GNOME_TYPE_CANVAS_LINE, - "width_pixels", 1, - "fill_color_gdk", - >K_WIDGET(mscale)->style->fg[GTK_STATE_NORMAL], - NULL); - mscale->itemlist = g_slist_prepend(mscale->itemlist, item); - - str = g_strdup_printf("%d", mscale->high - n); - item = gnome_canvas_item_new(rgroup, - GNOME_TYPE_CANVAS_TEXT, - "text", str, - "anchor", GTK_ANCHOR_WEST, - "font_gdk", GTK_WIDGET(mscale)->style->font, - "fill_color_gdk", - >K_WIDGET(mscale)->style->fg[GTK_STATE_NORMAL], - NULL); - mscale->itemlist = g_slist_prepend(mscale->itemlist, item); - - g_free(str); - } - - mscale->itemlist = g_slist_reverse(mscale->itemlist); - } - - points = gnome_canvas_points_new(2); - - list = mscale->itemlist; - n = mscale->low; - while (list) { - item = list->data; - - /* The line mark is first */ - points->coords[0] = MELYS_SCALE_WIDTH - 5; /* x1 */ - points->coords[1] = view_control_thing_to_y(mscroll->vcp, n); - points->coords[2] = MELYS_SCALE_WIDTH; /* x2 */ - points->coords[3] = view_control_thing_to_y(mscroll->vcp, n); - gnome_canvas_item_set(item, - "points", points, - NULL); - - list = list->next; - g_assert(list); - item = list->data; - - gnome_canvas_item_set(item, - "x", (double) 4, - "y", (double) view_control_thing_to_y(mscroll->vcp, n), - NULL); - - list = list->next; - n += mscale->step; - } - - gnome_canvas_points_unref(points); diff -rNu melys-0.1.16/widgets/melysscroll.m melys-0.1.17/widgets/melysscroll.m --- melys-0.1.16/widgets/melysscroll.m Tue Jan 4 10:45:13 2000 +++ melys-0.1.17/widgets/melysscroll.m Thu Jan 1 01:00:00 1970 @@ -1,366 +0,0 @@ ->>name melysscroll.m - A scrolled scalable canvas area in one or two directions. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. ->>extern - ->>header gtk/gtksignal.h - ->>header libgnomeui/gnome-canvas.h - ->>header elements.h ->>header md.h ->>header viewcontrol.h - ->>gtkobject melys_scroll gnome_canvas - ->>headerdef @header - -/* - * The MelysScroll structure. Each instance of the class is - * allocated one of these structures. - */ -struct _MelysScroll { - GnomeCanvas gnome_canvas; - - ViewControl *vcp; /* Controls for this view */ - - /* Dimentions for if the widget does not scroll in one direction */ - int width; - int height; - - /* Previous offsets */ - int voffset; /* Previous veritcal offset */ - int hoffset; /* Previous horizontal offset */ - - /* Previous mouse positions */ - int mouse_thing; - int mouse_tick; - - int which; /* Whether vertical or horizontal (or both) */ -}; - -/* - * The MelysScrollClass structure. There is only one of these - * allocated for the class. - */ -struct _MelysScrollClass { - GnomeCanvasClass parent_class; - - /* A scale change */ - void (*scale_changed)(MelysScroll *); - - /* Mouse moved */ - void (*position_change)(MelysScroll *, int, int); -}; - - ->>extern - -/* The list of signal id's that are being added for MelysScroll. */ -enum { - SCALE_CHANGED, - POSITION_CHANGE, - LAST_SIGNAL -}; - -#define x_to_tick(ms, x) view_control_x_to_tick( \ - ms->vcp, x) -#define tick_to_x(ms, tick) view_control_tick_to_x( \ - ms->vcp, tick) -#define y_to_thing(ms, n) view_control_y_to_thing( \ - ms->vcp, n); - ->>function melys_scroll_new -GtkWidget * -ViewControl *vcp; The view control -int which; Which directions we scroll in -int width; Set if fixed width -int height; Set if fixed height - ->>description -Create a new MelysScroll object. - ->>code - MelysScroll *mscroll = MELYS_SCROLL(gtk_type_new(melys_scroll_get_type())); - - if (vcp) - melys_scroll_set_control(mscroll, vcp, which, width, height); - - return GTK_WIDGET(mscroll); - - ->>function melys_scroll_init -static void -MelysScroll *mscroll; The MelysScroll to init ->>description -Initialise the MelysScroll. ->>code - - gtk_signal_connect(GTK_OBJECT(mscroll), "event", - GTK_SIGNAL_FUNC(canvas_event), NULL); - - ->>function melys_scroll_class_init -static void -MelysScrollClass *klass; The class to initialise - ->>description -Initialize the class. - ->>code - GtkObjectClass *object_class; - GnomeCanvasClass *gnome_canvas_class; - - object_class = (GtkObjectClass *)klass; - gnome_canvas_class = (GnomeCanvasClass *)klass; - - parent_class = gtk_type_class(gnome_canvas_get_type()); - - melys_scroll_signals[SCALE_CHANGED] = gtk_signal_new("scale-changed", - GTK_RUN_FIRST, - object_class->type, - GTK_SIGNAL_OFFSET(MelysScrollClass, scale_changed), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0 - ); - melys_scroll_signals[POSITION_CHANGE] = gtk_signal_new("position-change", - GTK_RUN_FIRST, - object_class->type, - GTK_SIGNAL_OFFSET(MelysScrollClass, position_change), - gtk_marshal_NONE__INT_INT, - GTK_TYPE_NONE, 2, - GTK_TYPE_INT, - GTK_TYPE_INT - ); - - gtk_object_class_add_signals(object_class, melys_scroll_signals, - LAST_SIGNAL); - - object_class->destroy = scroll_destroy; - - klass->scale_changed = NULL; - klass->position_change = NULL; - - ->>function melys_scroll_set_control -void -MelysScroll *mscroll; -ViewControl *vcp; The view control to set -int which; Horizontal/Vertical -int width; Width if fixed -int height; Height if fixed - ->>description -Set the controls for this view. - ->>code - - - mscroll->which = which; - mscroll->width = width; - mscroll->height = height; - - gtk_widget_set_usize(GTK_WIDGET(mscroll), width, height); - - if (vcp) { - if (mscroll->vcp) - gtk_object_unref((GtkObject *) mscroll->vcp); - mscroll->vcp = vcp; - gtk_object_ref((GtkObject *) vcp); - - gtk_signal_connect_after(GTK_OBJECT(vcp), "scale-changed", - vcp_scale_changed, mscroll); - - if (which & VC_HORIZONTAL) { - gtk_signal_connect((GtkObject *)vcp->hadj, "value-changed", - GTK_SIGNAL_FUNC(scroll_scroll), mscroll); - gtk_signal_connect((GtkObject *)vcp->hadj, "changed", - GTK_SIGNAL_FUNC(vcp_adj_changed), mscroll); - } - if (which & VC_VERTICAL) { - gtk_signal_connect((GtkObject *)vcp->vadj, "value-changed", - GTK_SIGNAL_FUNC(scroll_scroll), mscroll); - gtk_signal_connect((GtkObject *)vcp->vadj, "changed", - GTK_SIGNAL_FUNC(vcp_adj_changed), mscroll); - } - - vcp_scale_changed(vcp, mscroll); - } - - ->>function scroll_destroy -static void -GtkObject *obj; - ->>code - MelysScroll *mscroll = MELYS_SCROLL(obj); - - if (mscroll->vcp) { - gtk_object_unref(GTK_OBJECT(mscroll->vcp)); - mscroll->vcp = NULL; - } - - if (GTK_OBJECT_CLASS(parent_class)->destroy) - (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); - - ->>function scroll_scroll -static void -GtkAdjustment *adj; -gpointer data; - ->>code - MelysScroll *mscroll = data; - GnomeCanvas *canvas; - gboolean xchanged = FALSE; - gboolean ychanged = FALSE; - - if (adj == mscroll->vcp->hadj) { - if ((int)adj->value != mscroll->hoffset) { - xchanged = 1; - mscroll->hoffset = (int)adj->value; - } - } - if (adj == mscroll->vcp->vadj) { - if ((int)adj->value != mscroll->voffset) { - ychanged = 1; - mscroll->voffset = (int)adj->value; - } - } - - if (xchanged || ychanged) { - canvas = GNOME_CANVAS(mscroll); - gnome_canvas_scroll_to(canvas, - tick_to_x(mscroll, mscroll->hoffset), - mscroll->voffset * mscroll->vcp->vscale); - } - - ->>function vcp_scale_changed -static void -ViewControl *vcp; This is the view control -gpointer data; Our own data - ->>description -The scale has changed. -Deal with setting the scroll region and re-emit -as our own scale_changed signal. - ->>code - MelysScroll *mscroll = data; - - /* It looks better to do them in this order */ - gtk_signal_emit(GTK_OBJECT(mscroll), melys_scroll_signals[SCALE_CHANGED]); - scroll_set_region(mscroll); - - ->>function vcp_adj_changed -static void -GtkAdjustment *adj; -gpointer data; This is our mscroll - ->>code - scroll_set_region(MELYS_SCROLL(data)); - - ->>function scroll_set_region -static void -MelysScroll *mscroll; - ->>description -You need to set the scroll region when the scaling changes or -the adjustment range changes. - ->>code - ViewControl *vcp = mscroll->vcp; - int width; - int height; - - if (mscroll->which & VC_HORIZONTAL) - width = tick_to_x(mscroll, vcp->hadj->upper); - else - width = mscroll->width; - if (mscroll->which & VC_VERTICAL) - height = (1+vcp->vadj->upper) * vcp->vscale; - else - height = mscroll->height; - - if (height < GTK_WIDGET(mscroll)->allocation.height) - height = GTK_WIDGET(mscroll)->allocation.height; - - gnome_canvas_set_scroll_region(GNOME_CANVAS(mscroll), - -mscroll->vcp->hbase, 0.0, - width, height); - - mscroll->voffset = -1; - scroll_scroll(vcp->vadj, mscroll); - mscroll->hoffset = -1; - scroll_scroll(vcp->hadj, mscroll); - ->>function canvas_event -static int -GtkWidget *w; The scroll -GdkEvent *event; The event -gpointer data; Not used - ->>description -An event on the canvas. -Events appear to come here first, must return false to -allow the items to see them. - ->>code - MelysScroll *mscroll = MELYS_SCROLL(w); - ticktime_t tick; - int thing; - double dx, dy; - int x, y; - - gnome_canvas_window_to_world(GNOME_CANVAS(mscroll), - (double) event->motion.x, event->motion.y, - &dx, &dy); - - x = dx; y = dy; - - switch (event->type) { - case GDK_ENTER_NOTIFY: - if (!GTK_WIDGET_HAS_FOCUS(mscroll)) - gtk_widget_grab_focus(GTK_WIDGET(mscroll)); - break; - - case GDK_LEAVE_NOTIFY: - x = -1; y = -1; - goto sendnone; - - case GDK_MOTION_NOTIFY: - sendnone: - tick = thing = -1; - if (mscroll->which & VC_HORIZONTAL) - tick = (x<0)? -1: x_to_tick(mscroll, x); - if (mscroll->which & VC_VERTICAL) - thing = (y<0)? -1: y_to_thing(mscroll, y); - if (tick != mscroll->mouse_tick || thing != mscroll->mouse_thing) { - mscroll->mouse_tick = tick; - mscroll->mouse_thing = thing; - gtk_signal_emit(GTK_OBJECT(mscroll), - melys_scroll_signals[POSITION_CHANGE], tick, thing); - } - break; - - //case GDK_KEY_PRESS: - // return key_press(mscroll, NULL, &event->key); - - default: - break; - } - - return FALSE; - diff -rNu melys-0.1.16/widgets/melyssig.m melys-0.1.17/widgets/melyssig.m --- melys-0.1.16/widgets/melyssig.m Thu Jan 6 16:43:33 2000 +++ melys-0.1.17/widgets/melyssig.m Thu Jan 1 01:00:00 1970 @@ -1,299 +0,0 @@ ->>name melyssig.m - Base for time and key signature widgets - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. ->>extern - ->>header libgnomeui/gnome-canvas.h ->>header libgnomeui/gnome-canvas-text.h ->>header libgnomeui/gnome-canvas-rect-ellipse.h - ->>header elements.h ->>header md.h ->>header viewcontrol.h ->>header melysscroll.h ->>header melwidgets.h - ->>set nosignals ->>gtkobject melys_sig melys_scroll - ->>headerdef @header - -/* - * Extra display info for the items. - */ -struct edisplay_info { - struct display_info std; - GtkObject *rect; - GtkObject *text; -}; - -/* - * The MelysSig structure. Each instance of the class is - * allocated one of these structures. - */ -struct _MelysSig { - MelysScroll melys_scroll; - - struct tempomapElement *tmap; - char *infostr; - - int type; /* timesig or keysig */ -}; - -/* - * The MelysSigClass structure. There is only one of these - * allocated for the class. - */ -struct _MelysSigClass { - MelysScrollClass parent_class; - - /* Class methods to do the actual work */ - void (*update_item)(MelysSig *, struct edisplay_info *einfo, - struct tempomapElement *tmap, - struct mapElement *map1, struct mapElement *map2, - gboolean force); -}; - - - ->>extern - -static int nextinfo; - -#define SIG_CLASS(ms) ( MELYS_SIG_CLASS(GTK_OBJECT(ms)->klass) ) - ->>function melys_sig_init -static void -MelysSig *msig; The MelysSig to init ->>description -Initialise the MelysSig. ->>code - - msig->tmap = NULL; - msig->infostr = g_strdup_printf("%d-siginfo", nextinfo++); - - ->>function melys_sig_class_init -static void -MelysSigClass *klass; The class to initialise - ->>description -Initialize the class. - ->>code - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - MelysScrollClass *melys_scroll_class; - - object_class = (GtkObjectClass *)klass; - widget_class = (GtkWidgetClass *)klass; - melys_scroll_class = (MelysScrollClass *)klass; - - parent_class = gtk_type_class(melys_scroll_get_type()); - - object_class->destroy = sig_destroy; - - widget_class->draw = sig_draw; - - melys_scroll_class->scale_changed = sig_scale_changed; - - klass->update_item = NULL; - - ->>function melys_sig_set_map -void -MelysSig *msig; -struct tempomapElement *tmap; - ->>code - msig->tmap = tmap; - MD_REF(tmap); - - ->>function sig_destroy -static void -GtkObject *obj; ->>code - MelysSig *msig; - - msig = MELYS_SIG(obj); - if (msig->tmap) - MD_UNREF(msig->tmap); - - g_free(msig->infostr); - - GTK_OBJECT_CLASS(parent_class)->destroy(obj); - - ->>function sig_scale_changed -static void -MelysScroll *mscroll; - ->>code - - if (MELYS_SCROLL_CLASS(parent_class)->scale_changed) - MELYS_SCROLL_CLASS(parent_class)->scale_changed(mscroll); - - sig_common_draw(MELYS_SIG(mscroll), TRUE); - - ->>function sig_draw -static void -GtkWidget *w; -GdkRectangle *area; - ->>code - MelysSig *msig = MELYS_SIG(w); - - sig_common_draw(msig, TRUE); - - GTK_WIDGET_CLASS(parent_class)->draw(w, area); - - ->>function sig_common_draw -static void -MelysSig *msig; -int force; - ->>code - struct tempomapElement *tmap; - struct element *el; - struct mapElement *map1; - struct mapElement *map2; - struct edisplay_info *einfo; - GList *list; - int n; - - tmap = msig->tmap; - - if (tmap == NULL) - return; - - /* - * Go through and build a list of the relavent tempomap items. - * The display info is created if it does not exist. - */ - list = NULL; - for (n = 0; n < MD_CONTAINER_LEN(tmap); n++) { - el = MD_GET_INDEX(tmap, n); - - if (MD_TYPE(el) == msig->type) { - if (update_sig(msig, tmap, MD_MAP(el), force)) - list = g_list_append(list, el); - } - } - - /* - * Now step through the list and pass up to the class update routine. - * We pass the next item because that is needed to know the - * duration of the current item. - */ - while (list) { - map1 = MD_MAP(list->data); - if (list->next) - map2 = MD_MAP(list->next->data); - else - map2 = NULL; - einfo = g_dataset_get_data(map1, msig->infostr); - SIG_CLASS(msig)->update_item(msig, einfo, tmap, map1, map2, force); - list = list->next; - } - g_list_free(list); - - ->>function update_sig -static gboolean -MelysSig *msig; -struct tempomapElement *tmap; -struct mapElement *map; -int force; - ->>code - struct edisplay_info *einfo; - int state; - - if (MD_IS_DESTROYED(tmap) || MD_IS_DESTROYED(map)) - return FALSE; - - if (!force && !MD_MODIFIED(tmap) && !MD_MODIFIED(map)) - return FALSE; - - if (GTK_OBJECT_DESTROYED(msig)) - return FALSE; - - if (MD_SELECTED(map)) - state = GTK_STATE_SELECTED; - else - state = GTK_STATE_NORMAL; - - einfo = g_dataset_get_data(map, msig->infostr); - if (einfo == NULL) { - GnomeCanvasGroup *rgroup; - GnomeCanvasGroup *group; - - einfo = g_new(struct edisplay_info, 1); - - einfo->std.con = MD_CONTAINER(tmap); - MD_WREF(tmap); - - einfo->std.elem = MD_ELEMENT(map); - MD_WREF(map); - - rgroup = gnome_canvas_root((GnomeCanvas *)msig); - - group = (GnomeCanvasGroup *)gnome_canvas_item_new(rgroup, - GNOME_TYPE_CANVAS_GROUP, - NULL); - gtk_object_ref((GtkObject *)group); - einfo->std.item = GTK_OBJECT(group); - - einfo->rect = (GtkObject *)gnome_canvas_item_new(group, - GNOME_TYPE_CANVAS_RECT, - "x1", (double) 0, - "y1", (double) 1, - "x2", (double) 0, - "y2", (double) MELYS_SCROLL(msig)->vcp->vtitle-1, - "fill_color_gdk", - >K_WIDGET(msig)->style->base[GTK_STATE_NORMAL], - "width_pixels", 1, - "outline_color", "black", - NULL); - gtk_object_ref(einfo->rect); - - einfo->text = (GtkObject *)gnome_canvas_item_new(group, - GNOME_TYPE_CANVAS_TEXT, - "x", (double) 2, - "y", (double) 2, - "text", "", - "anchor", GTK_ANCHOR_NORTH_WEST, - "font_gdk", GTK_WIDGET(msig)->style->font, - "fill_color_gdk", - >K_WIDGET(msig)->style->fg[GTK_STATE_NORMAL], - NULL); - gtk_object_ref(einfo->text); - - g_dataset_set_data_full(map, msig->infostr, einfo, einfo_free); - } - - return TRUE; - - ->>function einfo_free -static void -gpointer data; - ->>code - struct edisplay_info *einfo = data; - - gtk_object_unref(einfo->rect); - gtk_object_unref(einfo->text); - display_info_free((struct display_info *)einfo); diff -rNu melys-0.1.16/widgets/melystempo.c melys-0.1.17/widgets/melystempo.c --- melys-0.1.16/widgets/melystempo.c Fri Jan 7 11:13:56 2000 +++ melys-0.1.17/widgets/melystempo.c Wed Feb 9 21:03:41 2000 @@ -50,16 +50,9 @@ /* The list of signal id's that are being added for MelysTempo. */ enum { - // XXX symbols for all signals here LAST_SIGNAL }; -/* Argument numbers */ -enum { - ARG_0, - // XXX argument names go here -}; - /* * scale conversions @@ -244,10 +237,6 @@ melys_view_class = (MelysViewClass *)klass; parent_class = gtk_type_class(melys_view_get_type()); - - // XXX Add args - - // XXX Create signals gtk_object_class_add_signals(object_class, melys_tempo_signals, LAST_SIGNAL); diff -rNu melys-0.1.16/widgets/melystempo.m melys-0.1.17/widgets/melystempo.m --- melys-0.1.16/widgets/melystempo.m Thu Jan 6 16:45:04 2000 +++ melys-0.1.17/widgets/melystempo.m Thu Jan 1 01:00:00 1970 @@ -1,519 +0,0 @@ ->>name melystempo.m - Display for tempo, time-signature and key-signature. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header gtk/gtktable.h ->>header gtk/gtkvbox.h ->>header gtk/gtkhbox.h ->>header gtk/gtkframe.h ->>header gtk/gtksignal.h ->>header gtk/gtklabel.h - ->>header libgnomeui/gnome-canvas.h ->>header libgnomeui/gnome-canvas-util.h ->>header libgnomeui/gnome-canvas-line.h ->>header libgnomeui/gnome-canvas-rect-ellipse.h - ->>header melmsg.h ->>header elements.h ->>header md.h ->>header melwidgets.h ->>header viewcontrol.h ->>header melysscroll.h ->>header melysview.h ->>header melysscale.h ->># /* TEMP */ ->>header melysrule.h ->>header melyssig.h ->>header melystimesig.h ->>header melyskeysig.h ->>header song.h - ->>gtkobject melys_tempo melys_view - ->>headerdef @header - -/* - * The MelysTempo structure. Each instance of the class is - * allocated one of these structures. - */ -struct _MelysTempo { - MelysView melys_view; - - GtkObject *lines; /* The lines connecting the changes */ - GtkWidget *tsig; /* Time signature widget */ - GtkWidget *ksig; /* Key signature widget */ -}; - -/* - * The MelysTempoClass structure. There is only one of these - * allocated for the class. - */ -struct _MelysTempoClass { - MelysViewClass parent_class; - // XXX class definition here -}; - ->>extern - -/* The list of signal id's that are being added for MelysTempo. */ -enum { - // XXX symbols for all signals here - LAST_SIGNAL -}; - -/* Argument numbers */ -enum { - ARG_0, - // XXX argument names go here -}; - ->>extern - -/* - * scale conversions - */ -#define MAX_BPM 1000 -#define thing_to_bpm(n) (MAX_BPM - (n)) -#define bpm_to_thing(b) (MAX_BPM - (b)) -#define thing_to_tempo(n) (MD_BPM_TO_TEMPO(thing_to_bpm(n))) -#define tempo_to_thing(tempo) (bpm_to_thing(MD_TEMPO_TO_BPM(tempo)) ) -#define tick_to_x(tp, t) view_control_tick_to_x( \ - MELYS_VIEW(tp)->vcp, t) -#define tempo_to_y(tp, ut) view_control_thing_to_y( \ - MELYS_VIEW(tp)->vcp, MAX_BPM - MD_TEMPO_TO_BPM(ut)) - - ->>function melys_tempo_new -GtkWidget * -struct tempomapElement *tmap; - ->>description -Create a new MelysTempo object. ->>code - GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_tempo_get_type())); - MelysTempo *mtempo = MELYS_TEMPO(w); - MelysView *mview = MELYS_VIEW(w); - - mview->viewcon = MD_CONTAINER(tmap); - MD_REF(tmap); - - melys_sig_set_map(MELYS_SIG(mtempo->tsig), tmap); - melys_sig_set_map(MELYS_SIG(mtempo->ksig), tmap); - - return w; - - ->>function melys_tempo_init -static void -MelysTempo *mtempo; The MelysTempo to init ->>description -Initialise the MelysTempo. ->>code - MelysView *mview = MELYS_VIEW(mtempo); - GtkWidget *mscale; - GtkTable *tab; - GtkBox *vbox; - GtkBox *vbox2; - GtkBox *hbox; - GtkWidget *invis; - GtkWidget *frame1; - GtkWidget *frame2; - GtkWidget *tsig; - GtkWidget *ksig; - - mview->type = MD_TYPE_TEMPO; - - tsig = melys_timesig_new(mview->vcp); - mtempo->tsig = tsig; - ksig = melys_keysig_new(mview->vcp); - mtempo->ksig = ksig; - - mview->vcp->vspace = 0; /* No separation between items on scale */ - mview->vcp->hbase = 5; - - view_control_set_vertical(mview->vcp, 1); - view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE * 2); - view_control_set_limits(mview->vcp, 1, 0, 1, 0); - - tab = (GtkTable *)gtk_table_new(2, 2, FALSE); - gtk_box_pack_start(GTK_BOX(mtempo), GTK_WIDGET(tab), 1, 1, 0); - - /* vert scrollbar group */ - gtk_table_attach(tab, mview->vcp->vsb, 1, 2, 0, 1, - 0, - GTK_FILL|GTK_SHRINK|GTK_EXPAND, - 0, 0 - ); - gtk_table_attach(tab, mview->vcp->hsb, 0, 1, 1, 2, - GTK_FILL|GTK_SHRINK|GTK_EXPAND, - 0, - 0, 0 - ); - - vbox = (GtkBox *)gtk_vbox_new(0, 0); - frame1 = gtk_frame_new(NULL); - gtk_frame_set_shadow_type(GTK_FRAME(frame1), GTK_SHADOW_IN); - - gtk_box_pack_start(vbox, mview->ruler, 0, 0, 0); - gtk_box_pack_start(vbox, tsig, 0, 0, 0); - gtk_box_pack_start(vbox, ksig, 0, 0, 0); - gtk_box_pack_start(vbox, mview->canvas, 1, 1, 0); - - gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(vbox)); - - vbox2 = (GtkBox *)gtk_vbox_new(0, 0); - frame2 = gtk_frame_new(NULL); - gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_IN); - mscale = melys_scale_new(mview->vcp, 0, MAX_BPM, 40); - invis = gtk_label_new(""); - - /* Pack them into a box */ - gtk_container_add(GTK_CONTAINER(frame2), mscale); - gtk_box_pack_start(vbox2, invis, 0, 0, 0); - gtk_box_pack_start(vbox2, frame2, 1, 1, 0); - - hbox = (GtkBox *)gtk_hbox_new(0, 0); - gtk_box_pack_start(hbox, GTK_WIDGET(vbox2), 0, 0, 0); - gtk_box_pack_start(hbox, GTK_WIDGET(frame1), 1, 1, 0); - gtk_table_attach(tab, GTK_WIDGET(hbox), 0, 1, 0, 2, - GTK_SHRINK|GTK_EXPAND|GTK_FILL, - GTK_SHRINK|GTK_EXPAND|GTK_FILL, - 0, 0 - ); - - gtk_widget_set_usize(invis, 0, 3*mview->vcp->vtitle); - gtk_widget_set_usize(mview->ruler, 0, mview->vcp->vtitle); - mview->vthings = MAX_BPM; /* Allow up to this many bpm */ - - gtk_widget_show_all(GTK_WIDGET(tab)); - - ->>function melys_tempo_class_init -static void -MelysTempoClass *klass; The class to initialise - ->>description -Initialize the class. - ->>code - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - MelysViewClass *melys_view_class; - - object_class = (GtkObjectClass *)klass; - widget_class = (GtkWidgetClass *)klass; - melys_view_class = (MelysViewClass *)klass; - - parent_class = gtk_type_class(melys_view_get_type()); - - // XXX Add args - - // XXX Create signals - - gtk_object_class_add_signals(object_class, - melys_tempo_signals, LAST_SIGNAL); - - widget_class->draw = tempo_draw; - widget_class->realize = tempo_realize; - - melys_view_class->scale_changed = tempo_scale_changed; - melys_view_class->get_nthing = tempo_get_nthing; - melys_view_class->drop_elem = tempo_drop_elem; - melys_view_class->position_change = tempo_pos_change; - - ->>function tempo_realize -static void -GtkWidget *w; - ->>code - MelysTempo *mtempo = MELYS_TEMPO(w); - - if (GTK_WIDGET_CLASS(parent_class)->realize) - GTK_WIDGET_CLASS(parent_class)->realize(w); - - tempo_scale_changed(MELYS_VIEW(mtempo)); - ->>function tempo_draw -static void -GtkWidget *w; -GdkRectangle *area; - ->>code - - tempo_common_draw(MELYS_TEMPO(w), FALSE); - - GTK_WIDGET_CLASS(parent_class)->draw(w, area); - - ->>function tempo_common_draw -static void -MelysTempo *mtempo; -gboolean force; - ->>description -Draw the tempo elements within the tempomap. - ->>code - int n; - int ntempos; - int maxtempo; - int lasttempo; - int pnum; - struct element *el; - struct tempomapElement *tmap; - MelysView *mview; - GnomeCanvasPoints *points; - - mview = MELYS_VIEW(mtempo); - - tmap = (struct tempomapElement *)mview->viewcon; - g_return_if_fail(MD_TYPE(tmap) == MD_TYPE_TEMPOMAP); - - ntempos = 0; - - /* Make sure that duration is same as root - * NB: modified is NOT set */ - MD_CONTAINER(tmap)->duration = MD_DURATION(mview->song->mdroot); - - /* Ensure that the line is created */ - if (mtempo->lines == NULL) { - mtempo->lines = (GtkObject *)gnome_canvas_item_new( - gnome_canvas_root((GnomeCanvas*)mview->canvas), - GNOME_TYPE_CANVAS_LINE, - NULL); - } - - /* - * First set the litle marks that show where tempo changes - * occur. - */ - for (n = 0; n < MD_CONTAINER_LEN(tmap); n++) { - el = MD_GET_INDEX(tmap, n); - if (el->type == MD_TYPE_TEMPO) { - update_tempo(mtempo, MD_TEMPO(el), force); - ntempos++; - } - } - - /* - * Now draw the line that connects all the change points. - * You need two line points per change. - */ - points = gnome_canvas_points_new(2 * ntempos); - pnum = 0; - lasttempo = -1; - maxtempo = 0; - - for (n = 0; n < MD_CONTAINER_LEN(tmap); n++) { - el = MD_GET_INDEX(tmap, n); - if (el->type == MD_TYPE_TEMPO) { - if (lasttempo > 0) { - points->coords[pnum] = tick_to_x(mtempo, MD_TIME(el)); - points->coords[pnum+1] = tempo_to_y(mtempo, lasttempo); - pnum += 2; - } - - points->coords[pnum] = tick_to_x(mtempo, MD_TIME(el)); - points->coords[pnum+1] = tempo_to_y(mtempo, - MD_TEMPO(el)->micro_tempo); - pnum += 2; - - lasttempo = MD_TEMPO(el)->micro_tempo; - maxtempo = MAX(lasttempo, maxtempo); - } - } - - points->coords[pnum] = tick_to_x(mtempo, MD_ENDTIME(mview->song->mdroot)); - points->coords[pnum+1] = tempo_to_y(mtempo, lasttempo); - - gnome_canvas_item_set(GNOME_CANVAS_ITEM(mtempo->lines), - "points", points, - NULL); - - gnome_canvas_points_unref(points); - - if (maxtempo) { - GtkAdjustment *adj; - - /* - * If the slider is right at the top, then we try to adjust - * it so that all the changes are in view. - */ - adj = mview->vcp->vadj; - if (adj->value == 0) { - gtk_adjustment_clamp_page(adj, - (gfloat) bpm_to_thing(1), - (gfloat) tempo_to_thing(maxtempo)); - } - - /* It is essential to call this even when no change... */ - gtk_adjustment_value_changed(adj); - } - ->>function update_tempo -static void -MelysTempo *mtempo; -struct tempoElement *tempo; -gboolean force; - ->>description -Create the canvas item for this tempo element or update its -position on a scale change. - ->>code - MelysView *mview; - GnomeCanvasItem *item; - struct display_info *dinfo; - struct tempomapElement *tmap; - int state; - - mview = MELYS_VIEW(mtempo); - - /* If elements are destroyed then we can't touch them */ - if (MD_IS_DESTROYED(tempo) || MD_IS_DESTROYED(mview->viewcon)) - return; - - /* If the element is not modified then there is no need to do anything */ - if (!force && !MD_MODIFIED(mview->viewcon) && !MD_MODIFIED(tempo)) - return; - - if (GTK_OBJECT_DESTROYED(mtempo)) - return; - - tmap = MD_TEMPOMAP(mview->viewcon); - - /* See if this note is selected or not */ - if (MD_SELECTED(tempo)) - state = GTK_STATE_SELECTED; - else - state = GTK_STATE_NORMAL; - - dinfo = g_dataset_get_data(tempo, mview->infostr); - if (dinfo == NULL) { - GnomeCanvasGroup *rgroup; - - rgroup = gnome_canvas_root((GnomeCanvas*)mview->canvas); - - /* - * A diamond shape would be cool, but we will draw a little - * box for now. - * Or a circle?? - */ - item = gnome_canvas_item_new(rgroup, - GNOME_TYPE_CANVAS_RECT, - "x1", (double) -4.0, - "y1", (double) -4.0, - "x2", (double) 4.0, - "y2", (double) 4.0, - "width_pixels", 1, - "outline_color", "black", - NULL); - - dinfo = g_new(struct display_info, 1); - gtk_object_ref((GtkObject *) item); - dinfo->item = (GtkObject *)item; - - MD_WREF(tempo); - dinfo->elem = MD_ELEMENT(tempo); - - MD_WREF(tmap); - dinfo->con = MD_CONTAINER(tmap); - - g_dataset_set_data_full(tempo, mview->infostr, - dinfo, display_info_free); - gtk_object_set_data(GTK_OBJECT(item), mview->infostr, dinfo); - - gtk_signal_connect(GTK_OBJECT(item), "event", - GTK_SIGNAL_FUNC(melys_view_item_event), mtempo); - - } - - g_assert(dinfo != NULL); - item = GNOME_CANVAS_ITEM(dinfo->item); - - canvas_item_move_abs(item, tick_to_x(mtempo, MD_TIME(tempo)), - tempo_to_y(mtempo, tempo->micro_tempo)); - - gnome_canvas_item_set(item, - "fill_color_gdk", >K_WIDGET(mtempo)->style->light[state], - NULL); - ->>function tempo_scale_changed -static void -MelysView *mview; - ->>description -There is nothing to draw on the canvas, we just make sure that -the items are configured correctly and let the canvas -draw them. - ->>code - - g_return_if_fail(mview->viewcon); - - if (MELYS_VIEW_CLASS(parent_class)->scale_changed) - MELYS_VIEW_CLASS(parent_class)->scale_changed(mview); - - tempo_common_draw(MELYS_TEMPO(mview), TRUE); - - ->>function tempo_get_nthing -static int -MelysView *mview; -struct element *el; - ->>code - - /* Return the value in bpm */ - /* Mmmm... should be a double? */ - return tempo_to_thing(MD_TEMPO(el)->micro_tempo); - - ->>function tempo_drop_elem -static gboolean -MelysView *mview; -struct element *elem; -int nthing; - ->>description -Deal with dropping an element on to us. - ->>code - - if (MD_TYPE(elem) != MD_TYPE_TEMPO) - return FALSE; - - MD_TEMPO(elem)->micro_tempo = thing_to_tempo(nthing); - md_add_sort(mview->viewcon, elem); - - return TRUE; - ->>function tempo_pos_change -static void -MelysView *mview; -int tick; -int thing; - ->>code - char *msg; - struct mbt mbt; - - if (tick < 0) - return; - md_tick_to_mbt(mview->tempomap, tick, &mbt); - msg = g_strdup_printf(_("Tempo: %3d Time: %3d:%02d:%03d"), - thing_to_bpm(thing), mbt.bars+1, mbt.beats+1, mbt.ticks); - mel_status_msg(mview->song, msg); - - g_free(msg); diff -rNu melys-0.1.16/widgets/melystimesig.m melys-0.1.17/widgets/melystimesig.m --- melys-0.1.16/widgets/melystimesig.m Thu Dec 2 17:19:52 1999 +++ melys-0.1.17/widgets/melystimesig.m Thu Jan 1 01:00:00 1970 @@ -1,138 +0,0 @@ ->>name melystimesig.m - Time signature widget - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. ->>extern - ->>header libgnomeui/gnome-canvas.h - ->>header elements.h ->>header md.h ->>header melwidgets.h ->>header viewcontrol.h ->>header melysscroll.h ->>header melyssig.h - ->>set nosignals ->>gtkobject melys_timesig melys_sig - ->>headerdef @header - -/* - * The MelysTimesig structure. Each instance of the class is - * allocated one of these structures. - */ -struct _MelysTimesig { - MelysSig melys_sig; -}; - -/* - * The MelysTimesigClass structure. There is only one of these - * allocated for the class. - */ -struct _MelysTimesigClass { - MelysSigClass parent_class; - -}; - ->>extern - -#define tick_to_x(ms, tick) ( view_control_tick_to_x( \ - MELYS_SCROLL(ms)->vcp, (tick)) ) - - ->>function melys_timesig_new -GtkWidget * -ViewControl *vcp; ->>description -Create a new MelysTimesig object. ->>code - MelysTimesig *mtsig = MELYS_TIMESIG(gtk_type_new(melys_timesig_get_type())); - - melys_scroll_set_control(MELYS_SCROLL(mtsig), vcp, - VC_HORIZONTAL, 0, vcp->vtitle); - - return GTK_WIDGET(mtsig); - - ->>function melys_timesig_init -static void -MelysTimesig *mtsig; The MelysTimesig to init ->>description -Initialise the MelysTimesig. ->>code - - MELYS_SIG(mtsig)->type = MD_TYPE_TIMESIG; - ->>function melys_timesig_class_init -static void -MelysTimesigClass *klass; The class to initialise - ->>description -Initialize the class. - ->>code - MelysSigClass *melys_sig_class; - - parent_class = gtk_type_class(melys_sig_get_type()); - - melys_sig_class = (MelysSigClass *)klass; - melys_sig_class->update_item = tsig_update_item; - - ->>function tsig_update_item -static void -MelysSig *msig; -struct edisplay_info *einfo; -struct tempomapElement *tmap; -struct mapElement *map1; -struct mapElement *map2; -gboolean force; - ->>code - struct timesigElement *ts1 = MD_TIMESIG(map1); - struct timesigElement *ts2 = MD_TIMESIG(map2); - char *str; - ticktime_t end; - int state; - - if (MD_SELECTED(ts1)) - state = GTK_STATE_SELECTED; - else - state = GTK_STATE_NORMAL; - - /* Get the end time which is either the start of the next change - * or the end of the song. - */ - if (ts2) - end = MD_TIME(ts2); - else - end = MD_ENDTIME(tmap); - - /* - * We know that the common routine created any needed einfo - * for us. - */ - g_return_if_fail(einfo); - - canvas_item_move_abs(GNOME_CANVAS_ITEM(einfo->std.item), - tick_to_x(msig, MD_TIME(ts1)), 0); - - str = g_strdup_printf("%d/%d", ts1->top, ts1->bottom); - gnome_canvas_item_set(GNOME_CANVAS_ITEM(einfo->text), - "text", str, - "fill_color_gdk", >K_WIDGET(msig)->style->fg[state], - NULL); - g_free(str); - - gnome_canvas_item_set(GNOME_CANVAS_ITEM(einfo->rect), - "x2", (double) tick_to_x(msig, end), - NULL); diff -rNu melys-0.1.16/widgets/melystrack.m melys-0.1.17/widgets/melystrack.m --- melys-0.1.16/widgets/melystrack.m Mon Nov 29 15:31:55 1999 +++ melys-0.1.17/widgets/melystrack.m Thu Jan 1 01:00:00 1970 @@ -1,299 +0,0 @@ ->>name melystrack.m - Track view widget - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. ->>extern -/* - * This is the main track view widget. This is the main view of the - * file and it should be the first created and the last destroyed. - * This widget uses the widgets MelysTrackInfo and MelysTrackDisplay - * which do most of the real work. - */ - ->>header gtk/gtk.h ->>header song.h ->>header elements.h ->>header pixmaps.h ->>header md.h ->>header melgui.h - ->>header libgnomeui/gnome-canvas.h ->>header libgnomeui/gnome-pixmap.h - ->>header viewcontrol.h ->>header melysscroll.h ->>header melysview.h ->>header melystrackinfo.h ->>header melystrackdisplay.h ->>header melwidgets.h - ->># Base on a vertical packing box. ->># This allows stuff to be put along the top. ->>gtkobject melys_track MelysTrack gtk_vbox GtkVBox - ->>headerdef @header - -struct _MelysTrack { - GtkVBox vbox; - - struct _ViewControl *vcp; /* H & V adjustment controls */ - GtkAdjustment *posadj; /* Song position adjustment */ - - struct _MelysTrackInfo *info; - struct _MelysTrackDisplay *display; - - struct rootElement *mdroot; - struct song *song; - -}; - - -struct _MelysTrackClass { - GtkVBoxClass parent_class; -}; - -/* - * Definitions that are shared between the two panes - */ -#define TRACK_DEF_HEIGHT 16 /* Default track height */ -#define TRACK_SEPARATION 2 /* Track separation */ - - ->>extern -enum { - LAST_SIGNAL -}; - ->>function melys_track_new -GtkWidget * -struct rootElement *root; Root for view - ->>description -Create a new MelysTrack object. ->>code - GtkWidget *mtrack = GTK_WIDGET(gtk_type_new(melys_track_get_type())); - - melys_track_set_md_root((MelysTrack *)mtrack, root); - - return mtrack; - - ->>function melys_track_init -static void -MelysTrack *mtrack; The MelysTrack to init ->>description -Initialise the MelysTrack. ->>code - GtkHPaned *hpan; - GtkTable *tab; - MelysTrackInfo *info; - MelysTrackDisplay *disp; - GtkWidget *frame1; - GtkWidget *frame2; - ViewControl *vcp; - - tab = (GtkTable*)gtk_table_new(4, 4, FALSE); - - gtk_container_add(GTK_CONTAINER(mtrack), GTK_WIDGET(tab)); - - disp = (MelysTrackDisplay*)melys_track_display_new(); - - vcp = (ViewControl *)MELYS_VIEW(disp)->vcp; - view_control_set_vertical(vcp, TRACK_DEF_HEIGHT + TRACK_SEPARATION); - view_control_set_limits(vcp, 1, 0, 9, 0); - - info = (MelysTrackInfo*)melys_track_info_new(vcp); - - mtrack->vcp = vcp; - gtk_object_ref((GtkObject*)vcp); - - gtk_signal_connect(GTK_OBJECT(vcp), "scale-changed", zoom, mtrack); - - frame1 = gtk_frame_new(NULL); - frame2 = gtk_frame_new(NULL); - gtk_frame_set_shadow_type(GTK_FRAME(frame1), GTK_SHADOW_IN); - gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_IN); - - gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(info)); - gtk_container_add(GTK_CONTAINER(frame2), GTK_WIDGET(disp)); - - gtk_widget_show_all((GtkWidget *)frame1); - gtk_widget_show_all((GtkWidget *)frame2); - - hpan = (GtkHPaned*)gtk_hpaned_new(); - gtk_paned_add1(GTK_PANED(hpan), GTK_WIDGET(frame1)); - gtk_paned_add2(GTK_PANED(hpan), GTK_WIDGET(frame2)); - - - gtk_table_attach(tab, GTK_WIDGET(hpan), 0, 1, 0, 1, - GTK_FILL|GTK_SHRINK|GTK_EXPAND, - GTK_FILL|GTK_SHRINK|GTK_EXPAND, - 0, 0 - ); - - gtk_table_attach(tab, GTK_WIDGET(vcp->vsb), 1, 2, 0, 1, - 0, - GTK_FILL|GTK_SHRINK|GTK_EXPAND, - 0, 0 - ); - gtk_table_attach(tab, GTK_WIDGET(vcp->hsb), 0, 1, 1, 2, - GTK_FILL|GTK_SHRINK|GTK_EXPAND, - 0, - 0, 0 - ); - - gtk_widget_show(GTK_WIDGET(hpan)); - gtk_widget_show(GTK_WIDGET(tab)); - - mtrack->info = info; - mtrack->display = disp; - - - ->>function melys_track_class_init -static void -MelysTrackClass *klass; The class to initialise - ->>description -Initialize the class. - ->>code - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - MelysTrackClass *mtrack_class; - - object_class = (GtkObjectClass *)klass; - widget_class = (GtkWidgetClass *)klass; - mtrack_class = (MelysTrackClass *)klass; - - parent_class = gtk_type_class(gtk_vbox_get_type()); - - gtk_object_class_add_signals(object_class, melys_track_signals, LAST_SIGNAL); - - object_class->destroy = destroy; - - widget_class->draw = track_draw; - - ->>function melys_track_set_md_root -static void -MelysTrack *mtrack; -struct rootElement *root; - ->>description -Set the root for this track view. - ->>code - - dprintf(3, "@func_name: Setting mdroot %p", root); - if (root == NULL) - return; - - mtrack->mdroot = md_root_inc_ref(root); - - /* - * Reset the adjustments. We do not control the horizontal - * adjustment. That is handled by trackdisplay. - */ - MELYS_VIEW(mtrack->display)->vthings = root->tracks; - //view_control_set_range(mtrack->vcp, VC_VERTICAL, 0.0, root->tracks); - //gtk_adjustment_set_value(mtrack->vcp->vadj, 0.0); - - melys_track_info_set_md_root(mtrack->info, root); - melys_track_display_set_md_root(mtrack->display, root); - - ->>function melys_track_set_song -void -MelysTrack *mtrack; -struct song *song; - ->>code - - mtrack->song = song; - - g_assert(song->posadj); - mtrack->posadj = song->posadj; - gtk_object_ref((GtkObject *)mtrack->posadj); - - melys_track_set_md_root(mtrack, song->mdroot); - mtrack->info->song = song; - melys_view_set_song(MELYS_VIEW(mtrack->display), song); - - ->>function track_draw -static void -GtkWidget *w; -GdkRectangle *area; - ->>description -This is called when a track is added or removed or some -other change is made to the song. -Everything is re-calculated and redrawn. -Emit a signal to allow all other views to also be redrawn. - ->>code - MelysTrack *mtrack = (MelysTrack *) w; - - /* Re-set the vertical scrollbar limits */ - MELYS_VIEW(mtrack->display)->vthings = mtrack->mdroot->tracks; - view_control_set_range(mtrack->vcp, - VC_VERTICAL, 0.0, mtrack->mdroot->tracks); - - /* We do not own the horizontal scrollbar */ - - /* Set the song position adjustment */ - mtrack->posadj->lower = 0.0; - mtrack->posadj->upper = MD_ENDTIME(mtrack->mdroot); - - GTK_WIDGET_CLASS(parent_class)->draw(w, area); - /* No signal yet */ - - ->>function destroy -static void -GtkObject *object; The Melys track object to be destroyed ->>description -Destroy the MelysTrack and all its resourses. - ->>code - MelysTrack *mtrack; - - g_return_if_fail(object != NULL); - g_return_if_fail(IS_MELYS_TRACK(object)); - - mtrack = MELYS_TRACK(object); - - if (mtrack->mdroot) - md_free(MD_ELEMENT(mtrack->mdroot)); - - if (mtrack->vcp) { - gtk_object_unref(GTK_OBJECT(mtrack->vcp)); - mtrack->vcp = NULL; - } - if (mtrack->posadj) { - gtk_object_unref(GTK_OBJECT(mtrack->posadj)); - mtrack->posadj = NULL; - } - - if (GTK_OBJECT_CLASS(parent_class)->destroy) - (GTK_OBJECT_CLASS(parent_class)->destroy)(object); - - ->>function zoom -static void -GtkObject *obj; The view control -gpointer data; - ->>code - - gtk_widget_queue_draw(GTK_WIDGET(data)); - diff -rNu melys-0.1.16/widgets/melystrackdisplay.m melys-0.1.17/widgets/melystrackdisplay.m --- melys-0.1.16/widgets/melystrackdisplay.m Sun Dec 19 16:36:26 1999 +++ melys-0.1.17/widgets/melystrackdisplay.m Thu Jan 1 01:00:00 1970 @@ -1,751 +0,0 @@ ->>name melystrackdisplay.m - the track parts display - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -This is the part display section of the track view. -It will later be reworked to be based off the MelysView widget. - ->>extern - ->>header gdk_imlib.h ->>header gtk/gtkwidget.h ->>header gtk/gtkvbox.h ->>header gtk/gtksignal.h ->>header gtk/gtkdrawingarea.h ->>header gtk/gtkdnd.h - ->>header gdk/gdkkeysyms.h - ->>header libgnomeui/gnome-app.h ->>header libgnomeui/gnome-app-helper.h ->>header libgnomeui/gnome-canvas.h ->>header libgnomeui/gnome-canvas-rect-ellipse.h ->>header libgnomeui/gnome-canvas-line.h ->>header libgnomeui/gnome-canvas-util.h ->>header libgnomeui/gnome-canvas-text.h ->>header libgnomeui/gnome-popup-menu.h - ->>header elements.h ->>header song.h ->>header md.h - ->>header viewcontrol.h ->>header melysscroll.h ->>header melysview.h ->>header melystrack.h ->>header melyspartitem.h ->>header melwidgets.h ->>header melysrule.h ->>header melgui.h ->>header melmsg.h ->>header meldnd.h - - ->>set nosignals ->>gtkobject melys_track_display melys_view - ->>headerdef @header - -#if 0 -/* Mouse click state */ -enum click_state { - CLICK_INACTIVE, - CLICK_BUTTON1_DOWN, - CLICK_BUTTON2_DOWN, - CLICK_BUTTON3_DOWN, - CLICK_DRAGGING, - CLICK_GESTURE, - - CLICK_ERROR -}; -#endif - -struct _MelysTrackDisplay { - MelysView melys_view; - -}; - -struct _MelysTrackDisplayClass { - MelysViewClass parent_class; -}; - ->>extern - -/* - * The different canvas items that go together to make - * up a part on the display. - */ -struct edisplay_info { - struct display_info normal; - - /* Our extra items, the group is in normal */ - GnomeCanvasItem *pitem; - GnomeCanvasItem *text; -}; - -#if 0 -/* Structure to keep selection info */ -struct sel_info { - struct partElement *part; - struct containerElement *con; -}; -#endif - -#if 0 -/* Drag and drop types */ -static const GtkTargetEntry targets[] = { - {MELYS_ELEM_ATOM_NAME, GTK_TARGET_SAME_APP, MELYS_ELEM_ATOM_ID}, -}; -#endif - -/* All the buttons that we deal with */ -//#define ALL_BUTTON_MASK (GDK_BUTTON1_MASK|GDK_BUTTON2_MASK|GDK_BUTTON3_MASK) - -//#define CONP struct containerElement * - -/* Defines to scale between x-coords and tick values */ -#define x_to_tick(mdisp, x) view_control_x_to_tick( \ - MELYS_VIEW(mdisp)->vcp, x) - -#define tick_to_x(mdisp, tick) view_control_tick_to_x( \ - MELYS_VIEW(mdisp)->vcp, tick) - -#define y_to_track(mdisp, y) view_control_y_to_thing( \ - MELYS_VIEW(mdisp)->vcp, y) - -#define track_to_y(mdisp, track) view_control_thing_to_y( \ - MELYS_VIEW(mdisp)->vcp, track) - ->>extern -a - -/* The menu for the display pane */ -static GnomeUIInfo displaymenu[] = { - {GNOME_APP_UI_ITEM, N_("_Slice"), N_("Slice the part into two"), - slice_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ - 0, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - - {GNOME_APP_UI_ITEM, N_("_Join"), N_("Join this part and the next"), - join_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ - 0, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - - {GNOME_APP_UI_ITEM, N_("Delete"), N_("Delete this part"), - delete_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ - 0, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - - GNOMEUIINFO_SEPARATOR, - - {GNOME_APP_UI_ITEM, N_("Piano roll view"), - N_("Open a piano roll view for this part"), - piano_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ - 0, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - - GNOMEUIINFO_SEPARATOR, - - {GNOME_APP_UI_ITEM, N_("Properties..."), N_("Part property box"), - part_prop_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ - 0, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - GNOMEUIINFO_END -}; - ->>function melys_track_display_new -GtkWidget * - ->>description -Create a new MelysTrackDisplay object. - ->>code - GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_track_display_get_type())); - - return w; - - ->>function melys_track_display_init -static void -MelysTrackDisplay *mdisp; The MelysTrackDisplay to init ->>description -Initialise the MelysTrackDisplay. ->>code - MelysView *mview = MELYS_VIEW(mdisp); - GtkWidget *box; - - box = gtk_vbox_new(0, 0); - - mview->type = MD_TYPE_PART; - view_control_set_snap(mview->vcp, SNAP_1_4); - - /* Create the pop up menu */ - mview->menu = gnome_popup_menu_new(displaymenu); - - /* - * Build up the pane. The title row has a fixed height but - * expands to fill the horizontal space. The canvas expands - * to fill the rest of the space. - */ - gtk_box_pack_start(GTK_BOX(box), mview->ruler, 0, 0, 0); - gtk_box_pack_start(GTK_BOX(box), mview->canvas, 1, 1, 0); - gtk_box_pack_start(GTK_BOX(mdisp), box, 1, 1, 0); - - gtk_widget_set_usize(mview->ruler, 0, mview->vcp->vtitle); - gtk_widget_show_all(GTK_WIDGET(box)); - - ->>function melys_track_display_class_init -static void -MelysTrackDisplayClass *klass; The class to initialise - ->>description -Initialize the class. - ->>code - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - MelysViewClass *view_class; - - object_class = (GtkObjectClass *)klass; - widget_class = (GtkWidgetClass *)klass; - view_class = (MelysViewClass *)klass; - - parent_class = gtk_type_class(melys_view_get_type()); - - /* Set up all the overrides */ - //object_class->destroy = disp_destroy; - - //widget_class->size_allocate = disp_size_allocate; - widget_class->draw = display_draw; - - view_class->scale_changed = disp_scale_changed; - view_class->button1_double = disp_button1_double; - view_class->get_nthing = disp_get_nthing; - view_class->drop_elem = disp_drop_elem; - view_class->get_base_from_pos = disp_get_base; - view_class->position_change = disp_pos_change; - - ->>function melys_track_display_set_md_root -void -MelysTrackDisplay *mdisp; -struct rootElement *root; - ->>code - MELYS_VIEW(mdisp)->viewcon = MD_CONTAINER(root); - MELYS_VIEW(mdisp)->vthings = root->tracks; - - ->>function disp_scale_changed -static void -MelysView *mview; - ->>description -The scaling has changed. -Recalculate all sizes. - ->>code - - if (parent_class->scale_changed) - (*parent_class->scale_changed)(mview); - - disp_common_draw(MELYS_TRACK_DISPLAY(mview), TRUE); - - ->>function display_draw -static void -GtkWidget *widget; -GdkRectangle *area; - ->>code - - disp_common_draw(MELYS_TRACK_DISPLAY(widget), FALSE); - GTK_WIDGET_CLASS(parent_class)->draw(widget, area); - - ->>function disp_common_draw -static void -MelysTrackDisplay *mdisp; -int force; - ->>description -Look through all the parts and set up the part items for -each part. - ->>code - int n; - int p; - MelysView *mview = MELYS_VIEW(mdisp); - struct trackElement *track; - struct partElement *part; /* note that this could be part or partref */ - struct rootElement *root; - - set_hscroll(mdisp); - - root = MD_ROOT(mview->viewcon); - for (n = 0; n < root->tracks; n++) { - track = md_track_nth(root, n); - - for (p = 0; p < MD_CONTAINER_LEN(track); p++) { - part = (struct partElement *) MD_GET_INDEX(track, p); - - if (MD_IS_DESTROYED(part)) { - /* This should not be happening */ - dprintf(0, "@func_name: part is destroyed!\n"); - continue; - } - - switch (MD_TYPE(part)) { - case MD_TYPE_PART: - case MD_TYPE_PARTREF: - update_part_item(mdisp, track, part, force); - break; - default: - dprintf(0, "Unexpexted type %d in @func_name", MD_TYPE(part)); - break; - } - } - } - - - ->>function update_part_item -static void -MelysTrackDisplay *mdisp; -struct trackElement *track; The track -struct partElement *part; Part or reference to part -int force; - ->>description -Given the part this routine creates or updates the representation -of the part in the canvas display. - ->>code - gboolean ref = FALSE; - GnomeCanvasItem *item; - MelysPartItem *pitem; - MelysView *mview; - struct edisplay_info *dinfo; - struct rootElement *root; - char *pname; - int state; - - g_return_if_fail(part != NULL && track != NULL); - - mview = MELYS_VIEW(mdisp); - root = MD_ROOT(mview->viewcon); - - if (MD_IS_DESTROYED(part) || MD_IS_DESTROYED(track)) - return; - - if (GTK_OBJECT_DESTROYED(mdisp)) - return; - - if (!force && !MD_MODIFIED(root) && !MD_MODIFIED(part)) - return; - -//printf("updating part root %d part %d\n", MD_MODIFIED(mdisp->mdroot), MD_MODIFIED(part)); - /* Is this a reference to a part (drawn with dotted outline) */ - if (MD_TYPE(part) == MD_TYPE_PARTREF) - ref = TRUE; - - /* See if this part is selected or not */ - if (MD_SELECTED(part)) - state = GTK_STATE_SELECTED; - else - state = GTK_STATE_NORMAL; - - /* Get the name, or default to the track name */ - pname = part->name; - if (pname && strcmp(pname, "") != 0) - ; - else if (track->name) - pname = track->name; - else - pname = ""; - - dinfo = (struct edisplay_info *)g_dataset_get_data(part, mview->infostr); - if (dinfo == NULL) { - GnomeCanvasGroup *rgroup; - GnomeCanvasGroup *group; - GnomeCanvasItem *text; - - rgroup = gnome_canvas_root((GnomeCanvas*)mview->canvas); - - group = (GnomeCanvasGroup *)gnome_canvas_item_new(rgroup, - GNOME_TYPE_CANVAS_GROUP, NULL); - - item = gnome_canvas_item_new(group, melys_part_item_get_type(), - "x1", (double) 0.0, - "y1", (double) 0.0, - "width_pixels", 1, - "outline_color", "black", - "dotted_border", ref, - NULL); - - text = gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_TEXT, - "x", (double) 2, - "y", (double) 2, - "font_gdk", GTK_WIDGET(mdisp)->style->font, - "anchor", GTK_ANCHOR_NORTH_WEST, - "clip", TRUE, - NULL); - - pitem = MELYS_PART_ITEM(item); - - /* - * Set all the info we need to display a part into the - * display_info structure. Increase the reference counts - * of everything that we hold. Because there is a back - * reference to the part, we use WREF calls to avoid - * circular references. - */ - dinfo = g_new(struct edisplay_info, 1); - gtk_object_ref((GtkObject*)group); - dinfo->normal.item = GTK_OBJECT(group); - gtk_object_ref((GtkObject*)item); - dinfo->pitem = item; - gtk_object_ref((GtkObject*)text); - dinfo->text = text; - MD_WREF(part); - dinfo->normal.elem = MD_ELEMENT(part); - MD_WREF(track); - dinfo->normal.con = MD_CONTAINER(track); - - g_dataset_set_data_full(part, mview->infostr, - dinfo, edisplay_info_free); - gtk_object_set_data(GTK_OBJECT(group), mview->infostr, dinfo); - - MD_WREF(part); - gtk_object_set_data_full(GTK_OBJECT(group), "part", part, - (GtkDestroyNotify)md_wfree); - gtk_signal_connect_while_alive(GTK_OBJECT(group), "event", - GTK_SIGNAL_FUNC(melys_view_item_event), mdisp, (GtkObject*)mdisp); - } - - g_assert(dinfo != NULL); - pitem = MELYS_PART_ITEM(dinfo->pitem); - - /* - * The scheme here is that we have a group that contains - * the part rectangle and maybe text. We position the group - * as a whole. The rectangle and the text both are positioned - * at around 0,0 within the group. - */ - /* The whole group is positioned */ - gnome_canvas_item_set((GnomeCanvasItem *)dinfo->normal.item, - "x", (double) tick_to_x(mdisp, MD_TIME(part)), - "y", (double) track_to_y(mdisp, MD_TRACKLIKE(track)->number), - NULL); - - /* Set the font and text properties */ - gnome_canvas_item_set(dinfo->text, - "text", pname, - "fill_color_gdk", >K_WIDGET(mdisp)->style->fg[state], - "clip_width", (double) tick_to_x(mdisp, MD_DURATION(part))-2, - "clip_height", (double) mview->vcp->vheight-2, - NULL); - - /* This size of the part is set here */ - gnome_canvas_item_set(dinfo->pitem, - "x1", 0.0, - "y1", 0.0, - "x2", (double) tick_to_x(mdisp, MD_DURATION(part)), - "y2", (double) mview->vcp->vheight, - "fill_color_gdk", >K_WIDGET(mdisp)->style->light[state], - NULL); - - ->>function set_hscroll -static void -MelysTrackDisplay *mdisp; - ->>description -We own the horizontal adjustment in the track display. -Therefore set the bounds and keep the value correct here. -The range is set to the duration of the piece plus a full width -of the display area. - ->>code - int pageticks; - int ticklen; - MelysView *mview; - GtkAdjustment *adj; - - if (!GTK_WIDGET_REALIZED(mdisp)) - return; - - mview = MELYS_VIEW(mdisp); - - adj = mview->vcp->hadj; - - pageticks = x_to_tick(mdisp, GTK_WIDGET(mview->canvas)->allocation.width); - ticklen = MD_ENDTIME(mview->viewcon) + pageticks; - - adj->page_size = pageticks; - adj->page_increment = adj->page_size; - adj->step_increment = x_to_tick(mdisp, 20); - - view_control_set_range(mview->vcp, VC_HORIZONTAL, 0.0, ticklen); - - if (adj->value > adj->upper - adj->page_size) - adj->value = adj->upper - adj->page_size; - - gtk_adjustment_value_changed(adj); - - - ->>function edisplay_info_free -static void -gpointer _info; - ->>code - struct edisplay_info *einfo = _info; - - gtk_object_unref((GtkObject*)einfo->pitem); - gtk_object_unref((GtkObject*)einfo->text); - - display_info_free((struct display_info *)einfo); - - ->># ----- The menu callbacks ----- - ->>function slice_cb -static void -GtkWidget *w; The menu item -gpointer data; This will be the mdisp - ->>description -Slice the part in two at the point that the mouse was clicked. - ->>code - MelysTrackDisplay *mdisp = data; - MelysView *mview = data; - struct partElement *part; - struct partElement *newpart; - struct trackElement *track; - ticktime_t t; - - t = mview->click_tick; - t = md_snap_tick(mview->tempomap, mview->vcp->snap, t); - - part = MD_PART(mview->click_elem); - track = MD_TRACK(mview->click_base); - if (MD_IS_DESTROYED(part)) - return; - - newpart = md_split(part, t); - if (newpart == NULL) - return; - - md_add_sort(MD_CONTAINER(track), MD_ELEMENT(newpart)); - - update_part_item(mdisp, track, part, FALSE); - update_part_item(mdisp, track, newpart, FALSE); - - ->>function join_cb -static void -GtkWidget *w; -gpointer data; - ->>description -Join the part that received the click and the next part together. - ->>code - MelysTrackDisplay *mdisp = data; - MelysView *mview = data; - struct partElement *part; - struct trackElement *track; - ticktime_t t; - - t = mview->click_tick; - - part = MD_PART(mview->click_elem); - track = MD_TRACK(mview->click_base); - - md_part_join(MD_CONTAINER(track), part); - - update_part_item(mdisp, track, part, FALSE); - - ->>function delete_cb -static void -GtkWidget *w; -gpointer data; ->>description -Delete all parts that are selected. - ->>code - MelysView *mview = data; - struct partElement *part; - struct trackElement *track; - struct element *el; - - part = MD_PART(mview->click_elem); - track = MD_TRACK(mview->click_base); - - if (MD_SELECTED(part)) { - GSList *sellist; - GSList *li; - - sellist = md_build_sel(NULL, MD_ELEMENT(mview->viewcon), MD_TYPE_PART); - sellist = md_build_sel(sellist, MD_ELEMENT(mview->viewcon), - MD_TYPE_PARTREF); - - li = sellist; - while (li) { - - el = li->data; - md_clear_data(el); - md_remove(el->con, el); - li = li->next; - } - - g_slist_free(sellist); - - } else { - md_clear_data(MD_ELEMENT(part)); - md_remove(MD_CONTAINER(track), MD_ELEMENT(part)); - } - - ->>function piano_cb -static void -GtkWidget *w; -gpointer data; The track display widget - ->>code - MelysView *mview = data; - extern void create_piano(struct song *, struct containerElement *); - - /* borrow routine from trackinfo */ - create_piano(mview->song, MD_CONTAINER(mview->click_elem)); - - ->>function part_prop_cb -static void -GtkWidget *w; -gpointer data; - ->>description -Bring up the part property box. - ->>code - MelysView *mview = data; - - part_prop_box(MD_PART(mview->click_elem), mview->song, 0); - - ->>function disp_get_base -static struct containerElement * -MelysView *mview; -int nthing; - ->>description -Return the base element for the specified thing position. -This is a track. -It is not just the containing element of the part as the part -may be inside another part. - ->>code - struct rootElement *root; - struct trackElement *track; - - root = MD_ROOT(mview->viewcon); - track = md_track_nth(root, nthing); - - return MD_CONTAINER(track); - - ->>function disp_button1_double -static void -MelysView *mview; -struct element *elem; - ->>code - part_prop_box(MD_PART(elem), mview->song, 0); - - ->># --- The drag and drop routines --- - ->>function disp_get_nthing -static int -MelysView *mview; -struct element *elem; - ->>code - - while (elem) { - if (MD_TYPE(elem) == MD_TYPE_TRACK) - return MD_TRACK_NUMBER(elem); - elem = MD_ELEMENT(elem->con); - } - g_warning("@func_name couldn't find thing"); - return 0; - - ->>function disp_drop_elem -static gboolean -MelysView *mview; -struct element *elem; -int nthing; - ->>description -Deal with dropping an element onto us. -The nthing parameter is the track to drop onto. - ->>code - struct trackElement *track; - struct rootElement *root; - - root = MD_ROOT(mview->viewcon); - - md_ensure_track(root, nthing); - track = md_track_nth(MD_ROOT(mview->viewcon), nthing); - md_set_devchan(elem, MD_DEVCHAN(track)); - - if (MD_TYPE(elem) == MD_TYPE_PART) { - md_add_sort(MD_CONTAINER(track), elem); - } else if (MD_TYPE(elem) == MD_TYPE_NOTE) { - /* Make sure that parts exist. This leads to bitty parts XXX */ - md_ensure_parts(MD_CONTAINER(track), - MD_TIME(elem), MD_TIME(elem) + MD_NOTE(elem)->length); - merge_in_elem(MD_CONTAINER(track), elem); - } else - return FALSE; - - return TRUE; - ->>function disp_pos_change -static void -MelysView *mview; -int tick; -int thing; - ->>code - char *msg; - struct mbt mbt; - - if (tick < 0) - return; - md_tick_to_mbt(mview->tempomap, tick, &mbt); - msg = g_strdup_printf(_("Time: %3d:%02d:%03d"), - mbt.bars+1, mbt.beats+1, mbt.ticks); - mel_status_msg(mview->song, msg); - - g_free(msg); diff -rNu melys-0.1.16/widgets/melystrackinfo.m melys-0.1.17/widgets/melystrackinfo.m --- melys-0.1.16/widgets/melystrackinfo.m Tue Dec 14 15:07:02 1999 +++ melys-0.1.17/widgets/melystrackinfo.m Thu Jan 1 01:00:00 1970 @@ -1,1703 +0,0 @@ ->>name melystrackinfo.m - Track information pane - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -This is a widget for the left pane of the track view. -The columns that can be seen will be configurable. - -Now that I know about the gnome canvas widget and am going to -use it for the trackdisplay pane, it may well have been a good -idea to use it for this widget as well. - ->>header gtk/gtkwidget.h ->>header gtk/gtkadjustment.h ->>header gtk/gtksignal.h ->>header gtk/gtkvbox.h - ->>header libgnomeui/gnome-app.h ->>header libgnomeui/gnome-app-helper.h ->>header libgnomeui/gnome-popup-menu.h - ->>header melmsg.h ->>header melgui.h ->>header pixmaps.h ->>header elements.h ->>header md.h ->>header song.h ->>header viewcontrol.h ->># Try to remove these elsewhere ->>header libgnomeui/gnome-canvas.h ->>header melysscroll.h ->>header melysview.h ->>header melystempo.h ->>header melyspiano.h - ->>gtkobject melys_track_info gtk_widget - ->>headerdef @header - -#define MAX_COLUMNS 30 - - -struct _MelysTrackInfo { - GtkWidget widget; - - /* The adjustment for vertical scrolling (and other things) */ - ViewControl *vcp; - - /* Amount of vertical scrolling, in tracks (you never see half a track) */ - int voffset; - - /* - * The columns are configurable in terms of which ones exist and - * which order they appear in (or will be). - * The following variables hold the current configuration. - */ - struct col_info *col_infos; /* Columns in use */ - gint col_used; /* Number of columns in use */ - - /* - * The amount of vertical space used by tracks is under control of - * the parent MelysTrack widget. This is because we must be in - * sync between MelysTrackInfo and MelysTrackDisplay. - */ - - /* The offset from the top of allocated space to text baseline */ - int vtextoffset; - - /* Allocated area that track information is being displayed in */ - GdkRectangle track_area; - - /* Our context menu */ - GtkWidget *menu; - - /* The actual composition that is being displayed */ - struct rootElement *mdroot; - - struct song *song; - - /* Labels and masks for the various buttons */ - GdkPixmap *rec_label; - GdkBitmap *rec_mask; - GdkPixmap *mute_label; - GdkBitmap *mute_mask; - GdkPixmap *solo_label; - GdkBitmap *solo_mask; - - /* Button click information */ - int click_track; /* the track that was clicked */ -}; - -struct _MelysTrackInfoClass { - GtkWidgetClass parent_class; - - void (*mute_track)(MelysTrackInfo *, struct trackElement *); - void (*unmute_track)(MelysTrackInfo *, struct trackElement *); - void (*record_track)(MelysTrackInfo *, struct trackElement *, int); -}; - ->>header melystrack.h ->>extern - -enum signals { - MUTE_TRACK, - UNMUTE_TRACK, - RECORD_TRACK, - LAST_SIGNAL -}; - -/* - * The type of column. Each possible column that could be displayed - * has a type here. They are not all necessarily shown though. - */ -enum column_type { - NUMBER, - NAME, - PROGRAM, - MUTE, - RECORD, - SOLO, - CHANNEL, - LAST_COLUMN_TYPE -}; - -/* - * The different kinds of column content. - */ -enum column_kind { - COL_TEXT, - COL_BUTTON -}; - - -/* - * Information about the possible column types. - */ -static struct col_info { - enum column_type type; - enum column_kind kind; - char *title; - int width; - gboolean present; /* Is this in the default configuration */ - - /* All below here are calculated and therefore do not need init */ - int totwidth; /* Total width up to end of this column */ - -} def_col_info[] = { - {NUMBER, COL_TEXT, "", 20, FALSE}, - {NAME, COL_TEXT, N_("Name"), 80, TRUE}, - {PROGRAM, COL_TEXT, N_("Prog"), 28, TRUE}, - {CHANNEL, COL_TEXT, N_("C"), 14, TRUE}, - {MUTE, COL_BUTTON, N_("Mute"), 28, TRUE}, - {SOLO, COL_BUTTON, N_("Solo"), 26, TRUE}, - {RECORD, COL_BUTTON, N_("Rec"), 26, TRUE}, -}; - -/* A border to the protect the column lines */ -#define COL_PADDING 2 - ->>extern -a -/* The popup menu */ -static GnomeUIInfo tracksmenu[] = { - {GNOME_APP_UI_ITEM, N_("_Add track"), N_("Add a track below this one"), - add_track_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ - 0, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - {GNOME_APP_UI_ITEM, N_("_Delete track"), - N_("Delete all selected or this track"), - delete_track_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ - 0, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - {GNOME_APP_UI_ITEM, N_("Delete _empty"), N_("Delete all empty tracks"), - delete_empty_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ - 0, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - GNOMEUIINFO_SEPARATOR, - - {GNOME_APP_UI_ITEM, N_("_Piano roll view"), - N_("Open a new piano roll view for this track"), - piano_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ - 0, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - {GNOME_APP_UI_ITEM, N_("_Tempomap view"), - N_("Open a view of the tempo, time and key signatures for this track"), - tempo_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ - 0, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - - GNOMEUIINFO_SEPARATOR, - - {GNOME_APP_UI_ITEM, N_("Properties..."), - N_("Bring up the track properties dialog"), - props_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ - 0, (GdkModifierType)0, /* Accel */ - (GtkWidget*)0 }, - GNOMEUIINFO_END -}; - - ->>function melys_track_info_new -GtkWidget * -ViewControl *vcp; For the vertical scrolling and scaling ->>description -Create a new MelysTrackInfo object. ->>code - GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_track_info_get_type())); - MelysTrackInfo *minfo; - - minfo = (MelysTrackInfo*)w; - - minfo->vcp = vcp; - gtk_signal_connect((GtkObject *)vcp, "scale-changed", - scale_changed, minfo); - gtk_signal_connect((GtkObject *)vcp->vadj, "value-changed", - (GtkSignalFunc)track_info_scroll, minfo); - - gtk_object_ref((GtkObject*)vcp); - - return w; - ->>function melys_track_info_init -static void -MelysTrackInfo *minfo; The MelysTrackInfo to init ->>description -Initialise the MelysTrackInfo. ->>code - int i; - int used; - struct col_info *cinfo; - - GTK_WIDGET_SET_FLAGS(minfo, GTK_CAN_FOCUS); - - minfo->vcp = NULL; - - used = 0; - minfo->col_infos = g_new0(struct col_info, MAX_COLUMNS); - - /* - * Go through the default list of column information and - * copy these defaults into our own structure where they - * can be modified. - */ - for (i = 0; i < NELEM(def_col_info); i++) { - cinfo = def_col_info+i; - - if (cinfo->present) { - - minfo->col_infos[used] = *cinfo; - used++; - } - } - - minfo->col_used = used; - - minfo->voffset = 0; - - minfo->mdroot = NULL; - minfo->song = NULL; - minfo->menu = gnome_popup_menu_new(tracksmenu); - gtk_object_ref(GTK_OBJECT(minfo->menu)); - gtk_object_sink(GTK_OBJECT(minfo->menu)); - - ->>function melys_track_info_class_init -static void -MelysTrackInfoClass *klass; The class to initialise - ->>description -Initialize the class. - ->>code - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - - object_class = (GtkObjectClass *)klass; - widget_class = (GtkWidgetClass *)klass; - - parent_class = gtk_type_class(gtk_widget_get_type()); - - - /* - * Create all the signals for this class and add them to - * the system. - */ - melys_track_info_signals[MUTE_TRACK] = gtk_signal_new("mute_track", - GTK_RUN_FIRST, - object_class->type, - GTK_SIGNAL_OFFSET(MelysTrackInfoClass, mute_track), - gtk_marshal_NONE__POINTER, - GTK_TYPE_NONE, 1, - GTK_TYPE_POINTER); - melys_track_info_signals[UNMUTE_TRACK] = gtk_signal_new("unmute_track", - GTK_RUN_FIRST, - object_class->type, - GTK_SIGNAL_OFFSET(MelysTrackInfoClass, unmute_track), - gtk_marshal_NONE__POINTER, - GTK_TYPE_NONE, 1, - GTK_TYPE_POINTER); - melys_track_info_signals[RECORD_TRACK] = gtk_signal_new("record_track", - GTK_RUN_ACTION, - object_class->type, - GTK_SIGNAL_OFFSET(MelysTrackInfoClass, record_track), - gtk_marshal_NONE__POINTER_INT, - GTK_TYPE_NONE, 2, - GTK_TYPE_POINTER, GTK_TYPE_INT); - - - gtk_object_class_add_signals - (object_class, melys_track_info_signals, LAST_SIGNAL); - - /* Set up all the overrides */ - object_class->destroy = track_info_destroy; - - widget_class->realize = track_info_realise; - widget_class->size_request = track_info_size_request; - widget_class->size_allocate = track_info_size_allocate; - widget_class->unrealize = track_info_unrealise; - widget_class->draw = track_info_draw; - widget_class->expose_event = track_info_expose; - widget_class->enter_notify_event = track_info_enter; - widget_class->button_press_event = track_info_button_press; - - klass->mute_track = real_mute_track; - klass->unmute_track = real_unmute_track; - klass->record_track = NULL; - - ->>function scale_changed -static void -GtkObject *obj; This is the vcp -MelysTrackInfo *minfo; Our info - ->>description -This is called when something in the vcp changes. -Re-calculate all geometry. ->>code - - if (GTK_WIDGET_REALIZED(minfo)) { - - /* This doesn't actually change at present, but would if - * it were middle aligned for example - */ - minfo->vtextoffset = GTK_WIDGET(minfo)->style->font->ascent + 1.5; - } - - track_vscroll_calc(minfo); - - ->>function melys_track_info_set_md_root -void -MelysTrackInfo *minfo; -struct rootElement *root; - ->>description -Set a new mdroot, freeing any existing one. -The widget is redrawn after this. - ->>code - - if (root == NULL) - return; - - if (minfo->mdroot) - md_free((struct element *)minfo->mdroot); - - minfo->mdroot = md_root_inc_ref(root); - - gtk_widget_queue_draw(GTK_WIDGET(minfo)); - - ->>function melys_track_info_update -void -MelysTrackInfo *minfo; - ->>description -Recalculate and redraw. -The song has changed and now we need to re-draw everything. -Probably only need to re-draw if the number of tracks has changed -in this widget. - ->>code - struct rootElement *root; - struct trackElement *track; - int all; - int n; - - root = minfo->mdroot; - all = MD_MODIFIED(root); - - if (all) { - gtk_widget_queue_draw(GTK_WIDGET(minfo)); - } else { - for (n = 0; n < root->tracks; n++) { - track = md_track_nth(root, n); - if (MD_MODIFIED(track)) - one_track_redraw(minfo, -1, track); - } - } - - /* - * We have to do this because even though the page size has - * not changed, gtk itself modifies the page size that we set - * when it is larger than upper-lower. Therefore we have to - * keep resetting it. - * I consider this a bug in gtk - */ - track_vscroll_calc(minfo); - - ->>function track_info_realise -static void -GtkWidget *widget; ->>description -Create the windows for this widget. -The main window itself is not mapped, but any subwindows are shown. - ->>code - MelysTrackInfo *minfo; - GdkWindowAttr attributes; - gint attributes_mask; - - dprintf2("@func_name called"); - g_return_if_fail (widget != NULL); - g_return_if_fail (IS_MELYS_TRACK_INFO(widget)); - - minfo = MELYS_TRACK_INFO(widget); - - GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED); - - attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = widget->allocation.x; - attributes.y = widget->allocation.y; - attributes.width = widget->allocation.width; - attributes.height = widget->allocation.height; - attributes.wclass = GDK_INPUT_OUTPUT; - attributes.visual = gtk_widget_get_visual(widget); - attributes.colormap = gtk_widget_get_colormap(widget); - attributes.event_mask = gtk_widget_get_events(widget); - attributes.event_mask |= (GDK_EXPOSURE_MASK | - GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK | - GDK_ENTER_NOTIFY_MASK | - 0 - ); - attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; - - /* Create the main window */ - widget->window = gdk_window_new(gtk_widget_get_parent_window(widget), - &attributes, attributes_mask); - gdk_window_set_user_data(widget->window, minfo); - - widget->style = gtk_style_attach(widget->style, widget->window); - gtk_style_set_background(widget->style, widget->window, GTK_STATE_NORMAL); - - minfo->vtextoffset = GTK_WIDGET(minfo)->style->font->ascent + 1.5; - - /* - * Now that we have a main window, we can create the pixmaps that - * belong to it. - */ - minfo->rec_label = gdk_pixmap_create_from_xpm_d( - widget->window, - &minfo->rec_mask, - NULL, - redball_xpm); - minfo->mute_label = gdk_pixmap_create_from_xpm_d( - widget->window, - &minfo->mute_mask, - NULL, - yellowball_xpm); - minfo->solo_label = gdk_pixmap_create_from_xpm_d( - widget->window, - &minfo->solo_mask, - NULL, - blueball_xpm); - ->>function track_info_unrealise -static void -GtkWidget *widget; ->>code - - GTK_WIDGET_UNSET_FLAGS(widget, GTK_MAPPED); - - if (GTK_WIDGET_CLASS(parent_class)->unrealize) - (GTK_WIDGET_CLASS(parent_class)->unrealize)(widget); - - ->>function track_info_destroy -static void -GtkObject *object; - ->>code - MelysTrackInfo *minfo; - - g_return_if_fail(IS_MELYS_TRACK_INFO(object)); - dprintf1("Destroy: @func_name %p", object); - - minfo = (MelysTrackInfo*)object; - - g_free(minfo->col_infos); - - if (minfo->vcp) { - gtk_object_unref(GTK_OBJECT(minfo->vcp)); - minfo->vcp = NULL; - } - - if (minfo->mdroot) { - md_free(MD_ELEMENT(minfo->mdroot)); - minfo->mdroot = NULL; - } - - gtk_widget_unref(minfo->menu); - - minfo->col_used = 0; - - if (GTK_OBJECT_CLASS(parent_class)->destroy) - (GTK_OBJECT_CLASS(parent_class)->destroy)(object); - ->>function track_info_size_request -static void -GtkWidget *widget; -GtkRequisition *req; Fill in with the size that we want - ->>description -Work out what size we want to be and fill in the details into -.A req . -We are mostly interested in our width. -Its not for us to wory about height. - ->>code - MelysTrackInfo *minfo; - int i; - int tot; - - g_return_if_fail(IS_MELYS_TRACK_INFO(widget)); - - minfo = (MelysTrackInfo*)widget; - - req->width = 0; - req->height = 0; - - /* - * Add up all the column widths and include the separator - * width. - */ - tot = 0; - for (i = 0; i < minfo->col_used; i++) { - tot += minfo->col_infos[i].width; - tot += 2*COL_PADDING; - - /* - * This is our position, you can find out which column by finding - * the first for which totwidth includes the x position - */ - minfo->col_infos[i].totwidth = tot; - - /* Add the width of the dividing line */ - tot += widget->style->klass->xthickness; - } - - req->width = tot; - - ->>function track_info_size_allocate -static void -GtkWidget *widget; -GtkAllocation *allocation; - ->>code - MelysTrackInfo *minfo; - - g_return_if_fail(widget != NULL); - g_return_if_fail(IS_MELYS_TRACK_INFO(widget)); - g_return_if_fail(allocation != NULL); - - minfo = (MelysTrackInfo*)widget; - widget->allocation = *allocation; - - dprintf2("@func_name: alloced (%d, %d) %dx%d", - allocation->x, allocation->y, allocation->width, allocation->height); - - if (GTK_WIDGET_REALIZED (widget)) { - - /* Save the track area, not including title area */ - minfo->track_area.x = allocation->x; - minfo->track_area.y = allocation->y + minfo->vcp->vtitle; - minfo->track_area.width = allocation->width; - minfo->track_area.height = allocation->height - minfo->vcp->vtitle; - - gdk_window_move_resize(widget->window, - allocation->x, allocation->y, - allocation->width, allocation->height); - - /* Set up the vertical scrollbar */ - track_vscroll_calc(minfo); - } - - - ->>function track_vscroll_calc -static void -MelysTrackInfo *minfo; - ->>description -Calculate how many tracks are visible on the page and set this -as the page increment. -Err on the low side. - ->>code - - minfo->vcp->vadj->page_size = - (minfo->track_area.height / minfo->vcp->vscale); - minfo->vcp->vadj->page_increment = minfo->vcp->vadj->page_size; - - gtk_adjustment_changed(minfo->vcp->vadj); - - ->>function track_info_draw -static void -GtkWidget *widget; -GdkRectangle *ap; Area to draw within - ->>description -This is the main routine that draws the whole widget. -To simplify the code, it is split into routines for drawing -each line (and the title is line -1 for this purpose), and -for each column. - ->>code - MelysTrackInfo *minfo; - GtkStyle *style; - GdkGC *fg_gc; - int start, end; - int ntrack; - - g_return_if_fail(widget != NULL); - g_return_if_fail(IS_MELYS_TRACK_INFO(widget)); - g_return_if_fail(ap != NULL); - - if (!GTK_WIDGET_DRAWABLE (widget)) - return; - - dprintf(2, "@func_name: (%d, %d) %dx%d", ap->x, ap->y, - ap->width, ap->height); - - minfo = (MelysTrackInfo*)widget; - g_return_if_fail(minfo->mdroot != NULL); - - style = widget->style; - fg_gc = style->fg_gc[GTK_STATE_NORMAL]; - - - /* The clear is needed for scrolling... may be removed in future */ - start = y_to_track(minfo, ap->y); - end = y_to_track(minfo, ap->y + ap->height) + 1; - if (start < 0) - start = 0; - - if (end > minfo->mdroot->tracks) { - GdkRectangle endarea; - - /* - * If there is some space after the valid tracks then we - * clear this part of the display. - */ - endarea.x = ap->x; - endarea.y = track_to_y(minfo, minfo->mdroot->tracks); - endarea.width = ap->width; - endarea.height = track_to_y(minfo, end) - endarea.y; - gdk_window_clear_area(widget->window, endarea.x, endarea.y, - endarea.width, endarea.height); - - end = minfo->mdroot->tracks; - } - if (end < 0) - end = minfo->mdroot->tracks; - - /* This draws in the title row */ - draw_row(minfo, -1); - - /* Draw in the separator line bewtween the titles and rows */ - gdk_draw_line(widget->window, fg_gc, - 0, minfo->vcp->vtitle - VIEW_TITLE_RULE, - minfo->track_area.width, minfo->vcp->vtitle - VIEW_TITLE_RULE); - - dprintf2("start %d end %d, tracks %d", start, end, minfo->mdroot->tracks); - for (ntrack = start; ntrack < end; ntrack++) - draw_row(minfo, ntrack); - - ->>function draw_row -static void -MelysTrackInfo *minfo; -int ntrack; The track number to draw (0 based). - ->>description -Draw the specified track. -The track -1 means the titles. - ->>code - GtkWidget *widget; - GtkStyle *style; - GdkGC *fg_gc; - GdkGC *bg_gc; - GdkRectangle area; - struct trackElement *track; - struct col_info *cip; - int xpos; - int i; - - widget = (GtkWidget *)minfo; - style = widget->style; - - track = md_track_nth(minfo->mdroot, ntrack); - - xpos = 0; - for (i = 0; i < minfo->col_used; i++) { - - cip = minfo->col_infos+i; - - if (ntrack >= 0 && track && MD_SELECTED(track) && cip->kind == COL_TEXT) { - fg_gc = widget->style->fg_gc[GTK_STATE_SELECTED]; - bg_gc = widget->style->bg_gc[GTK_STATE_SELECTED]; - } else { - fg_gc = widget->style->fg_gc[GTK_STATE_NORMAL]; - bg_gc = widget->style->bg_gc[GTK_STATE_NORMAL]; - } - - area.x = xpos; - area.y = track_to_y(minfo, ntrack); - area.width = cip->width + 2*COL_PADDING; - area.height = minfo->vcp->vscale; - - gdk_draw_rectangle(widget->window, bg_gc, TRUE, area.x, area.y, - area.width, area.height); - - /* - * Set up a clipping region for the content area of this cell. - * This is mainly to clip text columns that are too large for - * their cell. Buttons are supposed to be the correct size.. - */ - xpos += COL_PADDING; - area.x = xpos; - area.width = cip->width; - - gdk_gc_set_clip_rectangle(fg_gc, &area); - - draw_col(minfo, ntrack, track, &area, cip, fg_gc); - gdk_gc_set_clip_rectangle(fg_gc, NULL); - - xpos += cip->width + COL_PADDING; - xpos += style->klass->xthickness; - } - ->>function draw_col -static void -MelysTrackInfo *minfo; -int ntrack; The track number -struct trackElement *track; The track to display -GdkRectangle *ap; Allocated area, mainly for x,y position to use -struct col_info *cip; The column information -GdkGC *gc; The GC to use for drawing - ->>description -Draw a single column cell. -If track is NULL that means to write the title. - ->>code - - /* - * Deal with title cells first. They are text. - */ - if (ntrack == -1) { - draw_col_text(minfo, ntrack, NULL, ap, cip, gc); - return; - } - - /* - * Depending on the kind of column we have, draw it. - */ - switch (cip->kind) { - case COL_TEXT: - draw_col_text(minfo, ntrack, track, ap, cip, gc); - break; - case COL_BUTTON: - draw_col_button(minfo, ntrack, track, ap, cip, gc); - break; - } - ->>function draw_col_text -static void -MelysTrackInfo *minfo; -int ntrack; The track number -struct trackElement *track; The track being displayed -GdkRectangle *ap; Allocated area, mainly for x,y position to use -struct col_info *cip; The column information -GdkGC *gc; The GC to use for drawing - ->>code - GtkWidget *widget; - char buf[TMP_BUF_SIZE]; - char *str; - - widget = (GtkWidget *)minfo; - str = "N/YET"; /* A default to catch unimplemented columns */ - - if (ntrack == -1) { - str = _(cip->title); - - /* Have to draw the vertical lines */ - gtk_draw_vline(widget->style, widget->window, GTK_STATE_NORMAL, - 0, minfo->track_area.height + minfo->vcp->vtitle, - ap->x + cip->width + COL_PADDING); - - } else switch (cip->type) { - case NUMBER: - g_snprintf(buf, TMP_BUF_SIZE, "%2d", ntrack+1); - str = buf; - break; - case NAME: - if (track && track->name) { - str = track->name; - } else { - g_snprintf(buf, TMP_BUF_SIZE, _("Track %d"), ntrack+1); - str = buf; - if (track) - track->name = g_strdup(buf); - } - break; - case PROGRAM: - if (track) - g_snprintf(buf, TMP_BUF_SIZE, "%d", track->program->program & 0x7f); - str = buf; - break; - case CHANNEL: - if (track) - g_snprintf(buf, TMP_BUF_SIZE, "%2d", MD_CHAN(track) + 1); - str = buf; - default: - break; - } - - gdk_draw_string(GTK_WIDGET(minfo)->window, GTK_WIDGET(minfo)->style->font, - gc, ap->x, ap->y + minfo->vtextoffset, str); - - ->>function draw_col_button -static void -MelysTrackInfo *minfo; -int ntrack; The track number being displayed -struct trackElement *track; Track being displayed -GdkRectangle *ap; Allocated area, mainly for x,y position to use -struct col_info *cip; The column information -GdkGC *gc; The GC to use for drawing - ->>code - GtkWidget *widget; - GdkPixmap *pixmap; - GdkBitmap *mask; - int width, height; - int shadow_type; - int x, y; - -#define BUTTON_SURROUND 2 - - if (ntrack == -1) - return; - - widget = (GtkWidget *)minfo; - - shadow_type = GTK_SHADOW_OUT; - pixmap = NULL; - mask = NULL; - - switch (cip->type) { - case RECORD: - if (track->record) { - pixmap = minfo->rec_label; - mask = minfo->rec_mask; - } - break; - case MUTE: - if (track->mute) { - pixmap = minfo->mute_label; - mask = minfo->mute_mask; - } - break; - case SOLO: - if (track->solo) { - pixmap = minfo->solo_label; - mask = minfo->solo_mask; - } - break; - default: - mel_warning(_("Internal error.\n" - "There is a missing case in @func_name\n" - "Value was %d\n"), cip->type); - pixmap = NULL; - mask = NULL; - break; - } - - if (pixmap) { - gdk_window_get_size(pixmap, &width, &height); - x = ap->x + ap->width/2 - width/2; - y = ap->y + ap->height/2 - height/2; - - gdk_gc_set_clip_mask (widget->style->black_gc, mask); - gdk_gc_set_clip_origin (widget->style->black_gc, x, y); - - - gdk_draw_pixmap(widget->window, - widget->style->black_gc, - pixmap, - 0, 0, x, y, -1, -1); - - gdk_gc_set_clip_mask (widget->style->black_gc, NULL); - gdk_gc_set_clip_origin (widget->style->black_gc, 0, 0); - - shadow_type = GTK_SHADOW_IN; - } - - gtk_draw_shadow(widget->style, widget->window, - GTK_STATE_NORMAL, shadow_type, - ap->x, ap->y + BUTTON_SURROUND, - ap->width, ap->height - 2*BUTTON_SURROUND); - - ->>function track_info_expose -static int -GtkWidget *widget; -GdkEventExpose *event; - ->>description -Handle expose events. -We just call the draw routine with a suitable arg. -This means that we always re-draw some lines even when -not necessary. -But so what. - ->>code - MelysTrackInfo *minfo; - - if (!GTK_WIDGET_DRAWABLE (widget)) - return FALSE; - - minfo = MELYS_TRACK_INFO(widget); - - gtk_widget_queue_draw_area(widget, event->area.x, event->area.y, - event->area.width, event->area.height); - - return TRUE; - ->>function track_info_enter -static gint -GtkWidget *widget; -GdkEventCrossing *data; - ->>code - - if (widget == NULL) - {dprintf1("enter widget is NULL"); return FALSE;} - - gtk_widget_grab_focus(widget); - - return FALSE; - - ->>function track_info_button_press -static int -GtkWidget *widget; -GdkEventButton *event; - ->>description -Button presses select tracks and bring up dialogs to modify the -properties of tracks. -The action taken depends on which column is clicked and -whether the track is already selected and the modifiers. - -On the button columns, each click presses or release the button. - -The first button press elsewhere on a track selects it. -A button1 press on a track that is already selected will bring up -the track properties dialog. -If the click is in the patch column then the instrument selecter dialog -will be displayed. - -A control click will allow the selection state on a column to be -toggled. -A shift click will select a range of tracks. - -A button3 click will bring up a menu of track actions -- add delete etc. - ->>code - int row; - int y; - struct col_info *cip; - struct trackElement *track; - MelysTrackInfo *minfo; - - minfo = MELYS_TRACK_INFO(widget); - - /* Check if we are in the title area */ - if (event->y < minfo->track_area.y) - return FALSE; /* Will do something later */ - - /* Get the appropriate track for this button press */ - row = y_to_track(minfo, event->y); - minfo->click_track = row; - - track = md_track_nth(minfo->mdroot, row); - if (track == NULL) - return FALSE; - - /* Now work out the column */ - cip = x_to_col_info(minfo, event->x); - if (cip == NULL) - return FALSE; - - dprintf1("Click on track %d, col %s", row, cip->title); - - switch (event->button) { - case 1: - if (cip->kind == COL_TEXT) - button1_text(minfo, track, cip, event); - else - button1_button(minfo, track, cip, event); - break; - - case 3: - gnome_popup_menu_do_popup(minfo->menu, NULL, NULL, event, minfo); - break; - - default: - break; - } - - y = track_to_y(minfo, row); - gtk_widget_queue_draw_area(widget, - 0, y, minfo->track_area.width, minfo->vcp->vscale); - - return TRUE; - ->>function button1_text -static void -MelysTrackInfo *minfo; -struct trackElement *track; Track that was clicked in -struct col_info *cip; Column that was clicked in -GdkEventButton *event; - ->>code -If no modifiers: - unselect all others - if not selected: - select this track - else - do the column action - -If control: - toggle select status of this track - -If shift: - don't know; any ideas? - ->>code - int masks; - int i; - struct trackElement *otrack; - - /* - * The multi-click events just confuse things so we just return if - * we get one. - * At least for select... - */ - if (event->type == GDK_3BUTTON_PRESS) - return; - - masks = event->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK); - if (masks == 0) { - - /* Unselect all other tracks first */ - for (i = 0; ; i++) { - - otrack = md_track_nth(minfo->mdroot, i); - if (!otrack) - break; - - if (MD_SELECTED(otrack) && otrack != track) - unselect_track(minfo, otrack); - } - - select_track(minfo, track, cip->type); - if (event->type == GDK_2BUTTON_PRESS) - track_properties(minfo, track, cip->type); - - } else if (masks == GDK_CONTROL_MASK) { - if (MD_SELECTED(track)) - unselect_track(minfo, track); - else - select_track(minfo, track, cip->type); - - } else if (masks == GDK_SHIFT_MASK) { - /* TODO */ - } - - ->>function button1_button -static void -MelysTrackInfo *minfo; -struct trackElement *track; Track that was clicked in -struct col_info *cip; Column that was clicked in -GdkEventButton *event; The click event itself - ->>code - - /* - * The multi-click events just confuse things so we just return if - * we get one. - */ - if (event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) - return; - - switch (cip->type) { - case MUTE: - if (track->mute) - unmute_track(minfo, track); - else - mute_track(minfo, track); - break; - case SOLO: - if (track->solo) - unset_solo(minfo, track); - else - set_solo(minfo, track); - break; - case RECORD: - set_record(minfo, track, event->state); - break; - default: - break; - } - ->>function set_solo -static void -MelysTrackInfo *minfo; -struct trackElement *track; - ->>description -Solo is a shorthand for setting mute on other tracks. -Therefore we always light up the mute indicators to -show exactly which tracks are being played. -While in solo mode you can unmute certain tracks, these -are remembered so that you can toggle between these tracks and the -full set of tracks by clicking on the solo button. - ->>code - struct trackElement *te; - int last; - int i; - - if (track->sololast) - last = 1; - else - last = 0; - - track->solo = 1; - track->sololast = 1; - unmute_track(minfo, track); - track->solomute = 0; - - for (i = 0; i < minfo->mdroot->tracks; i++) { - - te = md_track_nth(minfo->mdroot, i); - - if (i == MD_TRACKLIKE(track)->number) - continue; - - te->solo = 0; - te->sololast = 0; - - if (te->mute) - continue; - - if (last) { - if (te->solomute) { - mute_track(minfo, te); - te->solomute = 1; - } - } else { - mute_track(minfo, te); - te->solomute = 1; - } - } - ->>function unset_solo -static void -MelysTrackInfo *minfo; -struct trackElement *track; - ->>description -Solo is a shorthand for setting mute on other tracks. -Therefore we always light up the mute indicators to -show exactly which tracks are being played. -While in solo mode you can unmute certain tracks, these -are remembered so that you can toggle between these tracks and the -full set of tracks by clicking on the solo button. - ->>code - struct trackElement *te; - int i; - - track->solo = 0; - - for (i = 0; i < minfo->mdroot->tracks; i++) { - - te = md_track_nth(minfo->mdroot, i); - - if (te->solomute) { - unmute_track(minfo, te); - te->mute = 0; - te->solomute = 1; - } - } - - ->>function set_record -static void -MelysTrackInfo *minfo; -struct trackElement *track; The track that is being set -int modifiers; The modifier keys used - ->>description -A normal click on a record button sets that button and -turns off all others. -If you click while holding the control key, multiple tracks -can be set for recording. -If a button is control-clicked it will toggle. - ->>code - int n; - struct trackElement *tr; - - if ((modifiers & GDK_CONTROL_MASK) == 0) { - /* - * First turn off all any other existing record button. - */ - for (n = 0; n < minfo->mdroot->tracks; n++) { - tr = md_track_nth(minfo->mdroot, n); - if (tr == track) { - one_track_redraw(minfo, -1, tr); - track->record ^= 1; - } else if (tr->record) { - if (tr->record) - one_track_redraw(minfo, -1, tr); - tr->record = 0; - gtk_signal_emit(GTK_OBJECT(minfo), - melys_track_info_signals[RECORD_TRACK], track, 0); - } - } - } else { - track->record ^= 1; - } - - gtk_signal_emit(GTK_OBJECT(minfo), melys_track_info_signals[RECORD_TRACK], - track, 1); - - ->># ==== Selection and click actions - ->>function select_track -static void -MelysTrackInfo *minfo; -struct trackElement *track; -int coltype; - ->>description -Select the track. - ->>code - MD_SET_SELECTED(track, TRUE); - ->>function track_properties -static void -MelysTrackInfo *minfo; -struct trackElement *track; -int coltype; - ->>description -Bring up a track properties box for the specified track. -The column position is used to determine the initial page. ->>code - int page; - - if (MD_SELECTED(track)) { - switch (coltype) { - case PROGRAM: - page = TRACK_PROP_INSTR; - break; - default: - page = TRACK_PROP_BASIC; - break; - } - track_prop_box(track, minfo->song, page); - } - - MD_SET_SELECTED(track, TRUE); - ->>function unselect_track -static void -MelysTrackInfo *minfo; -struct trackElement *track; - ->>code - - MD_SET_SELECTED(track, FALSE); - one_track_redraw(minfo, -1, track); - ->>function mute_track -static void -MelysTrackInfo *minfo; -struct trackElement *track; - ->>code - - gtk_signal_emit(GTK_OBJECT(minfo), melys_track_info_signals[MUTE_TRACK], - track); - ->>function unmute_track -static void -MelysTrackInfo *minfo; -struct trackElement *track; - ->>code - gtk_signal_emit(GTK_OBJECT(minfo), melys_track_info_signals[UNMUTE_TRACK], - track); - ->>function real_mute_track -static void -MelysTrackInfo *minfo; -struct trackElement *track; - ->>code - - track->mute = 1; - one_track_redraw(minfo, -1, track); - - ->>function real_unmute_track -static void -MelysTrackInfo *minfo; -struct trackElement *track; - ->>code - - track->mute = 0; - track->solomute = 0; - one_track_redraw(minfo, -1, track); - - ->># ==== Utility routines - ->>function y_to_track -static int -MelysTrackInfo *minfo; The widget -int ypix; Y pixel widget co-ordinate - ->>description -Given a y position within the widget window, return -the track number that belongs to that co-ordintate. -Track numbers start at 0, -1 means no track in other words -the y position is before the tracks start or after. -Beware that this works differently to the canvas based widgets. - ->>code - int n; - - n = (ypix - minfo->vcp->vtitle); - if (n < 0) - return minfo->voffset; - - n /= minfo->vcp->vscale; - - n += minfo->voffset; - - dprintf(3, "Y %d, voff %d track %d", ypix, minfo->voffset, n); - - return n; - ->>function track_to_y -static int -MelysTrackInfo *minfo; -int n; Track number ->>description -Given a track number, return the top y co-ord for that track. -It could be negative if beyond the top of the current -track area. -Beware that this works differently to the canvas based widgets. - ->>code - int ypix; - - n -= minfo->voffset; - if (n <= -1) - return 0; - - ypix = n * minfo->vcp->vscale + minfo->vcp->vtitle; - - return ypix; - ->>function x_to_col_info -static struct col_info * -MelysTrackInfo *minfo; -int x; - ->>code - struct col_info *cip; - int i; - - for (i = 0; i < minfo->col_used; i++) { - cip = minfo->col_infos + i; - - if (x <= cip->totwidth) - return cip; - } - - return NULL; - ->>extern - -#define TMP_BUF_SIZE 100 - ->>function get_info_string -char * -MelysTrackInfo *minfo; -int itype; -int ntrack; - ->>description -Return a text string which is the correct contents for the -given track and column type. - ->>code - enum column_type type = itype; - struct trackElement *track; - /* I keep typing defbug, I think its trying to tell me something... */ - static char defbuf[TMP_BUF_SIZE]; - char *str; - - str = "N/A"; - - switch (type) { - case NUMBER: - g_snprintf(defbuf, TMP_BUF_SIZE, "%2d", ntrack+1); - str = defbuf; - break; - case NAME: - track = md_track_nth(minfo->mdroot, ntrack); - if (track && track->name) { - str = track->name; - } else { - g_snprintf(defbuf, TMP_BUF_SIZE, "Track %d", ntrack+1); - str = defbuf; - } - break; - case PROGRAM: - track = md_track_nth(minfo->mdroot, ntrack); - if (track) - g_snprintf(defbuf, TMP_BUF_SIZE, "%d", track->program->program & 0x7f); - str = defbuf; - break; - default: - break; - } - - return str; - ->>function track_info_scroll -static void -GtkAdjustment *adj; -gpointer data; - ->>description -The vertical scrollbar has been moved. -So we have to set our current position and redraw. - ->>code - MelysTrackInfo *minfo; - int val; - - minfo = MELYS_TRACK_INFO(data); - - val = (int)(adj->value); - if (val >= 0 && val != minfo->voffset) { - minfo->voffset = val; - - /* - * I am just redrawing the whole pane here, it would be - * best to do copy areas, but it looks fast enough - * to me at the moment. Perhaps this will change - */ - gtk_widget_queue_clear((GtkWidget*)minfo); - gtk_widget_queue_draw_area((GtkWidget*)minfo, - minfo->track_area.x, minfo->track_area.y, - minfo->track_area.width, minfo->track_area.height); - } - - ->>function one_track_redraw -static void -MelysTrackInfo *minfo; -int number; Track number or -1 -struct trackElement *track; Track or NULL - ->>description -Queues up a redraw for the specified track which can be -given either by number or by track structure. -If -.A number -is given it will take priority. -You can call this several times in the course of an action and gtk -should combine them into as few real re-draw requests as possible. - ->>code - int x, y; - int width, height; - - if (number >= 0) - track = md_track_nth(minfo->mdroot, number); - - if (track) { - - x = minfo->track_area.x; - width = minfo->track_area.width; - - y = track_to_y(minfo, MD_TRACKLIKE(track)->number); - height = minfo->vcp->vscale; - - dprintf2("Q-DRAW %d: %d,%d %dx%d", MD_TRACKLIKE(track)->number, x, y, width, height); - if (y >= 0) - gtk_widget_queue_draw_area(GTK_WIDGET(minfo), x, y, width, height); - - } - - MD_SET_MODIFIED(track, 0); - - ->>function add_track_cb -static void -GtkWidget *w; The menu item -gpointer data; The minfo - ->>code - MelysTrackInfo *minfo = data; - struct trackElement *track; - - g_assert(minfo->mdroot); - - track = md_track_new(); - MD_ELEMENT(track)->device_channel = minfo->mdroot->tracks; - MD_TRACKLIKE(track)->number = minfo->click_track; - - md_add_sort(MD_CONTAINER(minfo->mdroot), MD_ELEMENT(track)); - song_view_update(minfo->song); - - ->>function delete_track_cb -static void -GtkWidget *w; The menu item -gpointer data; The minfo - ->>code - MelysTrackInfo *minfo = data; - struct trackElement *track; - struct trackElement *trk; - int i; - - track = md_track_nth(minfo->mdroot, minfo->click_track); - - if (MD_SELECTED(track)) { - rescan: - for (i = 0; i < minfo->mdroot->tracks; i++) { - trk = md_track_nth(minfo->mdroot, i); - - if (MD_SELECTED(trk)) { - md_clear_data(MD_ELEMENT(trk)); - md_remove(MD_CONTAINER(minfo->mdroot), MD_ELEMENT(trk)); - goto rescan; - } - } - } else { - md_clear_data(MD_ELEMENT(track)); - md_remove(MD_CONTAINER(minfo->mdroot), MD_ELEMENT(track)); - } - - song_view_update(minfo->song); - ->>function delete_empty_cb -static void -GtkWidget *w; The menu item -gpointer data; The minfo - ->>code - MelysTrackInfo *minfo = data; - struct trackElement *trk; - int i; - - rescan: - for (i = 0; i < minfo->mdroot->tracks; i++) { - trk = md_track_nth(minfo->mdroot, i); - - if (MD_CONTAINER(trk)->elements->len == 0) { - md_remove(MD_CONTAINER(minfo->mdroot), MD_ELEMENT(trk)); - goto rescan; - } - } - song_view_update(minfo->song); - ->>function piano_cb -static void -GtkWidget *w; The menu item -gpointer data; The minfo - ->>code - MelysTrackInfo *minfo = data; - struct trackElement *track; - - track = md_track_nth(minfo->mdroot, minfo->click_track); - - create_piano(minfo->song, MD_CONTAINER(track)); - - ->>function create_piano -void -struct song *song; -struct containerElement *con; - ->>code - GtkWidget *mp; - - mp = melys_piano_new(con); - melys_view_set_song(MELYS_VIEW(mp), song); - mel_add_view(song->mdi, song->child, mp, 0); - - ->>function tempo_cb -static void -GtkWidget *w; The menu item -gpointer data; The minfo - ->>code - MelysTrackInfo *minfo = data; - - create_tempo(minfo->song); - - ->>function create_tempo -static void -struct song *song; - ->>description -This does not belong here. -Create a tempo view. ->>code - GtkWidget *mtempo; - struct tempomapElement *tmap; - - tmap = md_get_tempomap(song->mdroot); - - mtempo = melys_tempo_new(tmap); - melys_view_set_song(MELYS_VIEW(mtempo), song); - mel_add_view(song->mdi, song->child, mtempo, 0); - - ->>function props_cb -static void -GtkWidget *w; The menu item -gpointer data; The minfo - ->>code - MelysTrackInfo *minfo = data; - struct trackElement *track; - - track = md_track_nth(minfo->mdroot, minfo->click_track); - g_return_if_fail(track); - g_assert(MD_TYPE(track) == MD_TYPE_TRACK); - - track_prop_box(track, minfo->song, 0); - diff -rNu melys-0.1.16/widgets/melystransport.m melys-0.1.17/widgets/melystransport.m --- melys-0.1.16/widgets/melystransport.m Mon Aug 9 00:05:59 1999 +++ melys-0.1.17/widgets/melystransport.m Thu Jan 1 01:00:00 1970 @@ -1,18 +0,0 @@ ->>name melystransport.m - XXX - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header gtk/gtkdrawingarea.h ->>set gtktemplate 1 ->>gtkobject melys_transport gtk_drawing_area ->>unset gtktemplate - diff -rNu melys-0.1.16/widgets/melysview.c melys-0.1.17/widgets/melysview.c --- melys-0.1.16/widgets/melysview.c Fri Jan 7 11:13:58 2000 +++ melys-0.1.17/widgets/melysview.c Wed Feb 9 21:03:43 2000 @@ -552,10 +552,11 @@ * do not change state as the popup menu takes * control and we never see a button release. */ - if (mview->menu) + if (mview->menu) { gnome_popup_menu_do_popup(mview->menu, NULL, NULL, event, mview); - else - res = FALSE; + } else { + mview->click_state = CLICK_BUTTON3_DOWN; + } break; default: res = FALSE; @@ -613,9 +614,8 @@ mview->click_state = CLICK_INACTIVE; break; -#if 0 case 2: - if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK) + if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON2_MASK) mview->click_state = CLICK_INACTIVE; break; @@ -623,7 +623,6 @@ if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK) mview->click_state = CLICK_INACTIVE; break; -#endif default: res = FALSE; break; @@ -646,6 +645,8 @@ drag_setup(mview, event); mview->click_state = CLICK_INACTIVE; res = TRUE; + break; + case CLICK_BUTTON3_DOWN: break; default: break; diff -rNu melys-0.1.16/widgets/melysview.m melys-0.1.17/widgets/melysview.m --- melys-0.1.16/widgets/melysview.m Thu Jan 6 16:46:20 2000 +++ melys-0.1.17/widgets/melysview.m Thu Jan 1 01:00:00 1970 @@ -1,1489 +0,0 @@ ->>name melysview.m - A base class for graphical views of a song. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -This is a base class for widgets that provide a graphical view of a -song with the time along the x axis and something else on the y axis. -The methods here take care of scrolling, zooming and song position -pointer display. ->>extern - ->>header gdk_imlib.h ->>header gdk/gdkkeysyms.h ->>header gtk/gtkvbox.h ->>header gtk/gtkadjustment.h ->>header gtk/gtkdnd.h - ->>header libgnomeui/gnome-canvas.h ->>header libgnomeui/gnome-canvas-util.h ->>header libgnomeui/gnome-canvas-line.h ->>header libgnomeui/gnome-canvas-rect-ellipse.h ->>header libgnomeui/gnome-popup-menu.h - ->>header elements.h ->>header md.h ->>header viewcontrol.h ->>header melysrule.h ->>header melysgrid.h ->>header melwidgets.h ->>header melysscroll.h ->>header song.h - - ->>gtkobject melys_view MelysView gtk_vbox GtkVBox - ->>headerdef @header - - -struct _MelysView { - GtkVBox vbox; - - int type; /* View type what is being displayed */ - - ViewControl *vcp; - - /* Play position offset, in ticks */ - int poffset; - - /* The number of things in the vertical direction */ - int vthings; /* Number of notes, tracks whatever */ - - struct containerElement *viewcon; - struct song *song; - struct tempomapElement *tempomap; - - /* Widgets that are controlled by this widget */ - GtkWidget *canvas; /* The canvas that the subclass will place items on */ - GtkWidget *ruler; /* A ruler that can be used */ - GtkObject *posline; /* Song position pointer */ - GtkWidget *menu; /* The item context menu */ - GtkObject *grid; /* The background grid */ - - /* For the posline */ - void *points; - - /* A string to identify our display data */ - char *infostr; - - /* Button click state */ - int click_state; - struct element *click_elem; /* Element clicked on */ - ticktime_t click_tick; /* Time at point of click */ - - /* The 'thing' is not necessarily the immediate parent of click_elem */ - /* although it usually will be and it will be an ancestor */ - int click_nthing; /* The y position */ - struct containerElement *click_base; /* Thing at y position */ - - int mouse_tick; /* Last mouse tick position */ - int mouse_thing; /* Last mouse thing position */ -}; - -/* - * The class structure. There is only one of these allocated for - * the class. - */ -struct _MelysViewClass { - GtkVBoxClass parent_class; - - /* Signals */ - void (*scale_changed)(MelysView *); - - /* Mouse moved */ - void (*position_change)(MelysView *, int, int); - - /* Action on button 1 double click */ - void (*button1_double)(MelysView *, struct element *); - - /* Method to get the base containing element */ - struct containerElement *(*get_base_from_pos)(MelysView *, int thing); - - /* Drop element */ - gboolean (*drop_elem)(MelysView *, struct element *, int thing); - - /* Method to get the 'thing' number from the element */ - int (*get_nthing)(MelysView *, struct element *); -}; - - ->>headerdef meldnd.h - -/* - * The drag and drop types that belong to this application. - */ -extern GdkAtom MelysElemAtom; -#define MELYS_ELEM_ATOM_NAME "application/x-melys-element" -#define MELYS_ELEM_ATOM_ID 1 - -/* - * Data for same-app transfers. - * If we ever do inter-app transfers then we will have to convert - * to ascii such as mdml or use a corba interface. - * - * This structure is to be used in many contexts, could be - * a part within a track, notes within a part or even a - * part within a part. - */ -struct drag_element_data { - gint32 len; /* Number of elements in a */ - gint min_tick_offset; - gint min_thing_offset; - gint32 data_size; /* size of this structure */ - struct drag_element_data_elements { - gint32 tick_offset; /* time offset of click into part */ - gint32 thing_offset; /* track offset of click into part */ - gint32 tick_len; /* The length in ticks */ - - struct element *element; /* The element being moved */ - struct containerElement *con; /* Containing element */ - } a[1]; /* Realy more */ -}; - -struct outline_data { - struct _GnomeCanvasGroup *group; - int tickoffset; - int thingoffset; -}; - ->>extern - -#define VIEW_CLASS(mv) MELYS_VIEW_CLASS(GTK_OBJECT(mv)->klass) - -/* The list of signal id's that are being added for MelysView. */ ->>set signals -enum { - SCALE_CHANGED, - POSITION_CHANGE, - LAST_SIGNAL -}; - -/* - * This is used so that we can have different views of the same - * set of notes. Display information is saved with different ids - * for each view - */ -static int ViewID; - -#define x_to_tick(v, x) view_control_x_to_tick(MELYS_VIEW(v)->vcp, (x)) -#define tick_to_x(v, t) view_control_tick_to_x(MELYS_VIEW(v)->vcp, (t)) -#define y_to_thing(v, y) view_control_y_to_thing(MELYS_VIEW(v)->vcp, (y)) -#define thing_to_y(v, thing) view_control_thing_to_y(MELYS_VIEW(v)->vcp, (thing)) - -/* Drag and drop types */ -static const GtkTargetEntry targets[] = { - {MELYS_ELEM_ATOM_NAME, GTK_TARGET_SAME_APP, MELYS_ELEM_ATOM_ID}, -}; - -/* All the buttons that we deal with */ -#define ALL_BUTTON_MASK (GDK_BUTTON1_MASK|GDK_BUTTON2_MASK|GDK_BUTTON3_MASK) - -/* Mouse click state */ -enum click_state { - CLICK_INACTIVE, - CLICK_BUTTON1_DOWN, - CLICK_BUTTON2_DOWN, - CLICK_BUTTON3_DOWN, - CLICK_DRAGGING, - CLICK_GESTURE, - - CLICK_ERROR -}; - -/* Structure to keep selection info */ -struct sel_info { - struct element *elem; - struct containerElement *con; -}; - ->>function melys_view_init -static void -MelysView *mview; The MelysView to init ->>description -Initialise the MelysView. ->>code - GnomeCanvas *canvas; - GnomeCanvasPoints *points; - - mview->vcp = view_control_new(); - mview->poffset = 0; - mview->vthings = -1; - - mview->viewcon = NULL; - mview->song = NULL; - - points = gnome_canvas_points_new(2); - points->coords[0] = 0; - points->coords[1] = 0; - points->coords[2] = 0; - points->coords[3] = 0; - mview->points = points; - - mview->click_elem = NULL; - mview->click_tick = 0; - mview->click_nthing = 0; - mview->click_base = NULL; - mview->click_state = CLICK_INACTIVE; - - mview->ruler = (GtkWidget *)melys_rule_new(mview->vcp); - gtk_widget_ref(mview->ruler); - -#undef AA -#ifdef AA - /* The aa canvas is buggy at present Oct 1999 */ - gtk_widget_push_visual(gdk_rgb_get_visual()); - gtk_widget_push_colormap(gdk_rgb_get_cmap()); - canvas = (GnomeCanvas *)melys_scroll_new(mview->vcp, VC_BOTH, 0, 0); - canvas->aa = 1; -#else - gtk_widget_push_visual(gdk_imlib_get_visual()); - gtk_widget_push_colormap(gdk_imlib_get_colormap()); - canvas = (GnomeCanvas *)melys_scroll_new(mview->vcp, VC_BOTH, 0, 0); -#endif - - mview->canvas = GTK_WIDGET(canvas); - gtk_widget_ref(mview->canvas); - melys_view_add_scroll(mview, MELYS_SCROLL(mview->canvas)); - - mview->grid = (GtkObject *)gnome_canvas_item_new( - gnome_canvas_root(canvas), - melys_grid_get_type(), - NULL); - - melys_grid_set_adj(MELYS_GRID(mview->grid), mview->vcp); - - mview->posline = (GtkObject *)gnome_canvas_item_new( - gnome_canvas_root(canvas), - GNOME_TYPE_CANVAS_LINE, - "points", mview->points, - NULL); - - mview->infostr = g_strdup_printf("%d-info", ViewID++); - - gtk_signal_connect(GTK_OBJECT(mview->vcp), "scale-changed", - vcp_scale_changed, mview); - - /* Set up a drop site for this widget */ - gtk_drag_dest_set(GTK_WIDGET(mview->canvas), - GTK_DEST_DEFAULT_MOTION, - targets, NELEM(targets), GDK_ACTION_MOVE|GDK_ACTION_COPY); - gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-drop", - GTK_SIGNAL_FUNC(drag_drop), mview); - gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-data-get", - GTK_SIGNAL_FUNC(drag_data_send), mview); - gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-data-received", - GTK_SIGNAL_FUNC(drag_data_received), mview); - gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-motion", - GTK_SIGNAL_FUNC(drag_motion), mview); - gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-leave", - GTK_SIGNAL_FUNC(drag_leave), mview); - gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-end", - GTK_SIGNAL_FUNC(drag_end), mview); - gtk_signal_connect(GTK_OBJECT(mview->canvas), "event", - GTK_SIGNAL_FUNC(canvas_event), mview); - - - ->>function melys_view_class_init -static void -MelysViewClass *klass; The class to initialise - ->>description -Initialize the class. - ->>code - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkVBoxClass *vbox_class; - - object_class = (GtkObjectClass *)klass; - widget_class = (GtkWidgetClass *)klass; - vbox_class = (GtkVBoxClass *)klass; - - parent_class = gtk_type_class(gtk_vbox_get_type()); - - melys_view_signals[SCALE_CHANGED] = gtk_signal_new("scale-changed", - GTK_RUN_FIRST, - object_class->type, - GTK_SIGNAL_OFFSET(MelysViewClass, scale_changed), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0 - ); - melys_view_signals[POSITION_CHANGE] = gtk_signal_new("position-change", - GTK_RUN_FIRST, - object_class->type, - GTK_SIGNAL_OFFSET(MelysViewClass, position_change), - gtk_marshal_NONE__INT_INT, - GTK_TYPE_NONE, 2, - GTK_TYPE_INT, - GTK_TYPE_INT - ); - - gtk_object_class_add_signals(object_class, melys_view_signals, LAST_SIGNAL); - - object_class->destroy = view_destroy; - - widget_class->draw = view_draw; - - klass->scale_changed = view_scale_changed; - klass->button1_double = NULL; - klass->get_base_from_pos = view_def_get_base; - klass->drop_elem = view_def_drop; - klass->get_nthing = NULL; - - ->>function view_destroy -static void -GtkObject *obj; - ->>code - MelysView *mview = MELYS_VIEW(obj); - - g_return_if_fail(IS_MELYS_VIEW(obj)); - - gnome_canvas_points_unref(mview->points); - - if (mview->posline) - gtk_object_destroy(GTK_OBJECT(mview->posline)); - - if (mview->vcp) { - gtk_object_unref(GTK_OBJECT(mview->vcp)); - mview->vcp = NULL; - } - if (mview->ruler) { - gtk_widget_unref(mview->ruler); - mview->ruler = NULL; - } - if (mview->canvas) { - gtk_widget_unref(mview->canvas); - mview->canvas = NULL; - } - - if (mview->viewcon) { - md_free(MD_ELEMENT(mview->viewcon)); - mview->viewcon = NULL; - } - if (mview->tempomap) { - md_free(MD_ELEMENT(mview->tempomap)); - mview->tempomap = NULL; - } - if (mview->infostr) { - g_free(mview->infostr); - mview->infostr = NULL; - } - - if (GTK_OBJECT_CLASS(parent_class)->destroy) - (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); - - ->>function view_draw -static void -GtkWidget *widget; -GdkRectangle *area; - ->>description -Look through all the parts and set up the part items for -each part. - ->>code - MelysView *mview = (MelysView *)widget; - - set_scrolls(mview); - - if (mview->grid) - gnome_canvas_item_request_update((GnomeCanvasItem *)mview->grid); - if (mview->posline) - gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mview->posline); - - GTK_WIDGET_CLASS(parent_class)->draw(widget, area); - - ->>function melys_view_set_song -void -MelysView *mview; The view -struct song *song; The song to set - ->>description -Set the song that this view is representing. -Useful information such as the song position pointer -and the tempomap are extracted. - ->>code - g_return_if_fail(mview->song == NULL); - - mview->song = song; - if (song->mdroot) { - mview->tempomap = md_get_tempomap(song->mdroot); - MD_REF(mview->tempomap); - } - melys_rule_set_tempomap(MELYS_RULE(mview->ruler), mview->tempomap); - melys_grid_set_tempomap(MELYS_GRID(mview->grid), mview->tempomap); - - if (song->posadj) { - view_control_set_posadj(mview->vcp, song->posadj); - gtk_signal_connect_while_alive((GtkObject *)mview->vcp->posadj, - "value-changed", (GtkSignalFunc)song_pos_cb, mview, - GTK_OBJECT(mview)); - } - - gtk_signal_emit(GTK_OBJECT(mview), melys_view_signals[SCALE_CHANGED]); - - ->>function melys_view_add_scroll -void -MelysView *mview; -MelysScroll *mscroll; Scrolling widget to add - ->>description -Associate the specified -.A mscroll -widget with this -.A mview -widget. -The relevant position change signals are connected to our own -position change signal. - ->>code - - gtk_signal_connect(GTK_OBJECT(mscroll), "position-change", - view_pos_change, mview); - - ->>function view_pos_change -static void -MelysScroll *mscroll; -int tick; -int thing; -gpointer data; ->>code - MelysView *mview = MELYS_VIEW(data); - - if (tick != mview->mouse_tick || thing != mview->mouse_thing) { - mview->mouse_tick = tick; - mview->mouse_thing = thing; - gtk_signal_emit(GTK_OBJECT(mview), - melys_view_signals[POSITION_CHANGE], tick, thing); - } - - ->>function canvas_event -static int -GtkWidget *w; -GdkEvent *event; -gpointer data; - ->>description -An event on the canvas. -Events appear to come here first, must return false to -allow the items to see them. - ->>code - MelysView *mview = MELYS_VIEW(data); - double dx, dy; - int x, y; - - gnome_canvas_window_to_world(GNOME_CANVAS(mview->canvas), - (double) event->motion.x, event->motion.y, - &dx, &dy); - - x = dx; y = dy; - - switch (event->type) { - - case GDK_KEY_PRESS: - return key_press(mview, NULL, &event->key); - - default: - break; - } - - return FALSE; - - ->>function melys_view_item_event -int -GtkObject *item; This is the canvas item that is receiving the event -GdkEvent *event; The event -gpointer data; The MelysView (sub-class) object - ->>description -The implementation connects "event" of all its relavent canvas -items to this function which implements the standard behaviour -for button clicks etc. - ->>code - MelysView *mview = data; - struct element *elem; - struct display_info *dinfo; - int res = FALSE; - - /* Get the display data from the group */ - dinfo = gtk_object_get_data(item, mview->infostr); - g_assert(dinfo); - - elem = dinfo->elem; - dprintf(3, "event %d for elem %d", event->type, elem->type); - - switch (event->type) { - case GDK_BUTTON_PRESS: - /* Save the original location */ - mview->click_elem = elem; - mview->click_tick = x_to_tick(mview, event->button.x); - mview->click_nthing = y_to_thing(mview, event->button.y); - - mview->click_base = VIEW_CLASS(mview)->get_base_from_pos( - mview, mview->click_nthing); - - res = button_press(mview, elem, &event->button); - break; - - case GDK_2BUTTON_PRESS: - if (event->button.button == 1 && VIEW_CLASS(mview)->button1_double) - VIEW_CLASS(mview)->button1_double(mview, elem); - break; - - case GDK_BUTTON_RELEASE: - res = button_release(mview, elem, &event->button); - break; - - case GDK_MOTION_NOTIFY: - if (event->motion.state & ALL_BUTTON_MASK) - res = button_motion(mview, elem, &event->motion); - break; - - default: - break; - } - - return res; - - ->>function button_press -static int -MelysView *mview; -struct element *elem; -GdkEventButton *event; - ->>description -Action to take when button 1 is pressed. - ->>code - int res = TRUE; - - if (mview->click_state != CLICK_INACTIVE) { - mview->click_state = CLICK_ERROR; - return TRUE; - } - - switch (event->button) { - case 1: - mview->click_state = CLICK_BUTTON1_DOWN; - break; - - case 2: - mview->click_state = CLICK_BUTTON2_DOWN; - break; - - case 3: - /* - * We checked that we were in the correct state, but - * do not change state as the popup menu takes - * control and we never see a button release. - */ - if (mview->menu) - gnome_popup_menu_do_popup(mview->menu, NULL, NULL, event, mview); - else - res = FALSE; - break; - default: - res = FALSE; - break; - } - - return res; - - ->>function button_release -static int -MelysView *mview; -struct element *elem; -GdkEventButton *event; - ->>description -Button 1 has been pressed on a part item. -This selects the item. - ->>code - int res = TRUE; - int mask; - struct display_info *dinfo; - - dinfo = g_dataset_get_data(elem, mview->infostr); - - if (mview->click_state == CLICK_ERROR) { - - mask = event->state & ALL_BUTTON_MASK; - - switch (event->button) { - case 1: mask &= ~GDK_BUTTON1_MASK; break; - case 2: mask &= ~GDK_BUTTON2_MASK; break; - case 3: mask &= ~GDK_BUTTON3_MASK; break; - } - - /* - * We had an error, now if this is the last button - * to be released then we can clear back to inactive state. - */ - if (mask == 0) - mview->click_state = CLICK_INACTIVE; - return TRUE; - } - - switch (event->button) { - case 1: - - dprintf2("Button at %f,%f\n", event->x, event->y); - if (!(event->state & GDK_CONTROL_MASK)) - md_clear_all_sel_by_type(MD_ELEMENT(mview->viewcon), MD_TYPE(elem)); - - MD_SET_SELECTED(elem, !MD_SELECTED(elem)); - - /* Is there a more efficient way */ - song_view_update(mview->song); - - if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON1_MASK) - mview->click_state = CLICK_INACTIVE; - break; - -#if 0 - case 2: - if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK) - mview->click_state = CLICK_INACTIVE; - break; - - case 3: - if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK) - mview->click_state = CLICK_INACTIVE; - break; -#endif - default: - res = FALSE; - break; - } - - return res; - ->>function button_motion -static int -MelysView *mview; -struct element *elem; -GdkEventMotion *event; - ->>description -Motion when a button is pressed down. -Drag and drop on button 1, gesture based editing on button 2. - ->>code - int res = FALSE; - - switch (mview->click_state) { - case CLICK_BUTTON1_DOWN: - drag_setup(mview, event); - mview->click_state = CLICK_INACTIVE; - res = TRUE; - break; - default: - break; - } - - return res; - ->>function key_press -static int -MelysView *mview; -struct element *el; -GdkEventKey *kevent; - ->>code - - switch (kevent->keyval) { - case GDK_Delete: - delete_selected(mview); - break; - default: - return FALSE; - } - - return TRUE; - - ->>function delete_selected -static void -MelysView *mview; ->>code - GSList *list; - GSList *li; - - list = md_build_sel(NULL, MD_ELEMENT(mview->viewcon), mview->type); - li = list; - while (li) { - struct element *el; - - el = (struct element *)li->data; - if (el) { - md_clear_data(el); - md_remove(el->con, el); - } - - li = li->next; - } - - g_slist_free(list); - - ->>function set_hscroll -static void -MelysView *mview; - ->>description -We own the horizontal adjustment in the track display. -Therefore set the bounds and keep the value correct here. -The range is set to the duration of the piece plus a full width -of the display area. - ->>code - int pageticks; - int ticklen; - GtkAdjustment *adj; - - if (!GTK_WIDGET_REALIZED(mview)) - return; - - adj = mview->vcp->hadj; - - pageticks = x_to_tick(mview, GTK_WIDGET(mview->canvas)->allocation.width); - ticklen = MD_ENDTIME(mview->viewcon) + pageticks; - - adj->page_size = pageticks; - adj->page_increment = adj->page_size; - adj->step_increment = x_to_tick(mview, 20); - - view_control_set_range(mview->vcp, - VC_HORIZONTAL, MD_TIME(mview->viewcon), ticklen); - - if (adj->value > adj->upper - adj->page_size) - adj->value = adj->upper - adj->page_size; - - gtk_adjustment_value_changed(adj); - - ->>function set_vscroll -static void -MelysView *mview; - ->>description -Calculate how many things are visible on the page and set this -as the page increment. -Err on the low side. - ->>code - int height; - GtkAdjustment *adj; - - height = GTK_WIDGET(mview->canvas)->allocation.height; - adj = mview->vcp->vadj; - - adj->page_size = height / mview->vcp->vscale; - adj->page_increment = adj->page_size; - - /* Re-set the vertical scrollbar limits */ - view_control_set_range(mview->vcp, VC_VERTICAL, 0.0, mview->vthings); - - ->>function song_pos_cb -static void -GtkAdjustment *adj; The song adjusment -gpointer data; This is our mview pointer - ->>description -This gets called when the song position pointer is updated. -This could be because the user changed it in a different -widget or during playback. - ->>code - MelysView *mview = MELYS_VIEW(data); - GtkAdjustment *hadj; - ticktime_t t; - int hoff; - int x; - - hadj = mview->vcp->hadj; - - t = (ticktime_t)mview->vcp->posadj->value; - x = tick_to_x(mview, t); - - if (x != tick_to_x(mview, mview->poffset)) { - int boundry; - int page_width; - - mview->poffset = t; - canvas_item_move_abs((GnomeCanvasItem*)mview->posline, - tick_to_x(mview, t), 0.0); - - /* - * First if this time is over the endtime then we are recording - * or otherwise increasing the length of the song. - * Increase the root duration to match, add on extra to - * avoid too many repeated calls -- it can be shrunk again - * later. - * XXX needs some thought -- should only increase when we are - * recording. We do not want views on parts to cause the part to - * increase. - */ - if (MD_TYPE(mview->viewcon) == MD_TYPE_TRACK && - t > MD_ENDTIME(mview->viewcon)) { - MD_SET_DURATION(mview->viewcon, t + hadj->page_size); - mview->vcp->posadj->upper = MD_ENDTIME(mview->viewcon); - set_scrolls(mview); - } - - /* - * If we are just about to go off the end then shift the - * canvas over so that we are just over from the left. - * But if the line is already past the edge then don't - * scroll. This is so you can scroll by hand with out it - * always jumping back. - */ - page_width = x_to_tick(mview, - GTK_WIDGET(mview->canvas)->allocation.width); - boundry = page_width / 10; - - hoff = MELYS_SCROLL(mview->canvas)->hoffset; - if (t - hoff > (ticktime_t)page_width - boundry && - t - hoff <= (ticktime_t)page_width) { - - /* If this is a restricted part then just fall off end */ - if (t < MD_ENDTIME(mview->viewcon)) { - hadj->value += page_width - 2*boundry; - set_hscroll(mview); - } - } - - /* - * This is a temporary way to ensure that we return to the - * beginning when starting playing. - */ - if (x < 5) {/*XXX*/ - hadj->value = 0; - set_scrolls(mview); - } - } - - - ->>function set_scrolls -static void -MelysView *mview; - ->>description -Set the canvas scrolling region. -The complete area required to show the current song at the -current scaling is calculated. -This is the scroll region for the canvas and the canvas -will take care of allowing that regions to be seen in conjunction -with our scroll bars. - ->>code - int height; - GnomeCanvasPoints *points; - GtkAdjustment *hadj; - GtkAdjustment *vadj; - ViewControl *vcp; - - /* You need to set vthings */ - g_return_if_fail(mview->vthings >= 0); - - if (!GTK_WIDGET_REALIZED(mview)) - return; - - vcp = mview->vcp; - hadj = vcp->hadj; - vadj = vcp->vadj; - - /* It is our job to modify the page_size for the horizontal scroll */ - set_hscroll(mview); - set_vscroll(mview); - - height = mview->vcp->vadj->upper * mview->vcp->vscale; - if (height < GTK_WIDGET(mview->canvas)->allocation.height) - height = GTK_WIDGET(mview->canvas)->allocation.height; - - points = mview->points; - points->coords[0] = 0.0; - points->coords[1] = 0.0; - points->coords[2] = 0.0; - points->coords[3] = height; - - gnome_canvas_item_set((GnomeCanvasItem *)mview->posline, - "points", points, - NULL); - - ->>function vcp_scale_changed -static void -GtkObject *vobj; This will be the vcp -gpointer data; This is our mview info - ->>code - GtkObject *mviewobj = data; - - /* - * Emit our own melys_view::scale-changed signal in - * response to a view_control::scale-changed - */ - gtk_signal_emit(mviewobj, melys_view_signals[SCALE_CHANGED]); - - ->>function view_scale_changed -static void -MelysView *mview; - ->>description -Default implementation of our scale_changed signal. -Sets the scroll region to suit the new configuration. - ->>code - - set_scrolls(mview); - - ->>function drag_setup -static void -MelysView *mview; -GdkEventMotion *event; - ->>description ->>code - GtkTargetList *tlist; - struct element *clickelem; - struct drag_element_data *dragdata; - GSList *list; - int mintickoff = 0; - int minthingoff = 0; - int size; - int len; - int i; - - tlist = gtk_target_list_new(targets, NELEM(targets)); - - clickelem = mview->click_elem; - - /* - * If the part that was click was selected, then we move all - * selected parts. If it wasn't then we just move the part that - * was clicked. - */ - if (MD_SELECTED(clickelem)) { - list = md_build_sel(NULL, MD_ELEMENT(mview->viewcon), - MD_TYPE(clickelem)); - len = g_slist_length(list); - } else { - /* - * Not moving the selected parts. Just create a - * temporary list of the single part. - */ - len = 1; - list = g_slist_append(NULL, clickelem); - } - - size = sizeof(struct drag_element_data) + - len * sizeof(struct drag_element_data_elements); - dragdata = g_malloc(size); - dragdata->data_size = size; - - for (i = 0; i < len; i++) { - int nthing; - struct element *elem; - - elem = g_slist_nth_data(list, i); - - nthing = VIEW_CLASS(mview)->get_nthing(mview, elem); - - dragdata->a[i].element = elem; - dragdata->a[i].con = elem->con; /*XXX not needed */ - dragdata->a[i].tick_offset = MD_TIME(elem) - mview->click_tick; - dragdata->a[i].thing_offset = nthing - mview->click_nthing; - dragdata->a[i].tick_len = md_get_duration(elem); - - mintickoff = MIN(mintickoff, dragdata->a[i].tick_offset); - minthingoff = MIN(minthingoff, dragdata->a[i].thing_offset); - } - dragdata->len = len; - dragdata->min_tick_offset = mintickoff; - dragdata->min_thing_offset = minthingoff; - - g_slist_free(list); - - gtk_object_set_data_full(GTK_OBJECT(mview->canvas), "drag-element-data", - dragdata, g_free); - - gtk_drag_begin(GTK_WIDGET(mview->canvas), - tlist, GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_ASK, - 1 /* The button number */, (GdkEvent*)event); - - gtk_target_list_unref(tlist); - - ->>function drag_motion -static gboolean -GtkWidget *widget; -GdkDragContext *context; -gint x; -gint y; -guint time; -gpointer user_data; - ->>description -Move around the drag outline group so that the user -can tell where the drag will land. - ->>code - MelysView *mview = user_data; - struct outline_data *oldata; - double wx, wy; - ticktime_t tick; - int thing; - - gnome_canvas_window_to_world(GNOME_CANVAS(mview->canvas), - (double)x, (double)y, &wx, &wy); - - thing = y_to_thing(mview, wy); - - oldata = gtk_object_get_data(GTK_OBJECT(mview), "outline-data"); - if (oldata == NULL) - oldata = drag_enter(mview, context); - if (oldata == NULL) - return FALSE; - - tick = oldata->tickoffset + x_to_tick(mview, wx); - if (tick < 0) - tick = 0; - wy = thing_to_y(mview, oldata->thingoffset) + wy - mview->vcp->vheight/2; - if (wy < 0) - wy = 0; - - tick = md_snap_tick(mview->tempomap, mview->vcp->snap, tick); - wx = tick_to_x(mview, tick); - canvas_item_move_abs(GNOME_CANVAS_ITEM(oldata->group), wx, wy); - - /* Synthesize motion events */ - view_pos_change(MELYS_SCROLL(mview->canvas), - x_to_tick(mview, wx), thing, mview); - - return TRUE; - - ->>function drag_enter -static struct outline_data * -MelysView *mview; -GdkDragContext *context; - ->>description -When a drag enters this widget, we construct a set of outlines -that represent the position of the drag. -The following drag motion events will be used to move these -outlines around. - -Keep in mind that the source of the drag could be a different type of -widget. -It could also be from a different application and even from a -different machine, although this isn't supported yet. - ->>code - GtkWidget *srcw; - GnomeCanvasGroup *group; - struct outline_data *oldata; - struct drag_element_data *dragdata; - struct drag_element_data_elements *dp; - double squeeze; - int len; - int i; - - srcw = gtk_drag_get_source_widget(context); - if (srcw == NULL) { - /* Another app probably which we don't yet deal with */ - return NULL; - } - - oldata = g_new(struct outline_data, 1); - dragdata = gtk_object_get_data(GTK_OBJECT(srcw), "drag-element-data"); - len = dragdata->len; - - /* - * All the outlines are placed into this group so that they - * can be moved as a unit to follow the cursor. - */ - group = (GnomeCanvasGroup *) gnome_canvas_item_new( - gnome_canvas_root((GnomeCanvas*)mview->canvas), - GNOME_TYPE_CANVAS_GROUP, - "x", 0.0, - "y", 0.0, - NULL); - - /* We now have enough information to fill the outline data */ - oldata->group = group; - oldata->tickoffset = dragdata->min_tick_offset; - oldata->thingoffset = dragdata->min_thing_offset; - - squeeze = get_squeeze_factor(mview->type, dragdata->a[0].element->type); - oldata->thingoffset *= squeeze; - - /* - * Create the individual outlines for each part that is being - * moved. - */ - for (i = 0; i < len; i++) { - int x1, y1; - - dp = dragdata->a + i; - - - x1 = tick_to_x(mview, dp->tick_offset - dragdata->min_tick_offset); - y1 = thing_to_y(mview, dp->thing_offset - dragdata->min_thing_offset); - - gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_RECT, - "x1", (double) x1, - "y1", (double) y1 * squeeze, - "x2", (double) x1 + tick_to_x(mview, dp->tick_len), - "y2", (double) (y1 + mview->vcp->vheight) * squeeze, - "width_pixels", 1, - "outline_color", "yellow", - NULL); - } - - /* Save for later use */ - gtk_object_set_data_full(GTK_OBJECT(mview), "outline-data", oldata, - (GtkDestroyNotify)outline_data_free); - - return oldata; - - ->>function drag_leave -static void -GtkWidget *widget; -GdkDragContext *context; -guint time; -gpointer user_data; - ->>description -This gets called when the drag leaves our window and also -at the end of the drag. -So its a good place to tidy up in. - ->>code - MelysView *mview = user_data; - - gtk_object_remove_data(GTK_OBJECT(mview), "outline-data"); - - ->>function drag_drop -static gboolean -GtkWidget *widget; The destination canvas widget -GdkDragContext *context; -gint x; -gint y; -guint time; -gpointer user_data; - ->>description -A callback that is called when a drop is made. -We study the context and decide which format to request. -Then we request the data. - ->>code - - dprintf1("drag drop on %s 0x%x at %d,%d\n", - gtk_type_name(GTK_OBJECT_TYPE(widget)), widget, x, y); - - /* We want the internal element format */ - gtk_drag_get_data(widget, context, MelysElemAtom, time); - - return TRUE; - - ->>function drag_data_send -static void -GtkWidget *widget; The source widget -GdkDragContext *context; The drag context -GtkSelectionData *selection_data; The data is set into here -guint info; Identification of transfer type -guint time; The associated time -gpointer data; The mview widget - ->>description -This is a callback that is executed when the drag_data_get signal is -received. -This means that we are being asked to send the data to -the destination. -It sends the element that is being dragged to the receiving -end. - ->>code - MelysView *mview = data; - struct element *elem; - struct drag_element_data *dragdata; - int len; - - if (info != MELYS_ELEM_ATOM_ID) { - g_warning("unexpected drag type received"); - return; - } - - elem = mview->click_elem; - - dragdata = gtk_object_get_data(GTK_OBJECT(mview->canvas), - "drag-element-data"); - len = dragdata->len; - - gtk_selection_data_set(selection_data, - selection_data->target, 8, - (guchar *)dragdata, dragdata->data_size); - - ->>function drag_data_received -static void -GtkWidget *widget; The destination widget -GdkDragContext *context; The drag context -gint x; The drop point in window coords (I think) -gint y; The drop point -GtkSelectionData *data; Data from the other side -guint info; The type of drag -guint time; Time of event -gpointer user_data; User data, probably not used - ->>description -This routine is called when a signal arrives on the destination -widget to say that data has actually been received. - ->>code - MelysView *mview; - struct drag_element_data *dragdata; - struct drag_element_data_elements *dp; - struct element *newelem; - ticktime_t t; - gboolean needrm = FALSE; - double dx, dy; - double squeeze; - int len; - int res; - int i; - - mview = MELYS_VIEW(user_data); - newelem = NULL; - - /* We are given window coordinate, so convert to world coords */ - gnome_canvas_window_to_world(GNOME_CANVAS(mview->canvas), - x, y, &dx, &dy); - x = (int)dx; - y = (int)dy; - - dprintf(2, "data received len %d %p, at %d,%d", - data->length, *(char **)data->data,x, y); - - dprintf(2, "data received len %d %p, at %g,%g %d,%d", - data->length, *(char **)data->data, dx, dy, x, y); - - dragdata = (struct drag_element_data *)data->data; - len = dragdata->len; - - /* - * We can not drop before the begining, so adjust the drop - * point as though the user had dropped so that that the - * selected rectangle was at 0. - */ - if (x + tick_to_x(mview, dragdata->min_tick_offset) < 0) - x = -tick_to_x(mview, dragdata->min_tick_offset); - if (y + thing_to_y(mview, dragdata->min_thing_offset) < 0) - y = -thing_to_y(mview, dragdata->min_thing_offset); - squeeze = get_squeeze_factor(mview->type, dragdata->a[0].element->type); - if (squeeze == 0) - goto error; - - md_undo_begin_set(MD_UNDO(mview->mdroot)); - - for (i = 0; i < len; i++) { - int tn; - int toff; - - dp = dragdata->a + i; - toff = dp->thing_offset * squeeze; - - switch (context->action) { - case GDK_ACTION_MOVE: - - /* Moving so new is same as old */ - newelem = dp->element; - - MD_REF(newelem); - md_remove(newelem->con, newelem); - - needrm = TRUE; - break; - - case GDK_ACTION_COPY: - newelem = md_copy(dp->element); - MD_REF(newelem); - break; - - default: - g_assert_not_reached(); - } - - t = dp->tick_offset + x_to_tick(mview, x); - if (t < 0) - t = 0; - t = md_snap_tick(mview->tempomap, mview->vcp->snap, t); - - tn = dp->thing_offset + y_to_thing(mview, y); - if (tn < 0) - tn = 0; - - /* - * We set the time, then hand to the class specific - * routine to do the real work of adding to the new track. - */ - md_change_time(newelem, t); - res = VIEW_CLASS(mview)->drop_elem(mview, newelem, tn); - if (res == FALSE) - goto error; /* Realy too late, half done */ - - MD_UNREF(newelem); - - md_clear_data(newelem); - } - - gtk_drag_finish(context, TRUE, needrm, time); - md_undo_end_set(MD_UNDO(mview->mdroot)); - - if (mview->posline) - gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mview->posline); - - md_shrink(mview->song->mdroot); - song_view_update(mview->song); - return; - - error: - gtk_drag_finish(context, FALSE, FALSE, time); - - ->>function outline_data_free -static void -gpointer data; - ->>code - struct outline_data *od = data; - - gtk_object_destroy(GTK_OBJECT(od->group)); - g_free(od); - - ->>function drag_end -static void -GtkWidget *widget; -GdkDragContext *drag_context; -gpointer user_data; - ->>code - MelysView *mview = user_data; - - dprintf2("@func_name\n"); - gtk_object_remove_data(GTK_OBJECT(mview), "drag-element-data"); - - ->>function view_def_get_base -static struct containerElement * -MelysView *mview; -int thing; - ->>description -The default implementation of this method returns the -same container that the view is based on. -This is correct for the piano roll and tempo views. -It will need overriding for the part display view. - ->>code - - return mview->viewcon; - - ->>function view_def_drop -static gboolean -MelysView *mview; -struct element *el; -int thing; - ->>description -The default implementation of this method returns the -topmost container above the one that the view is based on -ignoring the specified thing position. -Will probably always have to be overridden, so maybe not -useful. - ->>code - - dprintf1("merging in at %d\n", MD_TIME(el)); - md_set_devchan(el, MD_DEVCHAN(mview->viewcon)); - merge_in_elem(mview->viewcon, el); - - return TRUE; - - ->>function get_squeeze_factor -static double -int target; The type of the target view -int droptype; The type being dropped - ->>code - switch (target) { - case MD_TYPE_TEMPO: - switch (droptype) { - case MD_TYPE_TEMPO: - return 1; - case MD_TYPE_PART: - return 0; - case MD_TYPE_NOTE: - return 0; - } - break; - case MD_TYPE_PART: - switch (droptype) { - case MD_TYPE_TEMPO: - return 0; - case MD_TYPE_PART: - return 1; - case MD_TYPE_NOTE: - return 1.0/128; - } - break; - case MD_TYPE_NOTE: - switch (droptype) { - case MD_TYPE_TEMPO: - return 0; - case MD_TYPE_PART: - return 128.0; - case MD_TYPE_NOTE: - return 1; - } - break; - } - - g_warning("@func_name case %d/%d not implemented", target, droptype); - return 0; diff -rNu melys-0.1.16/widgets/misc.m melys-0.1.17/widgets/misc.m --- melys-0.1.16/widgets/misc.m Thu Dec 2 17:19:52 1999 +++ melys-0.1.17/widgets/misc.m Thu Jan 1 01:00:00 1970 @@ -1,88 +0,0 @@ ->>name misc.m - misc helper widgets - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header gtk/gtk.h ->>header libgnomeui/gnome-canvas.h ->>header libart_lgpl/art_affine.h ->>header pixmaps.h ->>header melgui.h ->>header elements.h ->>header md.h - ->>headerdef --decl melwidgets.h - -struct _GnomeCanvasItem; - -/* - * A structure to keep track of displayed elements. - */ -struct display_info { - GtkObject *item; /* The associated display item */ - struct containerElement *con; /* Container for elem */ - struct element *elem; /* The element being displayed */ -}; - ->>function mel_int_spinner -GtkWidget * -int lower; Lower value -int upper; Upper value -int val; Initial value - - ->>code - GtkObject *adj; - GtkWidget *spin; - - adj = gtk_adjustment_new(val, (gfloat)lower, (gfloat)upper, 1.0, 1.0, 1.0); - - spin = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1.0, 0); - - gtk_spin_button_set_shadow_type((GtkSpinButton *)spin, GTK_SHADOW_IN); - gtk_spin_button_set_wrap((GtkSpinButton *)spin, 1); - - return spin; - - ->>function canvas_item_move_abs -void -struct _GnomeCanvasItem *item; -double x; -double y; - ->>description -Gnome only appears to provide a relative routine at the time -of writing. -So here is the routine to give absolute coordinates. - ->>code - affine_t translate; - - art_affine_translate(translate, x, y); - gnome_canvas_item_affine_absolute(item, translate); - - ->>function display_info_free -void -gpointer _dinfo; - ->>code - struct display_info *dinfo = _dinfo; - - gtk_object_destroy((GtkObject *) dinfo->item); - gtk_object_unref((GtkObject *) dinfo->item); - MD_WUNREF(dinfo->con); - MD_WUNREF(dinfo->elem); - - g_free(_dinfo); - - diff -rNu melys-0.1.16/widgets/register.m melys-0.1.17/widgets/register.m --- melys-0.1.16/widgets/register.m Mon Sep 27 14:05:13 1999 +++ melys-0.1.17/widgets/register.m Thu Jan 1 01:00:00 1970 @@ -1,192 +0,0 @@ ->>name register.m - XXX - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - ->>header gtk/gtk.h ->>headerdef --decl melreg.h - -typedef int regid_t; - ->>extern - -/* - * This is the list of things we have registered. Don't expect that - * many but obviously if this changes then a hash table may be better. - */ -static GSList *regobjs = NULL; - -/* The structure that saves the ids */ -struct regid { - int id; - GtkObject *obj; - GtkObject *parent; - gint objsig; -}; - -/* The id generator, start at 1 as 0 is the invalid value */ -static int nextId = 1; - ->>function reg_object -int -GtkObject *obj; Object to be registered -GtkObject *parent; If given obj will be destroyed when parent is - ->>description -Register the object and return an integer that can be used to -identify it in the future by calling -.F reg_get . -When the object is destroyed its reference will be too. -This saves you having to keep track of the object which can -be tricky if using a non-modal dialog and the user deletes -the window manually. - -As an added convenience if you pass in -.A parent -it will be set up to destroy -.A obj -when the parent dies. - ->>code - struct regid *idp; - int id; - - id = nextId++; - - /* Get a save struct for the data */ - idp = g_new0(struct regid, 1); - idp->id = id; - idp->obj = obj; - - /* connect signals to unsave when destroyed */ - idp->objsig = gtk_signal_connect - (obj, "destroy", destroy_cb, GINT_TO_POINTER(idp->id)); - - /* Save it */ - regobjs = g_slist_append(regobjs, (gpointer)idp); - - /* Set up for the parent if required */ - if (parent) { - gtk_signal_connect_object_while_alive - (parent, "destroy", GTK_SIGNAL_FUNC(gtk_object_destroy), obj); - } - - return id; - ->>function reg_get -GtkObject * -int id; The ID of the object to recover - ->>description -Get the object corresponding to a saved ID. -If the object has been destroyed then it will not be found -and NULL will be returned. - ->>code - GSList *lp; - struct regid *idp; - - for (lp = regobjs; lp; lp = lp->next) { - idp = (struct regid *)lp->data; - if (idp->id == id) - return idp->obj; - } - - /* Not found, normal if it has been destroyed */ - return NULL; - ->>function reg_get_widget -GtkWidget * -int id; The ID of the object to recover - ->>description -As for -.F reg_get -except that it returns a widget type. -Obviously it must have been saved as a widget. - ->>code - GtkObject *obj; - - obj = reg_get(id); - - if (obj) - return GTK_WIDGET(obj); - else - return NULL; - ->>function reg_unreg -void -regid_t id; - ->>code - GtkObject *obj; - GSList *lp; - struct regid *idp; - - obj = NULL; - - for (lp = regobjs; lp; lp = lp->next) { - idp = (struct regid *)lp->data; - if (idp->id == id) { - break; - } - } - - if (lp) { - if (idp->objsig) - gtk_signal_disconnect(idp->obj, idp->objsig); - } - - ->>function reg_destroy -void -int id; Register id of widget to destroy - ->>description -The object corresponding to the specified id is destroyed if -it hasn't already been. - ->>code - GtkObject *obj; - - obj = reg_get(id); - if (obj) - gtk_object_destroy(obj); - - ->>function destroy_cb -static void -GtkObject *obj; The destroyed object -gpointer data; Its id - ->>description -Clean up when one of the register objects is destroyed. -The record will be removed. - ->>code - GSList *lp; - struct regid *idp; - - dprintf1("Destroy notify %s(id %d) at %p", - gtk_type_name(GTK_OBJECT_TYPE(obj)), GPOINTER_TO_INT(data), obj); - - for (lp = regobjs; lp; lp = lp->next) { - idp = (struct regid *)lp->data; - if (idp->id == GPOINTER_TO_INT(data)) { - regobjs = g_slist_remove_link(regobjs, lp); - if (idp->objsig) - gtk_signal_disconnect(idp->obj, idp->objsig); - return; - } - } - - diff -rNu melys-0.1.16/widgets/viewcontrol.m melys-0.1.17/widgets/viewcontrol.m --- melys-0.1.16/widgets/viewcontrol.m Tue Jan 4 10:45:13 2000 +++ melys-0.1.17/widgets/viewcontrol.m Thu Jan 1 01:00:00 1970 @@ -1,552 +0,0 @@ ->>name viewcontrol.m - view control adjustments etc. - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -This is an object that keeps together a number of things -that are required to implement the horizontal and vertical controls -in various of the melys widgets. - ->>extern - ->>header gtk/gtkobject.h ->>header gtk/gtkbox.h ->>header gtk/gtkvbox.h ->>header gtk/gtkhbox.h ->>header gtk/gtksignal.h ->>header gtk/gtkbutton.h ->>header gtk/gtkadjustment.h ->>header gtk/gtkhscrollbar.h ->>header gtk/gtkvscrollbar.h ->>header gtk/gtkmain.h - ->>header libgnomeui/gnome-pixmap.h - ->>header elements.h ->>header md.h ->>header pixmaps.h ->>header melgui.h - ->>gtkobject view_control gtk_object - ->>headerdef @header - -/* Scrolling directions */ -enum scroll_dir { - VC_HORIZONTAL = 0x01, - VC_VERTICAL = 0x02, - VC_BOTH = (VC_HORIZONTAL|VC_VERTICAL) -}; - -struct _ViewControl { - GtkObject object; - - /* Adjustments */ - GtkAdjustment *hadj; /* Horizontal adjustment position */ - GtkAdjustment *vadj; /* Vertical adjustment position */ - GtkAdjustment *posadj; /* The current song position */ - - /* Scrollbar groups */ - GtkWidget *hsb; /* The horizontal scrollbar group */ - GtkWidget *vsb; /* The vertical scrollbar group */ - - /* Vertical measurements */ - int vscale; /* Number of pixels from one thing to the next */ - int vspace; /* Separation between things */ - int vheight; /* Height of a 'thing' (vscale - vsep) */ - - /* Title height */ - int vtitle; /* Height of a title bar */ - - /* Horizontal measurements */ - int hscale; - int hbase; - - /* A controlling widget can set these to limit zooming */ - int hminscale; - int hmaxscale; - int vminscale; - int vmaxscale; - - /* For aligning to a grid */ - enum snap_type snap; -}; - -struct _ViewControlClass { - GtkObjectClass parent_class; - - void (*scale_changed)(ViewControl *); -}; - -#define VIEW_DEF_HEIGHT 16 /* Default track height */ -#define VIEW_SEPARATION 2 /* Track separation */ -#define VIEW_TITLE_HEIGHT 20 /* Title hight */ -#define VIEW_DEF_HSCALE 24 /* Default horizontal scale */ -#define VIEW_TITLE_RULE 4 /* Offset from bottom of title area */ - ->>extern - -/* The list of signal id's that are being added for ViewControl. */ ->>set signals -enum { - SCALE_CHANGED, - LAST_SIGNAL -}; - -/* Argument numbers */ -enum { - ARG_0, -}; - - ->>function view_control_new -ViewControl * ->>description -Create a new ViewControl object. ->>code - ViewControl *vcp = VIEW_CONTROL(gtk_type_new(view_control_get_type())); - - return vcp; - ->>function view_control_init -static void -ViewControl *vcp; The ViewControl to init ->>description -Initialise the ViewControl. ->>code - GtkAdjustment *hadj; - GtkAdjustment *vadj; - GtkWidget *hscroll; - GtkWidget *vscroll; - - hadj = (GtkAdjustment*)gtk_adjustment_new(0.0, - 0.0, 0.0, - 1.0, 1.0, - 1.0 - ); - vadj = (GtkAdjustment*)gtk_adjustment_new(0.0, - 0.0, 0.0, - 1.0, 1.0, - 1.0 - ); - - hscroll = gtk_hscrollbar_new(hadj); - vscroll = gtk_vscrollbar_new(vadj); - - vcp->hsb = scroll_group(vcp, hscroll, 0); - vcp->vsb = scroll_group(vcp, vscroll, 1); - - gtk_widget_show_all(vcp->hsb); - gtk_widget_show_all(vcp->vsb); - - vcp->vadj = vadj; - gtk_object_ref((GtkObject*)vadj); - gtk_object_sink((GtkObject*)vadj); - - vcp->hadj = hadj; - gtk_object_ref((GtkObject*)hadj); - gtk_object_sink((GtkObject*)hadj); - - vcp->vscale = VIEW_DEF_HEIGHT + VIEW_SEPARATION; - vcp->vspace = VIEW_SEPARATION; - vcp->vheight = VIEW_DEF_HEIGHT; - vcp->vtitle = VIEW_TITLE_HEIGHT + 2*VIEW_SEPARATION; - vcp->hscale = VIEW_DEF_HSCALE; - vcp->hbase = 0; - - /* Some defaults - but you are supposed to set them */ - vcp->hminscale = 1; - vcp->hmaxscale = 99999; - vcp->vminscale = 1 + vcp->vspace; - vcp->vmaxscale = 99999; - - ->>function view_control_class_init -static void -ViewControlClass *klass; The class to initialise - ->>description -Initialize the class. - ->>code - GtkObjectClass *object_class; - - object_class = (GtkObjectClass *)klass; - - parent_class = gtk_type_class(gtk_object_get_type()); - - view_control_signals[SCALE_CHANGED] = gtk_signal_new("scale-changed", - GTK_RUN_FIRST, - object_class->type, - GTK_SIGNAL_OFFSET(ViewControlClass, scale_changed), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0 - ); - - gtk_object_class_add_signals(object_class, view_control_signals, - LAST_SIGNAL); - - object_class->destroy = view_control_destroy; - - klass->scale_changed = NULL; - - ->>function view_control_set_posadj -void -ViewControl *vcp; -GtkAdjustment *posadj; - ->>code - vcp->posadj = posadj; - gtk_object_ref(GTK_OBJECT(vcp->posadj)); - - ->>function view_control_destroy -static void -GtkObject *obj; The view control ->>code - ViewControl *vcp = VIEW_CONTROL(obj); - - gtk_object_unref(GTK_OBJECT(vcp->hadj)); - gtk_object_unref(GTK_OBJECT(vcp->vadj)); - if (vcp->posadj) - gtk_object_unref(GTK_OBJECT(vcp->posadj)); - - gtk_widget_unref(vcp->hsb); - gtk_widget_unref(vcp->vsb); - - ->>function scroll_group -static GtkWidget * -ViewControl *vcp; The view control -GtkWidget *sb; The scrollbar to use -gboolean vert; True if the vertical case - ->>description -Create a box and place in the scrollbar and the magnifying glasses. -Set up the magnifying glass buttons to expand and shrink the main -views. - ->>code - GtkBox *box; - GtkWidget *plusbutton; - GtkWidget *minusbutton; - GtkWidget *plusicon; - GtkWidget *minusicon; - - if (vert) - box = (GtkBox *)gtk_vbox_new(0, 0); - else - box = (GtkBox *)gtk_hbox_new(0, 0); - - gtk_box_pack_start(box, sb, 1, 1, 0); - - plusbutton = gtk_button_new(); - minusbutton = gtk_button_new(); - - gtk_widget_set_usize(plusbutton, 18, 18); - gtk_widget_set_usize(minusbutton, 18, 18); - - plusicon = gnome_pixmap_new_from_xpm_d(plus_xpm); - minusicon = gnome_pixmap_new_from_xpm_d(minus_xpm); - - gtk_container_add(GTK_CONTAINER(plusbutton), plusicon); - gtk_container_add(GTK_CONTAINER(minusbutton), minusicon); - - gtk_box_pack_end(box, plusbutton, 0, 0, 0); - gtk_box_pack_end(box, minusbutton, 0, 0, 0); - - if (vert) { - gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", - vert_expand, vcp); - gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", - button_repeat, NULL); - gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", - vert_shrink, vcp); - gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", - button_repeat, NULL); - set_tip(plusbutton, _("Increase vertical scale")); - set_tip(minusbutton, _("Decrease vertical scale")); - } else { - gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", - horiz_expand, vcp); - gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", - button_repeat, NULL); - gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", - horiz_shrink, vcp); - gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", - button_repeat, NULL); - set_tip(plusbutton, _("Increase horizontal scale")); - set_tip(minusbutton, _("Decrease horizontail scale")); - } - - gtk_signal_connect(GTK_OBJECT(plusbutton), "released", - button_release, vcp); - gtk_signal_connect(GTK_OBJECT(minusbutton), "released", - button_release, vcp); - - gtk_widget_ref(GTK_WIDGET(box)); - return GTK_WIDGET(box); - - ->>function horiz_expand -static void -GtkWidget *w; -gpointer data; - ->>description -Increase the horizontal size of the parts. - ->>code - ViewControl *vcp = data; - - vcp->hscale /= 1.25; - if (vcp->hscale < vcp->hminscale) - vcp->hscale = vcp->hminscale; - - gtk_signal_emit(GTK_OBJECT(vcp), view_control_signals[SCALE_CHANGED]); - - ->>function horiz_shrink -static void -GtkWidget *w; -gpointer data; - ->>description -Increase the horizontal size of the parts. - ->>code - ViewControl *vcp = data; - int old; - - old = vcp->hscale; - - vcp->hscale *= 1.25; - if (old == vcp->hscale) - vcp->hscale++; - if (vcp->hscale > vcp->hmaxscale) - vcp->hscale = vcp->hmaxscale; - - gtk_signal_emit(GTK_OBJECT(vcp), view_control_signals[SCALE_CHANGED]); - - ->>function vert_expand -static void -GtkWidget *w; -gpointer data; - ->>description -Make the vertical size of the tracks larger. - ->>code - ViewControl *vcp = data; - - vcp->vscale += 2; - if (vcp->vscale > vcp->vmaxscale) - vcp->vscale = vcp->vmaxscale; - vcp->vheight = vcp->vscale - vcp->vspace; - - gtk_signal_emit(GTK_OBJECT(vcp), view_control_signals[SCALE_CHANGED]); - - ->>function vert_shrink -static void -GtkWidget *w; -gpointer data; - ->>description -Make the vertical size of the tracks smaller. - ->>code - ViewControl *vcp = data; - - vcp->vscale -= 2; - if (vcp->vscale < vcp->vminscale) - vcp->vscale = vcp->vminscale; - - vcp->vheight = vcp->vscale - vcp->vspace; - - gtk_signal_emit(GTK_OBJECT(vcp), view_control_signals[SCALE_CHANGED]); - ->>function button_repeat -static void -GtkWidget *but; -gpointer data; - ->>code - int to; - - to = gtk_timeout_add(150, (GtkFunction)click_it, but); - gtk_object_set_data_full(GTK_OBJECT(but), "button_repeat", - GINT_TO_POINTER(to), (GtkDestroyNotify)gtk_timeout_remove); - - ->>function click_it -static gboolean -gpointer *but; - ->>code - gtk_signal_emit_by_name(GTK_OBJECT(but), "pressed", NULL); - return TRUE; - ->>function button_release -static void -GtkWidget *w; Button that was released -gpointer data; - ->>code - - /* This will automatically remove the timeout */ - gtk_object_remove_data(GTK_OBJECT(w), "button_repeat"); - - ->>function view_control_set_vertical -void -ViewControl *vcp; -int vscale; Vertical scale - ->>description -Set up the view controls on the vertical side. - ->>code - vcp->vscale = vscale; - vcp->vheight = vscale - vcp->vspace; - ->>function view_control_set_horizontal -void -ViewControl *vcp; -int hscale; Horizontal scale - ->>description -Set up the view controls on the horizontal side of things. - ->>code - - vcp->hscale = hscale; - ->>function view_control_set_range -void -ViewControl *vcp; -int which; -gfloat lower; -gfloat upper; - ->>description -Set the range for one of the adjustments. - ->>code - GtkAdjustment *adj; - - if (which & VC_HORIZONTAL) - adj = vcp->hadj; - else - adj = vcp->vadj; - - adj->upper = upper; - adj->lower = lower; - - gtk_adjustment_changed(adj); - - ->>function view_control_set_limits -void -ViewControl *vcp; -int hmin; Horizontal minimum -int hmax; Horizontal maximum -int vmin; Vertical minimum -int vmax; Vertical maximum - ->>description -Set minimum and maximum values that will be allowed. -A max of zero means no limit. - ->>code - - vcp->hminscale = hmin; - if (vmin <= vcp->vspace) - vmin = vcp->vspace + 1; - vcp->vminscale = vmin; - if (hmax) - vcp->hmaxscale = hmax; - else - vcp->hmaxscale = G_MAXINT; - if (vmax) - vcp->vmaxscale = vmax; - else - vcp->vmaxscale = G_MAXINT; - - ->>function view_control_x_to_tick -int -ViewControl *vcp; -int xpix; - ->>description -Return the musical tick number given an x pixel value. -The x value is relative to the left hand side of the canvas. - ->>code - int tick; - - tick = xpix * vcp->hscale; - return tick; - - ->>function view_control_tick_to_x -int -ViewControl *vcp; -int tick; - ->>description -Return the x pixel position for the specified tick number. -The position is relative to the canvas. - ->>code - int x; - - g_return_val_if_fail(vcp->hscale != 0, 0); - - x = (tick + vcp->hscale/2) / vcp->hscale; - - return x; - ->>function view_control_y_to_thing -int -ViewControl *vcp; -int ypix; Pixel position - ->>code - return ypix / vcp->vscale; - - ->>function view_control_thing_to_y -int -ViewControl *vcp; The widget -int n; The track number - ->>description -Return the y pixel position of the top of the area allocated -to the specified -.A track . -This is relative to the top of the canvas and is independant -of the scroll position. - ->>code - return n * vcp->vscale; - ->>function view_control_set_snap -void -ViewControl *vcp; -enum snap_type snap; - ->>code - vcp->snap = snap; -