diff -rNu melys-0.0.15/ChangeLog melys-0.0.16/ChangeLog --- melys-0.0.15/ChangeLog Sun Oct 3 11:52:07 1999 +++ melys-0.0.16/ChangeLog Tue Oct 12 14:55:22 1999 @@ -1,4 +1,156 @@ -1999-10-02 Steve Ratcliffe +1999-10-12 Steve Ratcliffe + + * widgets/melystrackdisplay.m: + Handle the case where a distoyed part is present (which is a bug in + itself) more gracefully. + + * md/mdadd.m: + Fixed a major bug where newly created parts would be getting freed + even though they were added to a track. + + * midi/record.m: Free the temporary container after use. Fixes + a leak. + +1999-10-11 Steve Ratcliffe + + * doc/docgen.py, help/C/menus.sgml, help/C/track.sgml, po/FILES, + po/melys.pot, po/zz.po, README: + Documentation changes. + + * widgets/melystrackdisplay.m: Tidy up of drag and drop. + Copletely re-jigged the display-info stuff, see the longer + comment in partitem. + + * widgets/melyspartitem.m: + Re-thought the whole display-info filigree. So now part item + does not contain back references to its part and track. + Now part and track and all associated canvas items go into + display-info. The part owns display-info and there is a back + reference from the canvas group to the part via a object property. + + * md/mdutil.m: Remove hackery about resorting an element while changing + its time. Now it is up to the caller to get it right. + You should remove it from its container first (holding a reference + if needed) and re-add it with md_add_sort(). + Often it will be going in a different track anyway. + + * md/elements.m, md/mdadd.m: + Remove old hack to store data on the part element and + use super-cool g_dataset functions. + + * md/mdutil.m: + Added routine to ensure that a particular track number exists. + Also added/fixed routines to change the device and time + of a node -- has to be applied recursively. + + * md/mdlist.m: Added md_list_remove() + + * md/mdadd.m: Routine and code to keep the tracks numbered after + and insert/remove. + Perhaps it would be best to remove the number all together + and require a function call to get it? + + * gui/main.m: Create the X11 atom needed for drag and drop. + + * doc/mdml.dtd: + Corrections for omissions/errors. No intended functionallity change. + + * widgets/melystrackdisplay.m: The first working drag and drop version. + printf's still in. So you can drag a part or a group of + parts from one place to another, including a different window + in the same application. + +1999-10-10 Steve Ratcliffe + + * md/elements.m, md/mdadd.m: + Removed the back pointer. I was being silly, they can be + added to multiple containers. (although aren't yet) + + * util/gxstack.m: + Add a type of stack specially designed for stacking pointers. + Change the type name to GXStack in case glib gets stack routines + in the future. + + * md/mdseq.m, md/mdundo.m: GStack has changed to GXStack + + * md/elements.m, md/mdadd.m: Added the back pointer to containers. + + * song/song.m: + Ha! Found that pesky md leak that left one md element unfreed + per file. + + * files/mdmlread.m: Some minor memory leak fixes. + +1999-10-08 Steve Ratcliffe + + * md/mdtools.m: Splits now still work when the new part would be empty. + You just get an empty part with the correct length and + start time. + + * widgets/melystrackdisplay.m: + Implemented slice/join/delete/properties menu. + + * md/mdtools.m: Routines for manipulating md trees. + +1999-10-05 Steve Ratcliffe + + * gui/main.m: Can now put files on the command line. + They will all be read in at startup. + + * md/mdadd.m: On a weak final free remember to decrement the number of + available elements. + + * md/mdutil.m: + mdwalk now takes flags to tell it to ignore leaves or nodes. + + * seq/seqmidi.m: + Got rid of some incorrect field settings on note-on and note-off. + (they do not have a duration) + + * gui/main.m: Add drag and drop to receive file names. + You can now select a bunch of files in a file manager + and drag them into Melys. + All the files will be opened at once. + +1999-10-04 Steve Ratcliffe + + * widgets/melystrackdisplay.m: + Now clicking over the text still selects the part. + + * widgets/melystrackinfo.m: Now only use double click for property box + + * gui/partprop.m, gui/propbox.m, gui/trackprop.m: + Don't know what I was thinking when I wrote trackprop.m + Cleaned it up at the same time adding a part property dialog. + Some common code removed to propbox.m. + Things now don't crash if you delete the track that belongs to an + open property box and then apply changes. + +1999-10-03 Steve Ratcliffe + + * help/C/Makefile: Remove the unused stylesheet images. + + * doc/docgen.py: Fixes and improvements. + + * widgets/melystrackdisplay.m: + You can now click on a part and select it. + + * files/mdmlread.m, midi/play.m, midi/record.m, util/except.m: + some cc warnings removed + + * version: Version 0.0.15 + + * help/C/Makefile, help/C/menus.sgml, help/C/track.sgml, + ChangeLog, INSTALL, README: + Documentation cleanup for 0.0.15 release + +1999-10-02 Steve Ratcliffe + + * md/mdutil.m: Initial version of md_set_program + + * widgets/melystrackdisplay.m: + A temporary method of scrolling back to zero when play starts. + (you may not even want to do this for example) * midi/play.m: Improved the play start/stop code. @@ -50,7 +202,7 @@ Correct cue to cuepoint. Add program to track -1999-09-30 Steve Ratcliffe +1999-09-30 Steve Ratcliffe * widgets/melysrule.m: Put in the temporary ruler code. Next step is to actually take notice of the timesignatures etc. @@ -60,7 +212,7 @@ Reset some variables at the top of the loop to find the next event. -1999-09-29 Steve Ratcliffe +1999-09-29 Steve Ratcliffe * files/mdmlread.m: Modified error reporting. @@ -73,7 +225,7 @@ * files/midiread.m: Fixed a couple of problems with reading midi files. Zero length data reads and program numbers using MSB. -1999-09-28 Steve Ratcliffe +1999-09-28 Steve Ratcliffe * song/song.m, md/mdutil.m: After recording, shrink the size of the root element @@ -95,7 +247,7 @@ Introduced a weak reference mechanism and modified references thoughout. -1999-09-27 Steve Ratcliffe +1999-09-27 Steve Ratcliffe * md/elements.m, md/mdadd.m, programs/.cvsignore, seq/seqlib.m, song/song.m, widgets/melystrack.m, widgets/melystrackdisplay.m, @@ -108,7 +260,7 @@ Subtle memory bug was introduced. The message was being freed multiple times. -1999-09-26 Steve Ratcliffe +1999-09-26 Steve Ratcliffe * files/midiread.m: Keep program from the midi file again. Will need a better algorithm to see if it is safe @@ -125,7 +277,7 @@ * make.conf: debug defines -1999-09-25 Steve Ratcliffe +1999-09-25 Steve Ratcliffe * Makefile: Don't do the cfiles all up front in the normal make case. @@ -169,7 +321,7 @@ * files/midiwrite.m: removed an usused statement and decl. Track number is now on tracklike -1999-09-24 Steve Ratcliffe +1999-09-24 Steve Ratcliffe * widgets/melystrackdisplay.m, widgets/misc.m: Moved the canvas_item_move_abs routine as it will be more @@ -187,7 +339,7 @@ * md/mdutil.m: If a track has disappeared we may as well just ignore it rather than giving a debugging error. -1999-09-23 Steve Ratcliffe +1999-09-23 Steve Ratcliffe * ChangeLog: REL-0-0-13 @@ -224,7 +376,7 @@ * widgets/melystrack.m: Now handles supplying a frame for each child. Some fixes to the adjustment handling. -1999-09-23 Steve Ratcliffe +1999-09-23 Steve Ratcliffe * REL-0-0-13 diff -rNu melys-0.0.15/README melys-0.0.16/README --- melys-0.0.15/README Sun Oct 3 11:52:07 1999 +++ melys-0.0.16/README Tue Oct 12 00:37:36 1999 @@ -13,11 +13,17 @@ This is very early stage of development, although you can already do a few useful things with it. +The latest features are in the track parts display. You can now split +part, join them, delete them and drag and drop them, both at a different +time and also onto a different track. Parts can also be dragged to +another window in the same application. + At present you can: - Read in files in either midi format or the Melys native format MDML. There can be several files open at once. +- Slice a track part - Play a file, stop it in the middle and resume it, mute tracks, solo tracks. @@ -29,6 +35,8 @@ - Save the file. +- Files can be opened by dragging from a file manager. + Requirements. ------------- @@ -60,14 +68,18 @@ Showseq lists out all the ALSA clients. Melplay is a command line player. It reads all formats that Melys can -read. +read, which at present is midi, mdml and compressed mdml. Bug reporting ------------- My attitude to bugs is that they are not allowed even in software under heavy development as this is. So if you find any, then please mail them -to melys-bugs@parabola.demon.co.uk +to me at melys-bugs@parabola.demon.co.uk + +There should be no compile warnings, crashes or GTK messages. If compiled +with debug, then after closing all windows the debug menu item should +report 0 allocated elements. Authors ------- diff -rNu melys-0.0.15/config/ports.c melys-0.0.16/config/ports.c --- melys-0.0.15/config/ports.c Sun Oct 3 12:54:29 1999 +++ melys-0.0.16/config/ports.c Tue Oct 12 14:58:16 1999 @@ -25,11 +25,12 @@ #include "intl.h" +/* Static functions */ /* * Get the input ports that have been configured for use. - * + * * Arguments: * addrp - Address returned here */ @@ -53,7 +54,7 @@ /* * Get the output ports that have been configured. - * + * * Arguments: * addrp - Address returned here */ diff -rNu melys-0.0.15/doc/Makefile melys-0.0.16/doc/Makefile --- melys-0.0.15/doc/Makefile Thu Jan 1 00:00:00 1970 +++ melys-0.0.16/doc/Makefile Sun Oct 3 17:57:01 1999 @@ -0,0 +1,9 @@ + +all: + +doc: fordist + +fordist: + python docgen.py > index.html + echo ".cvsignore" >> .cvsignore + echo "index.html" >> .cvsignore diff -rNu melys-0.0.15/doc/README melys-0.0.16/doc/README --- melys-0.0.15/doc/README Wed Sep 22 11:05:33 1999 +++ melys-0.0.16/doc/README Sun Oct 3 17:57:02 1999 @@ -1,2 +1,7 @@ + +Melys + +This directory contains programmer type documentation. + See also the 'help' directory which contains all the documentation that is accessible from the application. diff -rNu melys-0.0.15/doc/docgen.py melys-0.0.16/doc/docgen.py --- melys-0.0.15/doc/docgen.py Thu Jan 1 00:00:00 1970 +++ melys-0.0.16/doc/docgen.py Tue Oct 12 00:37:39 1999 @@ -0,0 +1,90 @@ +#!/usr/bin/python -O +# +# Script to generate the html quick doc from the sources. +# + +import os, string + + +doclist = [ + ("ALSA sequencer interface", None), + ("Sequencer library", "seq/seqlib"), + ("Midi event initialisation", "seq/seqmidi"), + + ("MD tree utility routines", None), + ("Element creation", "md/elements"), + ("Element sequencing", "md/mdseq"), + ("Element utility routines", "md/mdutil"), + ("List routines", "md/mdlist"), + ("Undo routines (not yet implemented)", "md/mdundo"), + + ("Melys widgets", None), + ("The track display", "widgets/melystrack"), + ("The information pane", "widgets/melystrackinfo"), + ("The display pane", "widgets/melystrackdisplay"), + ("The time ruler", "widgets/melysrule"), + ("The part items", "widgets/melyspartitem"), + + ("General utility routines", None), + ("Stack routines", "util/gxstack"), +] + +header = """ + +Melys programming documentation + + + +

Quick documentation

+This is the compact programming documentation for Melys. +It is generated directly from the source code and so it +is always up to date. +

+Only the files that contain routines that are likely to +be useful generally in other routines are listed here. +More files can easily be added, see docgen.py. + +""" + +footer = """ + + +""" + +inlist = 0 + +cvsignore = open(".cvsignore", "w") + +print header + +for (title, location) in doclist: + + if not location: + # This is a heading + if inlist: + print "" + print "

%s

" % title + print "
    " + inlist = 1 + + else: + + ind = string.rfind(location, "/") + name = location[ind+1:] + print "
  • %s" % (name, title) + + os.system("mcode -f quickdoc -o %s.html ../%s.m" %(name, location)) + + cvsignore.write("%s.html\n" % name) + +print footer diff -rNu melys-0.0.15/doc/mdml.dtd melys-0.0.16/doc/mdml.dtd --- melys-0.0.15/doc/mdml.dtd Sat Oct 2 17:46:50 1999 +++ melys-0.0.16/doc/mdml.dtd Mon Oct 11 19:50:30 1999 @@ -18,10 +18,12 @@ The 'cue' element corrected to 'cuepoint'. This was an error in the DTD. The word 'cue' has never been recognised. + 991005: + Name added to partref. Omitted in error. --> - - + + @@ -112,6 +114,7 @@ diff -rNu melys-0.0.15/files/file.c melys-0.0.16/files/file.c --- melys-0.0.15/files/file.c Sun Oct 3 12:54:30 1999 +++ melys-0.0.16/files/file.c Tue Oct 12 14:58:17 1999 @@ -55,6 +55,7 @@ FILE_OPT_COMPRESSED}, }; +/* Static functions */ static void guess_type(struct File *file); @@ -86,6 +87,7 @@ * doesn't have the correct extension and can't be recognised * automatically. Also used internally when the type is * recognised. + * * Arguments: * type - File type FILE_TYPE_* */ @@ -120,6 +122,7 @@ * 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. + * * Arguments: * yesno - True to start using compressed format. */ @@ -175,6 +178,7 @@ * This function will be called from time to time during a long * read or write. The called routine can use * file_get_progress to see how things are going. + * * Arguments: * cb - Callback function */ @@ -202,7 +206,7 @@ /* * If no error has been set before then set the error status. You * can't set success with this routine. It is printf like. - * + * * Arguments: * file - Users file handle * code - The error code @@ -258,7 +262,6 @@ /* * File is read and converted into a MD tree, which is returned. - * */ struct rootElement * file_read(struct File *file) @@ -302,7 +305,7 @@ /* * The root is written to the specified file. - * + * * Arguments: * file - File to write * root - Root to write out @@ -338,7 +341,6 @@ /* * After a file is read in of whatever kind, this routine is run * allows various checks to be made and defaults added. - * */ void file_check_root(struct rootElement *root) @@ -372,7 +374,7 @@ if (tsig == NULL) { tsig = md_timesig_new(4, 4, 24, 8); MD_SET_TIME(tsig, 0); - md_add_elem_sort(MD_CONTAINER(tempomap), MD_ELEMENT(tsig)); + md_add_sort(MD_CONTAINER(tempomap), MD_ELEMENT(tsig)); } /* Key signature */ @@ -389,7 +391,7 @@ if (ksig == NULL) { ksig = md_keysig_new(0, 0); MD_SET_TIME(ksig, 0); - md_add_elem_sort(MD_CONTAINER(tempomap), MD_ELEMENT(ksig)); + md_add_sort(MD_CONTAINER(tempomap), MD_ELEMENT(ksig)); } } @@ -397,7 +399,6 @@ * 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. - * */ static void guess_type(struct File *file) diff -rNu melys-0.0.15/files/file.m melys-0.0.16/files/file.m --- melys-0.0.15/files/file.m Sat Oct 2 20:17:44 1999 +++ melys-0.0.16/files/file.m Fri Oct 8 22:15:19 1999 @@ -423,7 +423,7 @@ if (tsig == NULL) { tsig = md_timesig_new(4, 4, 24, 8); MD_SET_TIME(tsig, 0); - md_add_elem_sort(MD_CONTAINER(tempomap), MD_ELEMENT(tsig)); + md_add_sort(MD_CONTAINER(tempomap), MD_ELEMENT(tsig)); } /* Key signature */ @@ -440,7 +440,7 @@ if (ksig == NULL) { ksig = md_keysig_new(0, 0); MD_SET_TIME(ksig, 0); - md_add_elem_sort(MD_CONTAINER(tempomap), MD_ELEMENT(ksig)); + md_add_sort(MD_CONTAINER(tempomap), MD_ELEMENT(ksig)); } diff -rNu melys-0.0.15/files/mdmlread.c melys-0.0.16/files/mdmlread.c --- melys-0.0.15/files/mdmlread.c Sun Oct 3 12:54:31 1999 +++ melys-0.0.16/files/mdmlread.c Tue Oct 12 14:58:18 1999 @@ -46,10 +46,9 @@ int devchan; /* Current dev/channel */ struct rootElement *root; /* Pointer to root of MD tree */ struct headElement *head; /* Pointer to head element */ - GStack *estack; /* Element stack */ + GXStack *estack; /* Element stack */ int level; /* Container level */ char *errmsg; /* Error message */ - char *headname; /* A head element is in progress */ int timebase; /* The division time base */ int program; /* Saved program for track */ @@ -64,6 +63,7 @@ int textlen; }; +/* Static functions */ static struct element *tag_to_md(struct mdmlstate *msp, const xmlChar *name, const xmlChar **attrs); static void common_atts(struct mdmlstate *msp, const xmlChar **attrs, @@ -91,7 +91,6 @@ /* * Read in an mdml file given the filename. A pointer to a * rootElement is returned. - * */ struct rootElement * mdml_read_file(struct File *file) @@ -104,7 +103,6 @@ mstate.file = file; mstate.root = NULL; mstate.errmsg = NULL; - mstate.headname = NULL; init_sax_handler(); ourParseFile(&SAXhandler, file->name, &mstate); @@ -113,6 +111,7 @@ 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); @@ -131,7 +130,7 @@ /* * Take an XML document tree and convert it to an MD tree. Will be * converted to use the SAX interface when that is ready. - * + * * Arguments: * msp - Mdml write state */ @@ -254,6 +253,15 @@ 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; @@ -340,19 +348,15 @@ } else if (strcmp(name, "COPYRIGHT") == 0) { retel = NULL; - msp->headname = g_strdup(name); } else if (strcmp(name, "title") == 0) { retel = NULL; - msp->headname = g_strdup(name); } else if (strcmp(name, "author") == 0) { retel = NULL; - msp->headname = g_strdup(name); } else if (strcmp(name, "comment") == 0) { retel = NULL; - msp->headname = g_strdup(name); } else { printf("Unknown node name %s\n", name); @@ -374,7 +378,7 @@ /* * Extract common attributes from the node. These are things * like time and channel that can apply to almost any element. - * + * * Arguments: * attrs - Node to examine for attributes * el - Element to set attributes @@ -437,7 +441,7 @@ /* * Return an attribute, converted to an integer. If the * attribute does not exist then -1 is returned. - * + * * Arguments: * attrs - Node to be examined * name - Name of attribute @@ -459,7 +463,7 @@ /* * Get a property from a node and convert it to a double value. - * + * * Arguments: * attrs - Node to get property from * name - Name of property to get @@ -481,7 +485,7 @@ /* * Get the note value from the specified note name. - * + * * Arguments: * attrs - Node for this note * name - Name of property to get @@ -545,7 +549,7 @@ /* * Parse the text representation of the sysex and return a * newly allocated buffer containing the data. - * + * * Arguments: * hexchars - Input ascii hex characters * lenp - Length of returned array @@ -574,7 +578,6 @@ /* * Initialise the SAX handler callback set. This only needs to * be done once. - * */ static void init_sax_handler(void) @@ -624,13 +627,12 @@ g_assert(iscontainer(con)); if (el) - md_add_elem(con, el); + md_add(con, el); } state.elem = el; state.text = NULL; state.textlen = 0; - msp->headname = NULL; gx_stack_push(msp->estack, (gpointer) &state); } @@ -674,6 +676,7 @@ se->status = data[0]; se->data = g_memdup(data+1, len-1); se->length = len - 1; + g_free(data); } g_free(ls->text); @@ -732,7 +735,7 @@ te->length = ls->textlen; - } else if (ls->text) { + } else { g_free(ls->text); } } diff -rNu melys-0.0.15/files/mdmlread.m melys-0.0.16/files/mdmlread.m --- melys-0.0.15/files/mdmlread.m Sun Oct 3 12:24:46 1999 +++ melys-0.0.16/files/mdmlread.m Sun Oct 10 16:27:18 1999 @@ -34,10 +34,9 @@ int devchan; /* Current dev/channel */ struct rootElement *root; /* Pointer to root of MD tree */ struct headElement *head; /* Pointer to head element */ - GStack *estack; /* Element stack */ + GXStack *estack; /* Element stack */ int level; /* Container level */ char *errmsg; /* Error message */ - char *headname; /* A head element is in progress */ int timebase; /* The division time base */ int program; /* Saved program for track */ @@ -71,7 +70,6 @@ mstate.file = file; mstate.root = NULL; mstate.errmsg = NULL; - mstate.headname = NULL; init_sax_handler(); ourParseFile(&SAXhandler, file->name, &mstate); @@ -80,6 +78,7 @@ 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); @@ -223,6 +222,15 @@ 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; @@ -309,19 +317,15 @@ } else if (strcmp(name, "COPYRIGHT") == 0) { retel = NULL; - msp->headname = g_strdup(name); } else if (strcmp(name, "title") == 0) { retel = NULL; - msp->headname = g_strdup(name); } else if (strcmp(name, "author") == 0) { retel = NULL; - msp->headname = g_strdup(name); } else if (strcmp(name, "comment") == 0) { retel = NULL; - msp->headname = g_strdup(name); } else { printf("Unknown node name %s\n", name); @@ -594,13 +598,12 @@ g_assert(iscontainer(con)); if (el) - md_add_elem(con, el); + md_add(con, el); } state.elem = el; state.text = NULL; state.textlen = 0; - msp->headname = NULL; gx_stack_push(msp->estack, (gpointer) &state); @@ -647,6 +650,7 @@ se->status = data[0]; se->data = g_memdup(data+1, len-1); se->length = len - 1; + g_free(data); } g_free(ls->text); @@ -705,7 +709,7 @@ te->length = ls->textlen; - } else if (ls->text) { + } else { g_free(ls->text); } } diff -rNu melys-0.0.15/files/mdmlwrite.c melys-0.0.16/files/mdmlwrite.c --- melys-0.0.15/files/mdmlwrite.c Sun Oct 3 12:54:31 1999 +++ melys-0.0.16/files/mdmlwrite.c Tue Oct 12 14:58:18 1999 @@ -34,6 +34,7 @@ unsigned long starttime; /* Use to do relative times */ }; +/* Static functions */ static void mdml_write(struct File *file, FILE *fp, struct rootElement *root); static void build_section(struct mdmlstate *msp, xmlNodePtr base, struct containerElement *c); @@ -47,6 +48,7 @@ /* * Writes the MDML representation of the MD tree to the * specified file name . + * * Arguments: * file - File name to write to * root - Tree to write @@ -70,6 +72,7 @@ /* * Writes the MDML representation of the specified MD tree to * the specified file stream. + * * Arguments: * file - Users file handle * fp - File stream to write to @@ -183,7 +186,7 @@ /* * Deal with one track from a MD tree. The xml tree is built under * the given base . - * + * * Arguments: * msp - Current state * base - Base of xml tree @@ -324,7 +327,7 @@ * do not appear it they are the same as the previous values. * This applies completely across the file, including track * changes etc. - * + * * Arguments: * msp - Current state including current time and channel * node - The xml node to set the attribute on @@ -351,6 +354,7 @@ /* * Set a property from an integer value. + * * Arguments: * node - the xml node * name - Name of property @@ -368,6 +372,7 @@ /* * Set a property from a string and free the string. + * * Arguments: * node - the xml node * name - Name of property @@ -386,6 +391,7 @@ * 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. + * * Arguments: * note - Note number */ diff -rNu melys-0.0.15/files/midiread.c melys-0.0.16/files/midiread.c --- melys-0.0.15/files/midiread.c Sun Oct 3 12:54:31 1999 +++ melys-0.0.16/files/midiread.c Tue Oct 12 14:58:18 1999 @@ -64,6 +64,7 @@ struct except error; /* For exceptional errors */ }; +/* Static functions */ static struct rootElement *midi_read(struct midistate *msp, FILE *fp); static struct rootElement *read_head(struct midistate *msp); static struct trackElement *read_track(struct midistate *msp); @@ -83,7 +84,6 @@ /* * Read in a midi file from the specified file name. - * */ struct rootElement * midi_read_file(struct File *file) @@ -126,7 +126,7 @@ /* * Read in a midi file from the specified open file pointer, fp * and return an mtree structure tree representing the file. - * + * * Arguments: * fp - Input file pointer */ @@ -157,7 +157,7 @@ return NULL; } - md_add_elem(MD_CONTAINER(root), MD_ELEMENT(msp->tempo_map)); + md_add(MD_CONTAINER(root), MD_ELEMENT(msp->tempo_map)); msp->root->tracks = 0; /* Is re-calculated when tracks are added */ @@ -175,7 +175,7 @@ continue; } - md_add_elem(MD_CONTAINER(root), el); + md_add(MD_CONTAINER(root), el); } msp->tempo_map = NULL; @@ -187,7 +187,7 @@ /* * Read the header information from a midi file - * + * * Arguments: * msp - current midi state */ @@ -202,7 +202,7 @@ root = md_root_new(); head = md_head_new(); - md_add_elem(MD_CONTAINER(root), MD_ELEMENT(head)); + md_add(MD_CONTAINER(root), MD_ELEMENT(head)); root->head = head; msp->root = root; @@ -247,7 +247,7 @@ * 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. - * + * * Arguments: * msp - Midi state */ @@ -287,7 +287,7 @@ track = md_track_new(); part = md_part_new(); - md_add_elem(MD_CONTAINER(track), MD_ELEMENT(part)); + md_add(MD_CONTAINER(track), MD_ELEMENT(part)); msp->current_time = 0; while (msp->chunk_count < msp->chunk_size) { @@ -338,7 +338,7 @@ /* * Complete the reading of the status byte. The parsed midi * command will be added to the specified part . - * + * * Arguments: * msp - Current midi file status * part - Current part (track) @@ -485,7 +485,7 @@ el->element_time = msp->current_time; el->device_channel = device; - md_add_elem(MD_CONTAINER(part), el); + md_add(MD_CONTAINER(part), el); } } @@ -493,7 +493,7 @@ * 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. - * + * * Arguments: * msp - The midi file state * type - The meta event type @@ -560,7 +560,7 @@ /* If this affected the tempo map then add it */ if (map) { MD_ELEMENT(map)->element_time = msp->current_time; - md_add_elem(MD_CONTAINER(msp->tempo_map), MD_ELEMENT(map)); + md_add(MD_CONTAINER(msp->tempo_map), MD_ELEMENT(map)); } g_free(data); @@ -571,7 +571,7 @@ /* * Reads an interger from the midi file. The number of bytes to * be read is specified in n . - * + * * Arguments: * msp - Midi file state * n - Number of bytes to read @@ -602,6 +602,7 @@ * 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. + * * Arguments: * msp - Midifile state * length - Length of data to read @@ -632,7 +633,7 @@ * Read a variable length integer from the midifile and return * it. Returns an int32 so cannot really deal with more than * four bytes. - * + * * Arguments: * msp - Midi file state */ @@ -659,6 +660,7 @@ /* * Push back a character. Have to also keep track of the * chunk_count. + * * Arguments: * msp - Midi input state * c - Character to push back @@ -676,7 +678,7 @@ * 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. - * + * * Arguments: * msp - Midi file state * note - Note number @@ -701,7 +703,7 @@ /* * Called when a note off is seen. Finds the corresponding note * on and constructs a note element. - * + * * Arguments: * msp - Midi file state * note - Note number @@ -739,7 +741,7 @@ /* * 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. - * + * * Arguments: * msp - Midi file state */ diff -rNu melys-0.0.15/files/midiread.m melys-0.0.16/files/midiread.m --- melys-0.0.15/files/midiread.m Sat Oct 2 20:17:45 1999 +++ melys-0.0.16/files/midiread.m Fri Oct 8 22:15:19 1999 @@ -174,7 +174,7 @@ return NULL; } - md_add_elem(MD_CONTAINER(root), MD_ELEMENT(msp->tempo_map)); + md_add(MD_CONTAINER(root), MD_ELEMENT(msp->tempo_map)); msp->root->tracks = 0; /* Is re-calculated when tracks are added */ @@ -192,7 +192,7 @@ continue; } - md_add_elem(MD_CONTAINER(root), el); + md_add(MD_CONTAINER(root), el); } msp->tempo_map = NULL; @@ -217,7 +217,7 @@ root = md_root_new(); head = md_head_new(); - md_add_elem(MD_CONTAINER(root), MD_ELEMENT(head)); + md_add(MD_CONTAINER(root), MD_ELEMENT(head)); root->head = head; msp->root = root; @@ -301,7 +301,7 @@ track = md_track_new(); part = md_part_new(); - md_add_elem(MD_CONTAINER(track), MD_ELEMENT(part)); + md_add(MD_CONTAINER(track), MD_ELEMENT(part)); msp->current_time = 0; while (msp->chunk_count < msp->chunk_size) { @@ -498,7 +498,7 @@ el->element_time = msp->current_time; el->device_channel = device; - md_add_elem(MD_CONTAINER(part), el); + md_add(MD_CONTAINER(part), el); } >>function handle_meta @@ -571,7 +571,7 @@ /* If this affected the tempo map then add it */ if (map) { MD_ELEMENT(map)->element_time = msp->current_time; - md_add_elem(MD_CONTAINER(msp->tempo_map), MD_ELEMENT(map)); + md_add(MD_CONTAINER(msp->tempo_map), MD_ELEMENT(map)); } g_free(data); diff -rNu melys-0.0.15/files/midiwrite.c melys-0.0.16/files/midiwrite.c --- melys-0.0.15/files/midiwrite.c Sun Oct 3 12:54:32 1999 +++ melys-0.0.16/files/midiwrite.c Tue Oct 12 14:58:19 1999 @@ -44,6 +44,7 @@ int inQ; /* Running through the notes queue */ }; +/* Static functions */ static void midi_write(struct File *file, FILE *fp, struct rootElement *root); static void write_elem(struct element *el, void *arg, int flags); static void put_int(struct midiwstate *msp, int n, int val); @@ -63,6 +64,7 @@ /* * Write out the specified file. + * * Arguments: * file - File name to write to * root - the data to write @@ -88,6 +90,7 @@ /* * Write the md tree as a midi file to the specified file stream. + * * Arguments: * fp - File stream to write to * root - The data to write @@ -120,7 +123,7 @@ * 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. - * + * * Arguments: * el - Element to write out * arg - Our private data @@ -324,6 +327,7 @@ /* * Write out an integer val of size n to the output stream. + * * Arguments: * msp - Midi write state * n - Number of bytes to write @@ -342,6 +346,7 @@ /* * Put out a single byte. + * * Arguments: * msp - Midi write state * val - Value to write @@ -359,6 +364,7 @@ /* * Write an n byte integer at the place specified in the output * stream. This is only used to re-writing the track size. + * * Arguments: * msp - Midi write state * n - Number of bytes in integer @@ -377,6 +383,7 @@ /* * Take the integer value val of length n and place a byte * representation into buf , high byte first. + * * Arguments: * data - Buffer to write into * n - Number of bytes to write @@ -396,6 +403,7 @@ /* * Put out the time. The time is stored as a change from the * previous time, in the variable length format. + * * Arguments: * msp - Midi write state * time - Midi time @@ -427,6 +435,7 @@ * 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?. + * * Arguments: * msp - Midi write state * status - Midi status byte to write (or not) @@ -476,6 +485,7 @@ * 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. + * * Arguments: * msp - Midi write state * val - Value to put @@ -500,6 +510,7 @@ /* * Write out a buffer of data with the specified size. + * * Arguments: * msp - Midi write state * data - Data to write @@ -517,6 +528,7 @@ /* * Compare the elements based on the note off time. That is * element_time + length + * * Arguments: * item1 - first to compare * item2 - second to compare @@ -540,7 +552,7 @@ /* * Run the queue of pending events that need to be pushed out * before the specified time. - * + * * Arguments: * msp - Midi write state * time - Dequeue events at and before this time @@ -581,7 +593,7 @@ /* * Put out the program. This consists of possible bank select * controls as well as the patch number. - * + * * Arguments: * msp - Midi write state * chan - Channel for this change @@ -613,10 +625,9 @@ * 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. - * * Everything is put out at a time of zero. I realise that may not * work for everyone. - * + * * Arguments: * msp - Midi write state * track - The track to output startup info for diff -rNu melys-0.0.15/gui/.cvsignore melys-0.0.16/gui/.cvsignore --- melys-0.0.15/gui/.cvsignore Sun Oct 3 12:54:27 1999 +++ melys-0.0.16/gui/.cvsignore Tue Oct 12 14:58:13 1999 @@ -1,6 +1,8 @@ help.c main.c menus.c +partprop.c +propbox.c trackprop.c Makefile *.mdml *.mdml.gz *.mid diff -rNu melys-0.0.15/gui/Makefile melys-0.0.16/gui/Makefile --- melys-0.0.15/gui/Makefile Sun Oct 3 12:54:27 1999 +++ melys-0.0.16/gui/Makefile Tue Oct 12 14:58:13 1999 @@ -7,10 +7,14 @@ OBJS = help.o \ main.o \ menus.o \ + partprop.o \ + propbox.o \ trackprop.o GENCFILES = help.c \ main.c \ menus.c \ + partprop.c \ + propbox.c \ trackprop.c GENHFILES = ../include/melgui.h \ ../include/melmsg.h \ @@ -53,6 +57,18 @@ trackprop.o: ../include/melwidgets.h trackprop.o: ../include/md.h trackprop.o: ../include/melgui.h +propbox.o: ../include/melreg.h +propbox.o: ../include/song.h +propbox.o: ../include/elements.h +propbox.o: ../include/md.h +propbox.o: ../include/melgui.h +partprop.o: ../include/melreg.h +partprop.o: ../include/song.h +partprop.o: ../include/elements.h +partprop.o: ../include/melfile.h +partprop.o: ../include/melwidgets.h +partprop.o: ../include/md.h +partprop.o: ../include/melgui.h menus.o: ../include/melreg.h menus.o: ../include/elements.h menus.o: ../include/song.h @@ -71,6 +87,7 @@ main.o: ../include/melreg.h main.o: ../include/melfile.h main.o: ../include/melmidi.h +main.o: ../include/meldnd.h main.o: ../include/song.h main.o: ../include/melys.h main.o: ../include/melystrackinfo.h diff -rNu melys-0.0.15/gui/help.c melys-0.0.16/gui/help.c --- melys-0.0.15/gui/help.c Sun Oct 3 12:54:34 1999 +++ melys-0.0.16/gui/help.c Tue Oct 12 14:58:21 1999 @@ -28,6 +28,7 @@ #include "intl.h" +/* Static functions */ void diff -rNu melys-0.0.15/gui/main.c melys-0.0.16/gui/main.c --- melys-0.0.15/gui/main.c Sun Oct 3 12:54:34 1999 +++ melys-0.0.16/gui/main.c Tue Oct 12 14:58:22 1999 @@ -13,6 +13,8 @@ * * * + * + * */ @@ -20,12 +22,20 @@ #include "except.h" #include "util.h" #include -#include "gnome.h" +#include "libgnome/gnome-defs.h" +#include "libgnome/gnome-mime.h" +#include "libgnomeui/gnome-init.h" +#include "libgnomeui/gnome-mdi.h" +#include "libgnomeui/gnome-mdi-child.h" +#include "libgnomeui/gnome-mdi-generic-child.h" +#include "libgnomeui/gnome-dialog-util.h" +#include "libgnomeui/gnome-popup-help.h" #include "menus.h" #include "elements.h" #include "melreg.h" #include "melfile.h" #include "melmidi.h" +#include "meldnd.h" #include "song.h" #include "melys.h" #include "melystrackinfo.h" @@ -36,6 +46,11 @@ #include "melmsg.h" #include "intl.h" + +/* Atoms */ +GdkAtom MelysElemAtom; + + /* * Help text for the context menu on the info pane */ @@ -49,7 +64,11 @@ static struct except childError; struct except *noActiveChildError = &childError; +/* Static functions */ static GtkWidget *create_view(GnomeMDIChild *child, gpointer data); +static int drag_files_received(GtkWidget *w, GdkDragContext *context, gint x, + gint y, GtkSelectionData *data, guint info, guint time); +static gboolean create_files(gpointer data); static int add_view_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data); static void view_changed_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data); @@ -57,18 +76,24 @@ /* * Initialise the application and set up the initial screen. - * + * * Arguments: * argc - The program argument count * argv - The program arguments + * optind - Start of the file args */ int -melys_app(int argc, char **argv) +melys_app(int argc, char **argv, int optind) { GnomeMDI *mdi; struct song *song; + int oldargc = argc; - argc = 1; /* We currently do our own processing */ + /* + * 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", _("The Melys sequencer"))); @@ -77,16 +102,24 @@ mel_init_menus(mdi); /* Set to notebook mode */ - gnome_mdi_set_mode(mdi, GNOME_MDI_NOTEBOOK); 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(GTK_OBJECT(mdi), "view-changed" , GTK_SIGNAL_FUNC(view_changed_cb), NULL); - song = mel_create_song(GTK_OBJECT(mdi), NULL, NULL, NULL); - song->unused = 1; + argc = oldargc; + if (argc == optind) { + song = mel_create_song(GTK_OBJECT(mdi), NULL, NULL); + song->unused = 1; + } else { + while (optind++ < argc) + mel_create_song(GTK_OBJECT(mdi), argv[optind-1], NULL); + } + + MelysElemAtom = gdk_atom_intern(MELYS_ELEM_ATOM_NAME, FALSE); return 0; } @@ -95,6 +128,7 @@ * 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. + * * Arguments: * mdi - The MDI to find the active child */ @@ -116,6 +150,7 @@ /* * Get the child count. It would be better to use a public * interface for this, but there doesn't appear to be one. + * * Arguments: * mdi - MDI to get child count of */ @@ -131,6 +166,7 @@ /* * Set the child count. Would not be needed if you could get the * number of children via a public interface. + * * Arguments: * mdi - MDI to set count on * count - The new count to set @@ -147,29 +183,32 @@ * 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, psong has not been used then the file * will be read into psong and psong will be returned. * Otherwise a new song is created. - * + * * Arguments: - * psong - Song from current view, if any * filename - Filename to read. If NULL then default song is created. * parent - The dialogue or object that is creating this song */ struct song * -mel_create_song(GtkObject *mdi, struct song *psong, char *filename, - GtkObject *parent) +mel_create_song(GtkObject *mdi, char *filename, GtkObject *parent) { 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); /* @@ -216,13 +255,17 @@ 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; } /* * Add the view to the child. We have to go in a very round about * way of doing this... - * + * * Arguments: * toplevel - True if toplevel view required */ @@ -244,7 +287,7 @@ /* * Create the initial view on a file. - * + * * Arguments: * toplevel - True if toplevel view required */ @@ -289,7 +332,6 @@ /* * Update the current view. Use song_view_update if you have * the song pointer. - * */ void mel_view_update(void) @@ -307,7 +349,6 @@ * 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. - * */ static GtkWidget * create_view(GnomeMDIChild *child, gpointer data) @@ -331,6 +372,7 @@ * go away. If parent is supplied then when that object is * destroyed or unmapped the dialog will be destroyed to. The * routine is printf like. + * * Arguments: * parent - The parent that the dialog 'belongs' to * _type - The type of message @@ -393,7 +435,7 @@ * message will just cause the original to go away. If parent is * supplied then when that object is destroyed or unmapped the * dialog will be destroyed to. - * + * * Arguments: * msg - The message to place in the dialog box * parent - The parent that the dialog 'belongs' to @@ -423,7 +465,7 @@ * 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. - * + * * Arguments: * file - File status to check */ @@ -450,9 +492,87 @@ } /* - * Called when a view is added to a child of the mdi. XXX doesn't - * work anyway. - * + * Set the specified widget, 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. + */ +void +mel_accept_files(GtkObject *mdi, GtkWidget *w) +{ + 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); + } +} + +/* + * Respond to the signal that we have received a filename drop. + * + * Arguments: + * w - The app data drop on + * x - x location (not used) + * y - y location (not used) + */ +static int +drag_files_received(GtkWidget *w, GdkDragContext *context, gint x, gint y, + GtkSelectionData *data, guint info, guint time) +{ + 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; +} + +/* + * 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. + */ +static gboolean +create_files(gpointer data) +{ + 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; +} + +/* + * Called when a view is added to a child of the mdi. + * * Arguments: * mdi - The mdi object * widget - The newly added view @@ -469,7 +589,7 @@ /* * Called when the view is changed. - * + * * Arguments: * mdi - The mdi object * widget - The newly added view @@ -478,12 +598,17 @@ static void view_changed_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data) { - - dprintf1("view_changed_cb"); + GtkWidget *actview; if (widget == NULL) return; + dprintf1("view_changed_cb"); + + actview = gnome_mdi_get_active_view(GNOME_MDI(mdi)); + if (actview) + mel_accept_files(GTK_OBJECT(MainMDI), GTK_WIDGET(actview)); + gtk_widget_grab_focus(widget); return; @@ -491,6 +616,7 @@ /* * Print out the type of the specified object. + * * Arguments: * msg - Message to print first * o - Object to print type of diff -rNu melys-0.0.15/gui/main.m melys-0.0.16/gui/main.m --- melys-0.0.15/gui/main.m Sat Oct 2 22:48:43 1999 +++ melys-0.0.16/gui/main.m Mon Oct 11 19:51:06 1999 @@ -12,12 +12,22 @@ GNU General Public License for more details. >>header ->>header gnome.h + +>>header libgnome/gnome-defs.h +>>header libgnome/gnome-mime.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 melystrackinfo.h @@ -65,6 +75,11 @@ extern void mel_view_update(void); >>extern + +/* Atoms */ +GdkAtom MelysElemAtom; + + /* * Help text for the context menu on the info pane */ @@ -82,6 +97,7 @@ 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. @@ -89,8 +105,13 @@ >>code GnomeMDI *mdi; struct song *song; + int oldargc = argc; - argc = 1; /* We currently do our own processing */ + /* + * 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", _("The Melys sequencer"))); @@ -99,16 +120,24 @@ mel_init_menus(mdi); /* Set to notebook mode */ - gnome_mdi_set_mode(mdi, GNOME_MDI_NOTEBOOK); 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(GTK_OBJECT(mdi), "view-changed" , GTK_SIGNAL_FUNC(view_changed_cb), NULL); - song = mel_create_song(GTK_OBJECT(mdi), NULL, NULL, NULL); - song->unused = 1; + argc = oldargc; + if (argc == optind) { + song = mel_create_song(GTK_OBJECT(mdi), NULL, NULL); + song->unused = 1; + } else { + while (optind++ < argc) + mel_create_song(GTK_OBJECT(mdi), argv[optind-1], NULL); + } + + MelysElemAtom = gdk_atom_intern(MELYS_ELEM_ATOM_NAME, FALSE); return 0; @@ -162,7 +191,6 @@ >>function mel_create_song struct song * GtkObject *mdi; -struct song *psong; Song from current view, if any char *filename; Filename to read. If NULL then default song is created. GtkObject *parent; The dialogue or object that is creating this song @@ -183,12 +211,18 @@ 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); /* @@ -235,6 +269,10 @@ 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; @@ -482,6 +520,93 @@ return TRUE; /* True, there is an error */ +>>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 add_view_cb static int GtkObject *mdi; The mdi object @@ -490,7 +615,6 @@ >>description Called when a view is added to a child of the mdi. -XXX doesn't work anyway. >>code @@ -508,11 +632,16 @@ Called when the view is changed. >>code - - dprintf1("@func_name"); + GtkWidget *actview; if (widget == NULL) return; + + dprintf1("@func_name"); + + actview = gnome_mdi_get_active_view(GNOME_MDI(mdi)); + if (actview) + mel_accept_files(GTK_OBJECT(MainMDI), GTK_WIDGET(actview)); gtk_widget_grab_focus(widget); diff -rNu melys-0.0.15/gui/menus.c melys-0.0.16/gui/menus.c --- melys-0.0.15/gui/menus.c Sun Oct 3 12:54:35 1999 +++ melys-0.0.16/gui/menus.c Tue Oct 12 14:58:22 1999 @@ -42,6 +42,7 @@ #include "intl.h" +/* Static functions */ static void new_cb(GtkWidget *wid, gpointer data); static void open_cb(GtkWidget *wid, gpointer data); static void open_ok_cb(GtkWidget *button, gpointer data); @@ -183,7 +184,7 @@ /* * Initialise the menus for the application. - * + * * Arguments: * mdi - MDI widget */ @@ -197,7 +198,7 @@ /* * Starts a new empty song. - * + * * Arguments: * data - The mdi widget */ @@ -208,7 +209,7 @@ struct song *song; /* Create a new child for this file */ - song = mel_create_song(GTK_OBJECT(mdi), NULL, NULL, NULL); + song = mel_create_song(GTK_OBJECT(mdi), NULL, NULL); song->unused = 1; } @@ -216,10 +217,9 @@ * 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. - * + * * Arguments: * wid - widget event received on * data - This will be the mdi widget @@ -263,7 +263,7 @@ /* * Open a file. A new child window will be created if necessary. - * + * * Arguments: * data - The mdi */ @@ -297,13 +297,13 @@ * Create a new child. If the current one has not been * used, then it could be destroyed. */ - mel_create_song(GTK_OBJECT(mdi), song, filename, GTK_OBJECT(sel)); + mel_create_song(GTK_OBJECT(mdi), filename, GTK_OBJECT(sel)); } /* * Bring up a save-as dialog and write the song to the selected * file. - * + * * Arguments: * mi - The menu item selected * data - The mdi object @@ -345,7 +345,6 @@ /* * User has selected a file to write to. All we now have to do is * write it out! - * */ static void save_ok_cb(GtkWidget *button, gpointer data) @@ -379,7 +378,6 @@ /* * Cancel has been clicked, so just hide the dialog. Allows you * to carry on from where you left off after a cancel. - * */ static void file_cancel_cb(GtkWidget *button, gpointer data) @@ -392,7 +390,7 @@ /* * This function is called when the user clicks on the close * menu item. - * + * * Arguments: * w - Widget event received on * data - This will be the mdi widget @@ -413,7 +411,7 @@ /* * Close all the open windows. - * + * * Arguments: * w - Widget event received on * data - This will be the mdi widget @@ -424,13 +422,13 @@ GtkObject *mdi = GTK_OBJECT(data); gnome_mdi_remove_all(GNOME_MDI(mdi), 0); - dprintf1("Nfree is %d", md_nfree()); + dprintf1("Nfree is %d", md_get_nfree()); } /* * This function is called when the user clicks on the close * menu item. - * + * * Arguments: * w - widget event received on * data - This will be the mdi widget @@ -455,7 +453,7 @@ /* * Start playing the song. - * + * * Arguments: * w - Widget event received on * data - The mdi object @@ -520,7 +518,7 @@ * 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. - * + * * Arguments: * w - Widget event received on * data - The mdi object @@ -547,7 +545,7 @@ /* * Add a new empty track. - * + * * Arguments: * w - Widget event received on * data - The mdi object @@ -566,7 +564,7 @@ /* Set the default channel to be the track number */ MD_ELEMENT(track)->device_channel = sd->mdroot->tracks; - md_add_elem(MD_CONTAINER(sd->mdroot), MD_ELEMENT(track)); + md_add(MD_CONTAINER(sd->mdroot), MD_ELEMENT(track)); } song_view_update(sd); @@ -574,7 +572,7 @@ /* * Delete all selected tracks. - * + * * Arguments: * w - Widget event received on * data - The mdi object @@ -605,7 +603,7 @@ /* * Delete all selected tracks. - * + * * Arguments: * w - Widget event received on * data - The mdi object @@ -662,7 +660,7 @@ /* * Bring up a debugging window with some debugging info in it. - * + * * Arguments: * w - Widget event received on * data - The mdi object @@ -681,7 +679,7 @@ mel_song_info(sd, NULL, _("Number of allocated elements %d\n" - ), md_nfree()); + ), md_get_nfree()); #endif @@ -689,7 +687,7 @@ /* * Show the properties box for the first selected track. - * + * * Arguments: * w - widget event received on * data - the mdi object diff -rNu melys-0.0.15/gui/menus.m melys-0.0.16/gui/menus.m --- melys-0.0.15/gui/menus.m Tue Sep 28 18:42:34 1999 +++ melys-0.0.16/gui/menus.m Tue Oct 12 14:52:25 1999 @@ -177,7 +177,7 @@ struct song *song; /* Create a new child for this file */ - song = mel_create_song(GTK_OBJECT(mdi), NULL, NULL, NULL); + song = mel_create_song(GTK_OBJECT(mdi), NULL, NULL); song->unused = 1; @@ -267,7 +267,7 @@ * Create a new child. If the current one has not been * used, then it could be destroyed. */ - mel_create_song(GTK_OBJECT(mdi), song, filename, GTK_OBJECT(sel)); + mel_create_song(GTK_OBJECT(mdi), filename, GTK_OBJECT(sel)); >>function save_as_cb @@ -391,7 +391,8 @@ GtkObject *mdi = GTK_OBJECT(data); gnome_mdi_remove_all(GNOME_MDI(mdi), 0); - dprintf1("Nfree is %d", md_nfree()); + dprintf1("Nfree is %d", md_get_nfree()); + >>function exit_cb static void @@ -537,7 +538,7 @@ /* Set the default channel to be the track number */ MD_ELEMENT(track)->device_channel = sd->mdroot->tracks; - md_add_elem(MD_CONTAINER(sd->mdroot), MD_ELEMENT(track)); + md_add(MD_CONTAINER(sd->mdroot), MD_ELEMENT(track)); } song_view_update(sd); @@ -649,7 +650,7 @@ mel_song_info(sd, NULL, _("Number of allocated elements %d\n" - ), md_nfree()); + ), md_get_nfree()); #endif diff -rNu melys-0.0.15/gui/partprop.c melys-0.0.16/gui/partprop.c --- melys-0.0.15/gui/partprop.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.16/gui/partprop.c Tue Oct 12 14:58:22 1999 @@ -0,0 +1,190 @@ +/* + * + * Copyright (C) 1999 Steve Ratcliffe + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "gtk/gtk.h" +#include "libgnomeui/gnome-propertybox.h" +#include "libgnome/gnome-help.h" +#include "melreg.h" +#include "song.h" +#include "elements.h" +#include "melfile.h" +#include "melwidgets.h" +#include "md.h" +#include "melgui.h" +#include "intl.h" + + + +/* + * Structure to hold the state of the 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", "track.html", "part-prop-info"}, +}; +static struct help_entry help_entry = { + NELEM(pages), pages +}; + +/* Static functions */ +static GtkWidget *prop_part_info(struct part_prop *prop); +static void prop_apply(GtkWidget *w, gint page, struct part_prop *prop); + + +/* + * Bring up a property box for the specified part. When the user + * clicks apply/ok then the part properties are set. + * + * Arguments: + * part - The part to set the properties for + * song - Song information + * which - Which page to present first + */ +void +part_prop_box(struct partElement *part, struct song *song, int which) +{ + 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); + + 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); +} + +/* + * 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. + */ +static GtkWidget * +prop_part_info(struct part_prop *prop) +{ + 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; +} + +static void +prop_apply(GtkWidget *w, gint page, struct part_prop *prop) +{ + 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.0.15/gui/partprop.m melys-0.0.16/gui/partprop.m --- melys-0.0.15/gui/partprop.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.16/gui/partprop.m Mon Oct 4 22:19:55 1999 @@ -0,0 +1,192 @@ +>>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", "track.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); + + 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.0.15/gui/propbox.c melys-0.0.16/gui/propbox.c --- melys-0.0.15/gui/propbox.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.16/gui/propbox.c Tue Oct 12 14:58:22 1999 @@ -0,0 +1,111 @@ +/* + * + * Copyright (C) 1999 Steve Ratcliffe + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "gtk/gtk.h" +#include "libgnomeui/gnome-propertybox.h" +#include "libgnome/gnome-help.h" +#include "melreg.h" +#include "song.h" +#include "elements.h" +#include "md.h" +#include "melgui.h" +#include "intl.h" + + +/* Static functions */ +static void prop_destroy(GtkWidget *w, gpointer data); + + +/* + * This is a common routine for creating the property boxes. It + * enforces the rule that only one can be active at a time and + * handles destroying itself when the parent song is closed. + * + * Arguments: + * song - Song information + * elem - The affected element + * size - Size of property data + */ +struct prop_box * +mel_prop_box(struct song *song, struct element *elem, int size) +{ + GtkWidget *gpb; + struct prop_box *prop; + + /* + * First get rid of any existing one. + */ + reg_destroy(song->propbox); + + prop = g_malloc(size); + + MD_WREF(elem); + prop->elem = elem; + prop->song = song; + + gpb = gnome_property_box_new(); + prop->box = gpb; + song->propbox = reg_object((GtkObject*)gpb, (GtkObject*)song->child); + + gtk_signal_connect(GTK_OBJECT(gpb), "destroy", + GTK_SIGNAL_FUNC(prop_destroy), prop); + + return prop; +} + +void +attach_at(GtkWidget *tab, GtkWidget *w, int row, int col, int xopts, + int yopts) +{ + + gtk_table_attach(GTK_TABLE(tab), w, col, col+1, row, row+1, + xopts, yopts, 10, 4); +} + +/* + * Create a label and set its alignment and/or justification. + */ +GtkWidget * +new_lab_align(char *str) +{ + GtkWidget *lab; + + lab = gtk_label_new(str); + gtk_misc_set_alignment((GtkMisc *)lab, 0.0, 0.5); + return lab; +} + +void +prop_change(GtkWidget *w, gpointer data) +{ + struct prop_box *prop = data; + + if (prop->box) + gnome_property_box_changed((GnomePropertyBox *)prop->box); +} + +static void +prop_destroy(GtkWidget *w, gpointer data) +{ + struct prop_box *prop = data; + + MD_WUNREF(prop->elem); +} diff -rNu melys-0.0.15/gui/propbox.m melys-0.0.16/gui/propbox.m --- melys-0.0.15/gui/propbox.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.16/gui/propbox.m Tue Oct 5 21:28:02 1999 @@ -0,0 +1,129 @@ +>>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 */ +}; + +#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 enforces the rule that only one can be active at a time +and handles destroying itself when the parent song is closed. + +>>code + GtkWidget *gpb; + struct prop_box *prop; + + /* + * First get rid of any existing one. + */ + reg_destroy(song->propbox); + + prop = g_malloc(size); + + MD_WREF(elem); + prop->elem = elem; + prop->song = song; + + gpb = gnome_property_box_new(); + prop->box = gpb; + song->propbox = reg_object((GtkObject*)gpb, (GtkObject*)song->child); + + gtk_signal_connect(GTK_OBJECT(gpb), "destroy", + GTK_SIGNAL_FUNC(prop_destroy), prop); + + 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_destroy +static void +GtkWidget *w; +gpointer data; + +>>code + struct prop_box *prop = data; + + MD_WUNREF(prop->elem); + diff -rNu melys-0.0.15/gui/trackprop.c melys-0.0.16/gui/trackprop.c --- melys-0.0.15/gui/trackprop.c Sun Oct 3 12:54:35 1999 +++ melys-0.0.16/gui/trackprop.c Tue Oct 12 14:58:23 1999 @@ -38,13 +38,7 @@ */ struct track_prop { - regid_t box; /* The property box */ - - struct song *song; /* All the song information */ - struct trackElement *track; /* The track to be modified */ - - /* Signals set up that need disconnecting */ - guint destroy; + struct prop_box common; /* Common part of the property box */ /* Page numbers */ int basic_page; @@ -59,20 +53,25 @@ GtkSpinButton *banklsb; /* The instrument number low bank */ }; +/* Help locations */ +static struct help_page_entry pages[] = { + {"melys", "track.html", "track-prop-info"}, + {"melys", "track.html", "track-prop-instruments"}, +}; +static struct help_entry help_entry = { + NELEM(pages), pages +}; + +/* Static functions */ static GtkWidget *prop_track_info(struct track_prop *prop); static GtkWidget *prop_track_instruments(struct track_prop *prop); -static void attach_at(GtkTable *tab, GtkWidget *w, int row, int col, - int xopts, int yopts); -static GtkWidget *new_lab_align(char *str); -static void prop_change(GtkWidget *w, gpointer data); static void prop_apply(GtkWidget *w, gint page, struct track_prop *prop); -static void prop_destroy(GtkWidget *w, gpointer data); /* * Bring up a property box for the specified track. When the * user clicks apply/ok then the track properties are set. - * + * * Arguments: * track - The track to set the properties for * song - Song information @@ -88,25 +87,10 @@ GtkWidget *instrlab; struct track_prop *prop; - /* - * First check to see if one is open already. - */ - gpb = reg_get_widget(track->props); - if (gpb) { - gdk_window_show(gpb->window); - gdk_window_raise(gpb->window); - - goto out; - } - - prop = g_new0(struct track_prop, 1); - - prop->track = track; - prop->song = song; + prop = (struct track_prop *) mel_prop_box(song, + (struct element *)track, sizeof(struct track_prop)); - gpb = gnome_property_box_new(); - prop->box = reg_object((GtkObject*)gpb, (GtkObject*)song->child); - track->props = prop->box; + gpb = PROP_BOX(prop); basic = prop_track_info(prop); basiclab = gtk_label_new(_("Basic")); @@ -118,35 +102,18 @@ prop->instrument_page = gnome_property_box_append_page( GNOME_PROPERTY_BOX(gpb), instr, instrlab); - //gtk_notebook_set_page(gpb->notebook, prop->basic_page); - - prop->destroy = gtk_signal_connect(GTK_OBJECT(gpb), "destroy", - GTK_SIGNAL_FUNC(prop_destroy), prop); - gtk_signal_connect(GTK_OBJECT(gpb), "apply", - GTK_SIGNAL_FUNC(prop_apply), prop); gtk_signal_connect(GTK_OBJECT(gpb), "apply", GTK_SIGNAL_FUNC(prop_apply), prop); - { /* * Set up the help system. The standard gnome help system * for property boxes does not work well for me. So I am * using a system that allows the help to be in different * places and can be different sections in the same document. */ - static struct help_page_entry pages[] = { - {"melys", "track.html", "track-prop-info"}, - {"melys", "track.html", "track-prop-instruments"}, - }; - static struct help_entry help_entry = { - NELEM(pages), pages - }; - gtk_signal_connect(GTK_OBJECT(gpb), "help", GTK_SIGNAL_FUNC(mel_prop_help), &help_entry); - } - out: gtk_notebook_set_page((GtkNotebook*)GNOME_PROPERTY_BOX(gpb)->notebook, which); gtk_widget_show(gpb); } @@ -155,7 +122,6 @@ * Create the actual widget that makes up the basic track * properties page. A long routine, but straightforward. The * property box is built up piece by piece. - * */ static GtkWidget * prop_track_info(struct track_prop *prop) @@ -163,7 +129,7 @@ struct trackElement *track; GtkFrame *frame; GtkBox *mainbox; - GtkTable *tab; + GtkWidget *tab; /* Track name */ GtkWidget *namelab; GtkEntry *trackname; @@ -177,7 +143,7 @@ GtkWidget *chanlab; GtkWidget *chan; - track = prop->track; + track = MD_TRACK(PROP_ELEM(prop)); frame = (GtkFrame *)gtk_frame_new(_("Track properties")); @@ -185,7 +151,7 @@ * Create the boxes that some of the widgets are packed into. * The mainbox may not be needed. */ - tab = (GtkTable *)gtk_table_new(3, 3, 0); + tab = gtk_table_new(3, 3, 0); mainbox = (GtkBox *)gtk_vbox_new(0, 0/*spacing*/); devbox = gtk_hbox_new(0, 0); chanbox = gtk_hbox_new(0, 0); @@ -253,7 +219,6 @@ /* * Build up the instrument definition page. - * */ static GtkWidget * prop_track_instruments(struct track_prop *prop) @@ -274,7 +239,7 @@ GtkWidget *banklsb; GtkWidget *banklsblab; - track = prop->track; + track = MD_TRACK(PROP_ELEM(prop)); frame = gtk_frame_new(_("Instruments")); tmpbox = gtk_vbox_new(0, 0); @@ -320,39 +285,6 @@ } static void -attach_at(GtkTable *tab, GtkWidget *w, int row, int col, int xopts, int yopts) -{ - - gtk_table_attach(tab, w, col, col+1, row, row+1, xopts, yopts, 10, 4); -} - -/* - * Create a label and set its justification. - * - */ -static GtkWidget * -new_lab_align(char *str) -{ - GtkWidget *lab; - - lab = gtk_label_new(str); - gtk_misc_set_alignment((GtkMisc *)lab, 0.0, 0.5); - return lab; -} - -static void -prop_change(GtkWidget *w, gpointer data) -{ - struct track_prop *prop = data; - GtkWidget *gpb; - - gpb = reg_get_widget(prop->box); - if (gpb) { - gnome_property_box_changed((GnomePropertyBox *)gpb); - } -} - -static void prop_apply(GtkWidget *w, gint page, struct track_prop *prop) { struct trackElement *track; @@ -360,8 +292,8 @@ int num; int program; - track = prop->track; - if (!track) + track = MD_TRACK(PROP_ELEM(prop)); + if (!track || MD_IS_DESTROYED(track)) return; if (page != -1) @@ -396,20 +328,5 @@ } MD_SET_MODIFIED(track, TRUE); - song_view_update(prop->song); -} - -static void -prop_destroy(GtkWidget *w, gpointer data) -{ - struct track_prop *prop = data; - GtkObject *obj; - - obj = reg_get(prop->box); - if (obj) { - gtk_signal_disconnect(obj, prop->destroy); - gtk_object_unref(obj); - } - - reg_unreg(prop->box); + song_view_update(PROP_SONG(prop)); } diff -rNu melys-0.0.15/gui/trackprop.m melys-0.0.16/gui/trackprop.m --- melys-0.0.15/gui/trackprop.m Sat Oct 2 22:50:00 1999 +++ melys-0.0.16/gui/trackprop.m Mon Oct 4 22:20:28 1999 @@ -37,13 +37,7 @@ */ struct track_prop { - regid_t box; /* The property box */ - - struct song *song; /* All the song information */ - struct trackElement *track; /* The track to be modified */ - - /* Signals set up that need disconnecting */ - guint destroy; + struct prop_box common; /* Common part of the property box */ /* Page numbers */ int basic_page; @@ -58,6 +52,15 @@ GtkSpinButton *banklsb; /* The instrument number low bank */ }; +/* Help locations */ +static struct help_page_entry pages[] = { + {"melys", "track.html", "track-prop-info"}, + {"melys", "track.html", "track-prop-instruments"}, +}; +static struct help_entry help_entry = { + NELEM(pages), pages +}; + >>function track_prop_box void struct trackElement *track; The track to set the properties for @@ -76,25 +79,10 @@ GtkWidget *instrlab; struct track_prop *prop; - /* - * First check to see if one is open already. - */ - gpb = reg_get_widget(track->props); - if (gpb) { - gdk_window_show(gpb->window); - gdk_window_raise(gpb->window); - - goto out; - } - - prop = g_new0(struct track_prop, 1); - - prop->track = track; - prop->song = song; + prop = (struct track_prop *) mel_prop_box(song, + (struct element *)track, sizeof(struct track_prop)); - gpb = gnome_property_box_new(); - prop->box = reg_object((GtkObject*)gpb, (GtkObject*)song->child); - track->props = prop->box; + gpb = PROP_BOX(prop); basic = prop_track_info(prop); basiclab = gtk_label_new(_("Basic")); @@ -106,35 +94,18 @@ prop->instrument_page = gnome_property_box_append_page( GNOME_PROPERTY_BOX(gpb), instr, instrlab); - //gtk_notebook_set_page(gpb->notebook, prop->basic_page); - - prop->destroy = gtk_signal_connect(GTK_OBJECT(gpb), "destroy", - GTK_SIGNAL_FUNC(prop_destroy), prop); - gtk_signal_connect(GTK_OBJECT(gpb), "apply", - GTK_SIGNAL_FUNC(prop_apply), prop); gtk_signal_connect(GTK_OBJECT(gpb), "apply", GTK_SIGNAL_FUNC(prop_apply), prop); - { /* * Set up the help system. The standard gnome help system * for property boxes does not work well for me. So I am * using a system that allows the help to be in different * places and can be different sections in the same document. */ - static struct help_page_entry pages[] = { - {"melys", "track.html", "track-prop-info"}, - {"melys", "track.html", "track-prop-instruments"}, - }; - static struct help_entry help_entry = { - NELEM(pages), pages - }; - gtk_signal_connect(GTK_OBJECT(gpb), "help", GTK_SIGNAL_FUNC(mel_prop_help), &help_entry); - } - out: gtk_notebook_set_page((GtkNotebook*)GNOME_PROPERTY_BOX(gpb)->notebook, which); gtk_widget_show(gpb); @@ -153,7 +124,7 @@ struct trackElement *track; GtkFrame *frame; GtkBox *mainbox; - GtkTable *tab; + GtkWidget *tab; /* Track name */ GtkWidget *namelab; GtkEntry *trackname; @@ -167,7 +138,7 @@ GtkWidget *chanlab; GtkWidget *chan; - track = prop->track; + track = MD_TRACK(PROP_ELEM(prop)); frame = (GtkFrame *)gtk_frame_new(_("Track properties")); @@ -175,7 +146,7 @@ * Create the boxes that some of the widgets are packed into. * The mainbox may not be needed. */ - tab = (GtkTable *)gtk_table_new(3, 3, 0); + tab = gtk_table_new(3, 3, 0); mainbox = (GtkBox *)gtk_vbox_new(0, 0/*spacing*/); devbox = gtk_hbox_new(0, 0); chanbox = gtk_hbox_new(0, 0); @@ -264,7 +235,7 @@ GtkWidget *banklsb; GtkWidget *banklsblab; - track = prop->track; + track = MD_TRACK(PROP_ELEM(prop)); frame = gtk_frame_new(_("Instruments")); tmpbox = gtk_vbox_new(0, 0); @@ -309,51 +280,6 @@ return frame; ->>function attach_at -static void -GtkTable *tab; -GtkWidget *w; -int row; -int col; -int xopts; -int yopts; - ->>code - - gtk_table_attach(tab, w, col, col+1, row, row+1, xopts, yopts, 10, 4); - - - ->>function new_lab_align -static GtkWidget * -char *str; - ->>description -Create a label and set its justification. - ->>code - GtkWidget *lab; - - lab = gtk_label_new(str); - gtk_misc_set_alignment((GtkMisc *)lab, 0.0, 0.5); - return lab; - - ->>function prop_change -static void -GtkWidget *w; -gpointer data; - ->>code - struct track_prop *prop = data; - GtkWidget *gpb; - - gpb = reg_get_widget(prop->box); - if (gpb) { - gnome_property_box_changed((GnomePropertyBox *)gpb); - } - - >>function prop_apply static void GtkWidget *w; @@ -366,8 +292,8 @@ int num; int program; - track = prop->track; - if (!track) + track = MD_TRACK(PROP_ELEM(prop)); + if (!track || MD_IS_DESTROYED(track)) return; if (page != -1) @@ -402,21 +328,5 @@ } MD_SET_MODIFIED(track, TRUE); - song_view_update(prop->song); - ->>function prop_destroy -static void -GtkWidget *w; -gpointer data; - ->>code - struct track_prop *prop = data; - GtkObject *obj; - - obj = reg_get(prop->box); - if (obj) { - gtk_signal_disconnect(obj, prop->destroy); - gtk_object_unref(obj); - } + song_view_update(PROP_SONG(prop)); - reg_unreg(prop->box); diff -rNu melys-0.0.15/help/C/Makefile melys-0.0.16/help/C/Makefile --- melys-0.0.15/help/C/Makefile Sun Oct 3 11:52:10 1999 +++ melys-0.0.16/help/C/Makefile Sun Oct 3 19:16:08 1999 @@ -24,6 +24,7 @@ db2html melys.sgml rm -rf html mv melys html + rm -rf html/stylesheet-images cd html; mv melys.html index.html ps: $(SGMLFILES) diff -rNu melys-0.0.15/help/C/html/display-pane.html melys-0.0.16/help/C/html/display-pane.html --- melys-0.0.15/help/C/html/display-pane.html Sun Oct 3 12:54:46 1999 +++ melys-0.0.16/help/C/html/display-pane.html Tue Oct 12 14:58:34 1999 @@ -1,7 +1,7 @@ The information paneThe part display panePrevNext 
    The information paneThe part display pane

    This pane shows the recorded parts. @@ -84,13 +78,195 @@ that reference it will change as well.

    Not much implemented here yet - There will be slicing parts and rearranging them. - From the part display pane, you can slice parts into smaller + pieces, join parts together and move parts about. + Parts can be moved within the same track, across different + tracks and even between different songs.

    Right click menu

    Clicking on a part with the right menu button brings up a context + menu of operations that can be performed on that part. +

    Slice

    The part is cut into two at the point where the mouse + was clicked. + + It will be possible to snap to the beginning of a bar + or some other point in the future.

    Join

    The part is joined to the next one in the track. + If there is no next part then nothing happens.

    Delete

    The part that you clicked on is deleted.

    Properties...

    The part property box is brought up for the part that + was clicked on. + See part properties.

    Part drag and drop

    Much of the power of editing in the part display comes from + using drag and drop to manipulate parts. + It will be possible to move, copy and link parts together. + Parts can be moved just as easily from one song to another. + It is also possible to select a number of parts and move them + as a group. + The following describes what is currently implemented. + +

    Move a single part

    To move a single part it is not necessary to select the + part first. + However if other parts are selected and the part you want + to move is also selected, then you should click on + the part to be moved to ensure that only it is selected. +

    Press the left mouse button on the part that you wish to move, + holding the button down drag the part to where you want it + to go. + Hold the shift button down while releasing the mouse button. + You can drag the part anywhere in the song or to another song + altogether, as long as it is another window of the same + application. +

    Move a set of parts

    Select all the parts to be moved. + This can be done by holding down the control key while + left-clicking parts. + As long as the control key is down, clicking on an unselected + part will select it and clicking on a part that is + already selected will de-select that part. +

    Once all the parts are selected that are to be moved, click + with the left button one of the selected parts. + Keep the button down and drag it to desired location. + All the selected parts will move as a unit and keep the same + positions relative to each other. + For example if the two parts are selected on the same + track, then when they are moved they will maintain the same + time difference relative to each other at the destination. + Likewise if parts are on different tracks, say three tracks + apart then the parts will remain three tracks apart at + their final destination. + +

    Caveats

    Copying, linking are not implemented yet. + Do not allow parts to overlap, although nothing + bad will happen the behaviour is currently difficult + to predict and will be changed. + If parts overlap then saving in midi format will not + be successful. + Slicing or draging does not snap to bar or beat boundries + so it is not possible to position things very well. + This will be fixed in the next release.

    Part properties

    Double clicking on a part in the parts display brings up + the part properties box. +

    The box consists of the following fields that can be changed. + +

    Name

    The name of the part.

    PrevNext Track viewThe track menuThe track menu 
    The track menu
    The information paneThe part display pane
    The track menuRight click menu
    Part drag and drop
    Part properties

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

    This will close all open windows.

    Prev Next
    Prev NextThe information paneTrack view The part display pane
    Next
    The information paneThe track menu
    The track menuThe part display pane

    Further tracks can be unmuted by clicking on the relavent +> Further tracks can be unmuted by clicking on the relevant mute button. In this way you can have a selection of tracks playing. These unmuted tracks are remembered so that if you toggle @@ -253,7 +253,7 @@ CLASS="COMMAND" >showseq to display - a list of available sequenver ports on your system. + a list of available sequencer ports on your system. All ports labeled write

    You can type in a number between 0 and 127 or use the spin control arrows on the right to adjust the value. - There are also bank MSB and LSB controls.

    NextThe information paneThe track menu This will close all open windows. - Not currently useful - next operation will exit the sequencer. diff -rNu melys-0.0.15/help/C/track.sgml melys-0.0.16/help/C/track.sgml --- melys-0.0.15/help/C/track.sgml Sun Oct 3 11:52:10 1999 +++ melys-0.0.16/help/C/track.sgml Tue Oct 12 00:42:17 1999 @@ -70,7 +70,7 @@ Clicking on this button for a track will mute all other tracks, leaving the one track playing. - Further tracks can be unmuted by clicking on the relavent + Further tracks can be unmuted by clicking on the relevant mute button. In this way you can have a selection of tracks playing. These unmuted tracks are remembered so that if you toggle @@ -133,7 +133,7 @@ environment variable. This is a comma separated list of &alsa; sequencer ports. You can use the utility showseq to display - a list of available sequenver ports on your system. + a list of available sequencer ports on your system. All ports labeled - The information pane - - This pane shows the recorded parts. - Each part is represented by a rectangle in the display. - A scale at the top displays the bar numbers. - As the piece plays or during recording a pointer moves - across the display to show the current position in the - song. - - There are two kinds of parts. - Original parts, which are represented with a solid - border and reference parts which are represented with - a dotted border. - Reference parts are linked to some other part and - when the original part is changed all parts - that reference it will change as well. - - - Not much implemented here yet - There will be slicing parts and rearranging them. - + + The track menu @@ -224,6 +206,153 @@ track. See the track properties section for more details. + + + + + + The part display pane + + This pane shows the recorded parts. + Each part is represented by a rectangle in the display. + A scale at the top displays the bar numbers. + As the piece plays or during recording a pointer moves + across the display to show the current position in the + song. + + There are two kinds of parts. + Original parts, which are represented with a solid + border and reference parts which are represented with + a dotted border. + Reference parts are linked to some other part and + when the original part is changed all parts + that reference it will change as well. + + From the part display pane, you can slice parts into smaller + pieces, join parts together and move parts about. + Parts can be moved within the same track, across different + tracks and even between different songs. + + + Right click menu + + Clicking on a part with the right menu button brings up a context + menu of operations that can be performed on that part. + + + + + The part is cut into two at the point where the mouse + was clicked. + + It will be possible to snap to the beginning of a bar + or some other point in the future. + + + + + The part is joined to the next one in the track. + If there is no next part then nothing happens. + + + + + The part that you clicked on is deleted. + + + + + The part property box is brought up for the part that + was clicked on. + See part properties. + + + + + Part drag and drop + + Much of the power of editing in the part display comes from + using drag and drop to manipulate parts. + It will be possible to move, copy and link parts together. + Parts can be moved just as easily from one song to another. + It is also possible to select a number of parts and move them + as a group. + The following describes what is currently implemented. + + + Move a single part + + To move a single part it is not necessary to select the + part first. + However if other parts are selected and the part you want + to move is also selected, then you should click on + the part to be moved to ensure that only it is selected. + + Press the left mouse button on the part that you wish to move, + holding the button down drag the part to where you want it + to go. + Hold the shift button down while releasing the mouse button. + You can drag the part anywhere in the song or to another song + altogether, as long as it is another window of the same + application. + + Move a set of parts + + Select all the parts to be moved. + This can be done by holding down the control key while + left-clicking parts. + As long as the control key is down, clicking on an unselected + part will select it and clicking on a part that is + already selected will de-select that part. + + Once all the parts are selected that are to be moved, click + with the left button one of the selected parts. + Keep the button down and drag it to desired location. + All the selected parts will move as a unit and keep the same + positions relative to each other. + For example if the two parts are selected on the same + track, then when they are moved they will maintain the same + time difference relative to each other at the destination. + Likewise if parts are on different tracks, say three tracks + apart then the parts will remain three tracks apart at + their final destination. + + + Caveats + + Copying, linking are not implemented yet. + Do not allow parts to overlap, although nothing + bad will happen the behaviour is currently difficult + to predict and will be changed. + If parts overlap then saving in midi format will not + be successful. + Slicing or draging does not snap to bar or beat boundries + so it is not possible to position things very well. + This will be fixed in the next release. + + +Part properties + <para> + Double clicking on a part in the parts display brings up + the part properties box. + <para> + The box consists of the following fields that can be changed. + +<!-- begining of property box field list --> +<variablelist> +<varlistentry> + <term>Name + <listitem> + <para> + The name of the part. </variablelist> diff -rNu melys-0.0.15/include/elements.h melys-0.0.16/include/elements.h --- melys-0.0.15/include/elements.h Sun Oct 3 12:54:20 1999 +++ melys-0.0.16/include/elements.h Tue Oct 12 14:58:06 1999 @@ -45,9 +45,6 @@ struct element parent; GPtrArray *elements; /* List of elements */ guint32 duration; /* duration time for this container */ - /* A widget may free the data at any time and replace with its own */ - gpointer *data; /* Private data */ - void (*data_free)(gpointer); /* Function to free private data */ }; #define MD_CONTAINER(e) \ ((struct containerElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_CONTAINER)) @@ -99,7 +96,6 @@ struct containerElement *newpart; /* Part being recorded */ GPtrArray *notes; /* To save pending on notes */ unsigned char controllers[128]; /* Current controller values */ - int props; /* Track property box id */ int hasprogram:1; /* Has embeded program changes */ }; #define MD_TRACK(e) \ @@ -129,6 +125,7 @@ struct containerElement parent; char *name; /* Part name */ int id; /* Part id unique among all referenced parts */ + /* Private stuff */ }; #define MD_PART(e) \ ((struct partElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_PART)) diff -rNu melys-0.0.15/include/md.h melys-0.0.16/include/md.h --- melys-0.0.15/include/md.h Sun Oct 3 12:54:20 1999 +++ melys-0.0.16/include/md.h Tue Oct 12 14:58:06 1999 @@ -28,20 +28,22 @@ }; -#define md_add_elem(c, el) _md_add_elem(c, el, 0) -#define md_add_elem_sort(c, el) _md_add_elem(c, el, 1) +#define md_add(c, el) md_add_elem(c, el, 0) +#define md_add_sort(c, el) md_add_elem(c, el, 1) -void _md_add_elem(struct containerElement *c, struct element *el, int sort); +void md_add_elem(struct containerElement *c, struct element *el, int sort); void md_remove(struct containerElement *c, struct element *el); void md_free(struct element *el); void md_wfree(struct element *el); +void md_track_renum(struct rootElement *root); void md_merge_in(struct trackElement *track, struct containerElement *list, enum merge_mode mode); -int md_nfree(void); +int md_get_nfree(void); void md_list_append(struct containerElement *c, struct element *el); void md_list_prepend(struct containerElement *c, struct element *el); -void md_list_add_sort(struct containerElement *c, struct element *el); +int md_list_add_sort(struct containerElement *c, struct element *el); +void md_list_remove(struct containerElement *c, struct element *el); int md_list_size(struct containerElement *c); struct element *md_list_first(struct containerElement *c); struct element *md_list_last(struct containerElement *c); @@ -62,6 +64,10 @@ void md_elem_seek_back(struct sequenceState *seq, struct tracklikeElement *ltrack, unsigned long time); + +struct partElement *md_split(struct partElement *origpart, unsigned long t); +void md_part_join(struct containerElement *c, struct partElement *part1); + /* * 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. @@ -69,17 +75,24 @@ enum undo_op { MD_UNDO_ADD, /* Event is added */ MD_UNDO_REMOVE, /* Event is removed */ - MD_UNDO_TIME_CHANGE,/* Begin time of event is changed */ - MD_UNDO_DURATION_CHANGE, /* End time of event is changed */ - MD_UNDO_LAST + 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; }; -void md_undo_begin_set(void); -void md_undo_end_set(void); -void md_undo_freeze(void); -void md_undo_thaw(void); -void md_undo_save(struct containerElement *c, struct element *el, - enum undo_op op); +void md_undo_begin_set(struct undo_set *undo); +void md_undo_end_set(struct undo_set *undo); +void md_undo_freeze(struct undo_set *undo); +void md_undo_thaw(struct undo_set *undo); +void md_undo_op(struct undo_set *undo, enum undo_op op, + struct containerElement *c, struct element *el); +void md_undo_time_op(struct undo_set *undo, enum undo_op op, + struct containerElement *c, struct element *el, unsigned long t); +void md_undo_back(struct undo_set *undo); +void md_undo_forward(struct undo_set *undo); /* * Some macros to handle accessing some common fields in the @@ -87,12 +100,7 @@ */ #define MD_TYPE(el) ( ((struct element *)(el))->type) #define MD_TIME(el) ( ((struct element *)(el))->element_time) -#define MD_SET_TIME(el, t) MD_TIME(el) = (t) #define MD_DURATION(el) ( ((struct containerElement *)(el))->duration ) -#define MD_SET_DURATION(el, t) do { \ - ((struct containerElement *)(el))->duration = (t); \ - MD_SET_MODIFIED(el, TRUE); \ - } while (0) #define MD_ENDTIME(el) \ (MD_TIME(el) + ((struct containerElement *)(el))->duration) #define MD_DEVCHAN(el) (((struct element *)(el))->device_channel) @@ -103,26 +111,45 @@ #define MD_UNREF(el) MD_FREE(el) #define MD_MK_DEVCHAN(dev, chan) \ ((dev)<<4 | ((chan) & 0xf)) -#define MD_SET_DEVCHAN(el, devchan) \ - (((struct element *)el)->device_channel = devchan) #define MD_MODIFIED(el) ( ((struct element *)el)->modified ) -#define MD_SET_MODIFIED(el, v) ( ((struct element *)el)->modified = v) #define MD_SELECTED(el) ( ((struct element *)el)->selected ) -#define MD_SET_SELECTED(el, tf) do { \ - ((struct element *)el)->selected = (tf); \ - MD_SET_MODIFIED(el, 1); \ - } while (0) #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 MD_UNDO(el) NULL /* XXX */ #define MD_CONTAINER_LEN(c) ( ((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_DEVCHAN(el, devchan) \ + (((struct element *)el)->device_channel = devchan) +#define MD_SET_MODIFIED(el, v) ( ((struct element *)el)->modified = v) +#define MD_SET_TIME(el, t) MD_TIME(el) = (t) +#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) /* Defines for md_walk() */ -#define MD_WALK_ALL 1 /* Include all elements including deleted, hidden*/ +#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 */ @@ -151,11 +178,15 @@ struct rootElement *md_empty(void); struct rootElement *md_song_new(void); struct trackElement *md_track_nth(struct rootElement *root, int n); +void md_ensure_track(struct rootElement *root, int n); struct tempomapElement *md_get_tempomap(struct rootElement *root); void md_set_devchan(struct element *base, int dev, int chan); void md_set_program(struct trackElement *track, int program, gboolean clear); +void md_change_time(struct element *el, unsigned long t); void md_shrink(struct rootElement *root); void md_tick_to_mbt(struct tempomapElement *tempomap, unsigned long tick, struct mbt *mbtp); unsigned long md_mbt_to_tick(struct tempomapElement *tempomap, struct mbt *inmbtp); +unsigned long md_snap_tick(struct tempomapElement *tmap, int snap, + unsigned long tick); diff -rNu melys-0.0.15/include/meldnd.h melys-0.0.16/include/meldnd.h --- melys-0.0.15/include/meldnd.h Thu Jan 1 00:00:00 1970 +++ melys-0.0.16/include/meldnd.h Tue Oct 12 14:58:07 1999 @@ -0,0 +1,39 @@ +/* + * + * 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. + * + */ + +/* + * 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 { + struct element *element; /* The element being moved */ + struct containerElement *con; /* Containing element */ + + int tick_offset; /* time offset of click into part */ + int track_offset; /* track offset of click into part */ +}; + diff -rNu melys-0.0.15/include/melgui.h melys-0.0.16/include/melgui.h --- melys-0.0.15/include/melgui.h Sun Oct 3 12:54:21 1999 +++ melys-0.0.16/include/melgui.h Tue Oct 12 14:58:07 1999 @@ -36,12 +36,12 @@ struct rootElement; struct trackElement; -int melys_app(int argc, char **argv); +int melys_app(int argc, char **argv, int optind); struct song *get_song_from_mdi(GtkObject *mdi); int get_child_count(GtkObject *mdi); void set_child_count(GtkObject *mdi, int count); -struct song *mel_create_song(GtkObject *mdi, struct song *psong, - char *filename, GtkObject *parent); +struct song *mel_create_song(GtkObject *mdi, char *filename, + GtkObject *parent); void mel_add_view(GtkObject *mdi, GtkObject *child, GtkWidget *view, gboolean toplevel); void mel_initial_view(GtkObject *mdi, GtkObject *child, @@ -52,7 +52,41 @@ void mel_ui_warn(struct song *sd, char *msg, GtkObject *parent); gboolean mel_file_error(struct song *song, struct File *file, GtkObject *parent); +void mel_accept_files(GtkObject *mdi, GtkWidget *w); void mel_debug_print_type(char *msg, GtkObject *o); + +/* + * The different pages for the part properties. + */ +#define PART_PROP_BASIC 0 + +struct partElement; + +void part_prop_box(struct partElement *part, struct song *song, int which); + +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 */ +}; + +#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) + +struct prop_box *mel_prop_box(struct song *song, struct element *elem, + int size); +void attach_at(GtkWidget *tab, GtkWidget *w, int row, int col, int xopts, + int yopts); +GtkWidget *new_lab_align(char *str); +void prop_change(GtkWidget *w, gpointer data); /* * The different pages for the track properties. diff -rNu melys-0.0.15/include/melmsg.h melys-0.0.16/include/melmsg.h --- melys-0.0.15/include/melmsg.h Sun Oct 3 12:54:21 1999 +++ melys-0.0.16/include/melmsg.h Tue Oct 12 14:58:06 1999 @@ -13,6 +13,8 @@ * * * + * + * */ enum message_type { diff -rNu melys-0.0.15/include/melyspartitem.h melys-0.0.16/include/melyspartitem.h --- melys-0.0.15/include/melyspartitem.h Sun Oct 3 12:54:21 1999 +++ melys-0.0.16/include/melyspartitem.h Tue Oct 12 14:58:07 1999 @@ -12,11 +12,10 @@ * 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 and also hold - * some data referencing the part that it belongs to. - * The data could be held as object-data, but the dashed border - * is not available in the gnome rectangle item at the time of writing. - * We may also want in the future to draw squigles to mark midi events. + * 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. * * * @@ -37,8 +36,6 @@ int dotted; - struct partElement *part; /* The part being represented */ - struct trackElement *track; /* Track this part belongs to */ }; struct _MelysPartItemClass { diff -rNu melys-0.0.15/include/melystrack.h melys-0.0.16/include/melystrack.h --- melys-0.0.15/include/melystrack.h Sun Oct 3 12:54:22 1999 +++ melys-0.0.16/include/melystrack.h Tue Oct 12 14:58:07 1999 @@ -43,7 +43,6 @@ struct _MelysTrackClass { GtkVBoxClass parent_class; - // XXX class definition here }; /* diff -rNu melys-0.0.15/include/melystrackdisplay.h melys-0.0.16/include/melystrackdisplay.h --- melys-0.0.15/include/melystrackdisplay.h Sun Oct 3 12:54:22 1999 +++ melys-0.0.16/include/melystrackdisplay.h Tue Oct 12 14:58:08 1999 @@ -21,6 +21,18 @@ typedef struct _MelysTrackDisplayClass MelysTrackDisplayClass; +/* Mouse click state */ +enum click_state { + CLICK_INACTIVE, + CLICK_BUTTON1_DOWN, + CLICK_BUTTON2_DOWN, + CLICK_BUTTON3_DOWN, + CLICK_DRAGGING, + CLICK_GESTURE, + + CLICK_ERROR +}; + struct _MelysTrackDisplay { GtkVBox vbox; @@ -66,6 +78,17 @@ GtkWidget *title; gpointer posline; + GtkWidget *menu; + + /* Selected parts */ + GList *sel_list; + + /* Saved click position and state information */ + struct partElement *click_part; /* Part that was click on */ + unsigned long click_tick; /* Clicked tick position */ + struct trackElement *click_track; /* Clicked track */ + int click_ntrack; /* Clicked track position */ + enum click_state click_state; /* State for mouse clicks and movement */ }; struct _MelysTrackDisplayClass { @@ -78,4 +101,4 @@ void melys_track_display_set_md_root(MelysTrackDisplay *mdisp, struct rootElement *root); void melys_track_display_update(MelysTrackDisplay *mdisp); -void display_data_free(gpointer _data); +void display_info_free(gpointer _info); diff -rNu melys-0.0.15/include/seqlib.h melys-0.0.16/include/seqlib.h --- melys-0.0.15/include/seqlib.h Sun Oct 3 12:54:19 1999 +++ melys-0.0.16/include/seqlib.h Tue Oct 12 14:58:04 1999 @@ -93,9 +93,9 @@ void seq_midi_note(seq_context_t *ctxp, snd_seq_event_t *ep, int note, int vel, int length); void seq_midi_note_on(seq_context_t *ctxp, snd_seq_event_t *ep, int note, - int vel, int length); + int vel); void seq_midi_note_off(seq_context_t *ctxp, snd_seq_event_t *ep, int note, - int vel, int length); + int vel); void seq_midi_keypress(seq_context_t *ctxp, snd_seq_event_t *ep, int note, int value); void seq_midi_control(seq_context_t *ctxp, snd_seq_event_t *ep, int control, diff -rNu melys-0.0.15/include/song.h melys-0.0.16/include/song.h --- melys-0.0.15/include/song.h Sun Oct 3 12:54:18 1999 +++ melys-0.0.16/include/song.h Tue Oct 12 14:58:04 1999 @@ -39,6 +39,7 @@ int save_dialog; /* Save dialog box */ int dialog; /* Set if a dialog is in action */ + int propbox; /* Set if a property box is active */ struct play *play; /* Play data */ struct record *record; /* Record data */ diff -rNu melys-0.0.15/include/util.h melys-0.0.16/include/util.h --- melys-0.0.15/include/util.h Sun Oct 3 12:54:21 1999 +++ melys-0.0.16/include/util.h Tue Oct 12 14:58:06 1999 @@ -17,19 +17,26 @@ * */ -typedef struct _GStack { +typedef struct _GXStack { gint level; gint elemsize; GArray *array; -} GStack; +} GXStack; +typedef struct _GXPtrStack { + GXStack stack; +} GXPtrStack; -GStack *gx_stack_new(gint elemsize); -void gx_stack_free(GStack *stack); -void gx_stack_push(GStack *stack, gpointer item); -gboolean gx_stack_pop(GStack *stack, gpointer item); -gpointer gx_stack_top(GStack *stack); -gboolean gx_stack_empty(GStack *stack); +GXStack *gx_stack_new(gint elemsize); +void gx_stack_free(GXStack *stack); +void gx_stack_push(GXStack *stack, void *item); +gboolean gx_stack_pop(GXStack *stack, void *item); +void *gx_stack_top(GXStack *stack); +gboolean gx_stack_empty(GXStack *stack); +GXPtrStack *gx_ptr_stack_new(void); +void gx_ptr_stack_push(GXPtrStack *stack, void *ptr); +void *gx_ptr_stack_pop(GXPtrStack *stack); +void *gx_ptr_stack_top(GXPtrStack *stack); int main(int argc, char **argv); /* Useful macros */ diff -rNu melys-0.0.15/make.conf melys-0.0.16/make.conf --- melys-0.0.15/make.conf Sun Sep 26 20:50:22 1999 +++ melys-0.0.16/make.conf Sun Oct 10 16:26:53 1999 @@ -5,8 +5,10 @@ # Options required by the C compiler COPTS = -g -O2 -Wall -# Defines +# Debugging defines. Can be commented out without harm. DEBUG_DEFINES = -DDEBUG -DDEBUG_CASTS + +# Defines DEFINES = -DENABLE_NLS $(DEBUG_DEFINES) # Path to include files diff -rNu melys-0.0.15/md/.cvsignore melys-0.0.16/md/.cvsignore --- melys-0.0.15/md/.cvsignore Sun Oct 3 12:54:26 1999 +++ melys-0.0.16/md/.cvsignore Tue Oct 12 14:58:12 1999 @@ -2,6 +2,7 @@ mdadd.c mdlist.c mdseq.c +mdtools.c mdundo.c mdutil.c Makefile diff -rNu melys-0.0.15/md/Makefile melys-0.0.16/md/Makefile --- melys-0.0.15/md/Makefile Sun Oct 3 12:54:26 1999 +++ melys-0.0.16/md/Makefile Tue Oct 12 14:58:12 1999 @@ -8,12 +8,14 @@ mdadd.o \ mdlist.o \ mdseq.o \ + mdtools.o \ mdundo.o \ mdutil.o GENCFILES = elements.c \ mdadd.c \ mdlist.c \ mdseq.c \ + mdtools.c \ mdundo.c \ mdutil.c GENHFILES = ../include/elements.h \ @@ -49,15 +51,17 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< -mdseq.o: ../include/elements.h -mdseq.o: ../include/md.h -mdlist.o: ../include/melmsg.h -mdlist.o: ../include/md.h -mdundo.o: ../include/md.h elements.o: ../include/md.h elements.o: ../include/except.h elements.o: ../include/elements.h mdutil.o: ../include/seqlib.h mdutil.o: ../include/melfile.h mdutil.o: ../include/md.h +mdtools.o: ../include/elements.h +mdtools.o: ../include/md.h mdadd.o: ../include/md.h +mdlist.o: ../include/melmsg.h +mdlist.o: ../include/md.h +mdundo.o: ../include/md.h +mdseq.o: ../include/elements.h +mdseq.o: ../include/md.h diff -rNu melys-0.0.15/md/elements.c melys-0.0.16/md/elements.c --- melys-0.0.15/md/elements.c Sun Oct 3 12:54:32 1999 +++ melys-0.0.16/md/elements.c Tue Oct 12 14:58:19 1999 @@ -39,6 +39,7 @@ * This should be kept as small as possible. */ +/* Static functions */ static void md_element_init(struct element *e); static void md_container_init(struct containerElement *e); static void md_root_init(struct rootElement *e); @@ -69,6 +70,7 @@ /* * Initialize data structures within the element. This is * only really required when pointers need allocating. + * * Arguments: * e - Element to init */ @@ -99,6 +101,7 @@ /* * Initialize data structures within the element. This is * only really required when pointers need allocating. + * * Arguments: * e - Element to init */ @@ -108,8 +111,6 @@ md_element_init(MD_ELEMENT(e)); e->elements = g_ptr_array_new(); - e->data = NULL; - e->data_free = NULL; } /* @@ -129,6 +130,7 @@ /* * Initialize data structures within the element. This is * only really required when pointers need allocating. + * * Arguments: * e - Element to init */ @@ -157,6 +159,7 @@ /* * Initialize data structures within the element. This is * only really required when pointers need allocating. + * * Arguments: * e - Element to init */ @@ -202,6 +205,7 @@ /* * Initialize data structures within the element. This is * only really required when pointers need allocating. + * * Arguments: * e - Element to init */ @@ -231,6 +235,7 @@ /* * Initialize data structures within the element. This is * only really required when pointers need allocating. + * * Arguments: * e - Element to init */ @@ -276,6 +281,7 @@ /* * Initialize data structures within the element. This is * only really required when pointers need allocating. + * * Arguments: * e - Element to init */ @@ -304,6 +310,7 @@ /* * Initialize data structures within the element. This is * only really required when pointers need allocating. + * * Arguments: * e - Element to init */ @@ -332,6 +339,7 @@ /* * Initialize data structures within the element. This is * only really required when pointers need allocating. + * * Arguments: * e - Element to init */ @@ -459,6 +467,7 @@ /* * Initialize data structures within the element. This is * only really required when pointers need allocating. + * * Arguments: * e - Element to init */ @@ -487,6 +496,7 @@ /* * Initialize data structures within the element. This is * only really required when pointers need allocating. + * * Arguments: * e - Element to init */ @@ -608,7 +618,7 @@ * 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. - * + * * Arguments: * el - Element to be casted * type - type to cast to @@ -635,6 +645,9 @@ 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 (el->type == MD_TYPE_TEMPOMAP || el->type == MD_TYPE_TRACK) return el; @@ -650,9 +663,7 @@ * 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); - */ struct rootElement * md_root_inc_ref(struct rootElement *root) diff -rNu melys-0.0.15/md/elements.m melys-0.0.16/md/elements.m --- melys-0.0.15/md/elements.m Sat Oct 2 20:19:00 1999 +++ melys-0.0.16/md/elements.m Tue Oct 12 00:25:05 1999 @@ -64,13 +64,9 @@ GPtrArray *elements; /* List of elements */ guint32 duration; /* duration time for this container */ - /* A widget may free the data at any time and replace with its own */ - gpointer *data; /* Private data */ - void (*data_free)(gpointer); /* Function to free private data */ init e->elements = g_ptr_array_new(); - e->data = NULL; - e->data_free = NULL; + /* * The root element, used to hold all the other elements. @@ -119,7 +115,6 @@ struct containerElement *newpart; /* Part being recorded */ GPtrArray *notes; /* To save pending on notes */ unsigned char controllers[128]; /* Current controller values */ - int props; /* Track property box id */ int hasprogram:1; /* Has embeded program changes */ init e->name = NULL; @@ -149,6 +144,7 @@ char *name; /* Part name */ int id; /* Part id unique among all referenced parts */ + /* Private stuff */ init e->name = NULL; @@ -320,6 +316,9 @@ 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 (el->type == MD_TYPE_TEMPOMAP || el->type == MD_TYPE_TRACK) return el; diff -rNu melys-0.0.15/md/mdadd.c melys-0.0.16/md/mdadd.c --- melys-0.0.15/md/mdadd.c Sun Oct 3 12:54:32 1999 +++ melys-0.0.16/md/mdadd.c Tue Oct 12 14:58:19 1999 @@ -34,6 +34,7 @@ /* Short cut for cast */ #define CPTR struct containerElement * +/* Static functions */ static void merge_events(struct trackElement *track, struct containerElement *list); static void merge_in_elem(struct containerElement *ctrk, struct element *el); @@ -44,10 +45,9 @@ /* * Add an event to a track/part etc. Event is appended or sorted * into its correct position. - * */ void -_md_add_elem(struct containerElement *c, struct element *el, int sort) +md_add_elem(struct containerElement *c, struct element *el, int sort) { unsigned long endtime; unsigned long t; @@ -60,6 +60,7 @@ endtime = el->element_time; if (iscontainer(el)) { endtime += ((struct containerElement *)el)->duration; + } switch (el->type) { @@ -83,6 +84,9 @@ 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); } @@ -92,7 +96,6 @@ * operation to be undone if undo is enabled. The element that * is being removed will have its reference count decremented * and will be freed if there are no other references. - * */ void md_remove(struct containerElement *c, struct element *el) @@ -112,6 +115,9 @@ /* 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); } @@ -119,7 +125,7 @@ * Decrement the reference count on el and, if it is now zero, * free the element. If the element is freed then the process is * applied recursively. - * + * * Arguments: * el - Element tree to free */ @@ -150,8 +156,8 @@ } g_ptr_array_free(c->elements, 1); - if (c->data) - c->data_free(c->data); + /* Destroy any associated data */ + g_dataset_destroy(c); } switch (el->type) { @@ -182,6 +188,7 @@ memset(el, 0xa5, sizeof(struct containerElement)); else memset(el, 0xa5, sizeof(struct element)); + el->destroyed = 1; #endif g_free(el); Nelements--; @@ -194,11 +201,11 @@ /* * Decrement the back reference count and if zero and the * element is destroyed, then finally free the memory. - * */ void md_wfree(struct element *el) { + extern int Nelements; /* The wref should never be 0 when this is called */ g_return_if_fail(el->wref > 0); @@ -206,16 +213,46 @@ 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--; } } } /* + * Renumber the tracks, so that the tempomap is -1 and the + * tracks start at zero. + */ +void +md_track_renum(struct rootElement *root) +{ + 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; + } +} + +/* * Add a list of events to a track. The container c consists of * events that are not containers. They are merged into the * existing track in one of several ways. - * + * * Arguments: * track - Track to add events to * list - list of elements to be merged in @@ -241,7 +278,7 @@ * Add a list of events to a track. The container track consists * of events that are not containers. They are merged into the * existing track in one of several ways. - * + * * Arguments: * track - Track etc. to merge events into * list - list of elements to be merged in @@ -255,7 +292,7 @@ ctrk = MD_CONTAINER(track); - md_undo_begin_set(); + md_undo_begin_set(MD_UNDO(track)); /* Make sure that part elements cover all the duration of the list */ ensure_part_filled(ctrk, MD_TIME(list), MD_ENDTIME(list)); @@ -264,8 +301,9 @@ el = md_list_nth_elem(list, n); merge_in_elem(ctrk, el); } + list->elements->len = 0; - md_undo_end_set(); + md_undo_end_set(MD_UNDO(track)); } /* @@ -274,19 +312,15 @@ * 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. - * */ static void merge_in_elem(struct containerElement *ctrk, struct element *el) @@ -300,7 +334,8 @@ */ first = md_list_first(ctrk); if (!first || !iscontainer(first)) { - md_add_elem_sort(ctrk, el); + g_assert(!iscontainer(el)); + md_add_sort(ctrk, el); return; } @@ -318,7 +353,7 @@ /* * Ensure that there are part containers allocated from the * times begin to end . - * + * * Arguments: * begin - Begin time * end - End time @@ -353,7 +388,7 @@ MD_TIME(con) = begin; MD_DEVCHAN(con) = MD_DEVCHAN(ctrk); - md_list_add_sort(ctrk, MD_ELEMENT(con)); + md_add_sort(ctrk, MD_ELEMENT(con)); /* * Examine the next part, if any, and adjust the duration @@ -382,7 +417,7 @@ * debugging. */ int -md_nfree(void) +md_get_nfree(void) { extern int Nelements; diff -rNu melys-0.0.15/md/mdadd.m melys-0.0.16/md/mdadd.m --- melys-0.0.15/md/mdadd.m Tue Sep 28 16:04:55 1999 +++ melys-0.0.16/md/mdadd.m Tue Oct 12 14:52:03 1999 @@ -32,15 +32,15 @@ }; -#define md_add_elem(c, el) _md_add_elem(c, el, 0) -#define md_add_elem_sort(c, el) _md_add_elem(c, el, 1) +#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 +>>function md_add_elem void struct containerElement *c; struct element *el; @@ -62,6 +62,7 @@ endtime = el->element_time; if (iscontainer(el)) { endtime += ((struct containerElement *)el)->duration; + } switch (el->type) { @@ -85,6 +86,9 @@ 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); >>function md_remove @@ -115,6 +119,9 @@ /* 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); @@ -153,8 +160,8 @@ } g_ptr_array_free(c->elements, 1); - if (c->data) - c->data_free(c->data); + /* Destroy any associated data */ + g_dataset_destroy(c); } switch (el->type) { @@ -185,6 +192,7 @@ memset(el, 0xa5, sizeof(struct containerElement)); else memset(el, 0xa5, sizeof(struct element)); + el->destroyed = 1; #endif g_free(el); Nelements--; @@ -204,6 +212,7 @@ 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); @@ -211,11 +220,43 @@ 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 trackElement *track; Track to add events to @@ -263,7 +304,7 @@ ctrk = MD_CONTAINER(track); - md_undo_begin_set(); + md_undo_begin_set(MD_UNDO(track)); /* Make sure that part elements cover all the duration of the list */ ensure_part_filled(ctrk, MD_TIME(list), MD_ENDTIME(list)); @@ -272,8 +313,9 @@ el = md_list_nth_elem(list, n); merge_in_elem(ctrk, el); } + list->elements->len = 0; - md_undo_end_set(); + md_undo_end_set(MD_UNDO(track)); >>function merge_in_elem static void @@ -312,7 +354,8 @@ */ first = md_list_first(ctrk); if (!first || !iscontainer(first)) { - md_add_elem_sort(ctrk, el); + g_assert(!iscontainer(el)); + md_add_sort(ctrk, el); return; } @@ -366,7 +409,7 @@ MD_TIME(con) = begin; MD_DEVCHAN(con) = MD_DEVCHAN(ctrk); - md_list_add_sort(ctrk, MD_ELEMENT(con)); + md_add_sort(ctrk, MD_ELEMENT(con)); /* * Examine the next part, if any, and adjust the duration @@ -390,7 +433,7 @@ ctrk->duration = end - MD_TIME(ctrk); ->>function md_nfree +>>function md_get_nfree int >>description Return the number of allocated elements. diff -rNu melys-0.0.15/md/mdlist.c melys-0.0.16/md/mdlist.c --- melys-0.0.15/md/mdlist.c Sun Oct 3 12:54:33 1999 +++ melys-0.0.16/md/mdlist.c Tue Oct 12 14:58:20 1999 @@ -32,6 +32,7 @@ #include "intl.h" +/* Static functions */ void @@ -48,16 +49,16 @@ } /* - * Add element at a position sorted by time. - * + * Add element at a position sorted by time. Returns the + * position that the element was added at. */ -void +int md_list_add_sort(struct containerElement *c, struct element *el) { gpointer p; int n; - g_return_if_fail(el != NULL); + g_return_val_if_fail(el != NULL, 0); g_ptr_array_add(c->elements, NULL); /* Ensure enough space */ for (n = 0; n < c->elements->len; n++) { @@ -66,7 +67,7 @@ /* This was the one we have just added, add */ g_assert(n == c->elements->len - 1); /* check it was */ c->elements->pdata[n] = el; - return; + return n; } else if (MD_TIME(p) <= MD_TIME(el)) { /* Keep going */ @@ -78,10 +79,27 @@ sizeof(gpointer) * (c->elements->len - n - 1)); c->elements->pdata[n] = el; - return; + return n; } g_assert_not_reached(); + return 0; +} + +/* + * Remove an element directly from its container. + * + * Arguments: + * c - Container to remove from + * el - Element to remove from it + */ +void +md_list_remove(struct containerElement *c, struct element *el) +{ + gboolean ok; + + ok = g_ptr_array_remove(c->elements, el); + g_assert(ok); } /* @@ -123,6 +141,7 @@ /* * Return the nth element. + * * Arguments: * n - Return element at this position */ @@ -142,8 +161,8 @@ /* * Find the element in the specified container, c, that comes - * after the specified element, el . - * + * after the specified element, el . This is not to be used for + * stepping through a list as this would be slowish. */ struct element * md_list_next(struct containerElement *c, struct element *el) @@ -164,10 +183,9 @@ * Find the container that encompases the given time. The * argument c is a list of containers. We find the one that * covers the specified time . If none do then returns NULL. - * * If only leaf elements are present then return if the element * is a direct match. - * + * * Arguments: * ctrk - A track like container * time - Find container that covers this element @@ -178,7 +196,6 @@ struct element *el; int n; - el = md_list_first(ctrk); for (n = 0; n < md_list_size(ctrk); n++) { el = md_list_nth_elem(ctrk, n); @@ -198,7 +215,6 @@ * 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. - * */ void md_save_elem(struct containerElement *c, struct element *el) diff -rNu melys-0.0.15/md/mdlist.m melys-0.0.16/md/mdlist.m --- melys-0.0.15/md/mdlist.m Wed Sep 15 10:38:43 1999 +++ melys-0.0.16/md/mdlist.m Tue Oct 12 14:52:59 1999 @@ -40,18 +40,19 @@ >>function md_list_add_sort -void +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_if_fail(el != NULL); + g_return_val_if_fail(el != NULL, 0); g_ptr_array_add(c->elements, NULL); /* Ensure enough space */ for (n = 0; n < c->elements->len; n++) { @@ -60,7 +61,7 @@ /* This was the one we have just added, add */ g_assert(n == c->elements->len - 1); /* check it was */ c->elements->pdata[n] = el; - return; + return n; } else if (MD_TIME(p) <= MD_TIME(el)) { /* Keep going */ @@ -72,10 +73,27 @@ sizeof(gpointer) * (c->elements->len - n - 1)); c->elements->pdata[n] = el; - return; + 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 @@ -139,6 +157,8 @@ .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; @@ -174,7 +194,6 @@ struct element *el; int n; - el = md_list_first(ctrk); for (n = 0; n < md_list_size(ctrk); n++) { el = md_list_nth_elem(ctrk, n); diff -rNu melys-0.0.15/md/mdseq.c melys-0.0.16/md/mdseq.c --- melys-0.0.15/md/mdseq.c Sun Oct 3 12:54:33 1999 +++ melys-0.0.16/md/mdseq.c Tue Oct 12 14:58:20 1999 @@ -27,7 +27,7 @@ /* Information about a particular track */ struct trackinfo { struct tracklikeElement *ltrack; /* The associated track */ - GStack *stack; /* The position stack */ + GXStack *stack; /* The position stack */ long time; /* Time of last found element on this track */ struct element *lastelem; /* Last element returned */ gboolean need_next; /* Need to step onto next element */ @@ -57,6 +57,7 @@ int pos; }; +/* Static functions */ static struct element *get_elem(struct trackinfo *ti, gboolean nodes); @@ -64,13 +65,11 @@ * Return an object that can be passed to 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 md_seq_init_merge . - * * If nodes is set then container type elements are returned as * well. - * + * * Arguments: * con - The container to sequence over * nodes - If false then no nodes apart from root and head are returned @@ -80,7 +79,7 @@ { struct sequenceState *seq; struct trackinfo *ti; - GStack *stack; + GXStack *stack; struct pos pos; /* Actually this is allowed and this test will be removed when @@ -120,14 +119,13 @@ /* * Initialises a sequence that will merge all the tracks * together in time order. - * */ struct sequenceState * md_seq_init_merge(struct rootElement *root, gboolean nodes) { struct sequenceState *seq; struct trackinfo *ti; - GStack *stack; + GXStack *stack; struct pos pos; int i; @@ -176,7 +174,6 @@ /* * Release all resources for this sequence state. - * */ void md_seq_end(struct sequenceState *seq) @@ -184,7 +181,7 @@ int i; struct trackinfo *ti; struct pos pos; - GStack *stack; + GXStack *stack; if (seq == NULL) return; @@ -219,7 +216,6 @@ * from this routine must not be modified in any way. They must * also not be assumed to exist beyond the next md_seq_next or a * md_seq_end . - * */ struct element * md_seq_next(struct sequenceState *seq) @@ -258,7 +254,7 @@ bestti = NULL; bestel = NULL; for (i = 0; i < seq->ntinfo; i++) { - GStack *stack; + GXStack *stack; ti = &seq->trackinfos[i]; @@ -305,14 +301,14 @@ /* * Get the current or next element in the sequence. - * + * * Arguments: * nodes - If true return nodes. */ static struct element * get_elem(struct trackinfo *ti, gboolean nodes) { - GStack *pstack; + GXStack *pstack; struct element *el; struct pos *pos; struct pos npos; @@ -366,7 +362,6 @@ * 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 time . - * */ void md_elem_seek(struct sequenceState *seq, struct tracklikeElement *ltrack, @@ -376,7 +371,7 @@ struct pos *posp; struct element *el; struct trackinfo *ti; - GStack *stack; + GXStack *stack; int i; stack = NULL; @@ -430,7 +425,6 @@ * seek forward. In other words if the time is already greater * then the current play position the the play position is not * changed. - * */ void md_elem_seek_back(struct sequenceState *seq, struct tracklikeElement *ltrack, @@ -438,7 +432,7 @@ { struct pos *posp; struct trackinfo *ti; - GStack *stack; + GXStack *stack; int i; if (seq == NULL) diff -rNu melys-0.0.15/md/mdseq.m melys-0.0.16/md/mdseq.m --- melys-0.0.15/md/mdseq.m Thu Sep 30 16:02:25 1999 +++ melys-0.0.16/md/mdseq.m Sun Oct 10 19:09:00 1999 @@ -20,7 +20,7 @@ /* Information about a particular track */ struct trackinfo { struct tracklikeElement *ltrack; /* The associated track */ - GStack *stack; /* The position stack */ + GXStack *stack; /* The position stack */ long time; /* Time of last found element on this track */ struct element *lastelem; /* Last element returned */ gboolean need_next; /* Need to step onto next element */ @@ -71,7 +71,7 @@ >>code struct sequenceState *seq; struct trackinfo *ti; - GStack *stack; + GXStack *stack; struct pos pos; /* Actually this is allowed and this test will be removed when @@ -120,7 +120,7 @@ >>code struct sequenceState *seq; struct trackinfo *ti; - GStack *stack; + GXStack *stack; struct pos pos; int i; @@ -178,7 +178,7 @@ int i; struct trackinfo *ti; struct pos pos; - GStack *stack; + GXStack *stack; if (seq == NULL) return; @@ -256,7 +256,7 @@ bestti = NULL; bestel = NULL; for (i = 0; i < seq->ntinfo; i++) { - GStack *stack; + GXStack *stack; ti = &seq->trackinfos[i]; @@ -310,7 +310,7 @@ Get the current or next element in the sequence. >>code - GStack *pstack; + GXStack *pstack; struct element *el; struct pos *pos; struct pos npos; @@ -377,7 +377,7 @@ struct pos *posp; struct element *el; struct trackinfo *ti; - GStack *stack; + GXStack *stack; int i; stack = NULL; @@ -442,7 +442,7 @@ >>code struct pos *posp; struct trackinfo *ti; - GStack *stack; + GXStack *stack; int i; if (seq == NULL) diff -rNu melys-0.0.15/md/mdtools.c melys-0.0.16/md/mdtools.c --- melys-0.0.15/md/mdtools.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.16/md/mdtools.c Tue Oct 12 14:58:20 1999 @@ -0,0 +1,124 @@ +/* + * + * Copyright (C) 1999 Steve Ratcliffe + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "elements.h" +#include "md.h" +#include "intl.h" + + +/* Static functions */ + + +/* + * Split a part at a specified time. A new part is created events + * from origpart at times greater than or equal to t are moved + * into the new part. The original part has its end time set to t + * and the new part has its start time set to t . + * The new part is returned. + * + * Arguments: + * origpart - The part to split + * t - The time to split it at + */ +struct partElement * +md_split(struct partElement *origpart, unsigned long t) +{ + struct partElement *newpart; + struct element *el; + int i; + int cutoff = -1; + + 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) { + if (cutoff < 0) + cutoff = i; + md_add(MD_CONTAINER(newpart), el); + } + } + + /* No events so empty part will be created */ + if (cutoff < 0) + cutoff = i; + + /* Remove elements from the original part */ + while (cutoff < MD_CONTAINER_LEN(origpart)) { + el = MD_GET_INDEX(origpart, cutoff); + md_remove(MD_CONTAINER(origpart), el); + } + + MD_SET_DURATION(origpart, t - MD_TIME(origpart)); + md_undo_time_op(MD_UNDO(origpart), MD_UNDO_CHANGE_DURATION, + NULL, MD_ELEMENT(origpart), t); + + md_undo_end_set(MD_UNDO(origpart)); + + return newpart; +} + +/* + * Join the specified part, 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. + * + * Arguments: + * c - The container containing the parts + * part1 - First part + */ +void +md_part_join(struct containerElement *c, struct partElement *part1) +{ + struct partElement *part2; + struct element *el; + 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; + + for (i = 0; i < MD_CONTAINER_LEN(part2); i++) { + el = MD_GET_INDEX(part2, i); + md_add(MD_CONTAINER(part1), el); + } + + /* Remove the second part */ + md_remove(c, MD_ELEMENT(part2)); +} diff -rNu melys-0.0.15/md/mdtools.m melys-0.0.16/md/mdtools.m --- melys-0.0.15/md/mdtools.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.16/md/mdtools.m Fri Oct 8 22:48:52 1999 @@ -0,0 +1,120 @@ +>>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 +unsigned long 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; + int cutoff = -1; + + 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) { + if (cutoff < 0) + cutoff = i; + md_add(MD_CONTAINER(newpart), el); + } + } + + /* No events so empty part will be created */ + if (cutoff < 0) + cutoff = i; + + /* Remove elements from the original part */ + while (cutoff < MD_CONTAINER_LEN(origpart)) { + el = MD_GET_INDEX(origpart, cutoff); + md_remove(MD_CONTAINER(origpart), el); + } + + MD_SET_DURATION(origpart, t - MD_TIME(origpart)); + md_undo_time_op(MD_UNDO(origpart), MD_UNDO_CHANGE_DURATION, + NULL, 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; + 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; + + for (i = 0; i < MD_CONTAINER_LEN(part2); i++) { + el = MD_GET_INDEX(part2, i); + md_add(MD_CONTAINER(part1), el); + } + + /* Remove the second part */ + md_remove(c, MD_ELEMENT(part2)); + diff -rNu melys-0.0.15/md/mdundo.c melys-0.0.16/md/mdundo.c --- melys-0.0.15/md/mdundo.c Sun Oct 3 12:54:33 1999 +++ melys-0.0.16/md/mdundo.c Tue Oct 12 14:58:20 1999 @@ -23,17 +23,16 @@ #include "intl.h" +/* Static functions */ /* * 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. - * - */ void -md_undo_begin_set(void) +md_undo_begin_set(struct undo_set *undo) { } @@ -42,11 +41,9 @@ * are performed outside of a md_undo_begin_set / * md_undo_end_set pair, then they are undoable * individually. - * - */ void -md_undo_end_set(void) +md_undo_end_set(struct undo_set *undo) { } @@ -54,35 +51,75 @@ * Undo saving is switched off. This would happen when * building up a tree for example by reading in from a file, or by * hand. - * - */ void -md_undo_freeze(void) +md_undo_freeze(struct undo_set *undo) { } /* * Undo saving is switched back on again after a * md_undo_freeze . - * - */ void -md_undo_thaw(void) +md_undo_thaw(struct undo_set *undo) { } /* * Save an operation so that it can be undone again. - * - + * * Arguments: + * undo - The undo set + * op - Operation performed * c - Container added/removed from * el - Element that was added/removed/changed + */ +void +md_undo_op(struct undo_set *undo, enum undo_op op, struct containerElement *c, + struct element *el) +{ +} + +/* + * Save an time based operation (duration, different start + * time etc) so that it can be undone again. + * + * Arguments: + * undo - The undo set for the element * op - Operation performed + * c - Container added/removed from + * el - Element that was added/removed/changed + * t - The time difference to apply + */ +void +md_undo_time_op(struct undo_set *undo, enum undo_op op, + struct containerElement *c, struct element *el, unsigned long t) +{ +} + +/* + * 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. + * + * Arguments: + * undo - The undo operation set + */ +void +md_undo_back(struct undo_set *undo) +{ +} + +/* + * Step forward one group of undo operations. This + * corresponds to a redo operation. + * + * Arguments: + * undo - The undo operation set */ void -md_undo_save(struct containerElement *c, struct element *el, enum undo_op op) +md_undo_forward(struct undo_set *undo) { } diff -rNu melys-0.0.15/md/mdundo.m melys-0.0.16/md/mdundo.m --- melys-0.0.15/md/mdundo.m Tue Sep 14 14:59:46 1999 +++ melys-0.0.16/md/mdundo.m Sun Oct 10 19:09:00 1999 @@ -20,13 +20,18 @@ enum undo_op { MD_UNDO_ADD, /* Event is added */ MD_UNDO_REMOVE, /* Event is removed */ - MD_UNDO_TIME_CHANGE,/* Begin time of event is changed */ - MD_UNDO_DURATION_CHANGE, /* End time of event is changed */ - MD_UNDO_LAST + 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 @@ -35,6 +40,8 @@ >>function md_undo_end_set void +struct undo_set *undo; + >>description End a previous .F md_undo_begin_set . @@ -46,6 +53,7 @@ >>function md_undo_freeze void +struct undo_set *undo; >>description Undo saving is switched off. This would happen when building up a tree for @@ -54,18 +62,50 @@ >>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_save +>>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 -enum undo_op op; Operation performed >>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 containerElement *c; Container added/removed from +struct element *el; Element that was added/removed/changed +unsigned long 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.0.15/md/mdutil.c melys-0.0.16/md/mdutil.c --- melys-0.0.15/md/mdutil.c Sun Oct 3 12:54:33 1999 +++ melys-0.0.16/md/mdutil.c Tue Oct 12 14:58:21 1999 @@ -27,7 +27,8 @@ #include "intl.h" -static void set_chan(struct element *el, gpointer data, int flags); +/* Static functions */ +static void set_diff_time(struct element *base, unsigned long tdiff); static void mbtoffset(struct timesigElement *tsig, unsigned long tdiff, int timebase, struct mbt *mbtp); @@ -36,13 +37,11 @@ * Given a container c then md_walk iterates through all * elements and calls 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) - * + * * Arguments: * c - Container to be walked * fn - Callback function to call on each element @@ -56,7 +55,11 @@ GPtrArray *ar; int i; - fn((struct element *)c, arg, MD_WALK_START); + 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++) { @@ -64,16 +67,17 @@ if (iscontainer(el)) { md_walk((struct containerElement *)el, fn, arg, flags); } else { - fn(el, arg, MD_WALK_EMPTY); + if (flags & MD_WALK_LEAF) + fn(el, arg, MD_WALK_EMPTY); } } - fn((struct element *)c, arg, MD_WALK_END); + if (flags & MD_WALK_NODES) + fn((struct element *)c, arg, MD_WALK_END); } /* * Create a new empty md tree. - * */ struct rootElement * md_empty(void) @@ -93,15 +97,15 @@ head->ver_major = MDML_VERSION_MINOR; head->format = 1; - md_add_elem(MD_CONTAINER(root), MD_ELEMENT(head)); + md_add(MD_CONTAINER(root), MD_ELEMENT(head)); map = md_tempomap_new(); map->timebase = 192; tempo = md_tempo_new(500000); - md_add_elem(MD_CONTAINER(map), MD_ELEMENT(tempo)); + md_add(MD_CONTAINER(map), MD_ELEMENT(tempo)); - md_add_elem(MD_CONTAINER(root), MD_ELEMENT(map)); + md_add(MD_CONTAINER(root), MD_ELEMENT(map)); return root; } @@ -109,7 +113,6 @@ /* * Create a new song with a default number of tracks already * initialised. - * */ struct rootElement * md_song_new(void) @@ -123,7 +126,7 @@ for (i = 0; i < 32; i++) { track = md_track_new(); MD_ELEMENT(track)->device_channel = i; - md_add_elem((struct containerElement *)root, (struct element *)track); + md_add((struct containerElement *)root, (struct element *)track); } file_check_root(root); @@ -134,7 +137,6 @@ * 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. - * */ struct trackElement * md_track_nth(struct rootElement *root, int n) @@ -160,10 +162,30 @@ } /* + * If there a track n exists then nothing happens. Otherwise + * empty tracks are created until track n exists. + * + * Arguments: + * n - Ensure that there is a track n. + */ +void +md_ensure_track(struct rootElement *root, int n) +{ + struct trackElement *track; + int i; + + for (i = root->tracks - 1; i < n; i++) { + track = md_track_new(); + md_add(MD_CONTAINER(root), MD_ELEMENT(track)); + } + + g_assert(md_track_nth(root, n)); +} + +/* * 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. - * */ struct tempomapElement * md_get_tempomap(struct rootElement *root) @@ -185,38 +207,34 @@ /* * Sets the channel on given element and all its children. You - * would normally call this with a track argument. - * + * would normally call this with a track or part argument. */ void md_set_devchan(struct element *base, int dev, int chan) { + struct element *el; int devchan; - - if (!iscontainer(base)) { - MD_SET_DEVCHAN(base, MD_MK_DEVCHAN(dev, chan)); - return; - } + int i; devchan = MD_MK_DEVCHAN(dev, chan); - md_walk(MD_CONTAINER(base), set_chan, GINT_TO_POINTER(devchan), 0); -} -static void -set_chan(struct element *el, gpointer data, int flags) -{ - int devchan; - - devchan = GPOINTER_TO_INT(data); + MD_SET_DEVCHAN(base, devchan); - MD_DEVCHAN(el) = 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, dev, chan); + } + } } /* * Set the program number for this track. If clear is true, then * all embedded program changes for the track events are * removed. - * + * * Arguments: * track - The track to set program for * program - Program number to set @@ -234,10 +252,51 @@ } /* + * 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. + * + * Arguments: + * el - The element to change time + * t - The time to change to. + */ +void +md_change_time(struct element *el, unsigned long t) +{ + struct undo_set *undo; + unsigned long tdiff; + + undo = MD_UNDO(el); + + md_undo_time_op(undo, MD_UNDO_CHANGE_TIME, NULL/*XXX*/, el, t); + + tdiff = t - MD_TIME(el); + set_diff_time(el, tdiff); +} + +/* + */ +static void +set_diff_time(struct element *base, unsigned long tdiff) +{ + int i; + struct element *el; + + MD_SET_TIME(base, MD_TIME(base) + tdiff); + + 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); + } +} + +/* * Shrink the root duration to just fit the track durations. * This is needed because we artificially increase the root * duration while recording. - * */ void md_shrink(struct rootElement *root) @@ -260,7 +319,7 @@ /* * Convert the specified time into a mbt representation. - * + * * Arguments: * tempomap - the tempomap * tick - Input time @@ -315,7 +374,7 @@ /* * Convert the specified time into a mbt representation. - * + * * Arguments: * tempomap - the tempomap * inmbtp - Meters, beats and ticks input value @@ -373,12 +432,19 @@ return t; } +unsigned long +md_snap_tick(struct tempomapElement *tmap, int snap, unsigned long tick) +{ + /* not implemented yet */ + return tick; +} + /* * Internal routine to calculate the offset within a * particualar timesignature region. When there are a number * of timesignatures in a piece, we step through them all and * calculate the offsets separately. - * + * * Arguments: * tsig - an individual time signature element * tdiff - the time difference from begining of tsig in ticks diff -rNu melys-0.0.15/md/mdutil.m melys-0.0.16/md/mdutil.m --- melys-0.0.15/md/mdutil.m Sun Oct 3 00:18:28 1999 +++ melys-0.0.16/md/mdutil.m Tue Oct 12 00:26:59 1999 @@ -23,12 +23,7 @@ */ #define MD_TYPE(el) ( ((struct element *)(el))->type) #define MD_TIME(el) ( ((struct element *)(el))->element_time) -#define MD_SET_TIME(el, t) MD_TIME(el) = (t) #define MD_DURATION(el) ( ((struct containerElement *)(el))->duration ) -#define MD_SET_DURATION(el, t) do { \ - ((struct containerElement *)(el))->duration = (t); \ - MD_SET_MODIFIED(el, TRUE); \ - } while (0) #define MD_ENDTIME(el) \ (MD_TIME(el) + ((struct containerElement *)(el))->duration) #define MD_DEVCHAN(el) (((struct element *)(el))->device_channel) @@ -39,26 +34,45 @@ #define MD_UNREF(el) MD_FREE(el) #define MD_MK_DEVCHAN(dev, chan) \ ((dev)<<4 | ((chan) & 0xf)) -#define MD_SET_DEVCHAN(el, devchan) \ - (((struct element *)el)->device_channel = devchan) #define MD_MODIFIED(el) ( ((struct element *)el)->modified ) -#define MD_SET_MODIFIED(el, v) ( ((struct element *)el)->modified = v) #define MD_SELECTED(el) ( ((struct element *)el)->selected ) -#define MD_SET_SELECTED(el, tf) do { \ - ((struct element *)el)->selected = (tf); \ - MD_SET_MODIFIED(el, 1); \ - } while (0) #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 MD_UNDO(el) NULL /* XXX */ #define MD_CONTAINER_LEN(c) ( ((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_DEVCHAN(el, devchan) \ + (((struct element *)el)->device_channel = devchan) +#define MD_SET_MODIFIED(el, v) ( ((struct element *)el)->modified = v) +#define MD_SET_TIME(el, t) MD_TIME(el) = (t) +#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) /* Defines for md_walk() */ -#define MD_WALK_ALL 1 /* Include all elements including deleted, hidden*/ +#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 */ @@ -107,7 +121,11 @@ GPtrArray *ar; int i; - fn((struct element *)c, arg, MD_WALK_START); + 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++) { @@ -115,11 +133,13 @@ if (iscontainer(el)) { md_walk((struct containerElement *)el, fn, arg, flags); } else { - fn(el, arg, MD_WALK_EMPTY); + if (flags & MD_WALK_LEAF) + fn(el, arg, MD_WALK_EMPTY); } } - fn((struct element *)c, arg, MD_WALK_END); + if (flags & MD_WALK_NODES) + fn((struct element *)c, arg, MD_WALK_END); >>function md_empty @@ -144,15 +164,15 @@ head->ver_major = MDML_VERSION_MINOR; head->format = 1; - md_add_elem(MD_CONTAINER(root), MD_ELEMENT(head)); + md_add(MD_CONTAINER(root), MD_ELEMENT(head)); map = md_tempomap_new(); map->timebase = 192; tempo = md_tempo_new(500000); - md_add_elem(MD_CONTAINER(map), MD_ELEMENT(tempo)); + md_add(MD_CONTAINER(map), MD_ELEMENT(tempo)); - md_add_elem(MD_CONTAINER(root), MD_ELEMENT(map)); + md_add(MD_CONTAINER(root), MD_ELEMENT(map)); return root; @@ -174,7 +194,7 @@ for (i = 0; i < 32; i++) { track = md_track_new(); MD_ELEMENT(track)->device_channel = i; - md_add_elem((struct containerElement *)root, (struct element *)track); + md_add((struct containerElement *)root, (struct element *)track); } file_check_root(root); @@ -213,6 +233,30 @@ 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_add(MD_CONTAINER(root), MD_ELEMENT(track)); + } + + g_assert(md_track_nth(root, n)); + >>function md_get_tempomap struct tempomapElement * struct rootElement *root; @@ -247,32 +291,26 @@ >>description Sets the channel on given element and all its children. -You would normally call this with a track argument. +You would normally call this with a track or +part argument. >>code + struct element *el; int devchan; - - if (!iscontainer(base)) { - MD_SET_DEVCHAN(base, MD_MK_DEVCHAN(dev, chan)); - return; - } + int i; devchan = MD_MK_DEVCHAN(dev, chan); - md_walk(MD_CONTAINER(base), set_chan, GINT_TO_POINTER(devchan), 0); - - ->>function set_chan -static void -struct element *el; -gpointer data; -int flags; ->>code - int devchan; - - devchan = GPOINTER_TO_INT(data); + MD_SET_DEVCHAN(base, devchan); - MD_DEVCHAN(el) = 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, dev, chan); + } + } >>function md_set_program @@ -296,6 +334,50 @@ /* XXX not finished */ } +>>function md_change_time +void +struct element *el; The element to change time +unsigned long 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; + unsigned long tdiff; + + undo = MD_UNDO(el); + + md_undo_time_op(undo, MD_UNDO_CHANGE_TIME, NULL/*XXX*/, el, t); + + tdiff = t - MD_TIME(el); + set_diff_time(el, tdiff); + + +>>function set_diff_time +static void +struct element *base; +unsigned long tdiff; + +>>description +>>code + int i; + struct element *el; + + MD_SET_TIME(base, MD_TIME(base) + tdiff); + + 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_shrink void struct rootElement *root; @@ -432,6 +514,18 @@ return t; + +>>function md_snap_tick +unsigned long +struct tempomapElement *tmap; The tempomap +int snap; The boundry to snap to +unsigned long tick; The tick value to snap + +>>code + /* not implemented yet */ + return tick; + + >>function mbtoffset static void struct timesigElement *tsig; an individual time signature element @@ -458,3 +552,5 @@ rem = rem - (mbtp->beats * full) / tsig->bottom; mbtp->ticks = (rem * tsig->bottom) / 4; + + diff -rNu melys-0.0.15/midi/play.c melys-0.0.16/midi/play.c --- melys-0.0.15/midi/play.c Sun Oct 3 12:54:38 1999 +++ melys-0.0.16/midi/play.c Tue Oct 12 14:58:26 1999 @@ -64,6 +64,7 @@ #define ADDR_PARTS 4 #define SEP ", \t\n" +/* Static functions */ static gint run_events_idle(gpointer data); static void run_events_cb(gpointer vplay, gint fd, GdkInputCondition cond); static void run_events(struct play *play); @@ -80,7 +81,6 @@ /* * Return a newly allocated play structure. - * */ struct play * play_new(void) @@ -106,7 +106,7 @@ /* * Free all resources. - * + * * Arguments: * play - The play object to free */ @@ -134,7 +134,7 @@ /* * Sets the md root for this play structure. It is an error to set * it if one is already set. - * + * * Arguments: * play - The play object * root - Root of the md tree to use @@ -177,7 +177,7 @@ /* * Start playing the midi. If one is not set then nothing * happens. XXX some warning/error? - * + * * Arguments: * play - The play object */ @@ -224,7 +224,7 @@ * Stop playing. If start is called after the song will be * restarted from where it was stopped. Use play_stop to stop * and play from the beginning. - * + * * Arguments: * play - The play object */ @@ -261,7 +261,7 @@ /* * Rewind the song back to the beginning. The next start will * play the song from the beginning. - * + * * Arguments: * play - The play object to stop and rewind */ @@ -282,7 +282,7 @@ * 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. - * + * * Arguments: * recmode - True if recording is started */ @@ -302,6 +302,7 @@ /* * Get the sequencer context. + * * Arguments: * play - Will return play->ctxp */ @@ -510,7 +511,6 @@ * 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. - * */ static void run_events(struct play *play) @@ -569,7 +569,7 @@ /* * Get and process the available events. - * + * * Arguments: * vplay - Play object to be used * fd - The file descriptor that is ready @@ -606,7 +606,7 @@ * 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. - * + * * Arguments: * play - The play object * type - Type of echo event @@ -650,7 +650,7 @@ /* * The element is converted into an event and sent to the * sequencer. - * + * * Arguments: * ctxp - Sequence state * el - Element to send to sequencer @@ -674,7 +674,7 @@ /* * Convert an element to an event. Pass in the address of an * event to be completed. - * + * * Arguments: * ctxp - Sequencer context * el - Element to be converted @@ -740,7 +740,6 @@ /* * Called while playing to update the play position pointer. - * */ static gint play_pos_cb(gpointer data) @@ -762,7 +761,7 @@ /* * Add the io callbacks. - * + * * Arguments: * play - The play object * which - Which callbacks to add @@ -783,7 +782,7 @@ /* * Remove the io callbacks. - * + * * Arguments: * play - The play object * which - Which callbacks to remove diff -rNu melys-0.0.15/midi/record.c melys-0.0.16/midi/record.c --- melys-0.0.15/midi/record.c Sun Oct 3 12:54:38 1999 +++ melys-0.0.16/midi/record.c Tue Oct 12 14:58:26 1999 @@ -47,6 +47,7 @@ #define EPTR struct element * +/* Static functions */ static void run_events(gpointer vrecord, gint fd, GdkInputCondition cond); static void save_event(struct trackElement *track, snd_seq_event_t *ep); static void push_events(gpointer vrecord, gint fd, GdkInputCondition cond); @@ -65,7 +66,7 @@ * Allocate and initialise a record state. A new sequencer * context is created that will receive the incoming midi * events. - * + * * Arguments: * ctxp - The seq context */ @@ -137,7 +138,7 @@ /* * Set the current track that we are recording on. - * + * * Arguments: * devchan - Channel for this track */ @@ -153,7 +154,7 @@ /* * Start recording. Events are saved and added to the current * take. - * + * * Arguments: * record - Record state */ @@ -185,7 +186,7 @@ /* * Stop recording. - * + * * Arguments: * record - Record state */ @@ -230,6 +231,7 @@ track->newpart->duration = duration; md_merge_in(MD_TRACK(track), track->newpart, MD_ADD_MERGE); + md_free(MD_ELEMENT(track->newpart)); track->newpart = NULL; g_ptr_array_free(track->notes, 1); @@ -244,7 +246,7 @@ /* * Read and save the incoming events. - * + * * Arguments: * vrecord - This will be a record object * fd - The file descriptor that is ready @@ -261,6 +263,7 @@ int n; int tn; + if (ep->type != 50) dprintf2("Got event %d time %ld", ep->type, ep->time.tick); /* This is an ALSA bug (reported) keyboard events have the REL bit @@ -290,6 +293,7 @@ /* * Save the event in the current part that is being recorded. + * * Arguments: * ep - Event to save */ @@ -387,7 +391,7 @@ /* * Push out the events waiting to be written to the sequencer. - * + * * Arguments: * vrecord - This will be a record object * fd - The file descriptor that is ready @@ -406,7 +410,7 @@ /* * Add the io callbacks. - * + * * Arguments: * record - The record object * which - Which callbacks to add @@ -427,7 +431,7 @@ /* * Remove the io callbacks. - * + * * Arguments: * record - The record object * which - Which callbacks to remove @@ -451,6 +455,7 @@ * 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 + * * Arguments: * time - The current song time * ep - The note event @@ -471,7 +476,7 @@ /* * Called when a note off is seen. Finds the corresponding note * on and constructs a note element. - * + * * Arguments: * time - The time of the off note * ep - The off note @@ -506,7 +511,6 @@ /* * Save the controller state for the track device. Note that of * course tracks can share devices. - * */ static struct element * save_controller(struct trackElement *track, int control, int value) diff -rNu melys-0.0.15/midi/record.m melys-0.0.16/midi/record.m --- melys-0.0.15/midi/record.m Sun Oct 3 12:24:46 1999 +++ melys-0.0.16/midi/record.m Tue Oct 12 14:50:51 1999 @@ -209,6 +209,7 @@ track->newpart->duration = duration; md_merge_in(MD_TRACK(track), track->newpart, MD_ADD_MERGE); + md_free(MD_ELEMENT(track->newpart)); track->newpart = NULL; g_ptr_array_free(track->notes, 1); @@ -238,6 +239,7 @@ int n; int tn; + if (ep->type != 50) dprintf2("Got event %d time %ld", ep->type, ep->time.tick); /* This is an ALSA bug (reported) keyboard events have the REL bit diff -rNu melys-0.0.15/pixmaps/balls.c melys-0.0.16/pixmaps/balls.c --- melys-0.0.15/pixmaps/balls.c Sun Oct 3 12:54:38 1999 +++ melys-0.0.16/pixmaps/balls.c Tue Oct 12 14:58:26 1999 @@ -211,5 +211,6 @@ " ]^^] ", " "}; +/* Static functions */ diff -rNu melys-0.0.15/pixmaps/menu_icons.c melys-0.0.16/pixmaps/menu_icons.c --- melys-0.0.15/pixmaps/menu_icons.c Sun Oct 3 12:54:38 1999 +++ melys-0.0.16/pixmaps/menu_icons.c Tue Oct 12 14:58:26 1999 @@ -27,5 +27,6 @@ #include "mpause.xpm" #include "mstop.xpm" +/* Static functions */ diff -rNu melys-0.0.15/po/FILES melys-0.0.16/po/FILES --- melys-0.0.15/po/FILES Wed Sep 15 17:01:56 1999 +++ melys-0.0.16/po/FILES Tue Oct 12 00:37:39 1999 @@ -4,27 +4,40 @@ files/mdmlwrite.c files/midiread.c files/midiwrite.c +gui/help.c gui/main.c gui/menus.c +gui/partprop.c +gui/propbox.c +gui/trackprop.c md/elements.c -md/mdutil.c md/mdadd.c md/mdlist.c +md/mdseq.c +md/mdtools.c md/mdundo.c +md/mdutil.c midi/play.c midi/record.c +pixmaps/balls.c +pixmaps/menu_icons.c programs/mdmlconv.c -programs/melys.c programs/melplay.c +programs/melys.c programs/showseq.c seq/seqlib.c seq/seqmidi.c +seq/seqplay.c seq/sequtil.c song/song.c util/except.c +util/gxstack.c util/util.c +widgets/melyspartitem.c +widgets/melysrule.c widgets/melystrack.c widgets/melystrackdisplay.c widgets/melystrackinfo.c widgets/melystransport.c +widgets/misc.c widgets/register.c diff -rNu melys-0.0.15/po/melys.pot melys-0.0.16/po/melys.pot --- melys-0.0.15/po/melys.pot Sun Sep 19 23:02:58 1999 +++ melys-0.0.16/po/melys.pot Tue Oct 12 00:37:39 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-09-19 22:41+0100\n" +"POT-Creation-Date: 1999-10-11 20:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,7 +14,7 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: file.m:162 file.m:416 +#: file.m:162 file.m:475 msgid "The file type was not recognised" msgstr "" @@ -34,15 +34,11 @@ "This is probably a bug" msgstr "" -#: mdmlread.m:71 -msgid "Failed to read file" -msgstr "" - -#: mdmlwrite.m:42 +#: mdmlread.m:796 mdmlwrite.m:43 msgid "Could not open file" msgstr "" -#: midiread.m:117 +#: midiread.m:118 #, c-format msgid "" "Could not open file\n" @@ -50,7 +46,7 @@ "%s" msgstr "" -#: midiread.m:167 +#: midiread.m:169 #, c-format msgid "" "Could not read file\n" @@ -58,182 +54,273 @@ "%s" msgstr "" -#: midiread.m:229 +#: midiread.m:231 #, c-format msgid "Bad header (%x), probably not a real midi file" msgstr "" -#: midiread.m:240 +#: midiread.m:242 msgid "Bad header length, probably not a real midi file" msgstr "" -#: midiread.m:281 +#: midiread.m:283 #, c-format msgid "Bad track header (%x), probably not a midi file" msgstr "" -#: midiread.m:479 +#: midiread.m:493 #, c-format msgid "Bad status type 0x%x" msgstr "" -#: midiread.m:544 +#: midiread.m:567 #, c-format msgid "Meta event %d not implemented\n" msgstr "" -#: midiread.m:580 midiread.m:605 midiread.m:627 -msgid "Unexpected end of file" +#: midiread.m:759 +#, c-format +msgid "" +"Unexpected end of file\n" +" (offset %d/%d, type %s)\n" msgstr "" #: midiwrite.m:59 msgid "Can not open file" msgstr "" -#: midiwrite.m:391 +#: midiwrite.m:395 #, c-format msgid "Negative time difference (%d) writing midi file" msgstr "" -#: midiwrite.m:393 +#: midiwrite.m:397 msgid " difference set to zero" msgstr "" -#: main.m:72 +#: main.m:87 msgid "" "Here you can view the tracks and modify properties of the track such as " "instrument and midi channel. You can also add and delete tracks from this " "menu" msgstr "" -#: main.m:95 +#: main.m:117 msgid "The Melys sequencer" msgstr "" -#. Create the first child -#: main.m:110 menus.m:180 +#: main.m:246 msgid "Untitled" msgstr "" -#: menus.m:38 +#: main.m:248 +#, c-format +msgid "Track: %s" +msgstr "" + +#: menus.m:40 msgid "New" msgstr "" -#: menus.m:54 +#: menus.m:56 msgid "_Close all" msgstr "" -#: menus.m:54 +#: menus.m:56 msgid "Close all open windows" msgstr "" -#: menus.m:66 +#: menus.m:62 +msgid "_Debug" +msgstr "" + +#: menus.m:62 +msgid "Bring up a debugging window" +msgstr "" + +#: menus.m:75 msgid "_Add" msgstr "" -#: menus.m:66 +#: menus.m:75 msgid "Add a new track" msgstr "" -#: menus.m:71 +#: menus.m:80 msgid "_Delete" msgstr "" -#: menus.m:71 +#: menus.m:80 msgid "Delete selected tracks" msgstr "" -#: menus.m:76 +#: menus.m:85 msgid "Delete empty" msgstr "" -#: menus.m:76 +#: menus.m:85 msgid "Delete all empty tracks" msgstr "" -#: menus.m:87 +#: melystrackdisplay.m:211 menus.m:90 +msgid "Properties..." +msgstr "" + +#: menus.m:90 +msgid "The track properties box" +msgstr "" + +#: menus.m:101 msgid "_Start" msgstr "" -#: menus.m:87 +#: menus.m:101 msgid "Start playing" msgstr "" -#: menus.m:93 +#: menus.m:107 msgid "_Pause" msgstr "" -#: menus.m:93 +#: menus.m:107 msgid "Pause playing" msgstr "" -#: menus.m:99 +#: menus.m:113 msgid "S_top" msgstr "" -#: menus.m:99 +#: menus.m:113 msgid "Stop and return to beginning" msgstr "" -#: menus.m:105 +#: menus.m:119 msgid "_Record" msgstr "" -#: menus.m:105 +#: menus.m:119 msgid "Start recording" msgstr "" -#: menus.m:111 +#: menus.m:125 msgid "Record stop" msgstr "" -#: menus.m:111 +#: menus.m:125 msgid "Stop recording" msgstr "" -#: menus.m:130 +#: menus.m:144 msgid "_Tracks" msgstr "" -#: menus.m:131 +#: menus.m:145 msgid "_Actions" msgstr "" -#: menus.m:238 +#. Need to create a new file selection dialog. This +#. * is the first time, or the old one was killed from the +#. * window manager etc. +#. +#: menus.m:212 msgid "Select the file to read in..." msgstr "" -#: menus.m:344 +#: menus.m:295 msgid "Select the file name to write to..." msgstr "" -#: menus.m:560 +#: menus.m:513 msgid "Copyright Steve Ratcliffe (C) 1999" msgstr "" -#: menus.m:562 +#: menus.m:515 msgid "Melys is a sequencer application for ALSA" msgstr "" -#: mdadd.m:134 +#: menus.m:652 +#, c-format +msgid "Number of allocated elements %d\n" +msgstr "" + +#: menus.m:682 +msgid "No selected tracks" +msgstr "" + +#: partprop.m:81 trackprop.m:88 +msgid "Basic" +msgstr "" + +#: partprop.m:123 +msgid "Part properties" +msgstr "" + +#. spacing +#. spacing +#. Create the labels +#: partprop.m:134 +msgid "Part name" +msgstr "" + +#: trackprop.m:93 trackprop.m:240 +msgid "Instruments" +msgstr "" + +#: trackprop.m:143 +msgid "Track properties" +msgstr "" + +#. Create the labels +#: trackprop.m:156 +msgid "Track name" +msgstr "" + +#: trackprop.m:157 +msgid "Output device" +msgstr "" + +#: trackprop.m:158 +msgid "Channel" +msgstr "" + +#: trackprop.m:243 +msgid "Instrument" +msgstr "" + +#: trackprop.m:244 +msgid "Bank MSB" +msgstr "" + +#: trackprop.m:245 +msgid "Bank LSB" +msgstr "" + +#: trackprop.m:248 +msgid "" +"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" +msgstr "" + +#: mdadd.m:150 #, c-format -msgid "Freed an mdroot %d with bad reference count" +msgid "Freed an element %d with bad reference count %d" msgstr "" -#: play.m:333 +#: play.m:357 msgid "" "Melys was not built with the ALSA remove_events\n" "patch. The muting function will not work very well\n" "You will get hanging notes, for example" msgstr "" -#: play.m:362 +#: play.m:386 msgid "" "Melys should be built with ALSA version of\n" "at least 0.4.1. The muting function will hardly work at all" msgstr "" -#: play.m:445 +#: play.m:469 #, c-format msgid "BUG: play_unmute: t2=%ld, ahead time=%ld\n" msgstr "" @@ -242,88 +329,94 @@ msgid "Melys sequencer (record)" msgstr "" -#: mdmlconv.m:148 mdmlconv.m:157 +#: mdmlconv.m:149 mdmlconv.m:158 #, c-format msgid "Reading %s: %s\n" msgstr "" -#: melys.m:113 -#, c-format -msgid "" -"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" -msgstr "" - -#: melys.m:145 -msgid "Usage: melys [-x level]" -msgstr "" - -#: melys.m:147 -msgid " -x, --debug=LEVEL Set debuging level" -msgstr "" - -#: melplay.m:49 +#: melplay.m:51 msgid "port" msgstr "" -#: melplay.m:50 +#: melplay.m:52 msgid "list" msgstr "" -#: melplay.m:51 +#: melplay.m:53 msgid "delay" msgstr "" -#: melplay.m:52 +#: melplay.m:54 msgid "begin" msgstr "" -#: melplay.m:305 showseq.m:98 +#: melplay.m:307 showseq.m:98 #, c-format msgid "Could not open sequencer %s" msgstr "" -#: melplay.m:311 showseq.m:104 +#: melplay.m:313 showseq.m:104 #, c-format msgid "Could not get sequencer information %s" msgstr "" -#: melplay.m:316 +#: melplay.m:318 #, c-format msgid " Port %-30.30s %s\n" msgstr "" -#: melplay.m:316 +#: melplay.m:318 msgid "Client name" msgstr "" -#: melplay.m:316 +#: melplay.m:318 msgid "Port name" msgstr "" -#: melplay.m:346 +#: melplay.m:348 msgid "Usage: melplay [-p client:port ...] [-l] [-d delay] file ..." msgstr "" -#: melplay.m:348 +#: melplay.m:350 msgid " -p client:port - A alsa client and port number to send midi to" msgstr "" -#: melplay.m:349 +#: melplay.m:351 msgid " -l - List possible output ports that could be used" msgstr "" -#: melplay.m:350 +#: melplay.m:352 msgid " -d delay - Delay after song ends (default 2 sec)" msgstr "" -#: melplay.m:351 +#: melplay.m:353 msgid " -b time - Begin time" msgstr "" +#: melys.m:117 +#, c-format +msgid "" +"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" +msgstr "" + +#: melys.m:132 +msgid "" +"This operation is not possible\n" +"because there are no open files\n" +msgstr "" + +#: melys.m:163 +msgid "Usage: melys [-x level]" +msgstr "" + +#: melys.m:165 +msgid " -x, --debug=LEVEL Set debuging level" +msgstr "" + #: showseq.m:160 msgid "Usage: showseq" msgstr "" @@ -338,7 +431,7 @@ msgid "Error (%s) creating sequencer port\n" msgstr "" -#: song.m:105 +#: song.m:122 msgid "" "You have selected a type 0 midi file\n" "Unfortunately this will not work very well\n" @@ -346,18 +439,42 @@ "It is easy enough to fix given the right encouragement...\n" msgstr "" -#: song.m:121 song.m:192 +#: song.m:141 song.m:214 msgid "" "Could not open ALSA sequencer\n" "Perhaps modules are not loaded\n" msgstr "" -#: except.m:93 +#: except.m:96 msgid "ethrow called without being set up" msgstr "" -#: except.m:114 -msgid "ethrow_setup called when allready set up" +#: melystrackdisplay.m:196 +msgid "_Slice" +msgstr "" + +#: melystrackdisplay.m:196 +msgid "Slice the part into two" +msgstr "" + +#: melystrackdisplay.m:201 +msgid "_Join" +msgstr "" + +#: melystrackdisplay.m:201 +msgid "Join this part and the next" +msgstr "" + +#: melystrackdisplay.m:206 +msgid "Delete" +msgstr "" + +#: melystrackdisplay.m:206 +msgid "Delete this part" +msgstr "" + +#: melystrackdisplay.m:211 +msgid "Part property box" msgstr "" #: melystrackinfo.m:146 @@ -384,12 +501,12 @@ msgid "Rec" msgstr "" -#: melystrackinfo.m:813 +#: melystrackinfo.m:793 #, c-format msgid "Track %d" msgstr "" -#: melystrackinfo.m:884 +#: melystrackinfo.m:864 #, c-format msgid "" "Internal error.\n" diff -rNu melys-0.0.15/po/zz.po melys-0.0.16/po/zz.po --- melys-0.0.15/po/zz.po Sun Sep 19 23:02:58 1999 +++ melys-0.0.16/po/zz.po Tue Oct 12 00:37:39 1999 @@ -5,7 +5,7 @@ msgid "" msgstr "" -#: file.m:162 file.m:416 +#: file.m:162 file.m:475 msgid "The file type was not recognised" msgstr "T.H.E. F.I.L.E. T.Y.P.E. W.A.S. N.O.T. R.E.C.O.G.N.I.S.E.D." @@ -29,15 +29,11 @@ "C.O.U.L.D. N.O.T. W.R.I.T.E. F.I.L.E.\n" "T.H.I.S. I.S. P.R.O.B.A.B.L.Y. A. B.U.G." -#: mdmlread.m:71 -msgid "Failed to read file" -msgstr "F.A.I.L.E.D. T.O. R.E.A.D. F.I.L.E." - -#: mdmlwrite.m:42 +#: mdmlread.m:796 mdmlwrite.m:43 msgid "Could not open file" msgstr "C.O.U.L.D. N.O.T. O.P.E.N. F.I.L.E." -#: midiread.m:117 +#: midiread.m:118 #, c-format msgid "" "Could not open file\n" @@ -48,7 +44,7 @@ "\n" "%s" -#: midiread.m:167 +#: midiread.m:169 #, c-format msgid "" "Could not read file\n" @@ -59,48 +55,53 @@ "\n" "%s" -#: midiread.m:229 +#: midiread.m:231 #, c-format msgid "Bad header (%x), probably not a real midi file" msgstr "B.A.D. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. N.O.T. A. R.E.A.L. M.I.D.I. F.I.L.E." -#: midiread.m:240 +#: midiread.m:242 msgid "Bad header length, probably not a real midi file" msgstr "B.A.D. H.E.A.D.E.R. L.E.N.G.T.H., P.R.O.B.A.B.L.Y. N.O.T. A. R.E.A.L. M.I.D.I. F.I.L.E." -#: midiread.m:281 +#: midiread.m:283 #, c-format msgid "Bad track header (%x), probably not a midi file" msgstr "B.A.D. T.R.A.C.K. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. N.O.T. A. M.I.D.I. F.I.L.E." -#: midiread.m:479 +#: midiread.m:493 #, c-format msgid "Bad status type 0x%x" msgstr "B.A.D. S.T.A.T.U.S. T.Y.P.E. 0X.%x" -#: midiread.m:544 +#: midiread.m:567 #, c-format msgid "Meta event %d not implemented\n" msgstr "M.E.T.A. E.V.E.N.T. %d N.O.T. I.M.P.L.E.M.E.N.T.E.D.\n" -#: midiread.m:580 midiread.m:605 midiread.m:627 -msgid "Unexpected end of file" -msgstr "U.N.E.X.P.E.C.T.E.D. E.N.D. O.F. F.I.L.E." +#: midiread.m:759 +#, c-format +msgid "" +"Unexpected end of file\n" +" (offset %d/%d, type %s)\n" +msgstr "" +"U.N.E.X.P.E.C.T.E.D. E.N.D. O.F. F.I.L.E.\n" +" (O.F.F.S.E.T. %d/%d, T.Y.P.E. %s)\n" #: midiwrite.m:59 msgid "Can not open file" msgstr "C.A.N. N.O.T. O.P.E.N. F.I.L.E." -#: midiwrite.m:391 +#: midiwrite.m:395 #, c-format msgid "Negative time difference (%d) writing midi file" msgstr "N.E.G.A.T.I.V.E. T.I.M.E. D.I.F.F.E.R.E.N.C.E. (%d) W.R.I.T.I.N.G. M.I.D.I. F.I.L.E." -#: midiwrite.m:393 +#: midiwrite.m:397 msgid " difference set to zero" msgstr " D.I.F.F.E.R.E.N.C.E. S.E.T. T.O. Z.E.R.O." -#: main.m:72 +#: main.m:87 msgid "" "Here you can view the tracks and modify properties of the track such as " "instrument and midi channel. You can also add and delete tracks from this " @@ -110,121 +111,212 @@ "I.N.S.T.R.U.M.E.N.T. A.N.D. M.I.D.I. C.H.A.N.N.E.L.. Y.O.U. C.A.N. A.L.S.O. A.D.D. A.N.D. D.E.L.E.T.E. T.R.A.C.K.S. F.R.O.M. T.H.I.S. " "M.E.N.U." -#: main.m:95 +#: main.m:117 msgid "The Melys sequencer" msgstr "T.H.E. M.E.L.Y.S. S.E.Q.U.E.N.C.E.R." -#. Create the first child -#: main.m:110 menus.m:180 +#: main.m:246 msgid "Untitled" msgstr "U.N.T.I.T.L.E.D." -#: menus.m:38 +#: main.m:248 +#, c-format +msgid "Track: %s" +msgstr "T.R.A.C.K.: %s" + +#: menus.m:40 msgid "New" msgstr "N.E.W." -#: menus.m:54 +#: menus.m:56 msgid "_Close all" msgstr "_C.L.O.S.E. A.L.L." -#: menus.m:54 +#: menus.m:56 msgid "Close all open windows" msgstr "C.L.O.S.E. A.L.L. O.P.E.N. W.I.N.D.O.W.S." -#: menus.m:66 +#: menus.m:62 +msgid "_Debug" +msgstr "_D.E.B.U.G." + +#: menus.m:62 +msgid "Bring up a debugging window" +msgstr "B.R.I.N.G. U.P. A. D.E.B.U.G.G.I.N.G. W.I.N.D.O.W." + +#: menus.m:75 msgid "_Add" msgstr "_A.D.D." -#: menus.m:66 +#: menus.m:75 msgid "Add a new track" msgstr "A.D.D. A. N.E.W. T.R.A.C.K." -#: menus.m:71 +#: menus.m:80 msgid "_Delete" msgstr "_D.E.L.E.T.E." -#: menus.m:71 +#: menus.m:80 msgid "Delete selected tracks" msgstr "D.E.L.E.T.E. S.E.L.E.C.T.E.D. T.R.A.C.K.S." -#: menus.m:76 +#: menus.m:85 msgid "Delete empty" msgstr "D.E.L.E.T.E. E.M.P.T.Y." -#: menus.m:76 +#: menus.m:85 msgid "Delete all empty tracks" msgstr "D.E.L.E.T.E. A.L.L. E.M.P.T.Y. T.R.A.C.K.S." -#: menus.m:87 +#: melystrackdisplay.m:211 menus.m:90 +msgid "Properties..." +msgstr "P.R.O.P.E.R.T.I.E.S...." + +#: menus.m:90 +msgid "The track properties box" +msgstr "T.H.E. T.R.A.C.K. P.R.O.P.E.R.T.I.E.S. B.O.X." + +#: menus.m:101 msgid "_Start" msgstr "_S.T.A.R.T." -#: menus.m:87 +#: menus.m:101 msgid "Start playing" msgstr "S.T.A.R.T. P.L.A.Y.I.N.G." -#: menus.m:93 +#: menus.m:107 msgid "_Pause" msgstr "_P.A.U.S.E." -#: menus.m:93 +#: menus.m:107 msgid "Pause playing" msgstr "P.A.U.S.E. P.L.A.Y.I.N.G." -#: menus.m:99 +#: menus.m:113 msgid "S_top" msgstr "S._T.O.P." -#: menus.m:99 +#: menus.m:113 msgid "Stop and return to beginning" msgstr "S.T.O.P. A.N.D. R.E.T.U.R.N. T.O. B.E.G.I.N.N.I.N.G." -#: menus.m:105 +#: menus.m:119 msgid "_Record" msgstr "_R.E.C.O.R.D." -#: menus.m:105 +#: menus.m:119 msgid "Start recording" msgstr "S.T.A.R.T. R.E.C.O.R.D.I.N.G." -#: menus.m:111 +#: menus.m:125 msgid "Record stop" msgstr "R.E.C.O.R.D. S.T.O.P." -#: menus.m:111 +#: menus.m:125 msgid "Stop recording" msgstr "S.T.O.P. R.E.C.O.R.D.I.N.G." -#: menus.m:130 +#: menus.m:144 msgid "_Tracks" msgstr "_T.R.A.C.K.S." -#: menus.m:131 +#: menus.m:145 msgid "_Actions" msgstr "_A.C.T.I.O.N.S." -#: menus.m:238 +#. Need to create a new file selection dialog. This +#. * is the first time, or the old one was killed from the +#. * window manager etc. +#. +#: menus.m:212 msgid "Select the file to read in..." msgstr "S.E.L.E.C.T. T.H.E. F.I.L.E. T.O. R.E.A.D. I.N...." -#: menus.m:344 +#: menus.m:295 msgid "Select the file name to write to..." msgstr "S.E.L.E.C.T. T.H.E. F.I.L.E. N.A.M.E. T.O. W.R.I.T.E. T.O...." -#: menus.m:560 +#: menus.m:513 msgid "Copyright Steve Ratcliffe (C) 1999" msgstr "C.O.P.Y.R.I.G.H.T. S.T.E.V.E. R.A.T.C.L.I.F.F.E. (C.) 1999" -#: menus.m:562 +#: menus.m:515 msgid "Melys is a sequencer application for ALSA" msgstr "M.E.L.Y.S. I.S. A. S.E.Q.U.E.N.C.E.R. A.P.P.L.I.C.A.T.I.O.N. F.O.R. A.L.S.A." -#: mdadd.m:134 +#: menus.m:652 #, c-format -msgid "Freed an mdroot %d with bad reference count" -msgstr "F.R.E.E.D. A.N. M.D.R.O.O.T. %d W.I.T.H. B.A.D. R.E.F.E.R.E.N.C.E. C.O.U.N.T." +msgid "Number of allocated elements %d\n" +msgstr "N.U.M.B.E.R. O.F. A.L.L.O.C.A.T.E.D. E.L.E.M.E.N.T.S. %d\n" + +#: menus.m:682 +msgid "No selected tracks" +msgstr "N.O. S.E.L.E.C.T.E.D. T.R.A.C.K.S." + +#: partprop.m:81 trackprop.m:88 +msgid "Basic" +msgstr "B.A.S.I.C." + +#: partprop.m:123 +msgid "Part properties" +msgstr "P.A.R.T. P.R.O.P.E.R.T.I.E.S." -#: play.m:333 +#. spacing +#. spacing +#. Create the labels +#: partprop.m:134 +msgid "Part name" +msgstr "P.A.R.T. N.A.M.E." + +#: trackprop.m:93 trackprop.m:240 +msgid "Instruments" +msgstr "I.N.S.T.R.U.M.E.N.T.S." + +#: trackprop.m:143 +msgid "Track properties" +msgstr "T.R.A.C.K. P.R.O.P.E.R.T.I.E.S." + +#. Create the labels +#: trackprop.m:156 +msgid "Track name" +msgstr "T.R.A.C.K. N.A.M.E." + +#: trackprop.m:157 +msgid "Output device" +msgstr "O.U.T.P.U.T. D.E.V.I.C.E." + +#: trackprop.m:158 +msgid "Channel" +msgstr "C.H.A.N.N.E.L." + +#: trackprop.m:243 +msgid "Instrument" +msgstr "I.N.S.T.R.U.M.E.N.T." + +#: trackprop.m:244 +msgid "Bank MSB" +msgstr "B.A.N.K. M.S.B." + +#: trackprop.m:245 +msgid "Bank LSB" +msgstr "B.A.N.K. L.S.B." + +#: trackprop.m:248 +msgid "" +"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" +msgstr "" +"T.H.I.S. P.A.G.E. W.I.L.L. B.E. A. C.O.M.P.R.E.H.E.N.S.I.V.E. I.N.S.T.R.U.M.E.N.T. S.E.L.E.C.T.I.O.N. P.A.G.E.\n" +"A.T. P.R.E.S.E.N.T. Y.O.U. C.A.N. J.U.S.T. S.E.L.E.C.T. F.R.O.M. P.R.O.G.R.A.M.\n" +"A.N.D. B.A.N.K. M.S.B./L.S.B. N.U.M.B.E.R.S.\n" + +#: mdadd.m:150 +#, c-format +msgid "Freed an element %d with bad reference count %d" +msgstr "F.R.E.E.D. A.N. E.L.E.M.E.N.T. %d W.I.T.H. B.A.D. R.E.F.E.R.E.N.C.E. C.O.U.N.T. %d" + +#: play.m:357 msgid "" "Melys was not built with the ALSA remove_events\n" "patch. The muting function will not work very well\n" @@ -234,7 +326,7 @@ "P.A.T.C.H.. T.H.E. M.U.T.I.N.G. F.U.N.C.T.I.O.N. W.I.L.L. N.O.T. W.O.R.K. V.E.R.Y. W.E.L.L.\n" "Y.O.U. W.I.L.L. G.E.T. H.A.N.G.I.N.G. N.O.T.E.S., F.O.R. E.X.A.M.P.L.E." -#: play.m:362 +#: play.m:386 msgid "" "Melys should be built with ALSA version of\n" "at least 0.4.1. The muting function will hardly work at all" @@ -242,7 +334,7 @@ "M.E.L.Y.S. S.H.O.U.L.D. B.E. B.U.I.L.T. W.I.T.H. A.L.S.A. V.E.R.S.I.O.N. O.F.\n" "A.T. L.E.A.S.T. 0.4.1. T.H.E. M.U.T.I.N.G. F.U.N.C.T.I.O.N. W.I.L.L. H.A.R.D.L.Y. W.O.R.K. A.T. A.L.L." -#: play.m:445 +#: play.m:469 #, c-format msgid "BUG: play_unmute: t2=%ld, ahead time=%ld\n" msgstr "B.U.G.: P.L.A.Y._U.N.M.U.T.E.: T.2=%lD., A.H.E.A.D. T.I.M.E.=%lD.\n" @@ -251,93 +343,101 @@ msgid "Melys sequencer (record)" msgstr "M.E.L.Y.S. S.E.Q.U.E.N.C.E.R. (R.E.C.O.R.D.)" -#: mdmlconv.m:148 mdmlconv.m:157 +#: mdmlconv.m:149 mdmlconv.m:158 #, c-format msgid "Reading %s: %s\n" msgstr "R.E.A.D.I.N.G. %s: %s\n" -#: melys.m:113 -#, c-format -msgid "" -"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" -msgstr "" -"A. D.E.B.U.G.G.I.N.G. E.R.R.O.R. O.C.C.U.R.R.E.D.\n" -"M.E.L.Y.S. M.A.Y. N.O.W. C.R.A.S.H. U.N.E.X.P.E.C.T.E.D.L.Y.\n" -"P.L.E.A.S.E. S.A.V.E. Y.O.U.R. W.O.R.K. A.N.D. E.X.I.T.\n" -"T.H.E. A.P.P.L.I.C.A.T.I.O.N. A.S. S.O.O.N. A.S. P.O.S.S.I.B.L.E.\n" -"M.E.S.S.A.G.E.: %s" - -#: melys.m:145 -msgid "Usage: melys [-x level]" -msgstr "U.S.A.G.E.: M.E.L.Y.S. [-X. L.E.V.E.L.]" - -#: melys.m:147 -msgid " -x, --debug=LEVEL Set debuging level" -msgstr " -X., --D.E.B.U.G.=L.E.V.E.L. S.E.T. D.E.B.U.G.I.N.G. L.E.V.E.L." - -#: melplay.m:49 +#: melplay.m:51 msgid "port" msgstr "P.O.R.T." -#: melplay.m:50 +#: melplay.m:52 msgid "list" msgstr "L.I.S.T." -#: melplay.m:51 +#: melplay.m:53 msgid "delay" msgstr "D.E.L.A.Y." -#: melplay.m:52 +#: melplay.m:54 msgid "begin" msgstr "B.E.G.I.N." -#: melplay.m:305 showseq.m:98 +#: melplay.m:307 showseq.m:98 #, c-format msgid "Could not open sequencer %s" msgstr "C.O.U.L.D. N.O.T. O.P.E.N. S.E.Q.U.E.N.C.E.R. %s" -#: melplay.m:311 showseq.m:104 +#: melplay.m:313 showseq.m:104 #, c-format msgid "Could not get sequencer information %s" msgstr "C.O.U.L.D. N.O.T. G.E.T. S.E.Q.U.E.N.C.E.R. I.N.F.O.R.M.A.T.I.O.N. %s" -#: melplay.m:316 +#: melplay.m:318 #, c-format msgid " Port %-30.30s %s\n" msgstr " P.O.R.T. %-30.30S. %s\n" -#: melplay.m:316 +#: melplay.m:318 msgid "Client name" msgstr "C.L.I.E.N.T. N.A.M.E." -#: melplay.m:316 +#: melplay.m:318 msgid "Port name" msgstr "P.O.R.T. N.A.M.E." -#: melplay.m:346 +#: melplay.m:348 msgid "Usage: melplay [-p client:port ...] [-l] [-d delay] file ..." msgstr "U.S.A.G.E.: M.E.L.P.L.A.Y. [-P. C.L.I.E.N.T.:P.O.R.T. ...] [-L.] [-D. D.E.L.A.Y.] F.I.L.E. ..." -#: melplay.m:348 +#: melplay.m:350 msgid " -p client:port - A alsa client and port number to send midi to" msgstr " -P. C.L.I.E.N.T.:P.O.R.T. - A. A.L.S.A. C.L.I.E.N.T. A.N.D. P.O.R.T. N.U.M.B.E.R. T.O. S.E.N.D. M.I.D.I. T.O." -#: melplay.m:349 +#: melplay.m:351 msgid " -l - List possible output ports that could be used" msgstr " -L. - L.I.S.T. P.O.S.S.I.B.L.E. O.U.T.P.U.T. P.O.R.T.S. T.H.A.T. C.O.U.L.D. B.E. U.S.E.D." -#: melplay.m:350 +#: melplay.m:352 msgid " -d delay - Delay after song ends (default 2 sec)" msgstr " -D. D.E.L.A.Y. - D.E.L.A.Y. A.F.T.E.R. S.O.N.G. E.N.D.S. (D.E.F.A.U.L.T. 2 S.E.C.)" -#: melplay.m:351 +#: melplay.m:353 msgid " -b time - Begin time" msgstr " -B. T.I.M.E. - B.E.G.I.N. T.I.M.E." +#: melys.m:117 +#, c-format +msgid "" +"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" +msgstr "" +"A. D.E.B.U.G.G.I.N.G. E.R.R.O.R. O.C.C.U.R.R.E.D.\n" +"M.E.L.Y.S. M.A.Y. N.O.W. C.R.A.S.H. U.N.E.X.P.E.C.T.E.D.L.Y.\n" +"P.L.E.A.S.E. S.A.V.E. Y.O.U.R. W.O.R.K. A.N.D. E.X.I.T.\n" +"T.H.E. A.P.P.L.I.C.A.T.I.O.N. A.S. S.O.O.N. A.S. P.O.S.S.I.B.L.E.\n" +"M.E.S.S.A.G.E.: %s" + +#: melys.m:132 +msgid "" +"This operation is not possible\n" +"because there are no open files\n" +msgstr "" +"T.H.I.S. O.P.E.R.A.T.I.O.N. I.S. N.O.T. P.O.S.S.I.B.L.E.\n" +"B.E.C.A.U.S.E. T.H.E.R.E. A.R.E. N.O. O.P.E.N. F.I.L.E.S.\n" + +#: melys.m:163 +msgid "Usage: melys [-x level]" +msgstr "U.S.A.G.E.: M.E.L.Y.S. [-X. L.E.V.E.L.]" + +#: melys.m:165 +msgid " -x, --debug=LEVEL Set debuging level" +msgstr " -X., --D.E.B.U.G.=L.E.V.E.L. S.E.T. D.E.B.U.G.I.N.G. L.E.V.E.L." + #: showseq.m:160 msgid "Usage: showseq" msgstr "U.S.A.G.E.: S.H.O.W.S.E.Q." @@ -352,7 +452,7 @@ msgid "Error (%s) creating sequencer port\n" msgstr "E.R.R.O.R. (%s) C.R.E.A.T.I.N.G. S.E.Q.U.E.N.C.E.R. P.O.R.T.\n" -#: song.m:105 +#: song.m:122 msgid "" "You have selected a type 0 midi file\n" "Unfortunately this will not work very well\n" @@ -364,7 +464,7 @@ "A.T. T.H.E. C.U.R.R.E.N.T. T.I.M.E., B.U.T. S.H.O.U.L.D. P.L.A.Y..\n" "I.T. I.S. E.A.S.Y. E.N.O.U.G.H. T.O. F.I.X. G.I.V.E.N. T.H.E. R.I.G.H.T. E.N.C.O.U.R.A.G.E.M.E.N.T....\n" -#: song.m:121 song.m:192 +#: song.m:141 song.m:214 msgid "" "Could not open ALSA sequencer\n" "Perhaps modules are not loaded\n" @@ -372,13 +472,37 @@ "C.O.U.L.D. N.O.T. O.P.E.N. A.L.S.A. S.E.Q.U.E.N.C.E.R.\n" "P.E.R.H.A.P.S. M.O.D.U.L.E.S. A.R.E. N.O.T. L.O.A.D.E.D.\n" -#: except.m:93 +#: except.m:96 msgid "ethrow called without being set up" msgstr "E.T.H.R.O.W. C.A.L.L.E.D. W.I.T.H.O.U.T. B.E.I.N.G. S.E.T. U.P." -#: except.m:114 -msgid "ethrow_setup called when allready set up" -msgstr "E.T.H.R.O.W._S.E.T.U.P. C.A.L.L.E.D. W.H.E.N. A.L.L.R.E.A.D.Y. S.E.T. U.P." +#: melystrackdisplay.m:196 +msgid "_Slice" +msgstr "_S.L.I.C.E." + +#: melystrackdisplay.m:196 +msgid "Slice the part into two" +msgstr "S.L.I.C.E. T.H.E. P.A.R.T. I.N.T.O. T.W.O." + +#: melystrackdisplay.m:201 +msgid "_Join" +msgstr "_J.O.I.N." + +#: melystrackdisplay.m:201 +msgid "Join this part and the next" +msgstr "J.O.I.N. T.H.I.S. P.A.R.T. A.N.D. T.H.E. N.E.X.T." + +#: melystrackdisplay.m:206 +msgid "Delete" +msgstr "D.E.L.E.T.E." + +#: melystrackdisplay.m:206 +msgid "Delete this part" +msgstr "D.E.L.E.T.E. T.H.I.S. P.A.R.T." + +#: melystrackdisplay.m:211 +msgid "Part property box" +msgstr "P.A.R.T. P.R.O.P.E.R.T.Y. B.O.X." #: melystrackinfo.m:146 msgid "Name" @@ -404,12 +528,12 @@ msgid "Rec" msgstr "R.E.C." -#: melystrackinfo.m:813 +#: melystrackinfo.m:793 #, c-format msgid "Track %d" msgstr "T.R.A.C.K. %d" -#: melystrackinfo.m:884 +#: melystrackinfo.m:864 #, c-format msgid "" "Internal error.\n" @@ -419,3 +543,13 @@ "I.N.T.E.R.N.A.L. E.R.R.O.R..\n" "T.H.E.R.E. I.S. A. M.I.S.S.I.N.G. C.A.S.E. I.N. D.R.A.W._C.O.L._B.U.T.T.O.N.\n" "V.A.L.U.E. W.A.S. %d\n" + +#~ msgid "Delete all selected parts" +#~ msgstr "D.E.L.E.T.E. A.L.L. S.E.L.E.C.T.E.D. P.A.R.T.S." + +#~ msgid "Failed to read file" +#~ msgstr "F.A.I.L.E.D. T.O. R.E.A.D. F.I.L.E." + +#~ msgid "ethrow_setup called when allready set up" +#~ msgstr "" +#~ "E.T.H.R.O.W._S.E.T.U.P. C.A.L.L.E.D. W.H.E.N. A.L.L.R.E.A.D.Y. S.E.T. U.P." diff -rNu melys-0.0.15/programs/Makefile melys-0.0.16/programs/Makefile --- melys-0.0.15/programs/Makefile Sun Oct 3 12:54:28 1999 +++ melys-0.0.16/programs/Makefile Tue Oct 12 14:58:15 1999 @@ -44,9 +44,9 @@ ../seq/seqplay.o \ ../util/except.o ../util/util.o ../util/gxstack.o \ ../md/elements.o ../md/mdutil.o ../md/mdseq.o \ - ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o \ + ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o ../md/mdtools.o \ ../gui/main.o ../gui/menus.o ../gui/trackprop.o \ - ../gui/help.o \ + ../gui/help.o ../gui/partprop.o ../gui/propbox.o \ ../widgets/register.o ../widgets/misc.o \ ../midi/play.o ../midi/record.o \ ../song/song.o \ diff -rNu melys-0.0.15/programs/mdmlconv.c melys-0.0.16/programs/mdmlconv.c --- melys-0.0.15/programs/mdmlconv.c Sun Oct 3 12:54:39 1999 +++ melys-0.0.16/programs/mdmlconv.c Tue Oct 12 14:58:27 1999 @@ -42,13 +42,13 @@ {0, 0, 0, 0}, }; +/* Static functions */ static struct rootElement *new_file(void); static void show_usage(void); /* * Usage: - * * mdmlconv [-I input-type] [-O output-type] -o out-file input-file * mdmlconv -n -o out-file * Recognised types are: @@ -56,13 +56,11 @@ * 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. - * + * * Arguments: * argc - number of arguments * argv - argument vector @@ -200,10 +198,10 @@ take = md_take_new(); gm = md_sysex_new(0xf0, gminit+1, NELEM(gminit)-1); - md_add_elem(MD_CONTAINER(root), MD_ELEMENT(track)); - md_add_elem(MD_CONTAINER(track), MD_ELEMENT(part)); - md_add_elem(MD_CONTAINER(part), MD_ELEMENT(take)); - md_add_elem(MD_CONTAINER(take), MD_ELEMENT(gm)); + 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"; @@ -218,7 +216,6 @@ /* * Print a usage message and exit. - * */ static void show_usage(void) diff -rNu melys-0.0.15/programs/mdmlconv.m melys-0.0.16/programs/mdmlconv.m --- melys-0.0.15/programs/mdmlconv.m Wed Sep 29 12:08:07 1999 +++ melys-0.0.16/programs/mdmlconv.m Fri Oct 8 22:16:54 1999 @@ -193,10 +193,10 @@ take = md_take_new(); gm = md_sysex_new(0xf0, gminit+1, NELEM(gminit)-1); - md_add_elem(MD_CONTAINER(root), MD_ELEMENT(track)); - md_add_elem(MD_CONTAINER(track), MD_ELEMENT(part)); - md_add_elem(MD_CONTAINER(part), MD_ELEMENT(take)); - md_add_elem(MD_CONTAINER(take), MD_ELEMENT(gm)); + 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"; diff -rNu melys-0.0.15/programs/melplay.c melys-0.0.16/programs/melplay.c --- melys-0.0.15/programs/melplay.c Sun Oct 3 12:54:39 1999 +++ melys-0.0.16/programs/melplay.c Tue Oct 12 14:58:27 1999 @@ -62,6 +62,7 @@ #define ADDR_PARTS 4 /* Number of part in a port description addr 1:2:3:4 */ #define SEP ", \t" /* Separators for port description */ +/* Static functions */ static seq_context_t *openports(char *portdesc); static void playfile(seq_context_t *ctxp, char *filename); static void showlist(void); @@ -72,11 +73,11 @@ /* * Play a midi file * melplay [-p client:port ...] [-l] [-d delay] file ... - * -p, --port=client:port - An ALSA client and port number to use * -l, --list - List possible output ports that could be used * -d, --delay=SECS - Delay after song ends (default 2 sec) * -b, --begin=TIME - Begin time to start at + * * Arguments: * argc - arg count * argv - arg vector @@ -163,7 +164,6 @@ /* * Read a list of client/port specifications and return an * array of snd_seq_addr_t that describes them. - * */ static seq_context_t * openports(char *portdesc) @@ -294,7 +294,6 @@ /* * Show a list of possible output ports that midi could be sent * to. - * */ static void showlist(void) diff -rNu melys-0.0.15/programs/melys.c melys-0.0.16/programs/melys.c --- melys-0.0.15/programs/melys.c Sun Oct 3 12:54:39 1999 +++ melys-0.0.16/programs/melys.c Tue Oct 12 14:58:27 1999 @@ -42,12 +42,14 @@ {0, 0, 0, 0}, }; -extern int melys_app(int argc, char **argv); +extern int melys_app(int argc, char **argv, int optind); +/* Static functions */ static void showusage(void); /* + * * Arguments: * argc - arg count * argv - arg vector @@ -92,7 +94,7 @@ } } - melys_app(argc, argv); + melys_app(argc, argv, optind); if (CATCH(debugError)) { @@ -123,12 +125,14 @@ gtk_main(); +#ifdef DEBUG { void *p; p = malloc(1); /* Only used to get db malloc package linked in */ free(p); } +#endif UNCATCH(debugError); @@ -137,7 +141,6 @@ /* * Show a usage message. - * */ static void showusage(void) diff -rNu melys-0.0.15/programs/melys.m melys-0.0.16/programs/melys.m --- melys-0.0.15/programs/melys.m Sat Oct 2 20:19:45 1999 +++ melys-0.0.16/programs/melys.m Fri Oct 8 22:16:54 1999 @@ -19,9 +19,9 @@ >>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 +>>make --objects ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o ../md/mdtools.o >>make --objects ../gui/main.o ../gui/menus.o ../gui/trackprop.o ->>make --objects ../gui/help.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 @@ -59,7 +59,7 @@ {0, 0, 0, 0}, }; -extern int melys_app(int argc, char **argv); +extern int melys_app(int argc, char **argv, int optind); >>function main int @@ -105,7 +105,7 @@ } } - melys_app(argc, argv); + melys_app(argc, argv, optind); if (CATCH(debugError)) { @@ -136,12 +136,14 @@ gtk_main(); +#ifdef DEBUG { void *p; p = malloc(1); /* Only used to get db malloc package linked in */ free(p); } +#endif UNCATCH(debugError); diff -rNu melys-0.0.15/programs/showseq.c melys-0.0.16/programs/showseq.c --- melys-0.0.15/programs/showseq.c Sun Oct 3 12:54:39 1999 +++ melys-0.0.16/programs/showseq.c Tue Oct 12 14:58:27 1999 @@ -38,6 +38,7 @@ #define ADDR_PARTS 4 /* Number of part in a port description addr 1:2:3:4 */ #define SEP ", \t" /* Separators for port description */ +/* Static functions */ static void showlist(void); static void showusage(void); @@ -45,7 +46,7 @@ /* * Show all ALSA sequencer ports. * showseq - + * * Arguments: * argc - arg count * argv - arg vector @@ -89,7 +90,6 @@ /* * Show a list of possible output ports that midi could be sent * to. - * */ static void showlist(void) diff -rNu melys-0.0.15/seq/seqlib.c melys-0.0.16/seq/seqlib.c --- melys-0.0.15/seq/seqlib.c Sun Oct 3 12:54:29 1999 +++ melys-0.0.16/seq/seqlib.c Tue Oct 12 14:58:16 1999 @@ -40,6 +40,7 @@ #define POOL_LARGE 200 /* Making this quite small */ #define POOL_SMALL 80 /* This does need to be fairly large */ +/* Static functions */ static GArray *get_addr_list(seq_context_t *ctxp, int inout); static void fix_output_pool(snd_seq_t *seq, int client, int size); @@ -47,6 +48,7 @@ /* * Create a main client for an application. A queue is * allocated and a client is created. + * * Arguments: * name - Name of the client. */ @@ -113,7 +115,6 @@ /* * Create another client context based on the specified * context. The same queue will be used for both clients. - * */ seq_context_t * seq_add_subcontext(seq_context_t *ctxp) @@ -195,6 +196,7 @@ /* * Creates a new port on the specified context and returns the * port number. + * * Arguments: * ctxp - Context to create the port for */ @@ -235,7 +237,7 @@ /* * The name of the directly associated client on the context is * set. - * + * * Arguments: * name - The client name to set */ @@ -267,7 +269,7 @@ * 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. - * + * * Arguments: * inout - Whether in or out * addrlist - The list of addresses @@ -296,7 +298,7 @@ * 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. - * + * * Arguments: * inout - Whether in or out */ @@ -359,7 +361,7 @@ /* * Disconnect either input or output. For input this means * that no more events will be received from those addresses. - * + * * Arguments: * inout - Whether in or out */ @@ -409,7 +411,7 @@ /* * Return the address corresponding to the specified logical * device. - * + * * Arguments: * dev - Device to get the address of. * inout - Input or output device @@ -437,7 +439,7 @@ * If 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. - * + * * Arguments: * ctxp - Application context * resolution - Ticks per quarter note or realtime resolution @@ -464,7 +466,7 @@ * on this context will now use this queue. The special values * SND_SEQ_ADDRESS_SUBSCRIBERS can be used to send to all * subscribed clients. - * + * * Arguments: * ctxp - Context to modify * q - The queue number @@ -478,7 +480,7 @@ /* * Send the event to the specified client and port. - * + * * Arguments: * ctxp - Client context * ep - Event to send @@ -505,6 +507,7 @@ * 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. + * * Arguments: * ctxp - Client context * ep - Event to send @@ -524,7 +527,7 @@ * Send the event to all the connected devices across all * possible channels. This function is intended for * all-sounds-off type controls etc. - * + * * Arguments: * ctxp - Client context * ep - Event prototype to be sent @@ -624,7 +627,7 @@ * 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. - * + * * Arguments: * ctxp - Application context * ep - Event to be written @@ -648,7 +651,7 @@ * 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. - * + * * Arguments: * ctxp - Application context * ep - Event to be written @@ -677,7 +680,7 @@ /* * Return the next event. Returns NULL if none. - * + * * Arguments: * ctxp - The application context */ @@ -698,7 +701,6 @@ /* * Flush all output queues across all output devices so that * there are no events left in them. - * */ void seq_drain_output(seq_context_t *ctxp) @@ -738,7 +740,6 @@ * Free any variable length extension data that may be on the * event. The event itself is not freed. Assume data allocated * with g_malloc. - * */ void seq_event_data_free(snd_seq_event_t *ep) @@ -755,7 +756,7 @@ /* * Return the handle to the underlying snd_seq stream. - * + * * Arguments: * ctxp - Application context */ @@ -768,7 +769,7 @@ /* * Return the underlying file descriptor. - * + * * Arguments: * ctxp - Application context */ @@ -782,7 +783,7 @@ /* * Convert an address to a string. The string should be freed * after use. - * + * * Arguments: * addr - Address to convert to string */ @@ -821,7 +822,7 @@ * particular the default only wake you from select when the * pool is more than half empty, we need to know much earlier * than that. - * + * * Arguments: * seq - Sequencer handle * client - Client number diff -rNu melys-0.0.15/seq/seqmidi.c melys-0.0.16/seq/seqmidi.c --- melys-0.0.15/seq/seqmidi.c Sun Oct 3 12:54:30 1999 +++ melys-0.0.16/seq/seqmidi.c Tue Oct 12 14:58:17 1999 @@ -26,6 +26,7 @@ #include "intl.h" +/* Static functions */ /* @@ -35,7 +36,7 @@ * connection calls. In addition the time and channel are set. * This should be called first before any of the following * functions. - * + * * Arguments: * ctxp - Client application * ep - Event to init @@ -74,6 +75,7 @@ /* * Initialize a note event. + * * Arguments: * ctxp - Client context * ep - Event template @@ -92,41 +94,40 @@ /* * Initialize a note on event. + * * Arguments: * ctxp - Client context * ep - Event template */ void -seq_midi_note_on(seq_context_t *ctxp, snd_seq_event_t *ep, int note, int vel, - int length) +seq_midi_note_on(seq_context_t *ctxp, snd_seq_event_t *ep, int note, int vel) { ep->type = SND_SEQ_EVENT_NOTEON; ep->data.note.note = note; ep->data.note.velocity = vel; - ep->data.note.duration = length; } /* * Initialize a note off event. + * * Arguments: * ctxp - Client context * ep - Event template */ void -seq_midi_note_off(seq_context_t *ctxp, snd_seq_event_t *ep, int note, int vel, - int length) +seq_midi_note_off(seq_context_t *ctxp, snd_seq_event_t *ep, int note, int vel) { ep->type = SND_SEQ_EVENT_NOTEOFF; ep->data.note.note = note; ep->data.note.velocity = vel; - ep->data.note.duration = length; } /* * Initialize a key pressure event. + * * Arguments: * ctxp - Application context * ep - Event template @@ -146,6 +147,7 @@ /* * Initialize a control event. + * * Arguments: * ctxp - Application context * ep - Event template @@ -165,6 +167,7 @@ /* * Initialize a program change event. + * * Arguments: * ctxp - Application context * ep - Event template @@ -182,6 +185,7 @@ /* * Initialize a channel pressure event. + * * Arguments: * ctxp - Application context * ep - Event template @@ -199,6 +203,7 @@ /* * Initialize a pitchbend message. The bend parameter is * centered on zero, negative values mean a lower pitch. + * * Arguments: * ctxp - Application context * ep - Event template @@ -216,6 +221,7 @@ /* * Initialize a tempo event. The tempo parameter is in * microseconds per beat. + * * Arguments: * ctxp - Application context * ep - Event template @@ -235,6 +241,7 @@ /* * Prepare a sysex event. The status byte is to distiguish * continuation sysex messages. + * * Arguments: * ctxp - Application context * ep - Event template @@ -265,6 +272,7 @@ /* * Initialise an echo event. + * * Arguments: * ctxp - Application context * ep - Event template @@ -284,7 +292,7 @@ * 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. - * + * * Arguments: * ctxp - Application context * time - Time of event diff -rNu melys-0.0.15/seq/seqmidi.m melys-0.0.16/seq/seqmidi.m --- melys-0.0.15/seq/seqmidi.m Sat Oct 2 22:49:38 1999 +++ melys-0.0.16/seq/seqmidi.m Tue Oct 5 21:28:48 1999 @@ -83,7 +83,7 @@ snd_seq_event_t *ep; Event template int note; int vel; -int length; + >>description Initialize a note on event. >>code @@ -92,8 +92,6 @@ ep->data.note.note = note; ep->data.note.velocity = vel; - ep->data.note.duration = length; - >>function seq_midi_note_off @@ -102,7 +100,7 @@ snd_seq_event_t *ep; Event template int note; int vel; -int length; + >>description Initialize a note off event. >>code @@ -110,7 +108,6 @@ ep->type = SND_SEQ_EVENT_NOTEOFF; ep->data.note.note = note; ep->data.note.velocity = vel; - ep->data.note.duration = length; >>function seq_midi_keypress diff -rNu melys-0.0.15/seq/seqplay.c melys-0.0.16/seq/seqplay.c --- melys-0.0.15/seq/seqplay.c Sun Oct 3 12:54:30 1999 +++ melys-0.0.16/seq/seqplay.c Tue Oct 12 14:58:17 1999 @@ -27,6 +27,7 @@ +/* Static functions */ static snd_seq_real_time_t set_time(snd_seq_event_t *ep, snd_seq_real_time_t time); @@ -35,16 +36,13 @@ * 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. - * * Note that 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. - * */ void midi_play_prologue(struct seq_context *ctxp, struct rootElement *root) @@ -93,7 +91,7 @@ /* * Return the new time, based on the event just sent. - * + * * Arguments: * ep - Event that was sent * time - Current time diff -rNu melys-0.0.15/seq/sequtil.c melys-0.0.16/seq/sequtil.c --- melys-0.0.15/seq/sequtil.c Sun Oct 3 12:54:30 1999 +++ melys-0.0.16/seq/sequtil.c Tue Oct 12 14:58:17 1999 @@ -28,6 +28,7 @@ #define ADDR_PARTS 4 /* Number of parts in an address */ #define SEP " ,\t\n" /* Separators between addresses */ +/* Static functions */ /* @@ -35,7 +36,7 @@ * construct an array of addresses. The array is returned into * the argument addrp and should be freed by the caller. The * number of valid elements in the array is returned. - * + * * Arguments: * portdesc - String containing port descriptions * addrp - Returned array diff -rNu melys-0.0.15/song/song.c melys-0.0.16/song/song.c --- melys-0.0.15/song/song.c Sun Oct 3 12:54:29 1999 +++ melys-0.0.16/song/song.c Tue Oct 12 14:58:16 1999 @@ -33,6 +33,7 @@ +/* Static functions */ static void song_mute_track(gpointer notused, struct trackElement *track, struct song *song); static void song_unmute_track(GtkObject *notused, struct trackElement *track, @@ -55,7 +56,6 @@ * Open the file specified by filename and read it into the song * structure as an MD tree. If filename is NULL, then an empty * new song is created. - * */ void song_setup(struct song *song, char *filename, struct rootElement *root) @@ -145,7 +145,7 @@ */ if (MD_CONTAINER(song->newtrack)->elements->len) { g_message("adding the new track"); - md_add_elem(MD_CONTAINER(song->mdroot), MD_ELEMENT(song->newtrack)); + 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); @@ -161,7 +161,6 @@ * Start recording. This may be called while already playing, * or while not playing, in which case playing must be started * as well. - * */ void song_record_start(struct song *song) @@ -189,7 +188,6 @@ /* * Stop recording only. If the song is playing (as it will be if * not ended) then it will carry on playing. - * */ void song_record_stop(struct song *song) @@ -207,6 +205,7 @@ * 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. + * * Arguments: * child - Child to get data from */ @@ -225,7 +224,7 @@ /* * Create and initialise the child data. The newly created * data is returned. - * + * * Arguments: * mdi - The parent MDI * child - Child on which to create the data @@ -255,7 +254,6 @@ * Destroy the child data structure and any resourse * allocated off it. This will be called automatically when * the child is destroyed. - * */ void song_destroy(gpointer data) @@ -279,6 +277,9 @@ if (sd->play) play_free(sd->play); + if (sd->newtrack) + md_free(MD_ELEMENT(sd->newtrack)); + /* Free the data itself */ g_free(sd); } @@ -287,7 +288,6 @@ * Update all views. This is called after a change has been made * to the mdroot and you want to redisplay every thing. The view * widgets could optimise and check what has changed. - * */ void song_view_update(struct song *song) diff -rNu melys-0.0.15/song/song.m melys-0.0.16/song/song.m --- melys-0.0.15/song/song.m Sat Oct 2 22:50:32 1999 +++ melys-0.0.16/song/song.m Sun Oct 10 16:56:30 1999 @@ -52,6 +52,7 @@ int save_dialog; /* Save dialog box */ int dialog; /* Set if a dialog is in action */ + int propbox; /* Set if a property box is active */ struct play *play; /* Play data */ struct record *record; /* Record data */ @@ -182,7 +183,7 @@ */ if (MD_CONTAINER(song->newtrack)->elements->len) { g_message("adding the new track"); - md_add_elem(MD_CONTAINER(song->mdroot), MD_ELEMENT(song->newtrack)); + 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); @@ -315,6 +316,9 @@ if (sd->play) play_free(sd->play); + + if (sd->newtrack) + md_free(MD_ELEMENT(sd->newtrack)); /* Free the data itself */ g_free(sd); diff -rNu melys-0.0.15/util/except.c melys-0.0.16/util/except.c --- melys-0.0.15/util/except.c Sun Oct 3 12:54:34 1999 +++ melys-0.0.16/util/except.c Tue Oct 12 14:58:21 1999 @@ -40,17 +40,17 @@ #define ETHROW_MAGIC 0x671299AB +/* Static functions */ /* * 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. - * + * * Arguments: * e - Exception thrown * fmt - Reason message format @@ -85,7 +85,6 @@ /* * Setup for catching from ethrow. - * */ void ethrow_setup(struct except *ep) diff -rNu melys-0.0.15/util/gxstack.c melys-0.0.16/util/gxstack.c --- melys-0.0.15/util/gxstack.c Sun Oct 3 12:54:34 1999 +++ melys-0.0.16/util/gxstack.c Tue Oct 12 14:58:21 1999 @@ -21,29 +21,28 @@ #include "glib.h" #include "except.h" #include "util.h" -#include "string.h" -#include "stdio.h" #include "intl.h" +/* Static functions */ /* * Creates a new stack. The element size must be greater than * zero. - * + * * Arguments: * elemsize - Size of each element */ -GStack * +GXStack * gx_stack_new(gint elemsize) { - GStack *stack; + GXStack *stack; if (elemsize <= 0) return NULL; - stack = g_new(GStack, 1); + stack = g_new(GXStack, 1); stack->level = 0; stack->elemsize = elemsize; stack->array = g_array_new(0, 0, elemsize); @@ -53,12 +52,12 @@ /* * Free the stack and its data. - * + * * Arguments: * stack - The stack to free */ void -gx_stack_free(GStack *stack) +gx_stack_free(GXStack *stack) { g_array_free(stack->array, 1); @@ -67,13 +66,13 @@ /* * Copy the item pointed to by item onto the stack. - * + * * Arguments: * stack - The stack to push item onto * item - The item to copy onto the stack */ void -gx_stack_push(GStack *stack, gpointer item) +gx_stack_push(GXStack *stack, void *item) { g_return_if_fail(stack && stack->array); @@ -89,15 +88,15 @@ * there are no items on the stack then FALSE is returned and * item is unchanged. The item can be NULL; the stack is just * popped. - * + * * Arguments: * stack - The stack * item - Item is returned here */ gboolean -gx_stack_pop(GStack *stack, gpointer item) +gx_stack_pop(GXStack *stack, void *item) { - gpointer p; + void *p; g_return_val_if_fail(stack && stack->array, FALSE); @@ -121,14 +120,14 @@ /* * Return a pointer to the top item on the stack. It is not popped * off. Returns NULL if stack is emtpy. - * + * * Arguments: * stack - The stack */ -gpointer -gx_stack_top(GStack *stack) +void * +gx_stack_top(GXStack *stack) { - gpointer p; + void *p; g_return_val_if_fail(stack && stack->array, NULL); @@ -141,16 +140,79 @@ /* * Returns true if the stack is empty. - * */ gboolean -gx_stack_empty(GStack *stack) +gx_stack_empty(GXStack *stack) { return (stack->level == 0)? TRUE: FALSE; +} + +/* + * A pointer stack is just a special case of a stack where each + * item is a pointer. The interface is easier to use. + */ +GXPtrStack * +gx_ptr_stack_new(void) +{ + return (GXPtrStack *)gx_stack_new(sizeof(void *)); +} + +/* + * 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. + * + * Arguments: + * stack - The pointer array stack + * ptr - The pointer to push + */ +void +gx_ptr_stack_push(GXPtrStack *stack, void *ptr) +{ + + gx_stack_push((GXStack *)stack, &ptr); +} + +/* + * 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. + * + * Arguments: + * stack - The pointer stack + */ +void * +gx_ptr_stack_pop(GXPtrStack *stack) +{ + void *ptr; + gboolean ok; + + ok = gx_stack_pop((GXStack *)stack, &ptr); + if (!ok) + ptr = NULL; + + return ptr; +} + +void * +gx_ptr_stack_top(GXPtrStack *stack) +{ + 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 + *Test program. uncomment the two header lines as well */ #if 0 } @@ -162,7 +224,7 @@ char s1[40]; char s2[40]; }; - GStack *stack; + GXStack *stack; int ret; struct two first, second, third; @@ -178,9 +240,9 @@ stack = gx_stack_new(sizeof(struct two)); - gx_stack_push(stack, (gpointer)&first); - gx_stack_push(stack, (gpointer)&second); - gx_stack_push(stack, (gpointer)&third); + 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)); @@ -190,21 +252,21 @@ ip = gx_stack_top(stack); printf("peek should be third 1: %s 2:%s\n", ip->s1, ip->s2); - gx_stack_pop(stack, (gpointer)&item); + 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, (gpointer)&item); + gx_stack_pop(stack, (void *)&item); printf("1: %s 2:%s\n", item.s1, item.s2); - gx_stack_push(stack, (gpointer)&first); - gx_stack_pop(stack, (gpointer)&item); + 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, (gpointer)&item); + 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, (gpointer)&item); + ret = gx_stack_pop(stack, (void *)&item); printf("ret%d 1: %s 2:%s\n", ret, item.s1, item.s2); return 0; diff -rNu melys-0.0.15/util/gxstack.m melys-0.0.16/util/gxstack.m --- melys-0.0.15/util/gxstack.m Sat Sep 25 18:31:18 1999 +++ melys-0.0.16/util/gxstack.m Sun Oct 10 19:11:04 1999 @@ -16,15 +16,18 @@ >>headerdef --decl util.h -typedef struct _GStack { +typedef struct _GXStack { gint level; gint elemsize; GArray *array; -} GStack; +} GXStack; +typedef struct _GXPtrStack { + GXStack stack; +} GXPtrStack; >>function gx_stack_new -GStack * +GXStack * gint elemsize; Size of each element >>description @@ -32,12 +35,12 @@ The element size must be greater than zero. >>code - GStack *stack; + GXStack *stack; if (elemsize <= 0) return NULL; - stack = g_new(GStack, 1); + stack = g_new(GXStack, 1); stack->level = 0; stack->elemsize = elemsize; stack->array = g_array_new(0, 0, elemsize); @@ -47,7 +50,7 @@ >>function gx_stack_free void -GStack *stack; The stack to free +GXStack *stack; The stack to free >>description Free the stack and its data. @@ -60,8 +63,8 @@ >>function gx_stack_push void -GStack *stack; The stack to push item onto -gpointer item; The item to copy onto the stack +GXStack *stack; The stack to push item onto +void *item; The item to copy onto the stack >>description Copy the item pointed to by @@ -79,8 +82,8 @@ >>function gx_stack_pop gboolean -GStack *stack; The stack -gpointer item; Item is returned here +GXStack *stack; The stack +void *item; Item is returned here >>description Copy the top most item in the stack into the memory area pointed @@ -96,7 +99,7 @@ can be NULL; the stack is just popped. >>code - gpointer p; + void *p; g_return_val_if_fail(stack && stack->array, FALSE); @@ -117,8 +120,8 @@ return TRUE; >>function gx_stack_top -gpointer -GStack *stack; The stack +void * +GXStack *stack; The stack >>description Return a pointer to the top item on the stack. @@ -126,7 +129,7 @@ Returns NULL if stack is emtpy. >>code - gpointer p; + void *p; g_return_val_if_fail(stack && stack->array, NULL); @@ -139,7 +142,7 @@ >>function gx_stack_empty gboolean -GStack *stack; +GXStack *stack; >>description Returns true if the stack is empty. @@ -148,12 +151,82 @@ 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 + *Test program. uncomment the two header lines as well */ #if 0 ->>header string.h ->>header stdio.h +>>#header string.h +>>#header stdio.h >>function main int int argc; @@ -164,7 +237,7 @@ char s1[40]; char s2[40]; }; - GStack *stack; + GXStack *stack; int ret; struct two first, second, third; @@ -180,9 +253,9 @@ stack = gx_stack_new(sizeof(struct two)); - gx_stack_push(stack, (gpointer)&first); - gx_stack_push(stack, (gpointer)&second); - gx_stack_push(stack, (gpointer)&third); + 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)); @@ -192,21 +265,21 @@ ip = gx_stack_top(stack); printf("peek should be third 1: %s 2:%s\n", ip->s1, ip->s2); - gx_stack_pop(stack, (gpointer)&item); + 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, (gpointer)&item); + gx_stack_pop(stack, (void *)&item); printf("1: %s 2:%s\n", item.s1, item.s2); - gx_stack_push(stack, (gpointer)&first); - gx_stack_pop(stack, (gpointer)&item); + 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, (gpointer)&item); + 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, (gpointer)&item); + ret = gx_stack_pop(stack, (void *)&item); printf("ret%d 1: %s 2:%s\n", ret, item.s1, item.s2); return 0; diff -rNu melys-0.0.15/util/util.c melys-0.0.16/util/util.c --- melys-0.0.15/util/util.c Sun Oct 3 12:54:34 1999 +++ melys-0.0.16/util/util.c Tue Oct 12 14:58:21 1999 @@ -30,13 +30,14 @@ #endif +/* Static functions */ /* * A routine for conditionally printing out debugging * information. If the level argument is greater than or equal * to the debugging level, the message will be printed. - * + * * Arguments: * level - Debuging level to print at * fmt - Printf format diff -rNu melys-0.0.15/version melys-0.0.16/version --- melys-0.0.15/version Sun Oct 3 12:19:47 1999 +++ melys-0.0.16/version Tue Oct 12 14:57:41 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.0.15" +#define MELYS_VERSION_STRING "0.0.16" diff -rNu melys-0.0.15/widgets/Makefile melys-0.0.16/widgets/Makefile --- melys-0.0.15/widgets/Makefile Sun Oct 3 12:54:27 1999 +++ melys-0.0.16/widgets/Makefile Tue Oct 12 14:58:14 1999 @@ -24,6 +24,7 @@ ../include/melysrule.h \ ../include/melystrack.h \ ../include/melystrackdisplay.h \ + ../include/meldnd.h \ ../include/melystrackinfo.h \ ../include/melystransport.h \ ../include/melwidgets.h \ @@ -70,9 +71,13 @@ melystrackdisplay.o: ../include/melyspartitem.h melystrackdisplay.o: ../include/melwidgets.h melystrackdisplay.o: ../include/melysrule.h +melystrackdisplay.o: ../include/melgui.h +melystrackdisplay.o: ../include/melmsg.h melystrackdisplay.o: ../include/elements.h +melystrackdisplay.o: ../include/song.h melystrackdisplay.o: ../include/md.h melystrackdisplay.o: ../include/melystrackdisplay.h +melystrackdisplay.o: ../include/meldnd.h misc.o: ../include/melwidgets.h melystrackinfo.o: ../include/melmsg.h melystrackinfo.o: ../include/melgui.h diff -rNu melys-0.0.15/widgets/melyspartitem.c melys-0.0.16/widgets/melyspartitem.c --- melys-0.0.15/widgets/melyspartitem.c Sun Oct 3 12:54:35 1999 +++ melys-0.0.16/widgets/melyspartitem.c Tue Oct 12 14:58:23 1999 @@ -12,11 +12,10 @@ * 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 and also hold - * some data referencing the part that it belongs to. - * The data could be held as object-data, but the dashed border - * is not available in the gnome rectangle item at the time of writing. - * We may also want in the future to draw squigles to mark midi events. + * 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. * * * @@ -48,7 +47,8 @@ ARG_DOTTED_BORDER }; -static void melys_part_item_init(MelysPartItem *XXX); +/* Static functions */ +static void melys_part_item_init(MelysPartItem *pitem); static void melys_part_item_class_init(MelysPartItemClass *klass); static void part_item_update(GnomeCanvasItem *item, affine_t affine, ArtSVP *clip_path, gint flags); @@ -93,26 +93,27 @@ GnomeCanvasItem * melys_part_item_new(void) { - GnomeCanvasItem *item = GNOME_CANVAS_ITEM(gtk_type_new(melys_part_item_get_type())); - + GnomeCanvasItem *item = + GNOME_CANVAS_ITEM(gtk_type_new(melys_part_item_get_type())); return item; } /* * Initialise the MelysPartItem. + * * Arguments: - * XXX - The MelysPartItem to init + * pitem - The MelysPartItem to init */ static void -melys_part_item_init(MelysPartItem *XXX) +melys_part_item_init(MelysPartItem *pitem) { - // XXX add any children etc. + } /* * Initialize the class. - * + * * Arguments: * klass - The class to initialise */ @@ -143,7 +144,6 @@ /* * We intercept the update routine to set up the dashed * outline. - * */ static void part_item_update(GnomeCanvasItem *item, affine_t affine, ArtSVP *clip_path, diff -rNu melys-0.0.15/widgets/melyspartitem.m melys-0.0.16/widgets/melyspartitem.m --- melys-0.0.15/widgets/melyspartitem.m Tue Sep 28 16:04:55 1999 +++ melys-0.0.16/widgets/melyspartitem.m Tue Oct 12 00:31:59 1999 @@ -12,11 +12,10 @@ 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 and also hold -some data referencing the part that it belongs to. -The data could be held as object-data, but the dashed border -is not available in the gnome rectangle item at the time of writing. -We may also want in the future to draw squigles to mark midi events. +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 @@ -35,8 +34,6 @@ int dotted; - struct partElement *part; /* The part being represented */ - struct trackElement *track; /* Track this part belongs to */ }; struct _MelysPartItemClass { @@ -62,18 +59,17 @@ >>description Create a new MelysPartItem object. >>code - GnomeCanvasItem *item = GNOME_CANVAS_ITEM(gtk_type_new(melys_part_item_get_type())); - + GnomeCanvasItem *item = + GNOME_CANVAS_ITEM(gtk_type_new(melys_part_item_get_type())); return item; >>function melys_part_item_init static void -MelysPartItem *XXX; The MelysPartItem to init +MelysPartItem *pitem; The MelysPartItem to init >>description Initialise the MelysPartItem. >>code - // XXX add any children etc. >>function melys_part_item_class_init diff -rNu melys-0.0.15/widgets/melysrule.c melys-0.0.16/widgets/melysrule.c --- melys-0.0.15/widgets/melysrule.c Sun Oct 3 12:54:36 1999 +++ melys-0.0.16/widgets/melysrule.c Tue Oct 12 14:58:23 1999 @@ -41,6 +41,7 @@ ARG_0, }; +/* Static functions */ static void melys_rule_init(MelysRule *mrule); static void melys_rule_class_init(MelysRuleClass *klass); static void rule_draw(GtkWidget *widget, GdkRectangle *ap); @@ -99,6 +100,7 @@ /* * Initialise the MelysRule. + * * Arguments: * mrule - The MelysRule to init */ @@ -113,7 +115,7 @@ /* * Initialize the class. - * + * * Arguments: * klass - The class to initialise */ @@ -193,8 +195,6 @@ int tick; int yoff; - dprintf1("rule_draw"); - if (!GTK_WIDGET_DRAWABLE(widget)) return; @@ -268,7 +268,6 @@ /* * A scrollbar has been moved. So we have to set our current * position and redraw. - * */ static void rule_scroll(GtkAdjustment *adj, gpointer data) diff -rNu melys-0.0.15/widgets/melysrule.m melys-0.0.16/widgets/melysrule.m --- melys-0.0.15/widgets/melysrule.m Sat Oct 2 20:21:56 1999 +++ melys-0.0.16/widgets/melysrule.m Tue Oct 5 22:28:13 1999 @@ -168,8 +168,6 @@ int tick; int yoff; - dprintf1("@func_name"); - if (!GTK_WIDGET_DRAWABLE(widget)) return; diff -rNu melys-0.0.15/widgets/melystrack.c melys-0.0.16/widgets/melystrack.c --- melys-0.0.15/widgets/melystrack.c Sun Oct 3 12:54:36 1999 +++ melys-0.0.16/widgets/melystrack.c Tue Oct 12 14:58:23 1999 @@ -35,10 +35,10 @@ enum { - // XXX symbols for all signals here LAST_SIGNAL }; +/* Static functions */ static void melys_track_init(MelysTrack *mtp); static void melys_track_class_init(MelysTrackClass *klass); static void destroy(GtkObject *object); @@ -76,6 +76,7 @@ /* * Create a new MelysTrack object. + * * Arguments: * root - Root for view */ @@ -91,6 +92,7 @@ /* * Initialise the MelysTrack. + * * Arguments: * mtp - The MelysTrack to init */ @@ -194,7 +196,7 @@ /* * Initialize the class. - * + * * Arguments: * klass - The class to initialise */ @@ -218,7 +220,6 @@ /* * Set the root for this track view. - * */ void melys_track_set_md_root(MelysTrack *mtrack, struct rootElement *root) @@ -262,7 +263,6 @@ * change is made to the song. Everything is re-calculated and * redrawn. Emit a signal to allow all other views to also be * redrawn. - * */ void melys_track_update(MelysTrack *mtrack) @@ -290,7 +290,7 @@ /* * Destroy the MelysTrack and all its resourses. - * + * * Arguments: * object - The Melys track object to be destroyed */ diff -rNu melys-0.0.15/widgets/melystrack.m melys-0.0.16/widgets/melystrack.m --- melys-0.0.15/widgets/melystrack.m Mon Sep 27 14:05:13 1999 +++ melys-0.0.16/widgets/melystrack.m Tue Oct 5 22:29:06 1999 @@ -26,7 +26,7 @@ >>header melystrackdisplay.h >># Base on a vertical packing box. ->># This allows stuff to be put allong the top. +>># This allows stuff to be put along the top. >>gtkobject melys_track MelysTrack gtk_vbox GtkVBox >>headerdef @header @@ -53,7 +53,6 @@ struct _MelysTrackClass { GtkVBoxClass parent_class; - // XXX class definition here }; /* @@ -68,7 +67,6 @@ >>extern enum { - // XXX symbols for all signals here LAST_SIGNAL }; diff -rNu melys-0.0.15/widgets/melystrackdisplay.c melys-0.0.16/widgets/melystrackdisplay.c --- melys-0.0.15/widgets/melystrackdisplay.c Sun Oct 3 12:54:36 1999 +++ melys-0.0.16/widgets/melystrackdisplay.c Tue Oct 12 14:58:24 1999 @@ -22,18 +22,27 @@ #include "gtk/gtkvbox.h" #include "gtk/gtksignal.h" #include "gtk/gtkdrawingarea.h" +#include "gtk/gtkdnd.h" +#include "gdk/gdkkeysyms.h" +#include "libgnomeui/gnome-app.h" +#include "libgnomeui/gnome-app-helper.h" #include "libgnomeui/gnome-canvas.h" #include "libgnomeui/gnome-canvas-rect-ellipse.h" #include "libgnomeui/gnome-canvas-line.h" #include "libgnomeui/gnome-canvas-util.h" #include "libgnomeui/gnome-canvas-text.h" +#include "libgnomeui/gnome-popup-menu.h" #include "melystrack.h" #include "melyspartitem.h" #include "melwidgets.h" #include "melysrule.h" +#include "melgui.h" +#include "melmsg.h" #include "elements.h" +#include "song.h" #include "md.h" #include "melystrackdisplay.h" +#include "meldnd.h" #include "intl.h" @@ -42,37 +51,125 @@ + +/* Signals that this widget creates */ enum { LAST_SIGNAL }; -struct display_data { +/* + * The different canvas items that go together to make + * up a part on the display. + * In the future this may just be the one item that holds + * the text etc, and so the need for this structure will go + * away. + */ +struct display_info { GnomeCanvasGroup *group; - GnomeCanvasItem *item; + GnomeCanvasItem *pitem; GnomeCanvasItem *text; + struct trackElement *track; + struct partElement *part; +}; + +/* Structure to keep selection info */ +struct sel_info { + struct partElement *part; + struct containerElement *con; +}; + +/* Drag and drop types */ +const GtkTargetEntry targets[] = { + {MELYS_ELEM_ATOM_NAME, GTK_TARGET_SAME_APP, MELYS_ELEM_ATOM_ID}, + + /* Junk... */ + {"application/x-melys-track", GTK_TARGET_SAME_APP, 0}, + {"STRING", 0, 0}, + {"text/plain", 0, 0}, + {"text/uri-list", 0, 0}, }; +/* All the buttons that we deal with */ +#define ALL_BUTTON_MASK (GDK_BUTTON1_MASK|GDK_BUTTON2_MASK|GDK_BUTTON3_MASK) + +#define CONP struct containerElement * + +/* Static functions */ static void melys_track_display_init(MelysTrackDisplay *mdisp); static void melys_track_display_class_init(MelysTrackDisplayClass *klass); static void disp_scroll(GtkAdjustment *adj, gpointer data); static void song_pos_cb(GtkAdjustment *adj, gpointer data); -static void create_part_item(MelysTrackDisplay *mdisp, - struct partElement *part, struct trackElement *track); -static void item_destroy(GtkObject *obj, gpointer data); +static void update_part_item(MelysTrackDisplay *mdisp, + struct trackElement *track, struct partElement *part); static void disp_destroy(GtkObject *obj); static void item_event(GtkWidget *widget, GdkEvent *event, gpointer data); +static void button_press(MelysTrackDisplay *mdisp, struct partElement *part, + GdkEventButton *event); +static void button_release(MelysTrackDisplay *mdisp, struct partElement *part, + GdkEventButton *event); +static void button_motion(MelysTrackDisplay *mdisp, struct partElement *part, + GdkEventMotion *event); +static void drag_begin(MelysTrackDisplay *mdisp, GdkEventMotion *event); +static void build_sel_list(MelysTrackDisplay *mdisp); +static void build_sel1(MelysTrackDisplay *mdisp, struct containerElement *c, + struct element *base); +static void sel_add_list(MelysTrackDisplay *mdisp, struct containerElement *c, + struct partElement *part); +static void clear_all_part_sel(MelysTrackDisplay *mdisp, gboolean clear); +static void clear_part_sel(MelysTrackDisplay *mdisp, struct partElement *part); static void disp_size_allocate(GtkWidget *widget, GtkAllocation *allocation); static void set_scroll_region(MelysTrackDisplay *mdisp); static void set_hscroll(MelysTrackDisplay *mdisp); static int track_to_y(MelysTrackDisplay *mdisp, int n); +static int y_to_track(MelysTrackDisplay *mdisp, int ypix); static int x_to_tick(MelysTrackDisplay *mdisp, int xpix); static int tick_to_x(MelysTrackDisplay *mdisp, int tick); +static void slice_cb(GtkWidget *w, gpointer data); +static void join_cb(GtkWidget *w, gpointer data); +static void delete_cb(GtkWidget *w, gpointer data); +static void part_prop_cb(GtkWidget *w, gpointer data); +static gboolean drag_drop(GtkWidget *widget, GdkDragContext *context, gint x, + gint y, guint time, gpointer user_data); +static void drag_data_send(GtkWidget *widget, GdkDragContext *context, + GtkSelectionData *selection_data, guint info, guint time, + gpointer data); +static void drag_data_received(GtkWidget *widget, GdkDragContext *context, + gint wx, gint wy, GtkSelectionData *data, guint info, guint time, + gpointer user_data); +static void drag_end(GtkWidget *widget, GdkDragContext *drag_context, + gpointer user_data); static gint melys_track_display_signals[LAST_SIGNAL]; static GtkVBoxClass *parent_class = NULL; + +/* 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 }, + {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 +}; + /* * Return a unique integer that represents the object type. */ @@ -101,7 +198,7 @@ /* * Create a new MelysTrackDisplay object. - * + * * Arguments: * hadj - Horizontal adjustment * vadj - Vertical adjustment @@ -138,6 +235,7 @@ /* * Initialise the MelysTrackDisplay. + * * Arguments: * mdisp - The MelysTrackDisplay to init */ @@ -159,12 +257,16 @@ mdisp->mdroot = NULL; mdisp->song = NULL; + mdisp->click_part = NULL; + mdisp->click_track = NULL; + mdisp->click_state = CLICK_INACTIVE; + + mdisp->sel_list = NULL; + box = gtk_vbox_new(0, 0); title = (GtkWidget *)melys_rule_new(NULL); -#if 0 -#define AA -#endif +#undef AA #ifdef AA gtk_widget_push_visual(gdk_rgb_get_visual()); gtk_widget_push_colormap(gdk_rgb_get_cmap()); @@ -179,6 +281,8 @@ mdisp->title = GTK_WIDGET(title); gtk_widget_set_usize(mdisp->title, 1, mdisp->vtitle); + /* Create the pop up menu */ + mdisp->menu = gnome_popup_menu_new(displaymenu); /* * Build up the pane. The title row has a fixed height but @@ -188,12 +292,26 @@ gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(title), 0, 0, 0); gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(canvas), 1, 1, 0); gtk_container_add(GTK_CONTAINER(mdisp), box); + gtk_widget_show_all(GTK_WIDGET(mdisp)); + + /* Set up a drop site for this widget */ + gtk_drag_dest_set(GTK_WIDGET(mdisp->canvas), GTK_DEST_DEFAULT_MOTION, + targets, NELEM(targets), GDK_ACTION_MOVE); + + gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-drop", + GTK_SIGNAL_FUNC(drag_drop), mdisp); + gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-data-get", + GTK_SIGNAL_FUNC(drag_data_send), mdisp); + gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-data-received", + GTK_SIGNAL_FUNC(drag_data_received), mdisp); + gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-end", + GTK_SIGNAL_FUNC(drag_end), mdisp); } /* * Initialize the class. - * + * * Arguments: * klass - The class to initialise */ @@ -210,27 +328,19 @@ parent_class = gtk_type_class(gtk_vbox_get_type()); - // XXX Add args - - // XXX Create signals - gtk_object_class_add_signals(object_class, melys_track_display_signals, LAST_SIGNAL); /* Set up all the overrides */ object_class->destroy = disp_destroy; - //widget_class->realize = disp_realise; - //widget_class->size_request = disp_size_request; widget_class->size_allocate = disp_size_allocate; - //widget_class->unrealize = disp_unrealise; - //widget_class->draw = disp_draw; - //widget_class->expose_event = disp_expose; - //widget_class->enter_notify_event = disp_enter; - //widget_class->button_press_event = disp_button_press; - - // XXX Our functions } +/* + * Set the music description root. If there was an existing one + * it is freed first. Everything is reset to display the new + * song. + */ void melys_track_display_set_md_root(MelysTrackDisplay *mdisp, struct rootElement *root) @@ -249,49 +359,42 @@ set_hscroll(mdisp); melys_rule_set_tempomap((MelysRule *)mdisp->title, md_get_tempomap(root)); + + build_sel_list(mdisp); /* There may be some parts already selected */ + melys_track_display_update(mdisp); } /* * A scrollbar has been moved. So we have to set our current * position and redraw. - * */ static void disp_scroll(GtkAdjustment *adj, gpointer data) { MelysTrackDisplay *mdisp = data; GnomeCanvas *canvas; - int ychanged = 0; - int xchanged = 0; + int changed = 0; if (adj == mdisp->hadj) { if ((int)adj->value != mdisp->hoffset) { if (adj->value >= 0) { - xchanged = 1; + changed = 1; mdisp->hoffset = (int)adj->value; } } } if (adj == mdisp->vadj) { if ((int)adj->value != mdisp->voffset) { - ychanged = 1; + changed = 1; mdisp->voffset = (int)(adj->value + 0.1); } } - canvas = GNOME_CANVAS(mdisp->canvas); - if (xchanged || ychanged) { + if (changed) { -#if 0 - /* Clear title area so it will be redrawn (could be optimised) */ - if (xchanged) - gdk_window_clear_area_e(mdisp->title->window, - 0, 0, - mdisp->title->allocation.width, - mdisp->title->allocation.height); -#endif + canvas = GNOME_CANVAS(mdisp->canvas); gnome_canvas_scroll_to(canvas, tick_to_x(mdisp, mdisp->hoffset), mdisp->voffset * mdisp->vspace); @@ -302,7 +405,6 @@ * 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. - * */ static void song_pos_cb(GtkAdjustment *adj, gpointer data) @@ -370,7 +472,6 @@ /* * Look through all the parts and set up the part items for each * part. - * */ void melys_track_display_update(MelysTrackDisplay *mdisp) @@ -385,16 +486,19 @@ for (n = 0; n < mdisp->mdroot->tracks; n++) { track = md_track_nth(mdisp->mdroot, n); - for (p = 0; p < MD_CONTAINER(track)->elements->len; p++) { - part = MD_CONTAINER(track)->elements->pdata[p]; + for (p = 0; p < MD_CONTAINER_LEN(track); p++) { + part = (struct partElement *) MD_GET_INDEX(track, p); - if (MD_IS_DESTROYED(part)) - dprintf2("part is destroyed!\n"); + if (MD_IS_DESTROYED(part)) { + /* This should not be happening */ + dprintf(0, "melys_track_display_update: part is destroyed!\n"); + continue; + } switch (MD_TYPE(part)) { case MD_TYPE_PART: case MD_TYPE_PARTREF: - create_part_item(mdisp, part, track); + update_part_item(mdisp, track, part); break; default: dprintf(0, "Unexpexted type %d in melys_track_display_update", MD_TYPE(part)); @@ -404,18 +508,32 @@ } } +/* + * Given the part this routine creates or updates the + * representation of the part in the canvas display. + * + * Arguments: + * track - The track + * part - Part or reference to part + */ static void -create_part_item(MelysTrackDisplay *mdisp, struct partElement *part, - struct trackElement *track) +update_part_item(MelysTrackDisplay *mdisp, struct trackElement *track, + struct partElement *part) { gboolean ref = FALSE; GnomeCanvasItem *item; MelysPartItem *pitem; - struct display_data *ddata; + struct display_info *dinfo; char *pname; int state; -#if 0 + if (MD_IS_DESTROYED(part) || MD_IS_DESTROYED(track)) + return; + + if (GTK_OBJECT_DESTROYED(mdisp)) + return; + +#if 1 if (MD_MODIFIED(part) == FALSE) { dprintf(0, "part not modified"); return; @@ -433,14 +551,18 @@ state = GTK_STATE_NORMAL; pname = part->name; - - ddata = (struct display_data *) MD_CONTAINER(part)->data; - if (ddata == NULL) { + if (pname && strcmp(pname, "") != 0) + ; + else if (track->name) + pname = track->name; + else + pname = ""; + + dinfo = (struct display_info *) g_dataset_get_data(part, "display-info"); + if (dinfo == NULL) { GnomeCanvasGroup *rgroup; GnomeCanvasGroup *group; GnomeCanvasItem *text; - struct containerElement *c; - char *name; rgroup = gnome_canvas_root((GnomeCanvas*)mdisp->canvas); @@ -449,45 +571,36 @@ item = gnome_canvas_item_new(group, melys_part_item_get_type(), NULL); - if (pname && strcmp(pname, "") != 0) - name = pname; - else if (track->name) - name = track->name; - else - name = ""; text = gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_TEXT, - "text", name, + "text", pname, NULL); pitem = MELYS_PART_ITEM(item); - MD_WREF(part); - pitem->part = part; - - MD_WREF(track); - pitem->track = track; - - ddata = g_new(struct display_data, 1); + dinfo = g_new(struct display_info, 1); gtk_object_ref((GtkObject*)group); - ddata->group = group; + dinfo->group = group; gtk_object_ref((GtkObject*)item); - ddata->item = item; + dinfo->pitem = item; gtk_object_ref((GtkObject*)text); - ddata->text = text; + dinfo->text = text; + MD_WREF(part); + dinfo->part = part; + MD_WREF(track); + dinfo->track = track; - c = MD_CONTAINER(part); - if (c->data) - c->data_free(c->data); - c->data = (gpointer)ddata; - c->data_free = display_data_free; + g_dataset_set_data_full(part, "display-info", dinfo, display_info_free); - gtk_signal_connect(GTK_OBJECT(pitem), "destroy", item_destroy, NULL); - gtk_signal_connect(GTK_OBJECT(pitem), "event", item_event, NULL); + 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", + item_event, mdisp, (GtkObject*)mdisp); } - g_assert(ddata != NULL); - pitem = MELYS_PART_ITEM(ddata->item); + g_assert(dinfo != NULL); + pitem = MELYS_PART_ITEM(dinfo->pitem); /* * The scheme here is that we have a group that contains @@ -495,17 +608,17 @@ * 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 *)ddata->group, + gnome_canvas_item_set((GnomeCanvasItem *)dinfo->group, "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(ddata->text, + gnome_canvas_item_set(dinfo->text, "x", (double) 2, "y", (double) 2, + "text", pname, "font_gdk", GTK_WIDGET(mdisp)->style->font, "anchor", GTK_ANCHOR_NORTH_WEST, "clip", TRUE, @@ -514,7 +627,7 @@ NULL); /* This size of the part is set here */ - gnome_canvas_item_set(ddata->item, + gnome_canvas_item_set(dinfo->pitem, "x1", (double) 0.0, "y1", (double) 0.0, "x2", (double) tick_to_x(mdisp, MD_DURATION(part)), @@ -529,21 +642,10 @@ gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mdisp->posline); } -static void -item_destroy(GtkObject *obj, gpointer data) -{ - MelysPartItem *pitem = MELYS_PART_ITEM(obj); - - if (pitem->part) { - MD_WUNREF(pitem->part); - pitem->part = NULL; - } - if (pitem->track) { - MD_WUNREF(pitem->track); - pitem->track = NULL; - } -} - +/* + * The whole display widget has been destroyed. This should + * lead to all associated resources being freed. + */ static void disp_destroy(GtkObject *obj) { @@ -553,6 +655,8 @@ mdisp = (MelysTrackDisplay*)obj; + clear_all_part_sel(mdisp, FALSE); + if (mdisp->posline) gtk_object_destroy(GTK_OBJECT(mdisp->posline)); @@ -579,21 +683,358 @@ (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); } +/* + * An event has been received on one of the part + * representations on the display canvas. + * All events come through here, so we switch out to more + * specific routines once we have worked out what the event is. + * + * Arguments: + * widget - This will be a canvas group + * event - The event + * data - This will be the MelysTrackDisplay + */ static void item_event(GtkWidget *widget, GdkEvent *event, gpointer data) { - MelysPartItem *pitem; + MelysTrackDisplay *mdisp = data; + struct partElement *part; + GdkEventButton *bevent = (GdkEventButton *)event; + GdkEventMotion *mevent = (GdkEventMotion *)event; + + /* Get the display data from the group */ + part = gtk_object_get_data(GTK_OBJECT(widget), "part"); + g_assert(part); + + dprintf(3, "event %d for part %s", event->type, part->name); + + switch (event->type) { + case GDK_BUTTON_PRESS: + /* Save the original location */ + mdisp->click_part = part; + mdisp->click_tick = x_to_tick(mdisp, event->button.x); + mdisp->click_ntrack = y_to_track(mdisp, event->button.y); + mdisp->click_track = md_track_nth(mdisp->mdroot, mdisp->click_ntrack); + + button_press(mdisp, part, bevent); + break; + + case GDK_2BUTTON_PRESS: + part_prop_box(part, mdisp->song, 0); + break; + + case GDK_BUTTON_RELEASE: + button_release(mdisp, part, bevent); + break; + + case GDK_MOTION_NOTIFY: + if (mevent->state & ALL_BUTTON_MASK) + button_motion(mdisp, part, mevent); + break; + default: + break; + } +} + +/* + * Action to take when button 1 is pressed. + */ +static void +button_press(MelysTrackDisplay *mdisp, struct partElement *part, + GdkEventButton *event) +{ + if (mdisp->click_state != CLICK_INACTIVE) { + mdisp->click_state = CLICK_ERROR; + return; + } + + switch (event->button) { + case 1: + mdisp->click_state = CLICK_BUTTON1_DOWN; + break; + + case 2: + mdisp->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. + */ + gnome_popup_menu_do_popup(mdisp->menu, NULL, NULL, event, mdisp); + break; + } +} + +/* + * Button 1 has been pressed on a part item. This selects the + * item. + */ +static void +button_release(MelysTrackDisplay *mdisp, struct partElement *part, + GdkEventButton *event) +{ + int mask; + struct display_info *dinfo; + + dinfo = g_dataset_get_data(part, "display-info"); + + if (mdisp->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) + mdisp->click_state = CLICK_INACTIVE; + return; + } + + switch (event->button) { + case 1: + + dprintf2("Button at %f,%f\n", event->x, event->y); + if (!(event->state & GDK_CONTROL_MASK)) + clear_all_part_sel(mdisp, TRUE); + + if (MD_SELECTED(part)) { + MD_SET_SELECTED(part, FALSE); + clear_part_sel(mdisp, part); + } else { + MD_SET_SELECTED(part, TRUE); + sel_add_list(mdisp, MD_CONTAINER(dinfo->track), part); + } + + update_part_item(mdisp, dinfo->track, part); + + if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON1_MASK) + mdisp->click_state = CLICK_INACTIVE; + break; + case 2: + if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK) + mdisp->click_state = CLICK_INACTIVE; + break; + case 3: + if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK) + mdisp->click_state = CLICK_INACTIVE; + break; + } +} + +/* + * Motion when a button is pressed down. Drag and drop on button + * 1, gesture based editing on button 2. + */ +static void +button_motion(MelysTrackDisplay *mdisp, struct partElement *part, + GdkEventMotion *event) +{ + + switch (mdisp->click_state) { + case CLICK_BUTTON1_DOWN: + drag_begin(mdisp, event); + mdisp->click_state = CLICK_INACTIVE; + break; + default: + break; + } +} + +/* + */ +static void +drag_begin(MelysTrackDisplay *mdisp, GdkEventMotion *event) +{ + GtkTargetList *tlist; + struct partElement *clickpart; + struct drag_element_data *dragdata; + struct sel_info selinfo; + GList *list; + int len; + int i; + + tlist = gtk_target_list_new(targets, NELEM(targets)); + + clickpart = mdisp->click_part; + + /* + * 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(clickpart)) { + len = g_list_length(mdisp->sel_list); + list = mdisp->sel_list; + } else { + + len = 1; + selinfo.part = clickpart; + selinfo.con = (CONP) md_track_nth(mdisp->mdroot, mdisp->click_ntrack); + list = g_list_append(NULL, &selinfo); + } + + dragdata = g_new0(struct drag_element_data, len); + + for (i = 0; i < len; i++) { + int ntrack; + struct sel_info *sinfo; + + sinfo = g_list_nth_data(list, i); + ntrack = MD_TRACK_NUMBER(sinfo->con); + + dragdata[i].element = MD_ELEMENT(sinfo->part); + dragdata[i].con = sinfo->con; + dragdata[i].tick_offset = MD_TIME(sinfo->part) - mdisp->click_tick; + dragdata[i].track_offset = ntrack - mdisp->click_ntrack; + } + + if (list != mdisp->sel_list) + g_list_free(list); + + gtk_object_set_data_full(GTK_OBJECT(mdisp), "melys-element-data", + dragdata, g_free); + gtk_object_set_data(GTK_OBJECT(mdisp), "melys-element-data-len", + GINT_TO_POINTER(len)); + + gtk_drag_begin(GTK_WIDGET(mdisp->canvas), + tlist, + GDK_ACTION_MOVE|GDK_ACTION_ASK, + 1, /* The button number */ + (GdkEvent*)event); + + //gtk_target_list_free(tlist); +} + +/* + * Build up a list of all the selected parts. + */ +static void +build_sel_list(MelysTrackDisplay *mdisp) +{ + struct element *el; + int i; + + clear_all_part_sel(mdisp, FALSE); + + for (i = 0; i < MD_CONTAINER_LEN(mdisp->mdroot); i++) { + el = MD_GET_INDEX(mdisp->mdroot, i); + build_sel1(mdisp, MD_CONTAINER(mdisp->mdroot), el); + } +} + +/* + * Helper routine for build_sel_list that examines a single + * element and adds it to the selection list if required. + */ +static void +build_sel1(MelysTrackDisplay *mdisp, struct containerElement *c, + struct element *base) +{ + struct element *el; + int i; + + if (base->type == MD_TYPE_PART || base->type == MD_TYPE_PARTREF) { + if (MD_SELECTED(base)) + sel_add_list(mdisp, c, MD_PART(base)); + } + + if (iscontainer(base)) { + for (i = 0; i < MD_CONTAINER_LEN(base); i++) { + el = MD_GET_INDEX(base, i); + build_sel1(mdisp, MD_CONTAINER(base), el); + } + } +} + +/* + * Add a record of a part selection to the selection list. + */ +static void +sel_add_list(MelysTrackDisplay *mdisp, struct containerElement *c, + struct partElement *part) +{ + struct sel_info *info; + + info = g_new(struct sel_info, 1); + + MD_REF(part); + MD_REF(c); + info->part = part; + info->con = c; + + mdisp->sel_list = g_list_append(mdisp->sel_list, info); +} + +/* + * Clear the selection status on all parts. + * + * Arguments: + * mdisp - this will be the mdisp structure + */ +static void +clear_all_part_sel(MelysTrackDisplay *mdisp, gboolean clear) +{ + GList *list; - pitem = MELYS_PART_ITEM(widget); + while (mdisp->sel_list) { + struct sel_info *info; - dprintf(3, "event %d for track %s", event->type, pitem->track->name); + list = g_list_first(mdisp->sel_list); + info = list->data; + if (clear) + MD_SET_SELECTED(info->part, FALSE); + clear_part_sel(mdisp, info->part); + } +} + +/* + * Clear the selection status of the specified part . + */ +static void +clear_part_sel(MelysTrackDisplay *mdisp, struct partElement *part) +{ + GList *list; + struct display_info *dinfo; + struct sel_info *info; + + /* Find the sel_info for this part */ + list = g_list_first(mdisp->sel_list); + do { + info = list->data; + if (info->part == part) + break; + } while ((list = g_list_next(list)) != NULL); + + g_assert(list != NULL); + + /* Remove from list */ + mdisp->sel_list = g_list_remove(mdisp->sel_list, info); + + /* Now update the display */ + if (!MD_IS_DESTROYED(part)) { + dinfo = (struct display_info *)g_dataset_get_data(part, "display-info"); + update_part_item(mdisp, dinfo->track, dinfo->part); + } + + MD_UNREF(info->part); + MD_UNREF(info->con); + g_free(info); } /* * Intercept the size allocation routine to set our scroll * region. The region must at least as large as the allocated * space and also large enough to hold the complete song. - * */ static void disp_size_allocate(GtkWidget *widget, GtkAllocation *allocation) @@ -628,8 +1069,11 @@ } /* - * Set the canvas scrolling region. - * + * 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. */ static void set_scroll_region(MelysTrackDisplay *mdisp) @@ -680,7 +1124,6 @@ * 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. - * */ static void set_hscroll(MelysTrackDisplay *mdisp) @@ -712,28 +1155,45 @@ } void -display_data_free(gpointer _data) +display_info_free(gpointer _info) { - struct display_data *data = _data; + struct display_info *info = _info; - gtk_object_destroy((GtkObject *)data->group); - gtk_object_unref((GtkObject*)data->group); - gtk_object_unref((GtkObject*)data->item); - gtk_object_unref((GtkObject*)data->text); + gtk_object_destroy((GtkObject *)info->group); + gtk_object_unref((GtkObject*)info->group); + gtk_object_unref((GtkObject*)info->pitem); + gtk_object_unref((GtkObject*)info->text); + MD_WUNREF(info->track); + MD_WUNREF(info->part); - g_free(_data); + g_free(_info); } +/* + * Return the y pixel position of the top of the area allocated + * to the specified track . This is relative to the top of the + * canvas and is independant of the scroll position. + * + * Arguments: + * mdisp - The widget + * n - The track number + */ static int track_to_y(MelysTrackDisplay *mdisp, int n) { - int ypix; - - ypix = n * mdisp->vspace; + return n * mdisp->vspace; +} - return ypix; +static int +y_to_track(MelysTrackDisplay *mdisp, int ypix) +{ + return ypix / mdisp->vspace; } +/* + * Return the musical tick number given an x pixel value. The x + * value is relative to the left hand side of the canvas. + */ static int x_to_tick(MelysTrackDisplay *mdisp, int xpix) { @@ -743,6 +1203,10 @@ return tick; } +/* + * Return the x pixel position for the specified tick number. + * The position is relative to the canvas. + */ static int tick_to_x(MelysTrackDisplay *mdisp, int tick) { @@ -753,4 +1217,278 @@ x = (tick + mdisp->hscale/2) / mdisp->hscale; return x; +} + +/* + * Slice the part in two at the point that the mouse was clicked. + * + * Arguments: + * w - The menu item + * data - This will be the mdisp + */ +static void +slice_cb(GtkWidget *w, gpointer data) +{ + MelysTrackDisplay *mdisp = data; + struct partElement *part; + struct partElement *newpart; + struct trackElement *track; + unsigned long t; + + t = mdisp->click_tick; + + part = mdisp->click_part; + track = mdisp->click_track; + 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); + update_part_item(mdisp, track, newpart); +} + +/* + * Join the part that received the click and the next part + * together. + */ +static void +join_cb(GtkWidget *w, gpointer data) +{ + MelysTrackDisplay *mdisp = data; + struct partElement *part; + struct trackElement *track; + unsigned long t; + + t = mdisp->click_tick; + + part = mdisp->click_part; + track = mdisp->click_track; + + md_part_join(MD_CONTAINER(track), part); + + update_part_item(mdisp, track, part); +} + +/* + * Delete all parts that are selected. + */ +static void +delete_cb(GtkWidget *w, gpointer data) +{ + MelysTrackDisplay *mdisp = data; + struct partElement *part; + struct trackElement *track; + + part = mdisp->click_part; + track = mdisp->click_track; + + md_remove(MD_CONTAINER(track), MD_ELEMENT(part)); +} + +/* + * Bring up the part property box. + */ +static void +part_prop_cb(GtkWidget *w, gpointer data) +{ + MelysTrackDisplay *mdisp = data; + + part_prop_box(mdisp->click_part, mdisp->song, 0); +} + +/* + * 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. + * + * Arguments: + * widget - The destination canvas widget + */ +static gboolean +drag_drop(GtkWidget *widget, GdkDragContext *context, gint x, gint y, + guint time, gpointer user_data) +{ + + dprintf(2, "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; +} + +/* + * 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. + * + * Arguments: + * widget - The source widget + * context - The drag context + * selection_data - The data is set into here + * info - Identification of transfer type + * time - The associated time + * data - Not used + */ +static void +drag_data_send(GtkWidget *widget, GdkDragContext *context, + GtkSelectionData *selection_data, guint info, guint time, + gpointer data) +{ + MelysTrackDisplay *mdisp = MELYS_TRACK_DISPLAY(data); + struct partElement *part; + struct drag_element_data *dragdata; + int len; + + if (info != MELYS_ELEM_ATOM_ID) { + g_warning("unexpected drag type received"); + return; + } + + part = mdisp->click_part; + + dragdata = gtk_object_get_data(GTK_OBJECT(mdisp), "melys-element-data"); + len = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(mdisp), + "melys-element-data-len")); + + dprintf(2, "data_send from %p len %d\n", widget, len); + gtk_selection_data_set(selection_data, + selection_data->target, 8, + (guchar *)dragdata, len * sizeof(*dragdata)); +} + +/* + * This routine is called when a signal arrives on the + * destination widget to say that data has actually been + * received. + * + * Arguments: + * widget - The destination widget + * context - The drag context + * wx - The drop point in window coords (I think) + * wy - The drop point + * data - Data from the other side + * info - The type of drag + * time - Time of event + * user_data - User data, probably not used + */ +static void +drag_data_received(GtkWidget *widget, GdkDragContext *context, gint wx, + gint wy, GtkSelectionData *data, guint info, guint time, + gpointer user_data) +{ + MelysTrackDisplay *mdisp; + struct drag_element_data *dragdata; + struct drag_element_data *dp; + struct partElement *newpart; + struct trackElement *track; + unsigned long t; + int drop_track; + int drop_tick; + int track_start = 0; + int tick_start = 0; + gboolean needrm = FALSE; + int x, y; + double dx, dy; + int len; + int i; + + mdisp = MELYS_TRACK_DISPLAY(user_data); + + gnome_canvas_window_to_world(GNOME_CANVAS(mdisp->canvas), wx, wy, &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); + + drop_track = y_to_track(mdisp, y); + drop_tick = x_to_tick(mdisp, x); + + len = data->length / sizeof(struct drag_element_data); + dragdata = (struct drag_element_data *)data->data; + + /* + * Do a first pass through the elements. We must either do + * them all or do none of them. + */ + for (i = 0; i < len; i++) { + dp = dragdata+i; + if (dp->element->type != MD_TYPE_PART) + goto error; + + /* Check and adjust for droping before the beginning */ + if (dp->track_offset + drop_track < 0) + track_start = MIN(track_start, dp->track_offset + drop_track); + + /* Check and adjust for droping before the beginning */ + if (dp->tick_offset + drop_tick < 0) + tick_start = MIN(tick_start, dp->tick_offset + drop_tick); + } + + md_undo_begin_set(MD_UNDO(mdisp->mdroot)); + + for (i = 0; i < len; i++) { + int tn; + + dp = dragdata + i; + + switch (context->action) { + case GDK_ACTION_MOVE: + newpart = MD_PART(dp->element); + + MD_REF(newpart); + md_remove(dp->con, dp->element); + + needrm = TRUE; + break; + default: + newpart = NULL; + g_assert_not_reached(); + } + + tn = drop_track + dp->track_offset - track_start; + + /* Make sure that the track exists and create it if not */ + md_ensure_track(mdisp->mdroot, tn); + track = md_track_nth(mdisp->mdroot, tn); + + + t = drop_tick + dp->tick_offset - tick_start; + g_assert(t >= 0); + + md_change_time(MD_ELEMENT(newpart), t); + md_set_devchan(MD_ELEMENT(newpart), MD_DEV(track), MD_CHAN(track)); + md_add_sort(MD_CONTAINER(track), MD_ELEMENT(newpart)); + + MD_UNREF(newpart); + + g_dataset_remove_data(newpart, "display-info"); + update_part_item(mdisp, track, newpart); + } + + gtk_drag_finish(context, TRUE, needrm, time); + md_undo_end_set(MD_UNDO(mdisp->mdroot)); + md_shrink(mdisp->mdroot); + song_view_update(mdisp->song); + return; + + error: + gtk_drag_finish(context, FALSE, FALSE, time); +} + +static void +drag_end(GtkWidget *widget, GdkDragContext *drag_context, gpointer user_data) +{ + MelysTrackDisplay *mdisp = user_data; + + gtk_object_remove_data(GTK_OBJECT(mdisp), "melys-element-data"); + build_sel_list(mdisp); } diff -rNu melys-0.0.15/widgets/melystrackdisplay.m melys-0.0.16/widgets/melystrackdisplay.m --- melys-0.0.15/widgets/melystrackdisplay.m Sun Oct 3 00:17:18 1999 +++ melys-0.0.16/widgets/melystrackdisplay.m Tue Oct 12 14:53:52 1999 @@ -11,31 +11,52 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. >>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 melystrack.h >>header melyspartitem.h >>header melwidgets.h >>header melysrule.h +>>header melgui.h +>>header melmsg.h >>header elements.h +>>header song.h >>header md.h >>gtkobject melys_track_display MelysTrackDisplay gtk_vbox GtkVBox >>headerdef @header +/* Mouse click state */ +enum click_state { + CLICK_INACTIVE, + CLICK_BUTTON1_DOWN, + CLICK_BUTTON2_DOWN, + CLICK_BUTTON3_DOWN, + CLICK_DRAGGING, + CLICK_GESTURE, + + CLICK_ERROR +}; + struct _MelysTrackDisplay { GtkVBox vbox; @@ -81,22 +102,118 @@ GtkWidget *title; gpointer posline; + GtkWidget *menu; + + /* Selected parts */ + GList *sel_list; + + /* Saved click position and state information */ + struct partElement *click_part; /* Part that was click on */ + unsigned long click_tick; /* Clicked tick position */ + struct trackElement *click_track; /* Clicked track */ + int click_ntrack; /* Clicked track position */ + enum click_state click_state; /* State for mouse clicks and movement */ }; struct _MelysTrackDisplayClass { GtkVBoxClass parent_class; }; +>># This should be moved somewhere else. +>>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 { + struct element *element; /* The element being moved */ + struct containerElement *con; /* Containing element */ + + int tick_offset; /* time offset of click into part */ + int track_offset; /* track offset of click into part */ +}; + >>extern +/* Signals that this widget creates */ enum { LAST_SIGNAL }; -struct display_data { +/* + * The different canvas items that go together to make + * up a part on the display. + * In the future this may just be the one item that holds + * the text etc, and so the need for this structure will go + * away. + */ +struct display_info { GnomeCanvasGroup *group; - GnomeCanvasItem *item; + GnomeCanvasItem *pitem; GnomeCanvasItem *text; + struct trackElement *track; + struct partElement *part; +}; + +/* Structure to keep selection info */ +struct sel_info { + struct partElement *part; + struct containerElement *con; +}; + +/* Drag and drop types */ +const GtkTargetEntry targets[] = { + {MELYS_ELEM_ATOM_NAME, GTK_TARGET_SAME_APP, MELYS_ELEM_ATOM_ID}, + + /* Junk... */ + {"application/x-melys-track", GTK_TARGET_SAME_APP, 0}, + {"STRING", 0, 0}, + {"text/plain", 0, 0}, + {"text/uri-list", 0, 0}, +}; + +/* All the buttons that we deal with */ +#define ALL_BUTTON_MASK (GDK_BUTTON1_MASK|GDK_BUTTON2_MASK|GDK_BUTTON3_MASK) + +#define CONP struct containerElement * +>>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 }, + {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 @@ -155,12 +272,16 @@ mdisp->mdroot = NULL; mdisp->song = NULL; + mdisp->click_part = NULL; + mdisp->click_track = NULL; + mdisp->click_state = CLICK_INACTIVE; + + mdisp->sel_list = NULL; + box = gtk_vbox_new(0, 0); title = (GtkWidget *)melys_rule_new(NULL); -#if 0 -#define AA -#endif +#undef AA #ifdef AA gtk_widget_push_visual(gdk_rgb_get_visual()); gtk_widget_push_colormap(gdk_rgb_get_cmap()); @@ -175,6 +296,8 @@ mdisp->title = GTK_WIDGET(title); gtk_widget_set_usize(mdisp->title, 1, mdisp->vtitle); + /* Create the pop up menu */ + mdisp->menu = gnome_popup_menu_new(displaymenu); /* * Build up the pane. The title row has a fixed height but @@ -184,8 +307,21 @@ gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(title), 0, 0, 0); gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(canvas), 1, 1, 0); gtk_container_add(GTK_CONTAINER(mdisp), box); + gtk_widget_show_all(GTK_WIDGET(mdisp)); + /* Set up a drop site for this widget */ + gtk_drag_dest_set(GTK_WIDGET(mdisp->canvas), GTK_DEST_DEFAULT_MOTION, + targets, NELEM(targets), GDK_ACTION_MOVE); + + gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-drop", + GTK_SIGNAL_FUNC(drag_drop), mdisp); + gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-data-get", + GTK_SIGNAL_FUNC(drag_data_send), mdisp); + gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-data-received", + GTK_SIGNAL_FUNC(drag_data_received), mdisp); + gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-end", + GTK_SIGNAL_FUNC(drag_end), mdisp); >>function melys_track_display_class_init static void @@ -205,25 +341,12 @@ parent_class = gtk_type_class(gtk_vbox_get_type()); - // XXX Add args - - // XXX Create signals - gtk_object_class_add_signals(object_class, melys_track_display_signals, LAST_SIGNAL); /* Set up all the overrides */ object_class->destroy = disp_destroy; - //widget_class->realize = disp_realise; - //widget_class->size_request = disp_size_request; widget_class->size_allocate = disp_size_allocate; - //widget_class->unrealize = disp_unrealise; - //widget_class->draw = disp_draw; - //widget_class->expose_event = disp_expose; - //widget_class->enter_notify_event = disp_enter; - //widget_class->button_press_event = disp_button_press; - - // XXX Our functions >>function melys_track_display_set_md_root @@ -231,6 +354,11 @@ MelysTrackDisplay *mdisp; struct rootElement *root; +>>description +Set the music description root. +If there was an existing one it is freed first. +Everything is reset to display the new song. + >>code GnomeCanvas *canvas; @@ -246,6 +374,9 @@ set_hscroll(mdisp); melys_rule_set_tempomap((MelysRule *)mdisp->title, md_get_tempomap(root)); + + build_sel_list(mdisp); /* There may be some parts already selected */ + melys_track_display_update(mdisp); @@ -260,36 +391,27 @@ >>code MelysTrackDisplay *mdisp = data; GnomeCanvas *canvas; - int ychanged = 0; - int xchanged = 0; + int changed = 0; if (adj == mdisp->hadj) { if ((int)adj->value != mdisp->hoffset) { if (adj->value >= 0) { - xchanged = 1; + changed = 1; mdisp->hoffset = (int)adj->value; } } } if (adj == mdisp->vadj) { if ((int)adj->value != mdisp->voffset) { - ychanged = 1; + changed = 1; mdisp->voffset = (int)(adj->value + 0.1); } } - canvas = GNOME_CANVAS(mdisp->canvas); - if (xchanged || ychanged) { + if (changed) { -#if 0 - /* Clear title area so it will be redrawn (could be optimised) */ - if (xchanged) - gdk_window_clear_area_e(mdisp->title->window, - 0, 0, - mdisp->title->allocation.width, - mdisp->title->allocation.height); -#endif + canvas = GNOME_CANVAS(mdisp->canvas); gnome_canvas_scroll_to(canvas, tick_to_x(mdisp, mdisp->hoffset), mdisp->voffset * mdisp->vspace); @@ -385,16 +507,19 @@ for (n = 0; n < mdisp->mdroot->tracks; n++) { track = md_track_nth(mdisp->mdroot, n); - for (p = 0; p < MD_CONTAINER(track)->elements->len; p++) { - part = MD_CONTAINER(track)->elements->pdata[p]; + for (p = 0; p < MD_CONTAINER_LEN(track); p++) { + part = (struct partElement *) MD_GET_INDEX(track, p); - if (MD_IS_DESTROYED(part)) - dprintf2("part is destroyed!\n"); + 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: - create_part_item(mdisp, part, track); + update_part_item(mdisp, track, part); break; default: dprintf(0, "Unexpexted type %d in @func_name", MD_TYPE(part)); @@ -405,21 +530,31 @@ ->>function create_part_item +>>function update_part_item static void MelysTrackDisplay *mdisp; -struct partElement *part; Part or reference to part struct trackElement *track; The track +struct partElement *part; Part or reference to part + +>>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; - struct display_data *ddata; + struct display_info *dinfo; char *pname; int state; -#if 0 + if (MD_IS_DESTROYED(part) || MD_IS_DESTROYED(track)) + return; + + if (GTK_OBJECT_DESTROYED(mdisp)) + return; + +#if 1 if (MD_MODIFIED(part) == FALSE) { dprintf(0, "part not modified"); return; @@ -437,14 +572,18 @@ state = GTK_STATE_NORMAL; pname = part->name; - - ddata = (struct display_data *) MD_CONTAINER(part)->data; - if (ddata == NULL) { + if (pname && strcmp(pname, "") != 0) + ; + else if (track->name) + pname = track->name; + else + pname = ""; + + dinfo = (struct display_info *) g_dataset_get_data(part, "display-info"); + if (dinfo == NULL) { GnomeCanvasGroup *rgroup; GnomeCanvasGroup *group; GnomeCanvasItem *text; - struct containerElement *c; - char *name; rgroup = gnome_canvas_root((GnomeCanvas*)mdisp->canvas); @@ -453,45 +592,36 @@ item = gnome_canvas_item_new(group, melys_part_item_get_type(), NULL); - if (pname && strcmp(pname, "") != 0) - name = pname; - else if (track->name) - name = track->name; - else - name = ""; text = gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_TEXT, - "text", name, + "text", pname, NULL); pitem = MELYS_PART_ITEM(item); - MD_WREF(part); - pitem->part = part; - - MD_WREF(track); - pitem->track = track; - - ddata = g_new(struct display_data, 1); + dinfo = g_new(struct display_info, 1); gtk_object_ref((GtkObject*)group); - ddata->group = group; + dinfo->group = group; gtk_object_ref((GtkObject*)item); - ddata->item = item; + dinfo->pitem = item; gtk_object_ref((GtkObject*)text); - ddata->text = text; + dinfo->text = text; + MD_WREF(part); + dinfo->part = part; + MD_WREF(track); + dinfo->track = track; - c = MD_CONTAINER(part); - if (c->data) - c->data_free(c->data); - c->data = (gpointer)ddata; - c->data_free = display_data_free; + g_dataset_set_data_full(part, "display-info", dinfo, display_info_free); - gtk_signal_connect(GTK_OBJECT(pitem), "destroy", item_destroy, NULL); - gtk_signal_connect(GTK_OBJECT(pitem), "event", item_event, NULL); + 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", + item_event, mdisp, (GtkObject*)mdisp); } - g_assert(ddata != NULL); - pitem = MELYS_PART_ITEM(ddata->item); + g_assert(dinfo != NULL); + pitem = MELYS_PART_ITEM(dinfo->pitem); /* * The scheme here is that we have a group that contains @@ -499,17 +629,17 @@ * 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 *)ddata->group, + gnome_canvas_item_set((GnomeCanvasItem *)dinfo->group, "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(ddata->text, + gnome_canvas_item_set(dinfo->text, "x", (double) 2, "y", (double) 2, + "text", pname, "font_gdk", GTK_WIDGET(mdisp)->style->font, "anchor", GTK_ANCHOR_NORTH_WEST, "clip", TRUE, @@ -518,7 +648,7 @@ NULL); /* This size of the part is set here */ - gnome_canvas_item_set(ddata->item, + gnome_canvas_item_set(dinfo->pitem, "x1", (double) 0.0, "y1", (double) 0.0, "x2", (double) tick_to_x(mdisp, MD_DURATION(part)), @@ -533,28 +663,14 @@ gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mdisp->posline); ->>function item_destroy -static void -GtkObject *obj; -gpointer data; - ->>code - MelysPartItem *pitem = MELYS_PART_ITEM(obj); - - if (pitem->part) { - MD_WUNREF(pitem->part); - pitem->part = NULL; - } - if (pitem->track) { - MD_WUNREF(pitem->track); - pitem->track = NULL; - } - - >>function disp_destroy static void GtkObject *obj; +>>description +The whole display widget has been destroyed. +This should lead to all associated resources being freed. + >>code MelysTrackDisplay *mdisp; @@ -562,6 +678,8 @@ mdisp = (MelysTrackDisplay*)obj; + clear_all_part_sel(mdisp, FALSE); + if (mdisp->posline) gtk_object_destroy(GTK_OBJECT(mdisp->posline)); @@ -591,16 +709,372 @@ >>function item_event static void -GtkWidget *widget; -GdkEvent *event; -gpointer data; +GtkWidget *widget; This will be a canvas group +GdkEvent *event; The event +gpointer data; This will be the MelysTrackDisplay + +>>description +An event has been received on one of the part representations +on the display canvas. + +All events come through here, so we switch out to more specific +routines once we have worked out what the event is. >>code - MelysPartItem *pitem; + MelysTrackDisplay *mdisp = data; + struct partElement *part; + GdkEventButton *bevent = (GdkEventButton *)event; + GdkEventMotion *mevent = (GdkEventMotion *)event; + + /* Get the display data from the group */ + part = gtk_object_get_data(GTK_OBJECT(widget), "part"); + g_assert(part); + + dprintf(3, "event %d for part %s", event->type, part->name); + + switch (event->type) { + case GDK_BUTTON_PRESS: + /* Save the original location */ + mdisp->click_part = part; + mdisp->click_tick = x_to_tick(mdisp, event->button.x); + mdisp->click_ntrack = y_to_track(mdisp, event->button.y); + mdisp->click_track = md_track_nth(mdisp->mdroot, mdisp->click_ntrack); + + button_press(mdisp, part, bevent); + break; + + case GDK_2BUTTON_PRESS: + part_prop_box(part, mdisp->song, 0); + break; + + case GDK_BUTTON_RELEASE: + button_release(mdisp, part, bevent); + break; + + case GDK_MOTION_NOTIFY: + if (mevent->state & ALL_BUTTON_MASK) + button_motion(mdisp, part, mevent); + break; + default: + break; + } + + +>>function button_press +static void +MelysTrackDisplay *mdisp; +struct partElement *part; +GdkEventButton *event; +>>description +Action to take when button 1 is pressed. + +>>code + if (mdisp->click_state != CLICK_INACTIVE) { + mdisp->click_state = CLICK_ERROR; + return; + } + + switch (event->button) { + case 1: + mdisp->click_state = CLICK_BUTTON1_DOWN; + break; + + case 2: + mdisp->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. + */ + gnome_popup_menu_do_popup(mdisp->menu, NULL, NULL, event, mdisp); + break; + } + + +>>function button_release +static void +MelysTrackDisplay *mdisp; +struct partElement *part; +GdkEventButton *event; + +>>description +Button 1 has been pressed on a part item. +This selects the item. + +>>code + int mask; + struct display_info *dinfo; + + dinfo = g_dataset_get_data(part, "display-info"); + + if (mdisp->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) + mdisp->click_state = CLICK_INACTIVE; + return; + } + + switch (event->button) { + case 1: + + dprintf2("Button at %f,%f\n", event->x, event->y); + if (!(event->state & GDK_CONTROL_MASK)) + clear_all_part_sel(mdisp, TRUE); + + if (MD_SELECTED(part)) { + MD_SET_SELECTED(part, FALSE); + clear_part_sel(mdisp, part); + } else { + MD_SET_SELECTED(part, TRUE); + sel_add_list(mdisp, MD_CONTAINER(dinfo->track), part); + } + + update_part_item(mdisp, dinfo->track, part); + + if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON1_MASK) + mdisp->click_state = CLICK_INACTIVE; + break; + case 2: + if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK) + mdisp->click_state = CLICK_INACTIVE; + break; + case 3: + if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK) + mdisp->click_state = CLICK_INACTIVE; + break; + } + + +>>function button_motion +static void +MelysTrackDisplay *mdisp; +struct partElement *part; +GdkEventMotion *event; + +>>description +Motion when a button is pressed down. +Drag and drop on button 1, gesture based editing on button 2. +>>code + + switch (mdisp->click_state) { + case CLICK_BUTTON1_DOWN: + drag_begin(mdisp, event); + mdisp->click_state = CLICK_INACTIVE; + break; + default: + break; + } + + +>>function drag_begin +static void +MelysTrackDisplay *mdisp; +GdkEventMotion *event; + +>>description +>>code + GtkTargetList *tlist; + struct partElement *clickpart; + struct drag_element_data *dragdata; + struct sel_info selinfo; + GList *list; + int len; + int i; + + tlist = gtk_target_list_new(targets, NELEM(targets)); + + clickpart = mdisp->click_part; + + /* + * 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(clickpart)) { + len = g_list_length(mdisp->sel_list); + list = mdisp->sel_list; + } else { + + len = 1; + selinfo.part = clickpart; + selinfo.con = (CONP) md_track_nth(mdisp->mdroot, mdisp->click_ntrack); + list = g_list_append(NULL, &selinfo); + } + + dragdata = g_new0(struct drag_element_data, len); + + for (i = 0; i < len; i++) { + int ntrack; + struct sel_info *sinfo; + + sinfo = g_list_nth_data(list, i); + ntrack = MD_TRACK_NUMBER(sinfo->con); + + dragdata[i].element = MD_ELEMENT(sinfo->part); + dragdata[i].con = sinfo->con; + dragdata[i].tick_offset = MD_TIME(sinfo->part) - mdisp->click_tick; + dragdata[i].track_offset = ntrack - mdisp->click_ntrack; + } + + if (list != mdisp->sel_list) + g_list_free(list); + + gtk_object_set_data_full(GTK_OBJECT(mdisp), "melys-element-data", + dragdata, g_free); + gtk_object_set_data(GTK_OBJECT(mdisp), "melys-element-data-len", + GINT_TO_POINTER(len)); + + gtk_drag_begin(GTK_WIDGET(mdisp->canvas), + tlist, + GDK_ACTION_MOVE|GDK_ACTION_ASK, + 1, /* The button number */ + (GdkEvent*)event); + + //gtk_target_list_free(tlist); + + +>>function build_sel_list +static void +MelysTrackDisplay *mdisp; + +>>description +Build up a list of all the selected parts. + +>>code + struct element *el; + int i; + + clear_all_part_sel(mdisp, FALSE); + + for (i = 0; i < MD_CONTAINER_LEN(mdisp->mdroot); i++) { + el = MD_GET_INDEX(mdisp->mdroot, i); + build_sel1(mdisp, MD_CONTAINER(mdisp->mdroot), el); + } + +>>function build_sel1 +static void +MelysTrackDisplay *mdisp; +struct containerElement *c; +struct element *base; + +>>description +Helper routine for +.F build_sel_list +that examines a single element and adds it to the selection list +if required. + +>>code + struct element *el; + int i; + + if (base->type == MD_TYPE_PART || base->type == MD_TYPE_PARTREF) { + if (MD_SELECTED(base)) + sel_add_list(mdisp, c, MD_PART(base)); + } + + if (iscontainer(base)) { + for (i = 0; i < MD_CONTAINER_LEN(base); i++) { + el = MD_GET_INDEX(base, i); + build_sel1(mdisp, MD_CONTAINER(base), el); + } + } + + +>>function sel_add_list +static void +MelysTrackDisplay *mdisp; +struct containerElement *c; +struct partElement *part; + +>>description +Add a record of a part selection to the selection list. + +>>code + struct sel_info *info; + + info = g_new(struct sel_info, 1); + + MD_REF(part); + MD_REF(c); + info->part = part; + info->con = c; + + mdisp->sel_list = g_list_append(mdisp->sel_list, info); + + +>>function clear_all_part_sel +static void +MelysTrackDisplay *mdisp; this will be the mdisp structure +gboolean clear; - pitem = MELYS_PART_ITEM(widget); +>>description +Clear the selection status on all parts. + +>>code + GList *list; + + while (mdisp->sel_list) { + struct sel_info *info; + + list = g_list_first(mdisp->sel_list); + info = list->data; + if (clear) + MD_SET_SELECTED(info->part, FALSE); + clear_part_sel(mdisp, info->part); + } + + +>>function clear_part_sel +static void +MelysTrackDisplay *mdisp; +struct partElement *part; - dprintf(3, "event %d for track %s", event->type, pitem->track->name); +>>description +Clear the selection status of the specified +.A part . + +>>code + GList *list; + struct display_info *dinfo; + struct sel_info *info; + + /* Find the sel_info for this part */ + list = g_list_first(mdisp->sel_list); + do { + info = list->data; + if (info->part == part) + break; + } while ((list = g_list_next(list)) != NULL); + + g_assert(list != NULL); + + /* Remove from list */ + mdisp->sel_list = g_list_remove(mdisp->sel_list, info); + + /* Now update the display */ + if (!MD_IS_DESTROYED(part)) { + dinfo = (struct display_info *)g_dataset_get_data(part, "display-info"); + update_part_item(mdisp, dinfo->track, dinfo->part); + } + + MD_UNREF(info->part); + MD_UNREF(info->con); + g_free(info); >>function disp_size_allocate @@ -649,6 +1123,11 @@ >>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; @@ -731,19 +1210,21 @@ ->>function display_data_free +>>function display_info_free void -gpointer _data; +gpointer _info; >>code - struct display_data *data = _data; + struct display_info *info = _info; - gtk_object_destroy((GtkObject *)data->group); - gtk_object_unref((GtkObject*)data->group); - gtk_object_unref((GtkObject*)data->item); - gtk_object_unref((GtkObject*)data->text); + gtk_object_destroy((GtkObject *)info->group); + gtk_object_unref((GtkObject*)info->group); + gtk_object_unref((GtkObject*)info->pitem); + gtk_object_unref((GtkObject*)info->text); + MD_WUNREF(info->track); + MD_WUNREF(info->part); - g_free(_data); + g_free(_info); >>function track_to_y @@ -751,13 +1232,24 @@ MelysTrackDisplay *mdisp; 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 - int ypix; + return n * mdisp->vspace; - ypix = n * mdisp->vspace; - return ypix; +>>function y_to_track +static int +MelysTrackDisplay *mdisp; The widget +int ypix; Pixel position +>>code + return ypix / mdisp->vspace; >>function x_to_tick @@ -765,6 +1257,10 @@ MelysTrackDisplay *mdisp; 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; @@ -777,6 +1273,10 @@ MelysTrackDisplay *mdisp; int tick; +>>description +Return the x pixel position for the specified tick number. +The position is relative to the canvas. + >>code int x; @@ -785,3 +1285,290 @@ x = (tick + mdisp->hscale/2) / mdisp->hscale; return x; + + +>># ----- 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; + struct partElement *part; + struct partElement *newpart; + struct trackElement *track; + unsigned long t; + + t = mdisp->click_tick; + + part = mdisp->click_part; + track = mdisp->click_track; + 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); + update_part_item(mdisp, track, newpart); + + +>>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; + struct partElement *part; + struct trackElement *track; + unsigned long t; + + t = mdisp->click_tick; + + part = mdisp->click_part; + track = mdisp->click_track; + + md_part_join(MD_CONTAINER(track), part); + + update_part_item(mdisp, track, part); + + +>>function delete_cb +static void +GtkWidget *w; +gpointer data; +>>description +Delete all parts that are selected. + +>>code + MelysTrackDisplay *mdisp = data; + struct partElement *part; + struct trackElement *track; + + part = mdisp->click_part; + track = mdisp->click_track; + + md_remove(MD_CONTAINER(track), MD_ELEMENT(part)); + + +>>function part_prop_cb +static void +GtkWidget *w; +gpointer data; + +>>description +Bring up the part property box. + +>>code + MelysTrackDisplay *mdisp = data; + + part_prop_box(mdisp->click_part, mdisp->song, 0); + + +>># ---- The drag and drop routines ------ + +>>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 + + dprintf(2, "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; Not used + +>>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 + MelysTrackDisplay *mdisp = MELYS_TRACK_DISPLAY(data); + struct partElement *part; + struct drag_element_data *dragdata; + int len; + + if (info != MELYS_ELEM_ATOM_ID) { + g_warning("unexpected drag type received"); + return; + } + + part = mdisp->click_part; + + dragdata = gtk_object_get_data(GTK_OBJECT(mdisp), "melys-element-data"); + len = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(mdisp), + "melys-element-data-len")); + + dprintf(2, "data_send from %p len %d\n", widget, len); + gtk_selection_data_set(selection_data, + selection_data->target, 8, + (guchar *)dragdata, len * sizeof(*dragdata)); + + +>>function drag_data_received +static void +GtkWidget *widget; The destination widget +GdkDragContext *context; The drag context +gint wx; The drop point in window coords (I think) +gint wy; 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 + MelysTrackDisplay *mdisp; + struct drag_element_data *dragdata; + struct drag_element_data *dp; + struct partElement *newpart; + struct trackElement *track; + unsigned long t; + int drop_track; + int drop_tick; + int track_start = 0; + int tick_start = 0; + gboolean needrm = FALSE; + int x, y; + double dx, dy; + int len; + int i; + + mdisp = MELYS_TRACK_DISPLAY(user_data); + + gnome_canvas_window_to_world(GNOME_CANVAS(mdisp->canvas), wx, wy, &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); + + drop_track = y_to_track(mdisp, y); + drop_tick = x_to_tick(mdisp, x); + + len = data->length / sizeof(struct drag_element_data); + dragdata = (struct drag_element_data *)data->data; + + /* + * Do a first pass through the elements. We must either do + * them all or do none of them. + */ + for (i = 0; i < len; i++) { + dp = dragdata+i; + if (dp->element->type != MD_TYPE_PART) + goto error; + + /* Check and adjust for droping before the beginning */ + if (dp->track_offset + drop_track < 0) + track_start = MIN(track_start, dp->track_offset + drop_track); + + /* Check and adjust for droping before the beginning */ + if (dp->tick_offset + drop_tick < 0) + tick_start = MIN(tick_start, dp->tick_offset + drop_tick); + } + + md_undo_begin_set(MD_UNDO(mdisp->mdroot)); + + for (i = 0; i < len; i++) { + int tn; + + dp = dragdata + i; + + switch (context->action) { + case GDK_ACTION_MOVE: + newpart = MD_PART(dp->element); + + MD_REF(newpart); + md_remove(dp->con, dp->element); + + needrm = TRUE; + break; + default: + newpart = NULL; + g_assert_not_reached(); + } + + tn = drop_track + dp->track_offset - track_start; + + /* Make sure that the track exists and create it if not */ + md_ensure_track(mdisp->mdroot, tn); + track = md_track_nth(mdisp->mdroot, tn); + + + t = drop_tick + dp->tick_offset - tick_start; + g_assert(t >= 0); + + md_change_time(MD_ELEMENT(newpart), t); + md_set_devchan(MD_ELEMENT(newpart), MD_DEV(track), MD_CHAN(track)); + md_add_sort(MD_CONTAINER(track), MD_ELEMENT(newpart)); + + MD_UNREF(newpart); + + g_dataset_remove_data(newpart, "display-info"); + update_part_item(mdisp, track, newpart); + } + + gtk_drag_finish(context, TRUE, needrm, time); + md_undo_end_set(MD_UNDO(mdisp->mdroot)); + md_shrink(mdisp->mdroot); + song_view_update(mdisp->song); + return; + + error: + gtk_drag_finish(context, FALSE, FALSE, time); + + +>>function drag_end +static void +GtkWidget *widget; +GdkDragContext *drag_context; +gpointer user_data; + +>>code + MelysTrackDisplay *mdisp = user_data; + + gtk_object_remove_data(GTK_OBJECT(mdisp), "melys-element-data"); + build_sel_list(mdisp); + diff -rNu melys-0.0.15/widgets/melystrackinfo.c melys-0.0.16/widgets/melystrackinfo.c --- melys-0.0.15/widgets/melystrackinfo.c Sun Oct 3 12:54:37 1999 +++ melys-0.0.16/widgets/melystrackinfo.c Tue Oct 12 14:58:25 1999 @@ -106,6 +106,7 @@ #define TMP_BUF_SIZE 100 +/* Static functions */ static void melys_track_info_init(MelysTrackInfo *minfo); static void melys_track_info_class_init(MelysTrackInfoClass *klass); static void track_info_realise(GtkWidget *widget); @@ -118,11 +119,14 @@ static void track_info_draw(GtkWidget *widget, GdkRectangle *ap); static void draw_row(MelysTrackInfo *minfo, int ntrack); static void draw_col(MelysTrackInfo *minfo, int ntrack, - struct trackElement *track, GdkRectangle *ap, struct col_info *cip, GdkGC *gc); + struct trackElement *track, GdkRectangle *ap, struct col_info *cip, + GdkGC *gc); static void draw_col_text(MelysTrackInfo *minfo, int ntrack, - struct trackElement *track, GdkRectangle *ap, struct col_info *cip, GdkGC *gc); + struct trackElement *track, GdkRectangle *ap, struct col_info *cip, + GdkGC *gc); static void draw_col_button(MelysTrackInfo *minfo, int ntrack, - struct trackElement *track, GdkRectangle *ap, struct col_info *cip, GdkGC *gc); + struct trackElement *track, GdkRectangle *ap, struct col_info *cip, + GdkGC *gc); static int track_info_expose(GtkWidget *widget, GdkEventExpose *event); static gint track_info_enter(GtkWidget *widget, GdkEventCrossing *data); static int track_info_button_press(GtkWidget *widget, GdkEventButton *event); @@ -136,6 +140,8 @@ int modifiers); static void select_track(MelysTrackInfo *minfo, struct trackElement *track, int coltype); +static void track_properties(MelysTrackInfo *minfo, + struct trackElement *track, int coltype); static void unselect_track(MelysTrackInfo *minfo, struct trackElement *track); static void mute_track(MelysTrackInfo *minfo, struct trackElement *track); static void unmute_track(MelysTrackInfo *minfo, struct trackElement *track); @@ -182,6 +188,7 @@ /* * Create a new MelysTrackInfo object. + * * Arguments: * vadj - Vertical adjustment */ @@ -204,6 +211,7 @@ /* * Initialise the MelysTrackInfo. + * * Arguments: * minfo - The MelysTrackInfo to init */ @@ -252,7 +260,7 @@ /* * Initialize the class. - * + * * Arguments: * klass - The class to initialise */ @@ -319,6 +327,7 @@ * Set the height of the track and of the title. In addition * there will be a separation distance. This function is * called by MelysTrack. + * * Arguments: * height - New track height * htitle - The title height @@ -345,7 +354,6 @@ /* * Set a new mdroot, freeing any existing one. The widget is * redrawn after this. - * */ void melys_track_info_set_md_root(MelysTrackInfo *minfo, struct rootElement *root) @@ -366,7 +374,6 @@ * 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. - * */ void melys_track_info_update(MelysTrackInfo *minfo) @@ -402,7 +409,6 @@ /* * Create the windows for this widget. The main window itself * is not mapped, but any subwindows are shown. - * */ static void track_info_realise(GtkWidget *widget) @@ -510,7 +516,7 @@ * Work out what size we want to be and fill in the details into * req . We are mostly interested in our width. Its not for us to * wory about height. - * + * * Arguments: * req - Fill in with the size that we want */ @@ -587,7 +593,6 @@ /* * Calculate how many tracks are visible on the page and set * this as the page increment. Err on the low side. - * */ static void track_vscroll_calc(MelysTrackInfo *minfo) @@ -605,7 +610,7 @@ * 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. - * + * * Arguments: * ap - Area to draw within */ @@ -675,7 +680,7 @@ /* * Draw the specified track. The track -1 means the titles. - * + * * Arguments: * ntrack - The track number to draw (0 based). */ @@ -740,7 +745,7 @@ /* * Draw a single column cell. If track is NULL that means to * write the title. - * + * * Arguments: * ntrack - The track number * track - The track to display @@ -912,7 +917,6 @@ * 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. - * */ static int track_info_expose(GtkWidget *widget, GdkEventExpose *event) @@ -947,22 +951,17 @@ * 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. - * */ static int track_info_button_press(GtkWidget *widget, GdkEventButton *event) @@ -1025,7 +1024,7 @@ * we get one. * At least for select... */ - if (event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) + if (event->type == GDK_3BUTTON_PRESS) return; masks = event->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK); @@ -1042,10 +1041,9 @@ unselect_track(minfo, otrack); } - //if (!MD_SELECTED(track)) - select_track(minfo, track, cip->type); - //else - ;/* column action */ + 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)) @@ -1098,7 +1096,6 @@ * 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. - * */ static void set_solo(MelysTrackInfo *minfo, struct trackElement *track) @@ -1149,7 +1146,6 @@ * 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. - * */ static void unset_solo(MelysTrackInfo *minfo, struct trackElement *track) @@ -1176,7 +1172,7 @@ * 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. - * + * * Arguments: * track - The track that is being set * modifiers - The modifier keys used @@ -1213,13 +1209,22 @@ } /* - * If the track is already selected then we bring up a property - * box for it. Otherwise just select it. - * + * Select the track. */ static void select_track(MelysTrackInfo *minfo, struct trackElement *track, int coltype) { + MD_SET_SELECTED(track, TRUE); +} + +/* + * Bring up a track properties box for the specified track. The + * column position is used to determine the initial page. + */ +static void +track_properties(MelysTrackInfo *minfo, struct trackElement *track, + int coltype) +{ int page; if (MD_SELECTED(track)) { @@ -1282,7 +1287,7 @@ * 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. - * + * * Arguments: * minfo - The widget * ypix - Y pixel widget co-ordinate @@ -1309,7 +1314,7 @@ * 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. - * + * * Arguments: * n - Track number */ @@ -1346,7 +1351,6 @@ /* * Return a text string which is the correct contents for the * given track and column type. - * */ char * get_info_string(MelysTrackInfo *minfo, int itype, int ntrack) @@ -1389,7 +1393,6 @@ /* * The vertical scrollbar has been moved. So we have to set our * current position and redraw. - * */ static void track_info_scroll(GtkAdjustment *adj, gpointer data) @@ -1421,7 +1424,7 @@ * 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. - * + * * Arguments: * number - Track number or -1 * track - Track or NULL diff -rNu melys-0.0.15/widgets/melystrackinfo.m melys-0.0.16/widgets/melystrackinfo.m --- melys-0.0.15/widgets/melystrackinfo.m Sat Oct 2 20:22:48 1999 +++ melys-0.0.16/widgets/melystrackinfo.m Mon Oct 4 22:31:42 1999 @@ -1042,7 +1042,7 @@ * we get one. * At least for select... */ - if (event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) + if (event->type == GDK_3BUTTON_PRESS) return; masks = event->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK); @@ -1059,10 +1059,9 @@ unselect_track(minfo, otrack); } - //if (!MD_SELECTED(track)) - select_track(minfo, track, cip->type); - //else - ;/* column action */ + 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)) @@ -1245,10 +1244,20 @@ int coltype; >>description -If the track is already selected then we bring up a property -box for it. -Otherwise just select it. +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; diff -rNu melys-0.0.15/widgets/melystransport.c melys-0.0.16/widgets/melystransport.c --- melys-0.0.15/widgets/melystransport.c Sun Oct 3 12:54:37 1999 +++ melys-0.0.16/widgets/melystransport.c Tue Oct 12 14:58:25 1999 @@ -35,6 +35,7 @@ // XXX argument names go here }; +/* Static functions */ static void melys_transport_init(MelysTransport *XXX); static void melys_transport_class_init(MelysTransportClass *klass); @@ -84,6 +85,7 @@ /* * Initialise the MelysTransport. + * * Arguments: * XXX - The MelysTransport to init */ @@ -95,7 +97,7 @@ /* * Initialize the class. - * + * * Arguments: * klass - The class to initialise */ diff -rNu melys-0.0.15/widgets/misc.c melys-0.0.16/widgets/misc.c --- melys-0.0.15/widgets/misc.c Sun Oct 3 12:54:37 1999 +++ melys-0.0.16/widgets/misc.c Tue Oct 12 14:58:25 1999 @@ -26,6 +26,7 @@ #include "intl.h" +/* Static functions */ GtkWidget * @@ -48,7 +49,6 @@ * Gnome only appears to provide a relative routine at the time * of writing. So here is the routine to give absolute * coordinates. - * */ void canvas_item_move_abs(struct _GnomeCanvasItem *item, double x, double y) diff -rNu melys-0.0.15/widgets/register.c melys-0.0.16/widgets/register.c --- melys-0.0.15/widgets/register.c Sun Oct 3 12:54:37 1999 +++ melys-0.0.16/widgets/register.c Tue Oct 12 14:58:25 1999 @@ -40,6 +40,7 @@ /* The id generator, start at 1 as 0 is the invalid value */ static int nextId = 1; +/* Static functions */ static void destroy_cb(GtkObject *obj, gpointer data); @@ -50,10 +51,9 @@ * 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 parent it will be set up * to destroy obj when the parent dies. - * + * * Arguments: * obj - Object to be registered * parent - If given obj will be destroyed when parent is @@ -91,7 +91,7 @@ * 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. - * + * * Arguments: * id - The ID of the object to recover */ @@ -114,7 +114,7 @@ /* * As for reg_get except that it returns a widget type. * Obviously it must have been saved as a widget. - * + * * Arguments: * id - The ID of the object to recover */ @@ -156,7 +156,7 @@ /* * The object corresponding to the specified id is destroyed * if it hasn't already been. - * + * * Arguments: * id - Register id of widget to destroy */ @@ -173,7 +173,7 @@ /* * Clean up when one of the register objects is destroyed. The * record will be removed. - * + * * Arguments: * obj - The destroyed object * data - Its id