diff -rNu melys-0.0.13/ChangeLog melys-0.0.14/ChangeLog --- melys-0.0.13/ChangeLog Thu Sep 23 16:57:06 1999 +++ melys-0.0.14/ChangeLog Tue Sep 28 16:08:02 1999 @@ -1,3 +1,144 @@ +1999-09-28 Steve Ratcliffe + + * version: Version 0.0.14 + + * md/elements.m, md/mdadd.m, md/mdutil.m, widgets/melyspartitem.m, + widgets/melystrackdisplay.m, gui/menus.m: + Deleting a track did not update the track display properly. + Problem was that the partitems were not being destroyed properly + and that there were circular references. + Introduced a weak reference mechanism and modified references + thoughout. + +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, + widgets/melystrackinfo.m, widgets/register.m, gui/menus.m: + Continued to tidy up the file dialogs. + Bug hunt. No known bugs left. + Under debug we now poison freed elements to help finding bugs. + + * util/except.m: + Subtle memory bug was introduced. The message was being + freed multiple times. + +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 + to remove them to the track level. Problems are of + course with tracks that share channels as well as changes + within the track. + + * util/except.m: Allow nested exception catching + + * gui/main.m, gui/menus.m: + Combined code that created views into one place. + Now if a view has not been used it will be replaced + when you open another file. + + * make.conf: debug defines + +1999-09-25 Steve Ratcliffe + + * Makefile: Don't do the cfiles all up front in the normal make case. + + * md/.cvsignore, md/mdseq.m, md/mdutil.m: + After profiling made a few changes to reduce some very + highly called functions. + + * mlib/PROJECT/base.py: + Change cast defines so that the cast check can be ifdefed + + * midi/play.m: + Only add the timeout if there is not already one in action. + + * md/mdutil.m: Make iscontainer a macro and don't check the type. + + * md/mdseq.m: The new sequencing engine. + At present just does the same work as the old one + except that it works and it allows multiple sequences + to be active at once. + + * util/gxstack.m: Stack routines + + * programs/melplay.m, programs/melys.m: + Make and other changes for the new sequence engine + + * md/mdutil.m: + Removed the old sequence engine, after I found another bug + in it. It would need to be changed for the partref element + anyway. + Now there is a new sequence engine in mdseq.m. + + * md/mdadd.m: Tracklike changes. + Added code to keep track of unfreed elements mainly so + we can check for leaks. + + * md/elements.m: Made track and tempomap both kinds of tracklike. + Removed the playptr nonsense. + + * midi/play.m: Changes to match the new sequencing engine + + * files/midiwrite.m: removed an usused statement and decl. + Track number is now on tracklike + +1999-09-24 Steve Ratcliffe + + * widgets/melystrackdisplay.m, widgets/misc.m: + Moved the canvas_item_move_abs routine as it will be more + generally useful. + + * midi/play.m, widgets/melyspartitem.m, widgets/melystrack.m, + widgets/melystrackdisplay.m, gui/main.m: + Adds the play position marker. + The display window will scroll correctly when the play + position is about to go off the end of the window. + You can still manually scroll around without being affected by this. + + * util/util.m: Add an affine_t typedef + + * 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 + + * ChangeLog: REL-0-0-13 + + * widgets/melystrackdisplay.m: + Fixed bug in title ruler drawing, where a line was always drawn + at the begining of the exposed area even if there shouldn't have + been one there. + For some reason the adjustment value can go negative, just + detect this and ignore it. + + * version: Version 0.0.13 + + * md/mdutil.m: Added a MD_SET_DURATION macro. + + * midi/record.m: + When a part is added that is beyond the end of the root + then extend the root to cover it. + + * seq/seqmidi.m: If we don't have the correct device it used to + send to device 0. This is not correct when 0 is in + use as well. So we just effectively drop the events by + sending them to 0.0.0.0. + + * widgets/melystrackinfo.m: + Code simplified somewhat as we no long attempt to draw the + frame as part of this widget. The parent widget supplies + the frame (now why didn't I think of that before...) + + * widgets/melystrackdisplay.m: Complete phase 1 of the display screen. + Rudimentary scale along the top (not yet bar lines, unless 4/4 192 ppq :-) + Parts are labeled with the part name (defaults to track name). + Fixes to get the scrolling behaviour correct. + + * widgets/melystrack.m: Now handles supplying a frame for each child. + Some fixes to the adjustment handling. + 1999-09-23 Steve Ratcliffe * REL-0-0-13 diff -rNu melys-0.0.13/Makefile melys-0.0.14/Makefile --- melys-0.0.13/Makefile Wed Sep 22 20:53:57 1999 +++ melys-0.0.14/Makefile Sat Sep 25 21:53:48 1999 @@ -5,7 +5,7 @@ MAKEFILE = programs/Makefile CFILE = programs/melys.c HEADER = include/elements.h -PREREQ = $(HEADER) $(MAKEFILE) $(CFILE) +PREREQ = $(HEADER) $(MAKEFILE) all: $(PREREQ) build @@ -35,6 +35,6 @@ clobber: for i in $(DIRS); do (cd $$i; $(MAKE) clobber) || exit 1; done -fordist: $(PREREQ) +fordist: $(PREREQ) $(CFILE) find mlib -name '*.pyo' | xargs rm -f cd help/C ; make diff -rNu melys-0.0.13/files/mdmlread.c melys-0.0.14/files/mdmlread.c --- melys-0.0.13/files/mdmlread.c Thu Sep 23 17:03:20 1999 +++ melys-0.0.14/files/mdmlread.c Tue Sep 28 16:09:33 1999 @@ -84,7 +84,8 @@ mstate.file = file; /* Will use later XXX */ init_sax_handler(); - doc = xmlSAXParseFile(NULL, file->name, 0); + //doc = xmlSAXParseFile(NULL, file->name, 0); + doc = xmlParseFile(file->name); if (doc == NULL) { file_set_error(file, FILE_STATUS_BAD_FORMAT, _("Failed to read file")); diff -rNu melys-0.0.13/files/mdmlread.m melys-0.0.14/files/mdmlread.m --- melys-0.0.13/files/mdmlread.m Wed Sep 22 20:49:31 1999 +++ melys-0.0.14/files/mdmlread.m Sun Sep 26 20:53:58 1999 @@ -65,7 +65,8 @@ mstate.file = file; /* Will use later XXX */ init_sax_handler(); - doc = xmlSAXParseFile(NULL, file->name, 0); + //doc = xmlSAXParseFile(NULL, file->name, 0); + doc = xmlParseFile(file->name); if (doc == NULL) { file_set_error(file, FILE_STATUS_BAD_FORMAT, _("Failed to read file")); diff -rNu melys-0.0.13/files/midiread.c melys-0.0.14/files/midiread.c --- melys-0.0.13/files/midiread.c Thu Sep 23 17:03:20 1999 +++ melys-0.0.14/files/midiread.c Tue Sep 28 16:09:33 1999 @@ -423,9 +423,8 @@ val = read_int(msp, 1); val += msp->lsb_bank << 7; val += msp->msb_bank << 14; - if (msp->note_seen) - el = MD_ELEMENT(md_program_new(val)); - else + el = MD_ELEMENT(md_program_new(val)); + if (!msp->note_seen) msp->program = val; break; diff -rNu melys-0.0.13/files/midiread.m melys-0.0.14/files/midiread.m --- melys-0.0.13/files/midiread.m Wed Sep 22 20:48:56 1999 +++ melys-0.0.14/files/midiread.m Sun Sep 26 21:29:04 1999 @@ -437,9 +437,8 @@ val = read_int(msp, 1); val += msp->lsb_bank << 7; val += msp->msb_bank << 14; - if (msp->note_seen) - el = MD_ELEMENT(md_program_new(val)); - else + el = MD_ELEMENT(md_program_new(val)); + if (!msp->note_seen) msp->program = val; break; diff -rNu melys-0.0.13/files/midiwrite.c melys-0.0.14/files/midiwrite.c --- melys-0.0.13/files/midiwrite.c Thu Sep 23 17:03:21 1999 +++ melys-0.0.14/files/midiwrite.c Tue Sep 28 16:09:34 1999 @@ -165,14 +165,12 @@ if (el->type == MD_TYPE_TRACK) put_prologue(msp, MD_TRACK(el)); } else { - struct trackElement *tr; struct containerElement *ce; int size; /* do pending events */ run_queue(msp, G_MAXINT); - tr = MD_TRACK(el); ce = MD_CONTAINER(el); if (ce->duration > 0 && (el->element_time + ce->duration) >= msp->prev_time) @@ -628,7 +626,7 @@ /* * Some things are put out in track one. */ - if (track->number == 1) { + if (MD_TRACKLIKE(track)->number == 1) { if (msp->root->head->copyright) { str = msp->root->head->copyright; diff -rNu melys-0.0.13/files/midiwrite.m melys-0.0.14/files/midiwrite.m --- melys-0.0.13/files/midiwrite.m Wed Sep 22 20:48:56 1999 +++ melys-0.0.14/files/midiwrite.m Sat Sep 25 17:49:18 1999 @@ -143,14 +143,12 @@ if (el->type == MD_TYPE_TRACK) put_prologue(msp, MD_TRACK(el)); } else { - struct trackElement *tr; struct containerElement *ce; int size; /* do pending events */ run_queue(msp, G_MAXINT); - tr = MD_TRACK(el); ce = MD_CONTAINER(el); if (ce->duration > 0 && (el->element_time + ce->duration) >= msp->prev_time) @@ -594,7 +592,7 @@ /* * Some things are put out in track one. */ - if (track->number == 1) { + if (MD_TRACKLIKE(track)->number == 1) { if (msp->root->head->copyright) { str = msp->root->head->copyright; diff -rNu melys-0.0.13/gui/Makefile melys-0.0.14/gui/Makefile --- melys-0.0.13/gui/Makefile Thu Sep 23 17:03:15 1999 +++ melys-0.0.14/gui/Makefile Tue Sep 28 16:09:25 1999 @@ -54,12 +54,12 @@ trackprop.o: ../include/md.h trackprop.o: ../include/melgui.h menus.o: ../include/melreg.h -menus.o: ../include/seqlib.h menus.o: ../include/elements.h menus.o: ../include/song.h menus.o: ../include/melys.h menus.o: ../include/melfile.h menus.o: ../include/melmidi.h +menus.o: ../include/melmsg.h menus.o: ../include/melgui.h menus.o: ../include/pixmaps.h menus.o: ../include/md.h diff -rNu melys-0.0.13/gui/main.c melys-0.0.14/gui/main.c --- melys-0.0.13/gui/main.c Thu Sep 23 17:03:23 1999 +++ melys-0.0.14/gui/main.c Tue Sep 28 16:09:37 1999 @@ -46,6 +46,8 @@ ); static GnomeMDI *MainMDI; +static struct except childError; +struct except *noActiveChildError = &childError; static GtkWidget *create_view(GnomeMDIChild *child, gpointer data); static int add_view_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data); @@ -64,7 +66,6 @@ melys_app(int argc, char **argv) { GnomeMDI *mdi; - GnomeMDIGenericChild *child; struct song *song; argc = 1; /* We currently do our own processing */ @@ -84,21 +85,8 @@ gtk_signal_connect(GTK_OBJECT(mdi), "view-changed" , GTK_SIGNAL_FUNC(view_changed_cb), NULL); - /* Create the first child */ - child = gnome_mdi_generic_child_new(_("Untitled")); - song = song_new(GTK_OBJECT(mdi), GTK_OBJECT(child)); - - song_setup(song, NULL, md_song_new()); - - gnome_mdi_add_child(mdi, GNOME_MDI_CHILD(child)); - - mel_initial_view((GtkObject *)mdi, (GtkObject *)child, song->mdroot, TRUE); - - /* - * Set up the child count, (would prefer to get this directly from - * the mdi if possible) - */ - set_child_count((GtkObject *)mdi, 1); + song = mel_create_song(GTK_OBJECT(mdi), NULL, NULL, NULL); + song->unused = 1; return 0; } @@ -118,7 +106,7 @@ child = gnome_mdi_get_active_child(GNOME_MDI(mdi)); if (child == NULL) - ethrow(debugError, "No active child"); + ethrow(noActiveChildError, "No active child"); sd = song_get_data(GTK_OBJECT(child)); @@ -156,96 +144,79 @@ } /* - * Put up an error box. If song is supplied then there will only - * be one error box active for a file at once, although they are - * not modal. Another message will just cause the original to - * go away. If parent is supplied then when that object is - * destroyed or unmapped the dialog will be destroyed to. The - * routine is printf like. + * 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: - * parent - The parent that the dialog 'belongs' to - * _type - The type of message - * fmt - The message to place in the dialog box + * 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 */ -void -mel_song_display(struct song *sd, GtkObject *parent, int _type, char *fmt, - ...) +struct song * +mel_create_song(GtkObject *mdi, struct song *psong, char *filename, + GtkObject *parent) { - va_list ap; - enum message_type type = _type; - GtkWidget *dialog = NULL; - GtkWindow *parent_win; - int d_id = 0; - char *msg; + struct rootElement *root; + struct File *file; + struct song *song; + GnomeApp *ga; + GtkObject *child; + char *basename; + char *labelstr; + int count; - va_start(ap, fmt); - msg = g_strdup_vprintf(fmt, ap); - va_end(ap); + count = get_child_count(mdi); - /* The gnome idea of parent only includes windows */ - parent_win = NULL; - if (parent && GTK_IS_WINDOW(parent)) - parent_win = GTK_WINDOW(parent); + /* + * Read in the file first, if we can't do that then there + * is no point continuing. + */ + file = file_new(filename); + root = file_read(file); + if (mel_file_error(psong, file, parent)) + return NULL; + + /* Hide the parent dialogue box */ + if (parent && GTK_IS_WIDGET(parent)) + gtk_widget_hide((GtkWidget *)parent); - /* Destroy any old one */ - if (sd) - reg_destroy(sd->dialog); + ga = gnome_mdi_get_active_window(GNOME_MDI(mdi)); - /* Create the gnome dialog */ - switch (type) { - case MEL_MSG_LAST: - case MEL_MSG_ERROR: - dialog = gnome_error_dialog_parented(msg, parent_win); - break; - case MEL_MSG_WARNING: - dialog = gnome_warning_dialog_parented(msg, parent_win); - break; - case MEL_MSG_INFO: - dialog = gnome_ok_dialog_parented(msg, parent_win); - break; - } + if (filename) + basename = g_basename(filename); + else + basename = _("Untitled"); - if (dialog) - d_id = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); - if (sd) - sd->dialog = d_id; + labelstr = g_strdup_printf(_("Track: %s"), basename); - /* Destroy dialog when the parent is hidden as well */ - if (parent) - gtk_signal_connect_object_while_alive(GTK_OBJECT(parent), "hide" - , gtk_widget_destroy, GTK_OBJECT(dialog)); + /* Create the child mdi widget */ + child = (GtkObject *)gnome_mdi_generic_child_new(labelstr); + g_free(labelstr); - g_free(msg); -} + song = song_new(GTK_OBJECT(mdi), GTK_OBJECT(child)); + song->filename = filename; + song_setup(song, NULL, root); -/* - * Put up a warning box. There can only be one error box active - * for a file at once although they are not modal. Another - * message will just cause the original to go away. If 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 - */ -void -mel_ui_warn(struct song *sd, char *msg, GtkObject *parent) -{ - GtkWidget *dialog; + gnome_mdi_add_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); - /* Destroy any old one */ - reg_destroy(sd->dialog); + mel_initial_view((GtkObject *)mdi, (GtkObject *)child, song->mdroot, + (ga)? FALSE: TRUE); - /* Create the gnome dialog */ - dialog = gnome_warning_dialog(msg); - sd->dialog = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); + if (psong && psong->unused) { + count--; + gnome_mdi_remove_child(GNOME_MDI(mdi), + GNOME_MDI_CHILD(psong->child), 0); + } - /* Destroy dialog when the parent is hidden as well */ - if (parent) - gtk_signal_connect_object_while_alive(GTK_OBJECT(parent), "hide" - , gtk_widget_destroy, GTK_OBJECT(dialog)); + set_child_count((GtkObject *)mdi, ++count); + + return song; } /* @@ -296,7 +267,7 @@ mel_add_view(mdi, child, w, toplevel); - /* A bug with notbook drawing (may be fixed in gtk now) */ + /* Notebook bug? Need this to get it drawn properly */ while (gtk_events_pending()) gtk_main_iteration(); @@ -311,6 +282,21 @@ song->trackview = w; melys_track_set_song(MELYS_TRACK(w), song); + play_set_pos_adj(song->play, MELYS_TRACK(song->trackview)->posadj); +} + +/* + * Update the current view. Use song_view_update if you have + * the song pointer. + * + */ +void +mel_view_update(void) +{ + struct song *song; + + song = get_song_from_mdi((GtkObject *)MainMDI); + song_view_update(song); } /* @@ -338,6 +324,99 @@ } /* + * Put up an error box. If song is supplied then there will only + * be one error box active for a file at once, although they are + * not modal. Another message will just cause the original to + * go away. If 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 + * fmt - The message to place in the dialog box + */ +void +mel_song_display(struct song *sd, GtkObject *parent, int _type, char *fmt, + ...) +{ + va_list ap; + enum message_type type = _type; + GtkWidget *dialog = NULL; + GtkWindow *parent_win; + int d_id = 0; + char *msg; + + va_start(ap, fmt); + msg = g_strdup_vprintf(fmt, ap); + va_end(ap); + + /* The gnome idea of parent only includes windows */ + parent_win = NULL; + if (parent && GTK_IS_WINDOW(parent)) + parent_win = GTK_WINDOW(parent); + + /* Destroy any old one */ + if (sd) + reg_destroy(sd->dialog); + + /* Create the gnome dialog */ + switch (type) { + case MEL_MSG_LAST: + case MEL_MSG_ERROR: + dialog = gnome_error_dialog_parented(msg, parent_win); + break; + case MEL_MSG_WARNING: + dialog = gnome_warning_dialog_parented(msg, parent_win); + break; + case MEL_MSG_INFO: + dialog = gnome_ok_dialog_parented(msg, parent_win); + break; + } + + if (dialog) + d_id = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); + if (sd) + sd->dialog = d_id; + + /* Destroy dialog when the parent is hidden as well */ + if (parent) + gtk_signal_connect_object_while_alive(GTK_OBJECT(parent), "hide" + , gtk_widget_destroy, GTK_OBJECT(dialog)); + + g_free(msg); +} + +/* + * Put up a warning box. There can only be one error box active + * for a file at once although they are not modal. Another + * message will just cause the original to go away. If 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 + */ +void +mel_ui_warn(struct song *sd, char *msg, GtkObject *parent) +{ + GtkWidget *dialog; + + /* Destroy any old one */ + reg_destroy(sd->dialog); + + /* Create the gnome dialog */ + dialog = gnome_warning_dialog(msg); + + sd->dialog = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); + + /* Destroy dialog when the parent is hidden as well */ + if (parent) + gtk_signal_connect_object_while_alive(GTK_OBJECT(parent), "hide" + , gtk_widget_destroy, GTK_OBJECT(dialog)); +} + +/* * Check the file status and take any action. Put up an error or * warning message. If the status is to confirm then a dialog is * put up for the user. Returns TRUE if there is an error that @@ -370,19 +449,6 @@ } /* - * Update the current view. - * - */ -void -mel_view_update(void) -{ - struct song *song; - - song = get_song_from_mdi((GtkObject *)MainMDI); - song_view_update(song); -} - -/* * Called when a view is added to a child of the mdi. XXX doesn't * work anyway. * @@ -395,13 +461,13 @@ add_view_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data) { - dprintf1("add_view_cb: View Added (NOT IMPLEMENTED)"); + dprintf1("add_view_cb: View Added"); return TRUE; } /* - * Called when the view is changed. XXX not needed. + * Called when the view is changed. * * Arguments: * mdi - The mdi object diff -rNu melys-0.0.13/gui/main.m melys-0.0.14/gui/main.m --- melys-0.0.13/gui/main.m Sat Sep 18 17:00:01 1999 +++ melys-0.0.14/gui/main.m Sun Sep 26 20:52:13 1999 @@ -75,6 +75,8 @@ ); static GnomeMDI *MainMDI; +static struct except childError; +struct except *noActiveChildError = &childError; >>function melys_app int @@ -86,7 +88,6 @@ >>code GnomeMDI *mdi; - GnomeMDIGenericChild *child; struct song *song; argc = 1; /* We currently do our own processing */ @@ -106,21 +107,8 @@ gtk_signal_connect(GTK_OBJECT(mdi), "view-changed" , GTK_SIGNAL_FUNC(view_changed_cb), NULL); - /* Create the first child */ - child = gnome_mdi_generic_child_new(_("Untitled")); - song = song_new(GTK_OBJECT(mdi), GTK_OBJECT(child)); - - song_setup(song, NULL, md_song_new()); - - gnome_mdi_add_child(mdi, GNOME_MDI_CHILD(child)); - - mel_initial_view((GtkObject *)mdi, (GtkObject *)child, song->mdroot, TRUE); - - /* - * Set up the child count, (would prefer to get this directly from - * the mdi if possible) - */ - set_child_count((GtkObject *)mdi, 1); + song = mel_create_song(GTK_OBJECT(mdi), NULL, NULL, NULL); + song->unused = 1; return 0; @@ -138,7 +126,7 @@ child = gnome_mdi_get_active_child(GNOME_MDI(mdi)); if (child == NULL) - ethrow(debugError, "No active child"); + ethrow(noActiveChildError, "No active child"); sd = song_get_data(GTK_OBJECT(child)); @@ -171,103 +159,83 @@ MEL_MDI_CHILD_COUNT, GINT_TO_POINTER(count)); ->>function mel_song_display -void -struct song *sd; -GtkObject *parent; The parent that the dialog 'belongs' to -int _type; The type of message -char *fmt; The message to place in the dialog box -... +>>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 + +>>description +Read in a new file. +A new MDI child will be created for this file and an initial +view on it. +A new song structure is created and returned. + +If the parent song data, +.A psong +has not been used then the file will be read into psong and +.A psong +will be returned. +Otherwise a new song is created. ->>description -Put up an error box. -If song is supplied then there will only be one error box active -for a file at once, although they are not modal. -Another message will just cause the original to go away. -If -.A parent -is supplied then when that object is destroyed or unmapped -the dialog will be destroyed to. -The routine is printf like. >>code - va_list ap; - enum message_type type = _type; - GtkWidget *dialog = NULL; - GtkWindow *parent_win; - int d_id = 0; - char *msg; - - va_start(ap, fmt); - msg = g_strdup_vprintf(fmt, ap); - va_end(ap); - - /* The gnome idea of parent only includes windows */ - parent_win = NULL; - if (parent && GTK_IS_WINDOW(parent)) - parent_win = GTK_WINDOW(parent); + struct rootElement *root; + struct File *file; + struct song *song; + GnomeApp *ga; + GtkObject *child; + char *basename; + char *labelstr; + int count; - /* Destroy any old one */ - if (sd) - reg_destroy(sd->dialog); + count = get_child_count(mdi); - /* Create the gnome dialog */ - switch (type) { - case MEL_MSG_LAST: - case MEL_MSG_ERROR: - dialog = gnome_error_dialog_parented(msg, parent_win); - break; - case MEL_MSG_WARNING: - dialog = gnome_warning_dialog_parented(msg, parent_win); - break; - case MEL_MSG_INFO: - dialog = gnome_ok_dialog_parented(msg, parent_win); - break; - } + /* + * Read in the file first, if we can't do that then there + * is no point continuing. + */ + file = file_new(filename); + root = file_read(file); + if (mel_file_error(psong, file, parent)) + return NULL; + + /* Hide the parent dialogue box */ + if (parent && GTK_IS_WIDGET(parent)) + gtk_widget_hide((GtkWidget *)parent); - if (dialog) - d_id = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); - if (sd) - sd->dialog = d_id; + ga = gnome_mdi_get_active_window(GNOME_MDI(mdi)); - /* Destroy dialog when the parent is hidden as well */ - if (parent) - gtk_signal_connect_object_while_alive(GTK_OBJECT(parent), "hide" - , gtk_widget_destroy, GTK_OBJECT(dialog)); + if (filename) + basename = g_basename(filename); + else + basename = _("Untitled"); - g_free(msg); + labelstr = g_strdup_printf(_("Track: %s"), basename); + /* Create the child mdi widget */ + child = (GtkObject *)gnome_mdi_generic_child_new(labelstr); + g_free(labelstr); ->>function mel_ui_warn -void -struct song *sd; -char *msg; The message to place in the dialog box -GtkObject *parent; The parent that the dialog 'belongs' to + song = song_new(GTK_OBJECT(mdi), GTK_OBJECT(child)); + song->filename = filename; + song_setup(song, NULL, root); ->>description -Put up a warning box. -There can only be one error box active for a file at once although they -are not modal. -Another message will just cause the original to go away. -If -.A parent -is supplied then when that object is destroyed or unmapped -the dialog will be destroyed to. + gnome_mdi_add_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); ->>code - GtkWidget *dialog; + mel_initial_view((GtkObject *)mdi, (GtkObject *)child, song->mdroot, + (ga)? FALSE: TRUE); - /* Destroy any old one */ - reg_destroy(sd->dialog); - /* Create the gnome dialog */ - dialog = gnome_warning_dialog(msg); + if (psong && psong->unused) { + count--; + gnome_mdi_remove_child(GNOME_MDI(mdi), + GNOME_MDI_CHILD(psong->child), 0); + } - sd->dialog = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); + set_child_count((GtkObject *)mdi, ++count); - /* Destroy dialog when the parent is hidden as well */ - if (parent) - gtk_signal_connect_object_while_alive(GTK_OBJECT(parent), "hide" - , gtk_widget_destroy, GTK_OBJECT(dialog)); + return song; >>function mel_add_view @@ -318,7 +286,7 @@ mel_add_view(mdi, child, w, toplevel); - /* A bug with notbook drawing (may be fixed in gtk now) */ + /* Notebook bug? Need this to get it drawn properly */ while (gtk_events_pending()) gtk_main_iteration(); @@ -333,6 +301,24 @@ song->trackview = w; melys_track_set_song(MELYS_TRACK(w), song); + play_set_pos_adj(song->play, MELYS_TRACK(song->trackview)->posadj); + + +>>function mel_view_update +void + +>>description +Update the current view. +Use +.F song_view_update +if you have the song pointer. + +>>code + struct song *song; + + song = get_song_from_mdi((GtkObject *)MainMDI); + song_view_update(song); + >>function create_view static GtkWidget * @@ -361,6 +347,105 @@ return w; +>>function mel_song_display +void +struct song *sd; +GtkObject *parent; The parent that the dialog 'belongs' to +int _type; The type of message +char *fmt; The message to place in the dialog box +... + +>>description +Put up an error box. +If song is supplied then there will only be one error box active +for a file at once, although they are not modal. +Another message will just cause the original to go away. +If +.A parent +is supplied then when that object is destroyed or unmapped +the dialog will be destroyed to. +The routine is printf like. +>>code + va_list ap; + enum message_type type = _type; + GtkWidget *dialog = NULL; + GtkWindow *parent_win; + int d_id = 0; + char *msg; + + va_start(ap, fmt); + msg = g_strdup_vprintf(fmt, ap); + va_end(ap); + + /* The gnome idea of parent only includes windows */ + parent_win = NULL; + if (parent && GTK_IS_WINDOW(parent)) + parent_win = GTK_WINDOW(parent); + + /* Destroy any old one */ + if (sd) + reg_destroy(sd->dialog); + + /* Create the gnome dialog */ + switch (type) { + case MEL_MSG_LAST: + case MEL_MSG_ERROR: + dialog = gnome_error_dialog_parented(msg, parent_win); + break; + case MEL_MSG_WARNING: + dialog = gnome_warning_dialog_parented(msg, parent_win); + break; + case MEL_MSG_INFO: + dialog = gnome_ok_dialog_parented(msg, parent_win); + break; + } + + if (dialog) + d_id = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); + if (sd) + sd->dialog = d_id; + + /* Destroy dialog when the parent is hidden as well */ + if (parent) + gtk_signal_connect_object_while_alive(GTK_OBJECT(parent), "hide" + , gtk_widget_destroy, GTK_OBJECT(dialog)); + + g_free(msg); + + +>>function mel_ui_warn +void +struct song *sd; +char *msg; The message to place in the dialog box +GtkObject *parent; The parent that the dialog 'belongs' to + +>>description +Put up a warning box. +There can only be one error box active for a file at once although they +are not modal. +Another message will just cause the original to go away. +If +.A parent +is supplied then when that object is destroyed or unmapped +the dialog will be destroyed to. + +>>code + GtkWidget *dialog; + + /* Destroy any old one */ + reg_destroy(sd->dialog); + + /* Create the gnome dialog */ + dialog = gnome_warning_dialog(msg); + + sd->dialog = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); + + /* Destroy dialog when the parent is hidden as well */ + if (parent) + gtk_signal_connect_object_while_alive(GTK_OBJECT(parent), "hide" + , gtk_widget_destroy, GTK_OBJECT(dialog)); + + >>function mel_file_error gboolean struct song *song; @@ -395,19 +480,6 @@ return TRUE; /* True, there is an error */ ->>function mel_view_update -void - ->>description -Update the current view. - ->>code - struct song *song; - - song = get_song_from_mdi((GtkObject *)MainMDI); - song_view_update(song); - - >>function add_view_cb static int GtkObject *mdi; The mdi object @@ -420,7 +492,7 @@ >>code - dprintf1("@func_name: View Added (NOT IMPLEMENTED)"); + dprintf1("@func_name: View Added"); return TRUE; @@ -432,7 +504,6 @@ >>description Called when the view is changed. -XXX not needed. >>code diff -rNu melys-0.0.13/gui/menus.c melys-0.0.14/gui/menus.c --- melys-0.0.13/gui/menus.c Thu Sep 23 17:03:24 1999 +++ melys-0.0.14/gui/menus.c Tue Sep 28 16:09:38 1999 @@ -13,6 +13,8 @@ * * * + * + * */ @@ -26,12 +28,12 @@ #include "libgnomeui/gnome-mdi-generic-child.h" #include "libgnomeui/gnome-about.h" #include "melreg.h" -#include "seqlib.h" #include "elements.h" #include "song.h" #include "melys.h" #include "melfile.h" #include "melmidi.h" +#include "melmsg.h" #include "melgui.h" #include "pixmaps.h" #include "md.h" @@ -58,6 +60,9 @@ static void add_track_cb(GtkWidget *w, gpointer data); static void delete_track_cb(GtkWidget *w, gpointer data); static void delete_empty_track_cb(GtkWidget *w, gpointer data); +static GtkWidget *get_open_dialog(GtkObject *mdi); +static void set_open_dialog(GtkObject *mdi, GtkWidget *w); +static void debug_cb(GtkWidget *w, gpointer data); /* The file menu */ @@ -83,6 +88,13 @@ (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ 0, (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, +#ifdef DEBUG + {GNOME_APP_UI_ITEM, N_("_Debug"), N_("Bring up a debugging window"), + debug_cb, (gpointer)0, (gpointer)0, /* Callback and data */ + (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ + 0, (GdkModifierType)0, /* Accel */ + (GtkWidget*)0 }, +#endif GNOMEUIINFO_SEPARATOR, GNOMEUIINFO_END }; @@ -161,6 +173,8 @@ GNOMEUIINFO_END }; +extern struct except *noActiveChildError; + /* * Initialise the menus for the application. * @@ -185,50 +199,11 @@ new_cb(GtkWidget *wid, gpointer data) { GtkObject *mdi = data; - GtkObject *child; - struct song *sd; - struct File *file; - struct rootElement *root; - gchar *basename; - char *filename; - //int open_id; - int count; - - //sd = get_song_from_mdi(mdi); - //open_id = sd->open_id; - - /* Get the filename that the user selected */ - file = file_new(NULL); - root = file_read(file); - if (mel_file_error(NULL, file, NULL)) - return; - - filename = _("Untitled"); - - /* - * Create a new child. If the current one has not been - * used, then it could be destroyed. - */ - basename = g_basename(filename); - child = (GtkObject*)gnome_mdi_generic_child_new(basename); - - sd = song_new(GTK_OBJECT(mdi), GTK_OBJECT(child)); - sd->filename = ""; - - /* Want to use the same open dialog, but not same save */ - //sd->open_dialog = open_id; + struct song *song; - /* Set up the song for this file */ - song_setup(sd, filename, root); - - /* Add child and increase count */ - gnome_mdi_add_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); - - count = get_child_count(mdi); - set_child_count(mdi, ++count); - - /* Create a track view (or users first choice view) of the song */ - mel_initial_view(mdi, child, sd->mdroot, FALSE); + /* Create a new child for this file */ + song = mel_create_song(GTK_OBJECT(mdi), NULL, NULL, NULL); + song->unused = 1; } /* @@ -247,33 +222,33 @@ open_cb(GtkWidget *wid, gpointer data) { GtkObject *mdi = data; - GtkObject *child; - struct song *sd; GtkWidget *w; GtkFileSelection *sel; - sd = get_song_from_mdi(mdi); - child = sd->child; - /* Get a new file selection dialog or re-use the old one */ - w = NULL; - if (sd->open_dialog) - w = reg_get_widget(sd->open_dialog); + w = get_open_dialog(mdi); if (w == NULL) { + + /* Need to create a new file selection dialog. This + * is the first time, or the old one was killed from the + * window manager etc. + */ w = gtk_file_selection_new(_("Select the file to read in...")); sel = GTK_FILE_SELECTION(w); - sd->open_dialog = reg_object(GTK_OBJECT(sel), GTK_OBJECT(child)); + set_open_dialog(mdi, w); gtk_signal_connect(GTK_OBJECT(sel->ok_button), "clicked", - open_ok_cb, child); + open_ok_cb, mdi); gtk_signal_connect(GTK_OBJECT(sel->cancel_button), "clicked", file_cancel_cb, sel); } else { /* Else reuse it, and ensure raised */ - gtk_window_set_position(GTK_WINDOW(w), GTK_WIN_POS_MOUSE); + sel = GTK_FILE_SELECTION(w); + gtk_window_set_position(GTK_WINDOW(w), GTK_WIN_POS_MOUSE); gdk_window_raise(w->window); + gtk_editable_select_region(GTK_EDITABLE(sel->selection_entry), 0, -1); } gtk_window_set_position(GTK_WINDOW(w), GTK_WIN_POS_MOUSE); @@ -283,62 +258,40 @@ /* * Open a file. A new child window will be created if necessary. * + * Arguments: + * data - The mdi */ static void open_ok_cb(GtkWidget *button, gpointer data) { GtkObject *mdi; - GtkObject *child = GTK_OBJECT(data); - struct song *sd = song_get_data(child); GtkFileSelection *sel; - struct File *file; - struct rootElement *root; - gchar *basename; + struct song *song; char *filename; - int open_id; - int count; - /* Get the filename that the user selected */ - open_id = sd->open_dialog; - sel = (GtkFileSelection*)reg_get(open_id); - if (sel == NULL) { - return; + if (CATCH(noActiveChildError)) { + mdi = GTK_OBJECT(data); + song = NULL; + } else { + mdi = GTK_OBJECT(data); + song = get_song_from_mdi(mdi); } - filename = gtk_file_selection_get_filename(sel); - file = file_new(filename); - root = file_read(file); - if (mel_file_error(sd, file, (GtkObject*)sel)) - return; + UNCATCH(noActiveChildError); - gtk_widget_hide(GTK_WIDGET(sel)); - mdi = sd->mdi; + /* Get the filename that the user selected */ + sel = (GtkFileSelection*)get_open_dialog(mdi); + if (sel == NULL) + return; + + filename = gtk_file_selection_get_filename(sel); /* * Create a new child. If the current one has not been * used, then it could be destroyed. */ - basename = g_basename(filename); - child = (GtkObject*)gnome_mdi_generic_child_new(basename); - - sd = song_new(GTK_OBJECT(mdi), GTK_OBJECT(child)); - sd->filename = filename; - - /* Want to use the same open dialog, but not same save */ - sd->open_dialog = open_id; - - /* Set up the song for this file */ - song_setup(sd, filename, root); - - /* Add child and increase count */ - gnome_mdi_add_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); - - count = get_child_count(mdi); - set_child_count(mdi, ++count); - - /* Create a track view (or users first choice view) of the song */ - mel_initial_view(mdi, child, sd->mdroot, FALSE); + mel_create_song(GTK_OBJECT(mdi), song, filename, GTK_OBJECT(sel)); } /* @@ -462,10 +415,10 @@ static void close_all_cb(GtkWidget *w, gpointer data) { - GnomeMDI *mdi = GNOME_MDI(data); + GtkObject *mdi = GTK_OBJECT(data); - g_warning("Close all not fully implemented yet"); - gnome_mdi_remove_all(mdi, 0); + gnome_mdi_remove_all(GNOME_MDI(mdi), 0); + dprintf1("Nfree is %d", md_nfree()); } /* @@ -541,6 +494,7 @@ struct song *sd; sd = get_song_from_mdi(mdi); + sd->unused = 0; song_record_start(sd); } @@ -674,4 +628,55 @@ } song_view_update(sd); +} + +static GtkWidget * +get_open_dialog(GtkObject *mdi) +{ + gpointer data; + GtkWidget *w; + + data = gtk_object_get_data(mdi, MEL_OPEN_DIALOG); + w = reg_get_widget(GPOINTER_TO_INT(data)); + + return w; +} + +static void +set_open_dialog(GtkObject *mdi, GtkWidget *w) +{ + regid_t id; + + id = reg_object(GTK_OBJECT(w), NULL); + gtk_object_set_data(mdi, MEL_OPEN_DIALOG, GINT_TO_POINTER(id)); + + +#ifdef DEBUG +} + +/* + * Bring up a debugging window with some debugging info in it. + * + * Arguments: + * w - Widget event received on + * data - The mdi object + */ +static void +debug_cb(GtkWidget *w, gpointer data) +{ + struct song *sd; + GtkObject *mdi = data; + + if (CATCH(noActiveChildError)) + sd = NULL; + else + sd = get_song_from_mdi(mdi); + UNCATCH(noActiveChildError); + + mel_song_info(sd, NULL, + _("Number of allocated elements %d\n" + ), md_nfree()); + + +#endif } diff -rNu melys-0.0.13/gui/menus.m melys-0.0.14/gui/menus.m --- melys-0.0.13/gui/menus.m Wed Sep 22 20:53:06 1999 +++ melys-0.0.14/gui/menus.m Tue Sep 28 16:04:52 1999 @@ -13,17 +13,19 @@ >>header gtk/gtk.h >>header gdk/gdkkeysyms.h + >>header libgnomeui/gnome-app.h >>header libgnomeui/gnome-mdi.h >>header libgnomeui/gnome-mdi-generic-child.h >>header libgnomeui/gnome-about.h + >>header melreg.h ->>header seqlib.h >>header elements.h >>header song.h >>header melys.h >>header melfile.h >>header melmidi.h +>>header melmsg.h >>header melgui.h >>header pixmaps.h >>header md.h @@ -56,6 +58,13 @@ (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ 0, (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, +#ifdef DEBUG + {GNOME_APP_UI_ITEM, N_("_Debug"), N_("Bring up a debugging window"), + debug_cb, (gpointer)0, (gpointer)0, /* Callback and data */ + (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ + 0, (GdkModifierType)0, /* Accel */ + (GtkWidget*)0 }, +#endif GNOMEUIINFO_SEPARATOR, GNOMEUIINFO_END }; @@ -134,6 +143,7 @@ GNOMEUIINFO_END }; +extern struct except *noActiveChildError; >>function mel_init_menus void @@ -159,50 +169,11 @@ >>code GtkObject *mdi = data; - GtkObject *child; - struct song *sd; - struct File *file; - struct rootElement *root; - gchar *basename; - char *filename; - //int open_id; - int count; - - //sd = get_song_from_mdi(mdi); - //open_id = sd->open_id; - - /* Get the filename that the user selected */ - file = file_new(NULL); - root = file_read(file); - if (mel_file_error(NULL, file, NULL)) - return; - - filename = _("Untitled"); - - /* - * Create a new child. If the current one has not been - * used, then it could be destroyed. - */ - basename = g_basename(filename); - child = (GtkObject*)gnome_mdi_generic_child_new(basename); - - sd = song_new(GTK_OBJECT(mdi), GTK_OBJECT(child)); - sd->filename = ""; - - /* Want to use the same open dialog, but not same save */ - //sd->open_dialog = open_id; + struct song *song; - /* Set up the song for this file */ - song_setup(sd, filename, root); - - /* Add child and increase count */ - gnome_mdi_add_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); - - count = get_child_count(mdi); - set_child_count(mdi, ++count); - - /* Create a track view (or users first choice view) of the song */ - mel_initial_view(mdi, child, sd->mdroot, FALSE); + /* Create a new child for this file */ + song = mel_create_song(GTK_OBJECT(mdi), NULL, NULL, NULL); + song->unused = 1; >>function open_cb @@ -221,33 +192,33 @@ >>code GtkObject *mdi = data; - GtkObject *child; - struct song *sd; GtkWidget *w; GtkFileSelection *sel; - sd = get_song_from_mdi(mdi); - child = sd->child; - /* Get a new file selection dialog or re-use the old one */ - w = NULL; - if (sd->open_dialog) - w = reg_get_widget(sd->open_dialog); + w = get_open_dialog(mdi); if (w == NULL) { + + /* Need to create a new file selection dialog. This + * is the first time, or the old one was killed from the + * window manager etc. + */ w = gtk_file_selection_new(_("Select the file to read in...")); sel = GTK_FILE_SELECTION(w); - sd->open_dialog = reg_object(GTK_OBJECT(sel), GTK_OBJECT(child)); + set_open_dialog(mdi, w); gtk_signal_connect(GTK_OBJECT(sel->ok_button), "clicked", - open_ok_cb, child); + open_ok_cb, mdi); gtk_signal_connect(GTK_OBJECT(sel->cancel_button), "clicked", file_cancel_cb, sel); } else { /* Else reuse it, and ensure raised */ - gtk_window_set_position(GTK_WINDOW(w), GTK_WIN_POS_MOUSE); + sel = GTK_FILE_SELECTION(w); + gtk_window_set_position(GTK_WINDOW(w), GTK_WIN_POS_MOUSE); gdk_window_raise(w->window); + gtk_editable_select_region(GTK_EDITABLE(sel->selection_entry), 0, -1); } gtk_window_set_position(GTK_WINDOW(w), GTK_WIN_POS_MOUSE); @@ -257,7 +228,7 @@ >>function open_ok_cb static void GtkWidget *button; -gpointer data; +gpointer data; The mdi >>description Open a file. @@ -265,58 +236,33 @@ >>code GtkObject *mdi; - GtkObject *child = GTK_OBJECT(data); - struct song *sd = song_get_data(child); GtkFileSelection *sel; - struct File *file; - struct rootElement *root; - gchar *basename; + struct song *song; char *filename; - int open_id; - int count; - /* Get the filename that the user selected */ - open_id = sd->open_dialog; - sel = (GtkFileSelection*)reg_get(open_id); - if (sel == NULL) { - return; + if (CATCH(noActiveChildError)) { + mdi = GTK_OBJECT(data); + song = NULL; + } else { + mdi = GTK_OBJECT(data); + song = get_song_from_mdi(mdi); } - filename = gtk_file_selection_get_filename(sel); - file = file_new(filename); - root = file_read(file); - if (mel_file_error(sd, file, (GtkObject*)sel)) - return; + UNCATCH(noActiveChildError); - gtk_widget_hide(GTK_WIDGET(sel)); - mdi = sd->mdi; + /* Get the filename that the user selected */ + sel = (GtkFileSelection*)get_open_dialog(mdi); + if (sel == NULL) + return; + + filename = gtk_file_selection_get_filename(sel); /* * Create a new child. If the current one has not been * used, then it could be destroyed. */ - basename = g_basename(filename); - child = (GtkObject*)gnome_mdi_generic_child_new(basename); - - sd = song_new(GTK_OBJECT(mdi), GTK_OBJECT(child)); - sd->filename = filename; - - /* Want to use the same open dialog, but not same save */ - sd->open_dialog = open_id; - - /* Set up the song for this file */ - song_setup(sd, filename, root); - - /* Add child and increase count */ - gnome_mdi_add_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); - - count = get_child_count(mdi); - set_child_count(mdi, ++count); - - /* Create a track view (or users first choice view) of the song */ - mel_initial_view(mdi, child, sd->mdroot, FALSE); - + mel_create_song(GTK_OBJECT(mdi), song, filename, GTK_OBJECT(sel)); >>function save_as_cb @@ -437,10 +383,10 @@ Close all the open windows. >>code - GnomeMDI *mdi = GNOME_MDI(data); + GtkObject *mdi = GTK_OBJECT(data); - g_warning("Close all not fully implemented yet"); - gnome_mdi_remove_all(mdi, 0); + gnome_mdi_remove_all(GNOME_MDI(mdi), 0); + dprintf1("Nfree is %d", md_nfree()); >>function exit_cb static void @@ -519,6 +465,7 @@ struct song *sd; sd = get_song_from_mdi(mdi); + sd->unused = 0; song_record_start(sd); @@ -652,3 +599,52 @@ song_view_update(sd); +>>function get_open_dialog +static GtkWidget * +GtkObject *mdi; MDI it is saved on +>>code + gpointer data; + GtkWidget *w; + + data = gtk_object_get_data(mdi, MEL_OPEN_DIALOG); + w = reg_get_widget(GPOINTER_TO_INT(data)); + + return w; + +>>function set_open_dialog +static void +GtkObject *mdi; MDI to set it on +GtkWidget *w; The dialog widget +>>code + regid_t id; + + id = reg_object(GTK_OBJECT(w), NULL); + gtk_object_set_data(mdi, MEL_OPEN_DIALOG, GINT_TO_POINTER(id)); + + +#ifdef DEBUG +>>function debug_cb +static void +GtkWidget *w; Widget event received on +gpointer data; The mdi object + +>>description +Bring up a debugging window +with some debugging info in it. + +>>code + struct song *sd; + GtkObject *mdi = data; + + if (CATCH(noActiveChildError)) + sd = NULL; + else + sd = get_song_from_mdi(mdi); + UNCATCH(noActiveChildError); + + mel_song_info(sd, NULL, + _("Number of allocated elements %d\n" + ), md_nfree()); + + +#endif diff -rNu melys-0.0.13/include/elements.h melys-0.0.14/include/elements.h --- melys-0.0.13/include/elements.h Thu Sep 23 17:03:09 1999 +++ melys-0.0.14/include/elements.h Tue Sep 28 16:09:12 1999 @@ -30,23 +30,27 @@ short device_channel; /* Device/channel for this element */ char type; /* Element type */ char tag; /* Element tag */ - int refcount:8; /* Reference count */ + int refcount:16; /* Reference count */ + int wref:16; /* Weak references */ int floating:1; /* Not added to anything yet */ int selected:1; /* Element is selected */ int modified:1; /* Element was modified */ + int destroyed:1; /* Element is destroyed, (but wref > 0) */ }; #define MD_ELEMENT(e) \ - ((struct element *)md_check_cast((struct element *)(e), MD_TYPE_ELEMENT)) + ((struct element *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_ELEMENT)) struct containerElement { struct element parent; GPtrArray *elements; /* List of elements */ guint32 duration; /* duration time for this container */ - struct element **playptr; /* Play position pointer */ + /* 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)) + ((struct containerElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_CONTAINER)) struct rootElement { @@ -55,7 +59,7 @@ short tracks; /* Number of music tracks */ }; #define MD_ROOT(e) \ - ((struct rootElement *)md_check_cast((struct element *)(e), MD_TYPE_ROOT)) + ((struct rootElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_ROOT)) struct headElement { @@ -70,12 +74,19 @@ char *comment; /* Comments/notes about the piece */ }; #define MD_HEAD(e) \ - ((struct headElement *)md_check_cast((struct element *)(e), MD_TYPE_HEAD)) + ((struct headElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_HEAD)) -struct trackElement { +struct tracklikeElement { struct containerElement parent; - int number; /* Track number from 1 */ + int number; /* Track number, -1 for tempomap */ +}; +#define MD_TRACKLIKE(e) \ + ((struct tracklikeElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_TRACKLIKE)) + + +struct trackElement { + struct tracklikeElement parent; char *name; /* Name of track */ int program; /* Extended program number */ int inputdev; /* Input device for this track */ @@ -92,14 +103,14 @@ int props; /* Track property box */ }; #define MD_TRACK(e) \ - ((struct trackElement *)md_check_cast((struct element *)(e), MD_TYPE_TRACK)) + ((struct trackElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_TRACK)) struct tempomapElement { - struct containerElement parent; + struct tracklikeElement parent; }; #define MD_TEMPOMAP(e) \ - ((struct tempomapElement *)md_check_cast((struct element *)(e), MD_TYPE_TEMPOMAP)) + ((struct tempomapElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_TEMPOMAP)) struct noteElement { @@ -110,29 +121,24 @@ short length; /* Length of note */ }; #define MD_NOTE(e) \ - ((struct noteElement *)md_check_cast((struct element *)(e), MD_TYPE_NOTE)) + ((struct noteElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_NOTE)) struct partElement { struct containerElement parent; char *name; /* Part name */ int id; /* Part id unique among all referenced parts */ - /* Private stuff not to be written out */ - gpointer item; /* pointer to displayed item */ }; #define MD_PART(e) \ - ((struct partElement *)md_check_cast((struct element *)(e), MD_TYPE_PART)) + ((struct partElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_PART)) struct partrefElement { - struct element parent; - char *name; /* Name of this part (need not be the same as part ref'ed) */ + struct partElement parent; struct partElement *ref; /* The part referenced */ - /* Private stuff not to be written out */ - gpointer item; /* pointer to displayed item */ }; #define MD_PARTREF(e) \ - ((struct partrefElement *)md_check_cast((struct element *)(e), MD_TYPE_PARTREF)) + ((struct partrefElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_PARTREF)) struct takeElement { @@ -140,7 +146,7 @@ char *name; }; #define MD_TAKE(e) \ - ((struct takeElement *)md_check_cast((struct element *)(e), MD_TYPE_TAKE)) + ((struct takeElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_TAKE)) struct controlElement { @@ -149,7 +155,7 @@ char value; /* Controller value */ }; #define MD_CONTROL(e) \ - ((struct controlElement *)md_check_cast((struct element *)(e), MD_TYPE_CONTROL)) + ((struct controlElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_CONTROL)) struct programElement { @@ -157,7 +163,7 @@ int program; /* Program number */ }; #define MD_PROGRAM(e) \ - ((struct programElement *)md_check_cast((struct element *)(e), MD_TYPE_PROGRAM)) + ((struct programElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_PROGRAM)) struct keytouchElement { @@ -166,7 +172,7 @@ int velocity; }; #define MD_KEYTOUCH(e) \ - ((struct keytouchElement *)md_check_cast((struct element *)(e), MD_TYPE_KEYTOUCH)) + ((struct keytouchElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_KEYTOUCH)) struct pressureElement { @@ -174,7 +180,7 @@ int velocity; }; #define MD_PRESSURE(e) \ - ((struct pressureElement *)md_check_cast((struct element *)(e), MD_TYPE_PRESSURE)) + ((struct pressureElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_PRESSURE)) struct pitchElement { @@ -182,7 +188,7 @@ int pitch; }; #define MD_PITCH(e) \ - ((struct pitchElement *)md_check_cast((struct element *)(e), MD_TYPE_PITCH)) + ((struct pitchElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_PITCH)) struct sysexElement { @@ -192,21 +198,21 @@ int length; }; #define MD_SYSEX(e) \ - ((struct sysexElement *)md_check_cast((struct element *)(e), MD_TYPE_SYSEX)) + ((struct sysexElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_SYSEX)) struct metaElement { struct element parent; }; #define MD_META(e) \ - ((struct metaElement *)md_check_cast((struct element *)(e), MD_TYPE_META)) + ((struct metaElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_META)) struct mapElement { struct metaElement parent; }; #define MD_MAP(e) \ - ((struct mapElement *)md_check_cast((struct element *)(e), MD_TYPE_MAP)) + ((struct mapElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_MAP)) struct keysigElement { @@ -215,7 +221,7 @@ char minor; /* Is this a minor key or not */ }; #define MD_KEYSIG(e) \ - ((struct keysigElement *)md_check_cast((struct element *)(e), MD_TYPE_KEYSIG)) + ((struct keysigElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_KEYSIG)) struct timesigElement { @@ -226,7 +232,7 @@ short n32pq; /* Thirtysecond notes per quarter */ }; #define MD_TIMESIG(e) \ - ((struct timesigElement *)md_check_cast((struct element *)(e), MD_TYPE_TIMESIG)) + ((struct timesigElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_TIMESIG)) struct tempoElement { @@ -234,7 +240,7 @@ int micro_tempo; /* The tempo in microsec per quarter note */ }; #define MD_TEMPO(e) \ - ((struct tempoElement *)md_check_cast((struct element *)(e), MD_TYPE_TEMPO)) + ((struct tempoElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_TEMPO)) struct textElement { @@ -245,7 +251,7 @@ int length; /* length of the text (including a null?) */ }; #define MD_TEXT(e) \ - ((struct textElement *)md_check_cast((struct element *)(e), MD_TYPE_TEXT)) + ((struct textElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_TEXT)) struct smpteoffsetElement { @@ -257,20 +263,21 @@ short subframes; }; #define MD_SMPTEOFFSET(e) \ - ((struct smpteoffsetElement *)md_check_cast((struct element *)(e), MD_TYPE_SMPTEOFFSET)) + ((struct smpteoffsetElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_SMPTEOFFSET)) struct noopElement { struct element parent; }; #define MD_NOOP(e) \ - ((struct noopElement *)md_check_cast((struct element *)(e), MD_TYPE_NOOP)) + ((struct noopElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_NOOP)) struct element *md_element_new(void); struct containerElement *md_container_new(void); struct rootElement *md_root_new(void); struct headElement *md_head_new(void); +struct tracklikeElement *md_tracklike_new(void); struct trackElement *md_track_new(void); struct tempomapElement *md_tempomap_new(void); struct noteElement *md_note_new(char note, char vel, short length); @@ -304,22 +311,23 @@ #define MD_TYPE_TAKE (2 + MD_CONTAINER_BEGIN) #define MD_TYPE_NOOP 3 #define MD_TYPE_PROGRAM 4 -#define MD_TYPE_TEMPOMAP (5 + MD_CONTAINER_BEGIN) -#define MD_TYPE_NOTE 6 -#define MD_TYPE_ELEMENT 7 -#define MD_TYPE_SYSEX 8 -#define MD_TYPE_TIMESIG 9 -#define MD_TYPE_CONTAINER (10 + MD_CONTAINER_BEGIN) -#define MD_TYPE_PARTREF 11 -#define MD_TYPE_KEYTOUCH 12 -#define MD_TYPE_PITCH 13 -#define MD_TYPE_PART (14 + MD_CONTAINER_BEGIN) -#define MD_TYPE_META 15 -#define MD_TYPE_PRESSURE 16 -#define MD_TYPE_TEMPO 17 -#define MD_TYPE_TEXT 18 -#define MD_TYPE_TRACK (19 + MD_CONTAINER_BEGIN) -#define MD_TYPE_KEYSIG 20 -#define MD_TYPE_HEAD (21 + MD_CONTAINER_BEGIN) -#define MD_TYPE_MAP 22 -#define MD_TYPE_CONTROL 23 +#define MD_TYPE_TRACKLIKE (5 + MD_CONTAINER_BEGIN) +#define MD_TYPE_TEMPOMAP (6 + MD_CONTAINER_BEGIN) +#define MD_TYPE_NOTE 7 +#define MD_TYPE_ELEMENT 8 +#define MD_TYPE_SYSEX 9 +#define MD_TYPE_TIMESIG 10 +#define MD_TYPE_CONTAINER (11 + MD_CONTAINER_BEGIN) +#define MD_TYPE_PARTREF (12 + MD_CONTAINER_BEGIN) +#define MD_TYPE_KEYTOUCH 13 +#define MD_TYPE_PITCH 14 +#define MD_TYPE_PART (15 + MD_CONTAINER_BEGIN) +#define MD_TYPE_META 16 +#define MD_TYPE_PRESSURE 17 +#define MD_TYPE_TEMPO 18 +#define MD_TYPE_TEXT 19 +#define MD_TYPE_TRACK (20 + MD_CONTAINER_BEGIN) +#define MD_TYPE_KEYSIG 21 +#define MD_TYPE_HEAD (22 + MD_CONTAINER_BEGIN) +#define MD_TYPE_MAP 23 +#define MD_TYPE_CONTROL 24 diff -rNu melys-0.0.13/include/except.h melys-0.0.14/include/except.h --- melys-0.0.13/include/except.h Thu Sep 23 17:03:09 1999 +++ melys-0.0.14/include/except.h Tue Sep 28 16:09:13 1999 @@ -26,15 +26,17 @@ * not for user input, where errors are to be expected and should be * dealt with properly. */ +#define CATCH_MAX 4 struct except { int set; /* Flag to say if set up correctly */ - sigjmp_buf buf; /* The return point */ + int level; /* Catch nesting depth */ + sigjmp_buf buf[CATCH_MAX]; /* The return point */ char *message; /* The error message */ gpointer private; /* Pointer for application use */ }; /* Usage: if CATCH(&xError) { .. } */ -#define CATCH(e) (ethrow_setup(e), setjmp((e)->buf)) +#define CATCH(e) (ethrow_setup(e), setjmp((e)->buf[(e)->level])) #define UNCATCH(e) ethrow_unsetup(e) /* diff -rNu melys-0.0.13/include/md.h melys-0.0.14/include/md.h --- melys-0.0.13/include/md.h Thu Sep 23 17:03:09 1999 +++ melys-0.0.14/include/md.h Tue Sep 28 16:09:12 1999 @@ -34,8 +34,10 @@ 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_merge_in(struct trackElement *track, struct containerElement *list, enum merge_mode mode); +int md_nfree(void); void md_list_append(struct containerElement *c, struct element *el); void md_list_prepend(struct containerElement *c, struct element *el); @@ -49,6 +51,17 @@ unsigned long time); void md_save_elem(struct containerElement *c, struct element *el); +struct sequenceState *md_seq_init(struct containerElement *con, + gboolean nodes); +struct sequenceState *md_seq_init_merge(struct rootElement *root, + gboolean nodes); +void md_seq_end(struct sequenceState *seq); +struct element *md_seq_next(struct sequenceState *seq); +void md_elem_seek(struct sequenceState *seq, struct tracklikeElement *ltrack, + unsigned long time); +void md_elem_seek_back(struct sequenceState *seq, + struct tracklikeElement *ltrack, unsigned long time); + /* * 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. @@ -90,8 +103,8 @@ #define MD_UNREF(el) MD_FREE(el) #define MD_MK_DEVCHAN(dev, chan) \ ((dev)<<4 | ((chan) & 0xf)) -#define MD_SET_DEVCHAN(el, dev, chan) \ - (((struct element *)el)->device_channel = (dev)<<4 | ((chan) & 0xf)) +#define MD_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 ) @@ -99,6 +112,10 @@ ((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) /* Defines for md_walk() */ #define MD_WALK_ALL 1 /* Include all elements including deleted, hidden*/ @@ -108,33 +125,19 @@ #define MD_WALK_END 0x002 /* This is the end of an element */ #define MD_WALK_EMPTY (MD_WALK_START|MD_WALK_END) /* Empty element */ -/* Typedef for md_walk callback function */ -typedef void (*walkFunc)(struct element *, void *, int); +#ifdef DEBUG_CASTS +#define MD_CHECK_CAST(el, t) md_check_cast((el), (t)) +#else +#define MD_CHECK_CAST(el, t) (el) +#endif -/* - * Structure to keep track of the position on each track that - * is being merged. - */ -struct sequenceState { - int ntracks; /* Number of tracks to merge */ - - struct rootElement *root; /* The root being sequnced over */ - - struct rootElement *retroot; /* Copy of root, set to NULL after use */ - struct headElement *head; /* Head to be returned next */ - unsigned long duration; /* End time */ -}; +/* Typedef for md_walk callback function */ +typedef void (*walkFunc)(struct element *, void *, int); void md_walk(struct containerElement *c, walkFunc fn, void *arg, int flags); -int iscontainer(struct element *el); -struct sequenceState *md_sequence_init(struct rootElement *root); -struct element *md_sequence_next(struct sequenceState *seq); -void md_elem_seek(struct containerElement *c, unsigned long time); -gboolean md_elem_seek_back(struct containerElement *c, unsigned long time); -void md_sequence_end(struct sequenceState *seq); -unsigned long md_sequence_duration(struct sequenceState *seq); struct rootElement *md_empty(void); struct rootElement *md_song_new(void); struct trackElement *md_track_nth(struct rootElement *root, int n); +struct tempomapElement *md_get_tempomap(struct rootElement *root); void md_set_devchan(struct element *base, int dev, int chan); diff -rNu melys-0.0.13/include/melgui.h melys-0.0.14/include/melgui.h --- melys-0.0.13/include/melgui.h Thu Sep 23 17:03:09 1999 +++ melys-0.0.14/include/melgui.h Tue Sep 28 16:09:14 1999 @@ -40,16 +40,18 @@ struct song *get_song_from_mdi(GtkObject *mdi); int get_child_count(GtkObject *mdi); void set_child_count(GtkObject *mdi, int count); -void mel_song_display(struct song *sd, GtkObject *parent, int _type, - char *fmt, ...); -void mel_ui_warn(struct song *sd, char *msg, GtkObject *parent); +struct song *mel_create_song(GtkObject *mdi, struct song *psong, + char *filename, GtkObject *parent); void mel_add_view(GtkObject *mdi, GtkObject *child, GtkWidget *view, gboolean toplevel); void mel_initial_view(GtkObject *mdi, GtkObject *child, struct rootElement *root, gboolean toplevel); +void mel_view_update(void); +void mel_song_display(struct song *sd, GtkObject *parent, int _type, + char *fmt, ...); +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_view_update(void); void mel_debug_print_type(char *msg, GtkObject *o); /* diff -rNu melys-0.0.13/include/melmidi.h melys-0.0.14/include/melmidi.h --- melys-0.0.13/include/melmidi.h Thu Sep 23 17:03:11 1999 +++ melys-0.0.14/include/melmidi.h Tue Sep 28 16:09:17 1999 @@ -20,6 +20,7 @@ /* Opaque type to save all playing state */ struct play; struct seq_context; +struct _GtkAdjustment; #define ECHO_NOOP 0 #define ECHO_END_SONG 1 @@ -28,6 +29,7 @@ struct play *play_new(void); void play_free(struct play *play); void play_set_mdroot(struct play *play, struct rootElement *root); +void play_set_pos_adj(struct play *play, struct _GtkAdjustment *adj); void play_set_ports(struct play *play); void play_start(struct play *play); void play_pause(struct play *play); diff -rNu melys-0.0.13/include/melwidgets.h melys-0.0.14/include/melwidgets.h --- melys-0.0.13/include/melwidgets.h Thu Sep 23 17:03:10 1999 +++ melys-0.0.14/include/melwidgets.h Tue Sep 28 16:09:16 1999 @@ -15,4 +15,7 @@ * */ +struct _GnomeCanvasItem; + GtkWidget *mel_int_spinner(int lower, int upper, int val); +void canvas_item_move_abs(struct _GnomeCanvasItem *item, double x, double y); diff -rNu melys-0.0.13/include/melyspartitem.h melys-0.0.14/include/melyspartitem.h --- melys-0.0.13/include/melyspartitem.h Thu Sep 23 17:03:10 1999 +++ melys-0.0.14/include/melyspartitem.h Tue Sep 28 16:09:15 1999 @@ -35,14 +35,10 @@ struct _MelysPartItem { GnomeCanvasRect gnome_canvas_rect; - GnomeCanvasGroup *group; /* Group that this is a part of */ - GnomeCanvasItem *text; /* Text for this part */ - int dotted; - struct element *part; /* The part being represented */ + struct partElement *part; /* The part being represented */ struct trackElement *track; /* Track this part belongs to */ - struct rootElement *root; /* The complete root */ }; struct _MelysPartItemClass { diff -rNu melys-0.0.13/include/melystrack.h melys-0.0.14/include/melystrack.h --- melys-0.0.13/include/melystrack.h Thu Sep 23 17:03:10 1999 +++ melys-0.0.14/include/melystrack.h Tue Sep 28 16:09:15 1999 @@ -11,8 +11,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * - * */ #define MELYS_TRACK(obj) GTK_CHECK_CAST(obj, melys_track_get_type(), MelysTrack) @@ -28,6 +26,8 @@ GtkAdjustment *vadj; GtkAdjustment *hadj; + + GtkAdjustment *posadj; /* Song position adjustment */ struct _MelysTrackInfo *info; struct _MelysTrackDisplay *display; diff -rNu melys-0.0.13/include/melystrackdisplay.h melys-0.0.14/include/melystrackdisplay.h --- melys-0.0.13/include/melystrackdisplay.h Thu Sep 23 17:03:10 1999 +++ melys-0.0.14/include/melystrackdisplay.h Tue Sep 28 16:09:15 1999 @@ -27,11 +27,14 @@ /* The adjustments for scrolling */ GtkAdjustment *vadj; GtkAdjustment *hadj; + GtkAdjustment *posadj; /* Song position adjustment */ /* Amount of vertical scrolling, in tracks (you never see half a track) */ int voffset; /* Horizontal offset, in ticks */ int hoffset; + /* Play position offset, in ticks */ + int poffset; /* * The amount of vertical space used by tracks is under control of @@ -61,6 +64,7 @@ /* The sub-widgets that make up this widget */ GtkWidget *canvas; GtkWidget *title; + gpointer posline; }; @@ -69,7 +73,9 @@ }; guint melys_track_display_get_type(void); -GtkWidget *melys_track_display_new(GtkAdjustment *hadj, GtkAdjustment *vadj); +GtkWidget *melys_track_display_new(GtkAdjustment *hadj, GtkAdjustment *vadj, + GtkAdjustment *posadj); 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); diff -rNu melys-0.0.13/include/menus.h melys-0.0.14/include/menus.h --- melys-0.0.13/include/menus.h Thu Sep 23 17:03:09 1999 +++ melys-0.0.14/include/menus.h Tue Sep 28 16:09:14 1999 @@ -13,6 +13,8 @@ * * * + * + * */ void mel_init_menus(GnomeMDI *mdi); diff -rNu melys-0.0.13/include/song.h melys-0.0.14/include/song.h --- melys-0.0.13/include/song.h Thu Sep 23 17:03:07 1999 +++ melys-0.0.14/include/song.h Tue Sep 28 16:09:09 1999 @@ -17,6 +17,7 @@ * Properties for the parent MDI */ #define MEL_MDI_CHILD_COUNT "MDI_CHILD_COUNT" +#define MEL_OPEN_DIALOG "OPEN_DIALOG" /* * The following are properties that can be set on the mdi child @@ -36,7 +37,6 @@ GtkObject *mdi; /* Back pointer to the parent MDI */ GtkObject *child; /* Back pointer to the MDI child */ - int open_dialog; /* Open dialog box */ int save_dialog; /* Save dialog box */ int dialog; /* Set if a dialog is in action */ @@ -51,6 +51,7 @@ /* Here are all the views on this file */ GtkWidget *trackview; + int unused:1; /* This song has not been used (no file etc) */ }; diff -rNu melys-0.0.13/include/util.h melys-0.0.14/include/util.h --- melys-0.0.13/include/util.h Thu Sep 23 17:03:09 1999 +++ melys-0.0.14/include/util.h Tue Sep 28 16:09:13 1999 @@ -11,10 +11,27 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * + * There doesn't appear to be a stack in glib. So here is one. + * Replace if glib ever gets one. * * */ +typedef struct _GStack { + gint level; + gint elemsize; + GArray *array; +} GStack; + + +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); +int main(int argc, char **argv); + /* Useful macros */ /* The number of elements in an array */ @@ -23,9 +40,10 @@ /* End of an array for use in loops */ #define ENDOF(a) ((a) + NELEM(a)) -#define DEBUG /* XXX */ -#ifdef DEBUG +/* Typedef for the affine transformations */ +typedef double affine_t[6]; +#ifdef DEBUG /* * Debugging stuff. */ diff -rNu melys-0.0.13/make.conf melys-0.0.14/make.conf --- melys-0.0.13/make.conf Wed Sep 22 10:13:17 1999 +++ melys-0.0.14/make.conf Sun Sep 26 20:50:22 1999 @@ -6,7 +6,8 @@ COPTS = -g -O2 -Wall # Defines -DEFINES = -DENABLE_NLS +DEBUG_DEFINES = -DDEBUG -DDEBUG_CASTS +DEFINES = -DENABLE_NLS $(DEBUG_DEFINES) # Path to include files INCLUDES = -I ../include -I . diff -rNu melys-0.0.13/md/.cvsignore melys-0.0.14/md/.cvsignore --- melys-0.0.13/md/.cvsignore Thu Sep 23 17:03:14 1999 +++ melys-0.0.14/md/.cvsignore Tue Sep 28 16:09:23 1999 @@ -1,6 +1,7 @@ elements.c mdadd.c mdlist.c +mdseq.c mdundo.c mdutil.c Makefile diff -rNu melys-0.0.13/md/Makefile melys-0.0.14/md/Makefile --- melys-0.0.13/md/Makefile Thu Sep 23 17:03:14 1999 +++ melys-0.0.14/md/Makefile Tue Sep 28 16:09:23 1999 @@ -7,11 +7,13 @@ OBJS = elements.o \ mdadd.o \ mdlist.o \ + mdseq.o \ mdundo.o \ mdutil.o GENCFILES = elements.c \ mdadd.c \ mdlist.c \ + mdseq.c \ mdundo.c \ mdutil.c GENHFILES = ../include/elements.h \ @@ -47,6 +49,8 @@ .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 diff -rNu melys-0.0.13/md/elements.c melys-0.0.14/md/elements.c --- melys-0.0.13/md/elements.c Thu Sep 23 17:03:21 1999 +++ melys-0.0.14/md/elements.c Tue Sep 28 16:09:34 1999 @@ -30,6 +30,9 @@ static int partid; +/* Number of elements active, mainly for debugging */ +int Nelements; + /* * The basic element type. All elements have a time associated with * them and most use the device and channel field. @@ -41,6 +44,7 @@ static void md_root_init(struct rootElement *e); static void md_head_init(struct headElement *e); static void md_track_init(struct trackElement *e); +static void md_tempomap_init(struct tempomapElement *e); static void md_part_init(struct partElement *e); static void md_partref_init(struct partrefElement *e); static void md_take_init(struct takeElement *e); @@ -75,6 +79,7 @@ e->refcount = 1; e->floating = 1; e->modified = 1; + Nelements++; } /* @@ -103,8 +108,8 @@ md_element_init(MD_ELEMENT(e)); e->elements = g_ptr_array_new(); - e->playptr = NULL; - e->duration = 0; + e->data = NULL; + e->data_free = NULL; } /* @@ -167,6 +172,20 @@ } /* + * Create and initialise a tracklike element. + */ +struct tracklikeElement * +md_tracklike_new(void) +{ + struct tracklikeElement * e; + + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_TRACKLIKE; + md_container_init(MD_CONTAINER(e)); + return e; +} + +/* * Create and initialise a track element. */ struct trackElement * @@ -205,11 +224,25 @@ e = g_malloc0(sizeof(*e)); MD_ELEMENT(e)->type = MD_TYPE_TEMPOMAP; - md_container_init(MD_CONTAINER(e)); + md_tempomap_init(MD_TEMPOMAP(e)); return e; } /* + * Initialize data structures within the element. This is + * only really required when pointers need allocating. + * Arguments: + * e - Element to init + */ +static void +md_tempomap_init(struct tempomapElement *e) +{ + + md_container_init(MD_CONTAINER(e)); + MD_TRACKLIKE(e)->number = -1; +} + +/* * Create and initialise a note element. */ struct noteElement * @@ -252,7 +285,6 @@ md_container_init(MD_CONTAINER(e)); e->name = NULL; - e->item = NULL; } /* @@ -279,10 +311,8 @@ md_partref_init(struct partrefElement *e) { - md_element_init(MD_ELEMENT(e)); - e->name = NULL; - e->ref = NULL; - e->item = NULL; + md_part_init(MD_PART(e)); + e->ref = NULL; } /* @@ -590,6 +620,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 @@ -598,6 +629,10 @@ md_check_cast(struct element *el, int type) { + /* If it's the same type then this is always OK */ + if (type == el->type) + return el; + switch (type) { case MD_TYPE_CONTAINER: if (!iscontainer(el)) @@ -612,14 +647,11 @@ case MD_TYPE_MAP: /* TEMP: this is a parent type */ return el; - case MD_TYPE_TRACK: - if (el->type == MD_TYPE_TEMPOMAP) + case MD_TYPE_TRACKLIKE: + if (el->type == MD_TYPE_TEMPOMAP || el->type == MD_TYPE_TRACK) return el; break; } - - if (type == el->type) - return el; ethrow(debugError, "Cast from %d to %d not allowed", el->type, type); return NULL;/* not reached */ diff -rNu melys-0.0.13/md/elements.m melys-0.0.14/md/elements.m --- melys-0.0.13/md/elements.m Wed Sep 22 20:53:18 1999 +++ melys-0.0.14/md/elements.m Tue Sep 28 16:04:55 1999 @@ -31,6 +31,9 @@ static int partid; +/* Number of elements active, mainly for debugging */ +int Nelements; + /* * The basic element type. All elements have a time associated with * them and most use the device and channel field. @@ -41,14 +44,17 @@ short device_channel; /* Device/channel for this element */ char type; /* Element type */ char tag; /* Element tag */ - int refcount:8; /* Reference count */ + int refcount:16; /* Reference count */ + int wref:16; /* Weak references */ int floating:1; /* Not added to anything yet */ int selected:1; /* Element is selected */ int modified:1; /* Element was modified */ + int destroyed:1; /* Element is destroyed, (but wref > 0) */ init e->refcount = 1; e->floating = 1; e->modified = 1; + Nelements++; /* * An element that holds others. This includes tracks, parts and the @@ -57,11 +63,14 @@ >>elementdef container element GPtrArray *elements; /* List of elements */ guint32 duration; /* duration time for this container */ - struct element **playptr; /* Play position pointer */ + + /* 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->playptr = NULL; - e->duration = 0; + e->data = NULL; + e->data_free = NULL; /* * The root element, used to hold all the other elements. @@ -90,8 +99,11 @@ e->title = NULL; e->comment = NULL; ->>elementdef track container - int number; /* Track number from 1 */ +>># Superclass of both track and tempomap +>>elementdef tracklike container + int number; /* Track number, -1 for tempomap */ + +>>elementdef track tracklike char *name; /* Name of track */ int program; /* Extended program number */ @@ -113,7 +125,10 @@ e->name = NULL; e->program = 0; ->>elementdef tempomap container +>># For the tempomap, its a special kind of track. +>>elementdef tempomap tracklike +init + MD_TRACKLIKE(e)->number = -1; >># This should be kept as small as possible as they will soon >># begin to eat up memory. @@ -133,22 +148,19 @@ char *name; /* Part name */ int id; /* Part id unique among all referenced parts */ - /* Private stuff not to be written out */ - gpointer item; /* pointer to displayed item */ init e->name = NULL; - e->item = NULL; ->>elementdef partref element - char *name; /* Name of this part (need not be the same as part ref'ed) */ +>># This is not really a part as it is not even a container. +>># I have considered allowing partref to have some extra events +>># that are merged into the parent part, so allowing 'just like this +>># part but with this extra note' type expressions. +>># At present though it is an error to actuall put elements into +>># a partref. +>>elementdef partref part struct partElement *ref; /* The part referenced */ - - /* Private stuff not to be written out */ - gpointer item; /* pointer to displayed item */ init - e->name = NULL; - e->ref = NULL; - e->item = NULL; + e->ref = NULL; >>elementdef take container char *name; @@ -298,8 +310,13 @@ in proper use. In particular do not use this routine to check types unless you want the program to exit if the check fails. + >>code + /* If it's the same type then this is always OK */ + if (type == el->type) + return el; + switch (type) { case MD_TYPE_CONTAINER: if (!iscontainer(el)) @@ -314,17 +331,15 @@ case MD_TYPE_MAP: /* TEMP: this is a parent type */ return el; - case MD_TYPE_TRACK: - if (el->type == MD_TYPE_TEMPOMAP) + case MD_TYPE_TRACKLIKE: + if (el->type == MD_TYPE_TEMPOMAP || el->type == MD_TYPE_TRACK) return el; break; } - if (type == el->type) - return el; - ethrow(debugError, "Cast from %d to %d not allowed", el->type, type); return NULL;/* not reached */ + >>function md_root_inc_ref struct rootElement * diff -rNu melys-0.0.13/md/mdadd.c melys-0.0.14/md/mdadd.c --- melys-0.0.13/md/mdadd.c Thu Sep 23 17:03:22 1999 +++ melys-0.0.14/md/mdadd.c Tue Sep 28 16:09:35 1999 @@ -23,9 +23,13 @@ #include "except.h" #include "util.h" #include "elements.h" +#include "gtk/gtkobject.h" #include "md.h" #include "intl.h" +#ifdef DEBUG +#include +#endif /* Short cut for cast */ #define CPTR struct containerElement * @@ -63,7 +67,7 @@ endtime += ((struct noteElement *)el)->length; break; case MD_TYPE_TRACK: - MD_TRACK(el)->number = MD_ROOT(c)->tracks++; + MD_TRACKLIKE(el)->number = MD_ROOT(c)->tracks++; break; default: break; @@ -123,24 +127,31 @@ md_free(struct element *el) { struct containerElement *c; + struct element *ep; + extern int Nelements; int i; - + + g_return_if_fail(el->destroyed == 0); + if (--el->refcount > 0) return; if (el->refcount < 0) { - ethrow(debugError, _("Freed an mdroot %d with bad reference count"), - MD_ELEMENT(el)->refcount); + ethrow(debugError, _("Freed an element %d with bad reference count %d"), + MD_TYPE(el), MD_ELEMENT(el)->refcount); return; } if (el->type >= MD_CONTAINER_BEGIN) { c = (struct containerElement *)el; for (i = 0; i < c->elements->len; i++) { - struct element *p = g_ptr_array_index(c->elements, i); - md_free(p); + ep = g_ptr_array_index(c->elements, i); + md_free(ep); } g_ptr_array_free(c->elements, 1); + + if (c->data) + c->data_free(c->data); } switch (el->type) { @@ -154,6 +165,7 @@ if (MD_TRACK(el)->name) g_free(MD_TRACK(el)->name); break; + case MD_TYPE_PARTREF: case MD_TYPE_PART: if (MD_PART(el)->name) g_free(MD_PART(el)->name); @@ -161,7 +173,42 @@ default: break; } - g_free(el); + + el->destroyed = 1; + + if (el->wref <= 0) { +#ifdef DEBUG + if (iscontainer(el)) + memset(el, 0xa5, sizeof(struct containerElement)); + else + memset(el, 0xa5, sizeof(struct element)); +#endif + g_free(el); + Nelements--; + } + else + /* This is not yet allowed */ + dprintf(0, "wref for type %d was %d", el->type, el->wref); +} + +/* + * Decrement the back reference count and if zero and the + * element is destroyed, then finally free the memory. + * + */ +void +md_wfree(struct element *el) +{ + + /* The wref should never be 0 when this is called */ + g_return_if_fail(el->wref > 0); + el->wref--; + if (el->wref <= 0) { + if (el->destroyed) { + dprintf1("Final free of a %d at %p", el->type, el); + g_free(el); + } + } } /* @@ -328,4 +375,16 @@ if (MD_ENDTIME(ctrk) < end) ctrk->duration = end - MD_TIME(ctrk); +} + +/* + * Return the number of allocated elements. Mainly for + * debugging. + */ +int +md_nfree(void) +{ + extern int Nelements; + + return Nelements; } diff -rNu melys-0.0.13/md/mdadd.m melys-0.0.14/md/mdadd.m --- melys-0.0.13/md/mdadd.m Sat Sep 18 17:01:25 1999 +++ melys-0.0.14/md/mdadd.m Tue Sep 28 16:04:55 1999 @@ -15,6 +15,11 @@ operations. Specialized tranformation are likely to be implmented in a tools directory. +>>extern +#ifdef DEBUG +#include +#endif +>>header gtk/gtkobject.h >>headerdef --decl md.h /* * The merge mode types @@ -64,7 +69,7 @@ endtime += ((struct noteElement *)el)->length; break; case MD_TYPE_TRACK: - MD_TRACK(el)->number = MD_ROOT(c)->tracks++; + MD_TRACKLIKE(el)->number = MD_ROOT(c)->tracks++; break; default: break; @@ -125,24 +130,31 @@ >>code struct containerElement *c; + struct element *ep; + extern int Nelements; int i; - + + g_return_if_fail(el->destroyed == 0); + if (--el->refcount > 0) return; if (el->refcount < 0) { - ethrow(debugError, _("Freed an mdroot %d with bad reference count"), - MD_ELEMENT(el)->refcount); + ethrow(debugError, _("Freed an element %d with bad reference count %d"), + MD_TYPE(el), MD_ELEMENT(el)->refcount); return; } if (el->type >= MD_CONTAINER_BEGIN) { c = (struct containerElement *)el; for (i = 0; i < c->elements->len; i++) { - struct element *p = g_ptr_array_index(c->elements, i); - md_free(p); + ep = g_ptr_array_index(c->elements, i); + md_free(ep); } g_ptr_array_free(c->elements, 1); + + if (c->data) + c->data_free(c->data); } switch (el->type) { @@ -156,6 +168,7 @@ if (MD_TRACK(el)->name) g_free(MD_TRACK(el)->name); break; + case MD_TYPE_PARTREF: case MD_TYPE_PART: if (MD_PART(el)->name) g_free(MD_PART(el)->name); @@ -163,7 +176,44 @@ default: break; } - g_free(el); + + el->destroyed = 1; + + if (el->wref <= 0) { +#ifdef DEBUG + if (iscontainer(el)) + memset(el, 0xa5, sizeof(struct containerElement)); + else + memset(el, 0xa5, sizeof(struct element)); +#endif + g_free(el); + Nelements--; + } + else + /* This is not yet allowed */ + dprintf(0, "wref for type %d was %d", el->type, el->wref); + + + +>>function md_wfree +void +struct element *el; + +>>description +Decrement the back reference count and if zero and the +element is destroyed, then finally free the memory. + +>>code + + /* The wref should never be 0 when this is called */ + g_return_if_fail(el->wref > 0); + el->wref--; + if (el->wref <= 0) { + if (el->destroyed) { + dprintf1("Final free of a %d at %p", el->type, el); + g_free(el); + } + } >>function md_merge_in @@ -338,3 +388,14 @@ if (MD_ENDTIME(ctrk) < end) ctrk->duration = end - MD_TIME(ctrk); + + +>>function md_nfree +int +>>description +Return the number of allocated elements. +Mainly for debugging. +>>code + extern int Nelements; + + return Nelements; diff -rNu melys-0.0.13/md/mdseq.c melys-0.0.14/md/mdseq.c --- melys-0.0.13/md/mdseq.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.14/md/mdseq.c Tue Sep 28 16:09:35 1999 @@ -0,0 +1,461 @@ +/* + * + * 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" + + +/* Information about a particular track */ +struct trackinfo { + struct tracklikeElement *ltrack; /* The associated track */ + GStack *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 */ + int istrack:1; /* Is this really a track, (not tempomap) */ +}; + +/* To keep track of a particular sequence */ +struct sequenceState { + int merge:1; /* Merge together tracks */ + int nodes:1; /* Don't return nodes */ + int usedroot:1; /* Root has been returned */ + int usedhead:1; /* Head has been returned */ + + struct rootElement *root; /* Root being sequenced over */ + + struct trackinfo *trackinfos; /* List of track info structures */ + int ntinfo; /* Number of elements in trackinfos */ + + struct rootElement *retroot; /* Root to be returned */ + struct headElement *rethead; /* Head to be returned */ + long duration; /* End time */ +}; + +/* Used in a stack to keep track of our position */ +struct pos { + struct containerElement *con; + int pos; +}; + +static struct element *get_elem(struct trackinfo *ti, gboolean nodes); + + +/* + * 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 + */ +struct sequenceState * +md_seq_init(struct containerElement *con, gboolean nodes) +{ + struct sequenceState *seq; + struct trackinfo *ti; + GStack *stack; + struct pos pos; + + /* Actually this is allowed and this test will be removed when + conversion is complete and tested. */ + g_return_val_if_fail(MD_TYPE(con) != MD_TYPE_ROOT, NULL); + + seq = g_new(struct sequenceState, 1); + seq->merge = 0; + seq->nodes = nodes; + + seq->usedroot = 1; + seq->usedhead = 1; + seq->retroot = NULL; + seq->rethead = NULL; + + seq->ntinfo = 1; + seq->trackinfos = g_new(struct trackinfo, seq->ntinfo); + + stack = gx_stack_new(sizeof(struct pos)); + + pos.pos = -1; + pos.con = con; + MD_REF(con); + + gx_stack_push(stack, &pos); + + ti = &seq->trackinfos[0]; + ti->stack = stack; + ti->need_next = 0; + ti->lastelem = NULL; + ti->time = 0; + ti->ltrack = NULL; /* Maybe should set if con is a track ?? */ + + return seq; +} + +/* + * 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; + struct pos pos; + int i; + + g_return_val_if_fail(MD_TYPE(root) == MD_TYPE_ROOT, NULL); + + seq = g_new(struct sequenceState, 1); + seq->merge = 1; + seq->nodes = nodes; + + seq->usedroot = 0; + seq->usedhead = 0; + seq->retroot = md_root_inc_ref(root); + seq->rethead = root->head; + MD_REF(root->head); + + /* The +1 is for the tempo map */ + seq->ntinfo = root->tracks + 1; + seq->trackinfos = g_new(struct trackinfo, seq->ntinfo); + + for (i = 0; i < seq->ntinfo; i++) { + stack = gx_stack_new(sizeof(struct pos)); + ti = &seq->trackinfos[i]; + + pos.pos = -1; + if (i == seq->ntinfo - 1) { + pos.con = (struct containerElement *)md_get_tempomap(root); + ti->istrack = 0; + } else { + pos.con = (struct containerElement *)md_track_nth(root, i); + ti->istrack = 1; + } + MD_REF(pos.con); + + gx_stack_push(stack, &pos); + + ti->stack = stack; + ti->need_next = 0; + ti->lastelem = NULL; + ti->time = 0; + ti->ltrack = MD_TRACKLIKE(pos.con); + MD_REF(ti->ltrack); + } + + return seq; +} + +/* + * Release all resources for this sequence state. + * + */ +void +md_seq_end(struct sequenceState *seq) +{ + int i; + struct trackinfo *ti; + struct pos pos; + GStack *stack; + + if (seq == NULL) + return; + + for (i = 0; i < seq->ntinfo; i++) { + ti = &seq->trackinfos[i]; + + stack = ti->stack; + /* Pop off any unused entries and un-ref them */ + while (gx_stack_pop(stack, &pos)) + MD_UNREF(pos.con); + + /* Now free the stack */ + gx_stack_free(stack); + + MD_UNREF(ti->ltrack); + } + + if (seq->trackinfos) + g_free(seq->trackinfos); + + if (seq->retroot) + MD_UNREF(seq->retroot); + if (seq->rethead) + MD_UNREF(seq->rethead); + + g_free(seq); +} + +/* + * Get the next element in the sequence. Elements returned + * from this routine must not be modified in any way. They must + * also not be assumed to exist beyond the next md_seq_next or a + * md_seq_end . + * + */ +struct element * +md_seq_next(struct sequenceState *seq) +{ + long besttime; + struct element *el = NULL; + struct element *bestel = NULL; + struct trackinfo *bestti = NULL; + struct trackinfo *ti; + int i; + long t; + + if (!seq) + return NULL; + + el = NULL; + + if (!seq->usedroot) { + seq->usedroot = 1; + return MD_ELEMENT(seq->retroot); + } + if (!seq->usedhead) { + seq->usedhead = 1; + return MD_ELEMENT(seq->rethead); + } + + if (!seq->merge) { + ti = &seq->trackinfos[0]; + el = get_elem(ti, seq->nodes); + ti->need_next = 1; + return el; + } + + retry: + besttime = G_MAXLONG; + for (i = 0; i < seq->ntinfo; i++) { + GStack *stack; + + ti = &seq->trackinfos[i]; + + stack = ti->stack; + if (ti->need_next || ti->lastelem == NULL) { + el = get_elem(ti, seq->nodes); + ti->need_next = 0; + ti->lastelem = el; + } else { + el = ti->lastelem; + } + + if (!el) + continue; + + t = MD_TIME(el); + if (t < besttime) { + besttime = t; + bestel = el; + bestti = ti; + } + } + + if (bestti) { + bestti->need_next = 1; + bestti->time = MD_TIME(bestel); + + /* Set the tag number for this element */ + if (bestti->ltrack) + bestel->tag = bestti->ltrack->number; + else + bestel->tag = 255; + + if (bestti->istrack && MD_TRACK(bestti->ltrack)->mute) { + if (bestel->type == MD_TYPE_NOTE) { + goto retry; + } + } + } + + return bestel; +} + +/* + * 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; + struct element *el; + struct pos *pos; + struct pos npos; + int next; + + el = NULL; + next = ti->need_next; + pstack = ti->stack; + + while (el == NULL) { + pos = gx_stack_top(pstack); + + if (!pos) + return NULL; + + if (next) { + pos->pos++; + next = 0; + } + + + if (pos->pos < 0) { + el = MD_ELEMENT(pos->con); + next = 1; + } else if (pos->pos >= pos->con->elements->len) { + /* Do not pop the initial track element */ + if (MD_TYPE(pos->con) == MD_TYPE_TRACK) + return NULL; + gx_stack_pop(pstack, &npos); + MD_UNREF(npos.con); + next = 1; + continue; + } else { + el = pos->con->elements->pdata[pos->pos]; + if (iscontainer(el)) { + npos.con = MD_CONTAINER(el); + npos.pos = -1; + MD_REF(npos.con); + gx_stack_push(pstack, &npos); + } + } + + if (el && iscontainer(el) && !nodes) + el = NULL; + } + + return el; +} + +/* + * 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, + unsigned long time) +{ + struct pos pos; + struct pos *posp; + struct element *el; + struct trackinfo *ti; + GStack *stack; + int i; + + stack = NULL; + ti = NULL; + + for (i = 0; i < seq->ntinfo; i++) { + ti = &seq->trackinfos[i]; + stack = ti->stack; + posp = (struct pos *)stack->array->data; + if (posp->con == MD_CONTAINER(ltrack)) + break; + } + + g_return_if_fail(i < seq->ntinfo); + + /* + * OK this is a very simple algorithm. It just winds back to the + * beginning and steps forward to the correct place. + * Since we sometimes use this routine to step back a short way + * this may not be very efficient. If you notice performance + * problems feel free to improve it... + */ + while(gx_stack_pop(stack, &pos)) + MD_UNREF(pos.con); + + /* Push it back on, positioned at the beginning */ + MD_REF(pos.con); + pos.pos = -1; + gx_stack_push(stack, &pos); + + ti->need_next = 0; + ti->lastelem = NULL; + do { + el = get_elem(ti, FALSE); + ti->need_next = 1; + } while (el && MD_TIME(el) < time); + +//if (MD_TYPE(ltrack) == MD_TYPE_TRACK)printf("track %d: ", ltrack->number); +//else if (MD_TYPE(ltrack) == MD_TYPE_TEMPOMAP)printf("tempomap: "); +//if (el) +//printf(" final seek at %ld\n", MD_TIME(el)); +//else +//printf(" no el\n"); + ti->time = MD_TIME(el); + ti->need_next = 0; + ti->lastelem = NULL; +} + +/* + * Seek to the specified time as in md_elem_seek but will not + * seek forward. In other words if the time is already greater + * then the current play position the the play position is not + * changed. + * + */ +void +md_elem_seek_back(struct sequenceState *seq, struct tracklikeElement *ltrack, + unsigned long time) +{ + struct pos *posp; + struct trackinfo *ti; + GStack *stack; + int i; + + stack = NULL; + ti = NULL; + + for (i = 0; i < seq->ntinfo; i++) { + ti = &seq->trackinfos[i]; + stack = ti->stack; + if (gx_stack_empty(stack)) + continue; + posp = (struct pos *)stack->array->data; + if (posp->con == MD_CONTAINER(ltrack)) + break; + } + + g_return_if_fail(i < seq->ntinfo); + +//printf("seek back to %ld cur %ld\n", time, ti->time); + if (ti->time <= time) + return; /* Nothing to do */ + + md_elem_seek(seq, ltrack, time); +} diff -rNu melys-0.0.13/md/mdseq.m melys-0.0.14/md/mdseq.m --- melys-0.0.13/md/mdseq.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.14/md/mdseq.m Sun Sep 26 20:52:37 1999 @@ -0,0 +1,464 @@ +>>name mdseq.m - the md sequencing routines. + +Copyright (C) 1999 Steve Ratcliffe + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +>>header elements.h + +>>headerdef --decl md.h + +>>extern + +/* Information about a particular track */ +struct trackinfo { + struct tracklikeElement *ltrack; /* The associated track */ + GStack *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 */ + int istrack:1; /* Is this really a track, (not tempomap) */ +}; + +/* To keep track of a particular sequence */ +struct sequenceState { + int merge:1; /* Merge together tracks */ + int nodes:1; /* Don't return nodes */ + int usedroot:1; /* Root has been returned */ + int usedhead:1; /* Head has been returned */ + + struct rootElement *root; /* Root being sequenced over */ + + struct trackinfo *trackinfos; /* List of track info structures */ + int ntinfo; /* Number of elements in trackinfos */ + + struct rootElement *retroot; /* Root to be returned */ + struct headElement *rethead; /* Head to be returned */ + long duration; /* End time */ +}; + +/* Used in a stack to keep track of our position */ +struct pos { + struct containerElement *con; + int pos; +}; + +>>function md_seq_init +struct sequenceState * +struct containerElement *con; The container to sequence over +gboolean nodes; If false then no nodes apart from root and head are returned + +>>description +Return an object that can be passed to +.F md_sequence_next +to iterate over all the elements in a tree in time sequenced order. + +This is intended for use with a non root container. +For a root you would more likely use +.F md_seq_init_merge . + +If +.A nodes +is set then container type elements are returned as well. + +>>code + struct sequenceState *seq; + struct trackinfo *ti; + GStack *stack; + struct pos pos; + + /* Actually this is allowed and this test will be removed when + conversion is complete and tested. */ + g_return_val_if_fail(MD_TYPE(con) != MD_TYPE_ROOT, NULL); + + seq = g_new(struct sequenceState, 1); + seq->merge = 0; + seq->nodes = nodes; + + seq->usedroot = 1; + seq->usedhead = 1; + seq->retroot = NULL; + seq->rethead = NULL; + + seq->ntinfo = 1; + seq->trackinfos = g_new(struct trackinfo, seq->ntinfo); + + stack = gx_stack_new(sizeof(struct pos)); + + pos.pos = -1; + pos.con = con; + MD_REF(con); + + gx_stack_push(stack, &pos); + + ti = &seq->trackinfos[0]; + ti->stack = stack; + ti->need_next = 0; + ti->lastelem = NULL; + ti->time = 0; + ti->ltrack = NULL; /* Maybe should set if con is a track ?? */ + + return seq; + + +>>function md_seq_init_merge +struct sequenceState * +struct rootElement *root; +gboolean nodes; + +>>description +Initialises a sequence that will merge all the tracks together +in time order. + +>>code + struct sequenceState *seq; + struct trackinfo *ti; + GStack *stack; + struct pos pos; + int i; + + g_return_val_if_fail(MD_TYPE(root) == MD_TYPE_ROOT, NULL); + + seq = g_new(struct sequenceState, 1); + seq->merge = 1; + seq->nodes = nodes; + + seq->usedroot = 0; + seq->usedhead = 0; + seq->retroot = md_root_inc_ref(root); + seq->rethead = root->head; + MD_REF(root->head); + + /* The +1 is for the tempo map */ + seq->ntinfo = root->tracks + 1; + seq->trackinfos = g_new(struct trackinfo, seq->ntinfo); + + for (i = 0; i < seq->ntinfo; i++) { + stack = gx_stack_new(sizeof(struct pos)); + ti = &seq->trackinfos[i]; + + pos.pos = -1; + if (i == seq->ntinfo - 1) { + pos.con = (struct containerElement *)md_get_tempomap(root); + ti->istrack = 0; + } else { + pos.con = (struct containerElement *)md_track_nth(root, i); + ti->istrack = 1; + } + MD_REF(pos.con); + + gx_stack_push(stack, &pos); + + ti->stack = stack; + ti->need_next = 0; + ti->lastelem = NULL; + ti->time = 0; + ti->ltrack = MD_TRACKLIKE(pos.con); + MD_REF(ti->ltrack); + } + + return seq; + + +>>function md_seq_end +void +struct sequenceState *seq; + +>>description +Release all resources for this sequence state. + +>>code + int i; + struct trackinfo *ti; + struct pos pos; + GStack *stack; + + if (seq == NULL) + return; + + for (i = 0; i < seq->ntinfo; i++) { + ti = &seq->trackinfos[i]; + + stack = ti->stack; + /* Pop off any unused entries and un-ref them */ + while (gx_stack_pop(stack, &pos)) + MD_UNREF(pos.con); + + /* Now free the stack */ + gx_stack_free(stack); + + MD_UNREF(ti->ltrack); + } + + if (seq->trackinfos) + g_free(seq->trackinfos); + + if (seq->retroot) + MD_UNREF(seq->retroot); + if (seq->rethead) + MD_UNREF(seq->rethead); + + g_free(seq); + + +>>function md_seq_next +struct element * +struct sequenceState *seq; + +>>description +Get the next element in the sequence. +Elements returned from this routine must not be modified in +any way. +They must also not be assumed to exist beyond the next +.F md_seq_next +or a +.F md_seq_end . + +>>code + long besttime; + struct element *el = NULL; + struct element *bestel = NULL; + struct trackinfo *bestti = NULL; + struct trackinfo *ti; + int i; + long t; + + if (!seq) + return NULL; + + el = NULL; + + if (!seq->usedroot) { + seq->usedroot = 1; + return MD_ELEMENT(seq->retroot); + } + if (!seq->usedhead) { + seq->usedhead = 1; + return MD_ELEMENT(seq->rethead); + } + + if (!seq->merge) { + ti = &seq->trackinfos[0]; + el = get_elem(ti, seq->nodes); + ti->need_next = 1; + return el; + } + + retry: + besttime = G_MAXLONG; + for (i = 0; i < seq->ntinfo; i++) { + GStack *stack; + + ti = &seq->trackinfos[i]; + + stack = ti->stack; + if (ti->need_next || ti->lastelem == NULL) { + el = get_elem(ti, seq->nodes); + ti->need_next = 0; + ti->lastelem = el; + } else { + el = ti->lastelem; + } + + if (!el) + continue; + + t = MD_TIME(el); + if (t < besttime) { + besttime = t; + bestel = el; + bestti = ti; + } + } + + if (bestti) { + bestti->need_next = 1; + bestti->time = MD_TIME(bestel); + + /* Set the tag number for this element */ + if (bestti->ltrack) + bestel->tag = bestti->ltrack->number; + else + bestel->tag = 255; + + if (bestti->istrack && MD_TRACK(bestti->ltrack)->mute) { + if (bestel->type == MD_TYPE_NOTE) { + goto retry; + } + } + } + + return bestel; + + +>>function get_elem +static struct element * +struct trackinfo *ti; +gboolean nodes; If true return nodes. + +>>description +Get the current or next element in the sequence. + +>>code + GStack *pstack; + struct element *el; + struct pos *pos; + struct pos npos; + int next; + + el = NULL; + next = ti->need_next; + pstack = ti->stack; + + while (el == NULL) { + pos = gx_stack_top(pstack); + + if (!pos) + return NULL; + + if (next) { + pos->pos++; + next = 0; + } + + + if (pos->pos < 0) { + el = MD_ELEMENT(pos->con); + next = 1; + } else if (pos->pos >= pos->con->elements->len) { + /* Do not pop the initial track element */ + if (MD_TYPE(pos->con) == MD_TYPE_TRACK) + return NULL; + gx_stack_pop(pstack, &npos); + MD_UNREF(npos.con); + next = 1; + continue; + } else { + el = pos->con->elements->pdata[pos->pos]; + if (iscontainer(el)) { + npos.con = MD_CONTAINER(el); + npos.pos = -1; + MD_REF(npos.con); + gx_stack_push(pstack, &npos); + } + } + + if (el && iscontainer(el) && !nodes) + el = NULL; + } + + return el; + + +>>function md_elem_seek +void +struct sequenceState *seq; +struct tracklikeElement *ltrack; +unsigned long time; + +>>description +Set the play pointer stack on the specifed track so that the next +event to play from the position stack will be at or later than +the specified +.A time . + +>>code + struct pos pos; + struct pos *posp; + struct element *el; + struct trackinfo *ti; + GStack *stack; + int i; + + stack = NULL; + ti = NULL; + + for (i = 0; i < seq->ntinfo; i++) { + ti = &seq->trackinfos[i]; + stack = ti->stack; + posp = (struct pos *)stack->array->data; + if (posp->con == MD_CONTAINER(ltrack)) + break; + } + + g_return_if_fail(i < seq->ntinfo); + + /* + * OK this is a very simple algorithm. It just winds back to the + * beginning and steps forward to the correct place. + * Since we sometimes use this routine to step back a short way + * this may not be very efficient. If you notice performance + * problems feel free to improve it... + */ + while(gx_stack_pop(stack, &pos)) + MD_UNREF(pos.con); + + /* Push it back on, positioned at the beginning */ + MD_REF(pos.con); + pos.pos = -1; + gx_stack_push(stack, &pos); + + ti->need_next = 0; + ti->lastelem = NULL; + do { + el = get_elem(ti, FALSE); + ti->need_next = 1; + } while (el && MD_TIME(el) < time); + +//if (MD_TYPE(ltrack) == MD_TYPE_TRACK)printf("track %d: ", ltrack->number); +//else if (MD_TYPE(ltrack) == MD_TYPE_TEMPOMAP)printf("tempomap: "); +//if (el) +//printf(" final seek at %ld\n", MD_TIME(el)); +//else +//printf(" no el\n"); + ti->time = MD_TIME(el); + ti->need_next = 0; + ti->lastelem = NULL; + + +>>function md_elem_seek_back +void +struct sequenceState *seq; +struct tracklikeElement *ltrack; +unsigned long time; + +>>description +Seek to the specified time as in +.F md_elem_seek +but will not seek forward. +In other words if the time is already greater then the current play position +the the play position is not changed. + +>>code + struct pos *posp; + struct trackinfo *ti; + GStack *stack; + int i; + + stack = NULL; + ti = NULL; + + for (i = 0; i < seq->ntinfo; i++) { + ti = &seq->trackinfos[i]; + stack = ti->stack; + if (gx_stack_empty(stack)) + continue; + posp = (struct pos *)stack->array->data; + if (posp->con == MD_CONTAINER(ltrack)) + break; + } + + g_return_if_fail(i < seq->ntinfo); + +//printf("seek back to %ld cur %ld\n", time, ti->time); + if (ti->time <= time) + return; /* Nothing to do */ + + md_elem_seek(seq, ltrack, time); diff -rNu melys-0.0.13/md/mdutil.c melys-0.0.14/md/mdutil.c --- melys-0.0.13/md/mdutil.c Thu Sep 23 17:03:22 1999 +++ melys-0.0.14/md/mdutil.c Tue Sep 28 16:09:35 1999 @@ -26,12 +26,6 @@ #include "intl.h" -#define LAST_ELEMENTP(c) ((struct element **)((c)->elements->pdata + (c)->elements->len)) -#define FIRST_ELEMENTP(c) ((struct element **)((c)->elements->pdata)) - -static void seqinit(struct element *el, void *arg, int flags); -static struct element *get_curr_elem(struct containerElement *c); -static gboolean inc_elem(struct containerElement *c); static void set_chan(struct element *el, gpointer data, int flags); @@ -59,355 +53,19 @@ GPtrArray *ar; int i; - fn(MD_ELEMENT(c), arg, MD_WALK_START); + fn((struct element *)c, arg, MD_WALK_START); ar = c->elements; for (i = 0; i < ar->len; i++) { el = g_ptr_array_index(ar, i); if (iscontainer(el)) { - md_walk(MD_CONTAINER(el), fn, arg, flags); + md_walk((struct containerElement *)el, fn, arg, flags); } else { fn(el, arg, MD_WALK_EMPTY); } } - fn(MD_ELEMENT(c), arg, MD_WALK_END); -} - -/* - * Return true if the element is some kind of container. - * Arguments: - * el - Element to be tested - */ -int -iscontainer(struct element *el) -{ - - if (el->type >= MD_CONTAINER_BEGIN) - return 1; - else - return 0; -} - -/* - * 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 what you want if you actually want to play the - * song for example. The elements in the container must - * already be in sorted order within their own tracks or - * subcontainers. - * - * Arguments: - * root - Root to sequence over - */ -struct sequenceState * -md_sequence_init(struct rootElement *root) -{ - struct sequenceState *state; - int nchild; - - state = g_new(struct sequenceState, 1); - - nchild = MD_CONTAINER(root)->elements->len; - state->root = md_root_inc_ref(root); - - state->retroot = root; - state->ntracks = 0; - state->duration = 0; - - md_walk(MD_CONTAINER(root), seqinit, state, 0); - - return state; -} - -static void -seqinit(struct element *el, void *arg, int flags) -{ - struct sequenceState *seq = arg; - struct containerElement *c; - - if (el->type == MD_TYPE_HEAD) { - /* Save so that it can be given to the user */ - seq->head = MD_HEAD(el); - } - - /* - * Only interested in containers. They have a separate start and end - * we just trigger on the start. - */ - if ((flags & MD_WALK_EMPTY) == MD_WALK_START) { - c = MD_CONTAINER(el); - - c->playptr = FIRST_ELEMENTP(c); - if (el->type == MD_TYPE_TRACK) { - seq->ntracks++; - if (c->duration > seq->duration) - seq->duration = c->duration; - } - } -} - -/* - * Return the next element as sorted by time. The root and head - * elements are returned, but otherwise just leaf elements - * are returned. - * - * Arguments: - * seq - Sequence state information - */ -struct element * -md_sequence_next(struct sequenceState *seq) -{ - struct element *el; - struct trackElement *track; - struct trackElement *besttrack = NULL; - struct element *bestelem = NULL; - unsigned long leasttime; - int i; - - if (seq == NULL) - return NULL; - - if (seq->retroot) { - /* The first time we return the root element */ - el = MD_ELEMENT(seq->retroot); - seq->retroot = NULL; - return el; - } - if (seq->head) { - /* Next we return the head element */ - el = MD_ELEMENT(seq->head); - seq->head = NULL; - return el; - } - - leasttime = -1; - - /* - * Now look at the next element in each track and see which - * one should come first. The track -1 is the tempo map. - */ - for (i = -1; i < seq->ntracks; i++) { - if (i == -1) - /* XXX not even a track */ - track = ((struct trackElement **)MD_CONTAINER(seq->root)->elements->pdata)[1]; - else - track = md_track_nth(seq->root, i); - if (track == NULL) - ethrow(debugError, "md_sequence_next: track is NULL"); - - /* - * Get the next element on this track and see if it comes - * earlier than any others. - */ - el = get_curr_elem(MD_CONTAINER(track)); - if (el == NULL) - continue; - - if (leasttime == -1 || el->element_time < leasttime) { - - if (i != -1 && track->mute && el->type == MD_TYPE_NOTE) { - inc_elem(MD_CONTAINER(track)); - continue; - } - - leasttime = el->element_time; - besttrack = track; - bestelem = el; - } - } - - /* We found the next one so return it */ - if (bestelem) { - - /* Step onto the next event for selected track */ - - (void)inc_elem(MD_CONTAINER(besttrack)); - - /* TEMP set tag to track number */ - bestelem->tag = besttrack->number; - - return bestelem; - } - - /* Nothing left */ - return NULL; -} - -/* - * Get the current item that is being pointed to by the play - * position pointers. This routine is recursive but - * recursion depth is low, typically one. - * - * Arguments: - * c - Track to get next element from - */ -static struct element * -get_curr_elem(struct containerElement *c) -{ - struct element *el; - - if (c->playptr == NULL) - return NULL; - - if (iscontainer(*c->playptr)) - el = get_curr_elem(MD_CONTAINER(*c->playptr)); - else - el = MD_ELEMENT(*c->playptr); - - return el; -} - -/* - * Step onto the next element beneath this container. This is - * quite a complex routine as when you reach the end of one - * container you have to step back and try the next one, which - * may be empty so you have to try the next and so on. - * - * Returns TRUE when element found and incremented. - * - * Arguments: - * c - Container to step on to next element - */ -static gboolean -inc_elem(struct containerElement *c) -{ - gboolean rc; - - if (c == NULL) - return FALSE; - if (c->playptr == NULL) - return FALSE; - - do { - if (iscontainer(*c->playptr)) { - rc = inc_elem(MD_CONTAINER(*c->playptr)); - if (rc == TRUE) - return TRUE; - - } - - c->playptr++; - if (c->playptr >= LAST_ELEMENTP(c)) { - c->playptr = NULL; - return FALSE; - } - - /* - * The while below is only needed (I think) for empty container - * elements. - */ - } while (get_curr_elem(c) == NULL); - - return TRUE; - -} - -/* - * Set the play pointers on the specifed track so that the next - * event to play from the track will be at or later than the - * specified time . NB: This routine is almost certainly - * incorrect, needs proving. - * - */ -void -md_elem_seek(struct containerElement *c, unsigned long time) -{ - struct element **nextpp; - struct element **lastpp; - - lastpp = NULL; - for (nextpp = FIRST_ELEMENTP(c); nextpp < LAST_ELEMENTP(c); nextpp++) { - if (iscontainer(*nextpp)) { - if (MD_ELEMENT(*nextpp)->element_time < time) { - lastpp = nextpp; - } else { - break; - } - } else { - if (MD_ELEMENT(*nextpp)->element_time >= time) { - lastpp = nextpp; - break; - } - } - } - - if (lastpp == NULL) - lastpp = FIRST_ELEMENTP(c); - - c->playptr = lastpp; - - if (c->playptr && iscontainer(*c->playptr)) - md_elem_seek(MD_CONTAINER(*c->playptr), time); - - { - struct element *el; - el = get_curr_elem(c); - if (el) - dprintf(3, "after seek to %ld, el%d time is %ld", time, el->type, el->element_time); - else { - dprintf(3, "after seek to %ld, there was NO EL\n", time); - inc_elem(c); - el = get_curr_elem(c); - if (el) - dprintf1(" second attempt after seek to %ld, el time is %ld", time, el->element_time); - } - } -} - -/* - * Seek to the specified time, but only in the backward - * direction. If the current play position is already - * earlier, then this routine returns FALSE. Otherwise set - * the play position and return TRUE. It may be the case that - * this track has no more events left, in this case it still - * returns TRUE. - * - */ -gboolean -md_elem_seek_back(struct containerElement *c, unsigned long time) -{ - struct element *el; - - el = get_curr_elem(c); - if (el && el->element_time < time) - return FALSE; - - md_elem_seek(c, time); - return TRUE; - - -} - -/* - * Finish with a sequence object. Frees all resources. The - * object cannot be used any more. - * Arguments: - * seq - Sequence state information - */ -void -md_sequence_end(struct sequenceState *seq) -{ - - if (!seq) - return; - - if (seq->root) - md_free(MD_ELEMENT(seq->root)); - - g_free(seq); -} - -/* - * Get the final time for the song. - * Arguments: - * seq - Sequence state information - */ -unsigned long -md_sequence_duration(struct sequenceState *seq) -{ - - return seq->duration; + fn((struct element *)c, arg, MD_WALK_END); } /* @@ -431,7 +89,7 @@ head->ver_major = MDML_VERSION_MAJOR; head->ver_major = MDML_VERSION_MINOR; head->format = 1; - head->time_base = 96; + head->time_base = 192; md_add_elem(MD_CONTAINER(root), MD_ELEMENT(head)); @@ -491,13 +149,37 @@ if (idx < p->len) { track = MD_TRACK(g_ptr_array_index(p, idx)); - track->number = n; + ((struct tracklikeElement *)track)->number = n; } return track; } /* + * 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) +{ + GPtrArray *p; + struct tempomapElement *tmap = NULL; + + if (root == NULL) + return NULL; + + p = MD_CONTAINER(root)->elements; + + if (p->len > 1) + tmap = MD_TEMPOMAP(g_ptr_array_index(p, 1)); + + g_assert(MD_TYPE(tmap) == MD_TYPE_TEMPOMAP); + return tmap; +} + +/* * Sets the channel on given element and all its children. You * would normally call this with a track argument. * @@ -508,7 +190,7 @@ int devchan; if (!iscontainer(base)) { - MD_SET_DEVCHAN(base, dev, chan); + MD_SET_DEVCHAN(base, MD_MK_DEVCHAN(dev, chan)); return; } diff -rNu melys-0.0.13/md/mdutil.m melys-0.0.14/md/mdutil.m --- melys-0.0.13/md/mdutil.m Thu Sep 23 16:17:08 1999 +++ melys-0.0.14/md/mdutil.m Tue Sep 28 16:04:55 1999 @@ -38,8 +38,8 @@ #define MD_UNREF(el) MD_FREE(el) #define MD_MK_DEVCHAN(dev, chan) \ ((dev)<<4 | ((chan) & 0xf)) -#define MD_SET_DEVCHAN(el, dev, chan) \ - (((struct element *)el)->device_channel = (dev)<<4 | ((chan) & 0xf)) +#define MD_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 ) @@ -47,6 +47,10 @@ ((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) /* Defines for md_walk() */ #define MD_WALK_ALL 1 /* Include all elements including deleted, hidden*/ @@ -56,6 +60,13 @@ #define MD_WALK_END 0x002 /* This is the end of an element */ #define MD_WALK_EMPTY (MD_WALK_START|MD_WALK_END) /* Empty element */ +#ifdef DEBUG_CASTS +#define MD_CHECK_CAST(el, t) md_check_cast((el), (t)) +#else +#define MD_CHECK_CAST(el, t) (el) +#endif + + /* Typedef for md_walk callback function */ typedef void (*walkFunc)(struct element *, void *, int); @@ -83,371 +94,19 @@ GPtrArray *ar; int i; - fn(MD_ELEMENT(c), arg, MD_WALK_START); + fn((struct element *)c, arg, MD_WALK_START); ar = c->elements; for (i = 0; i < ar->len; i++) { el = g_ptr_array_index(ar, i); if (iscontainer(el)) { - md_walk(MD_CONTAINER(el), fn, arg, flags); + md_walk((struct containerElement *)el, fn, arg, flags); } else { fn(el, arg, MD_WALK_EMPTY); } } - fn(MD_ELEMENT(c), arg, MD_WALK_END); - ->>function iscontainer -int -struct element *el; Element to be tested ->>description -Return true if the element is some kind of container. ->>code - - if (el->type >= MD_CONTAINER_BEGIN) - return 1; - else - return 0; - - ->>headerdef md.h - -/* - * Structure to keep track of the position on each track that - * is being merged. - */ -struct sequenceState { - int ntracks; /* Number of tracks to merge */ - - struct rootElement *root; /* The root being sequnced over */ - - struct rootElement *retroot; /* Copy of root, set to NULL after use */ - struct headElement *head; /* Head to be returned next */ - unsigned long duration; /* End time */ -}; - ->>extern - -#define LAST_ELEMENTP(c) ((struct element **)((c)->elements->pdata + (c)->elements->len)) -#define FIRST_ELEMENTP(c) ((struct element **)((c)->elements->pdata)) - ->>function md_sequence_init -struct sequenceState * -struct rootElement *root; Root to sequence over - ->>description -Return an object that can be passed to -.F md_sequence_next -to iterate over all the elements in a tree in time sequenced order. -This is what you want if you actually want to play the song -for example. -The elements in the container must already be in sorted order within -their own tracks or subcontainers. - ->>code - struct sequenceState *state; - int nchild; - - state = g_new(struct sequenceState, 1); - - nchild = MD_CONTAINER(root)->elements->len; - state->root = md_root_inc_ref(root); - - state->retroot = root; - state->ntracks = 0; - state->duration = 0; - - md_walk(MD_CONTAINER(root), seqinit, state, 0); - - return state; - ->>function seqinit -static void -struct element *el; -void *arg; -int flags; - ->>code - struct sequenceState *seq = arg; - struct containerElement *c; - - if (el->type == MD_TYPE_HEAD) { - /* Save so that it can be given to the user */ - seq->head = MD_HEAD(el); - } - - /* - * Only interested in containers. They have a separate start and end - * we just trigger on the start. - */ - if ((flags & MD_WALK_EMPTY) == MD_WALK_START) { - c = MD_CONTAINER(el); - - c->playptr = FIRST_ELEMENTP(c); - if (el->type == MD_TYPE_TRACK) { - seq->ntracks++; - if (c->duration > seq->duration) - seq->duration = c->duration; - } - } - - ->>function md_sequence_next -struct element * -struct sequenceState *seq; Sequence state information - ->>description -Return the next element as sorted by time. -The root and head elements are returned, but otherwise -just leaf elements are returned. - ->>code - struct element *el; - struct trackElement *track; - struct trackElement *besttrack = NULL; - struct element *bestelem = NULL; - unsigned long leasttime; - int i; - - if (seq == NULL) - return NULL; - - if (seq->retroot) { - /* The first time we return the root element */ - el = MD_ELEMENT(seq->retroot); - seq->retroot = NULL; - return el; - } - if (seq->head) { - /* Next we return the head element */ - el = MD_ELEMENT(seq->head); - seq->head = NULL; - return el; - } - - leasttime = -1; - - /* - * Now look at the next element in each track and see which - * one should come first. The track -1 is the tempo map. - */ - for (i = -1; i < seq->ntracks; i++) { - if (i == -1) - /* XXX not even a track */ - track = ((struct trackElement **)MD_CONTAINER(seq->root)->elements->pdata)[1]; - else - track = md_track_nth(seq->root, i); - if (track == NULL) - ethrow(debugError, "@func_name: track is NULL"); - - /* - * Get the next element on this track and see if it comes - * earlier than any others. - */ - el = get_curr_elem(MD_CONTAINER(track)); - if (el == NULL) - continue; - - if (leasttime == -1 || el->element_time < leasttime) { - - if (i != -1 && track->mute && el->type == MD_TYPE_NOTE) { - inc_elem(MD_CONTAINER(track)); - continue; - } - - leasttime = el->element_time; - besttrack = track; - bestelem = el; - } - } - - /* We found the next one so return it */ - if (bestelem) { - - /* Step onto the next event for selected track */ - - (void)inc_elem(MD_CONTAINER(besttrack)); - - /* TEMP set tag to track number */ - bestelem->tag = besttrack->number; - - return bestelem; - } - - /* Nothing left */ - return NULL; - ->>function get_curr_elem -static struct element * -struct containerElement *c; Track to get next element from - ->>description -Get the current item that is being pointed to by the play position -pointers. -This routine is recursive but recursion depth is low, typically one. - ->>code - struct element *el; - - if (c->playptr == NULL) - return NULL; - - if (iscontainer(*c->playptr)) - el = get_curr_elem(MD_CONTAINER(*c->playptr)); - else - el = MD_ELEMENT(*c->playptr); - - return el; - - ->>function inc_elem -static gboolean -struct containerElement *c; Container to step on to next element - ->>description -Step onto the next element beneath this container. -This is quite a complex routine as when you reach the end -of one container you have to step back and try the next one, which -may be empty so you have to try the next and so on. - -Returns TRUE when element found and incremented. - ->>code - gboolean rc; - - if (c == NULL) - return FALSE; - if (c->playptr == NULL) - return FALSE; - - do { - if (iscontainer(*c->playptr)) { - rc = inc_elem(MD_CONTAINER(*c->playptr)); - if (rc == TRUE) - return TRUE; - - } - - c->playptr++; - if (c->playptr >= LAST_ELEMENTP(c)) { - c->playptr = NULL; - return FALSE; - } - - /* - * The while below is only needed (I think) for empty container - * elements. - */ - } while (get_curr_elem(c) == NULL); - - return TRUE; - - ->>function md_elem_seek -void -struct containerElement *c; -unsigned long time; - ->>description -Set the play pointers on the specifed track so that the next -event to play from the track will be at or later than -the specified -.A time . -NB: This routine is almost certainly incorrect, needs proving. - ->>code - struct element **nextpp; - struct element **lastpp; - - lastpp = NULL; - for (nextpp = FIRST_ELEMENTP(c); nextpp < LAST_ELEMENTP(c); nextpp++) { - if (iscontainer(*nextpp)) { - if (MD_ELEMENT(*nextpp)->element_time < time) { - lastpp = nextpp; - } else { - break; - } - } else { - if (MD_ELEMENT(*nextpp)->element_time >= time) { - lastpp = nextpp; - break; - } - } - } - - if (lastpp == NULL) - lastpp = FIRST_ELEMENTP(c); - - c->playptr = lastpp; - - if (c->playptr && iscontainer(*c->playptr)) - md_elem_seek(MD_CONTAINER(*c->playptr), time); - - { - struct element *el; - el = get_curr_elem(c); - if (el) - dprintf(3, "after seek to %ld, el%d time is %ld", time, el->type, el->element_time); - else { - dprintf(3, "after seek to %ld, there was NO EL\n", time); - inc_elem(c); - el = get_curr_elem(c); - if (el) - dprintf1(" second attempt after seek to %ld, el time is %ld", time, el->element_time); - } - } - ->>function md_elem_seek_back -gboolean -struct containerElement *c; -unsigned long time; - ->>description -Seek to the specified time, but only in the backward -direction. -If the current play position is already earlier, then this routine -returns FALSE. -Otherwise set the play position and return TRUE. -It may be the case that this track has no more events left, in -this case it still returns TRUE. - ->>code - struct element *el; - - el = get_curr_elem(c); - if (el && el->element_time < time) - return FALSE; - - md_elem_seek(c, time); - return TRUE; - - ->>function md_sequence_end -void -struct sequenceState *seq; Sequence state information - ->>description -Finish with a sequence object. -Frees all resources. -The object cannot be used any more. ->>code - - if (!seq) - return; - - if (seq->root) - md_free(MD_ELEMENT(seq->root)); - - g_free(seq); - ->>function md_sequence_duration -unsigned long -struct sequenceState *seq; Sequence state information ->>description -Get the final time for the song. ->>code - - return seq->duration; + fn((struct element *)c, arg, MD_WALK_END); >>function md_empty @@ -471,7 +130,7 @@ head->ver_major = MDML_VERSION_MAJOR; head->ver_major = MDML_VERSION_MINOR; head->format = 1; - head->time_base = 96; + head->time_base = 192; md_add_elem(MD_CONTAINER(root), MD_ELEMENT(head)); @@ -534,12 +193,38 @@ if (idx < p->len) { track = MD_TRACK(g_ptr_array_index(p, idx)); - track->number = n; + ((struct tracklikeElement *)track)->number = n; } return track; +>>function md_get_tempomap +struct tempomapElement * +struct rootElement *root; + +>>description +Get the nth track of the composition. +Track numbers start at 0. +Routine assumes that tempomap is at position 1 and that the +music tracks start right after. + +>>code + GPtrArray *p; + struct tempomapElement *tmap = NULL; + + if (root == NULL) + return NULL; + + p = MD_CONTAINER(root)->elements; + + if (p->len > 1) + tmap = MD_TEMPOMAP(g_ptr_array_index(p, 1)); + + g_assert(MD_TYPE(tmap) == MD_TYPE_TEMPOMAP); + return tmap; + + >>function md_set_devchan void struct element *base; @@ -554,7 +239,7 @@ int devchan; if (!iscontainer(base)) { - MD_SET_DEVCHAN(base, dev, chan); + MD_SET_DEVCHAN(base, MD_MK_DEVCHAN(dev, chan)); return; } diff -rNu melys-0.0.13/midi/play.c melys-0.0.14/midi/play.c --- melys-0.0.13/midi/play.c Thu Sep 23 17:03:27 1999 +++ melys-0.0.14/midi/play.c Tue Sep 28 16:09:43 1999 @@ -27,6 +27,7 @@ #include #include "gdk/gdk.h" #include "gtk/gtkmain.h" +#include "gtk/gtkadjustment.h" #include "seqlib.h" #include "seqplay.h" #include "elements.h" @@ -55,6 +56,9 @@ struct sequenceState *seq; /* To hold current sequence position */ struct element *pend_element;/* Element that is pending play */ + struct _GtkAdjustment *posadj; /* Play position adjustment */ + + int to_id; /* Timeout id */ }; #define ADDR_PARTS 4 @@ -68,6 +72,7 @@ static int send_element(struct seq_context *ctxp, struct element *el); static void conv_event(struct seq_context *ctxp, struct element *el, snd_seq_event_t *ep); +static gint play_pos_cb(gpointer data); static void add_io_cb(struct play *play, int which); static void remove_io_cb(struct play *play, int which); static void debug_pool(struct play *play); @@ -110,8 +115,12 @@ { remove_io_cb(play, INPUT_ALL); + + if (play->to_id) + gtk_timeout_remove(play->to_id); + if (play->seq) - (void) md_sequence_end(play->seq); + (void) md_seq_end(play->seq); if (play->mdroot) md_free(MD_ELEMENT(play->mdroot)); @@ -135,8 +144,14 @@ { play->mdroot = md_root_inc_ref(root); +} - return; +void +play_set_pos_adj(struct play *play, struct _GtkAdjustment *adj) +{ + + if (play) + play->posadj = adj; } /* @@ -186,7 +201,7 @@ } else { play->isended = FALSE; play->isplaying = FALSE; - play->seq = md_sequence_init(play->mdroot); + play->seq = md_seq_init_merge(play->mdroot, FALSE); play->pend_element = NULL; seq_drain_output(ctxp); @@ -200,6 +215,10 @@ add_io_cb(play, INPUT_ALL); + /* Timeout is in ms */ + if (play->to_id == 0) + play->to_id = gtk_timeout_add(40, play_pos_cb, play); + /* * ALSA bug 19 Jul 1999, select does not return write possible * until after at least one write has been done. @@ -257,7 +276,7 @@ play_pause(play); if (play->seq) - (void) md_sequence_end(play->seq); + (void) md_seq_end(play->seq); play->seq = NULL; play->ispaused = FALSE; @@ -330,7 +349,7 @@ fqueue.dest = *addr; fqueue.dest.channel = MD_ELEMENT(track)->device_channel & 0xf; fqueue.type = SND_SEQ_EVENT_NOTE; - fqueue.tag = track->number; /* XXX TEMP */ + fqueue.tag = MD_TRACKLIKE(track)->number; /* XXX TEMP */ fqueue.remove_mode = SND_SEQ_REMOVE_DEST | SND_SEQ_REMOVE_DEST_CHANNEL | @@ -422,12 +441,12 @@ SND_SEQ_REMOVE_TIME_AFTER; fqueue.dest = *seq_dev_addr(play->ctxp, dev, SEQ_ADDR_OUTPUT);/*XXX*/ fqueue.dest.channel = chan; - fqueue.tag = track->number; + fqueue.tag = MD_TRACKLIKE(track)->number; fqueue.tick = 1; fqueue.time.tick = now; snd_seq_remove_events(seq_handle(play->ctxp), &fqueue); - md_elem_seek_back(MD_CONTAINER(track), now); + md_elem_seek_back(play->seq, MD_TRACKLIKE(track), now); /* * Next need to make room for more events. It is quite likely @@ -450,10 +469,10 @@ * Seek back all tracks that are too far ahead. */ for (n = 0; n < play->mdroot->tracks; n++) { - if (n == track->number) + if (n == MD_TRACKLIKE(track)->number) continue; t = md_track_nth(play->mdroot, n); - md_elem_seek_back(MD_CONTAINER(t), ahead); + md_elem_seek_back(play->seq, MD_TRACKLIKE(t), ahead); } t2 = seq_get_time(play->ctxp); @@ -523,7 +542,7 @@ } /* Try and push out next items in the sequence */ - while ((el = md_sequence_next(play->seq)) != NULL) { + while ((el = md_seq_next(play->seq)) != NULL) { dprintf2("Sending type %d for %d at %ld", el->type, el->device_channel, el->element_time); status = send_element(play->ctxp, el); if (status < 0) { @@ -535,7 +554,7 @@ /* Detect the end of the sequence */ if (el == NULL && play->isended == FALSE) { - end = md_sequence_duration(play->seq); + end = MD_ENDTIME(play->mdroot); /* MMM this could fail */ seq_midi_send_echo(play->ctxp, end, ECHO_END_SONG); @@ -611,7 +630,7 @@ play->isended = TRUE; if (play->seq) { - md_sequence_end(play->seq); + md_seq_end(play->seq); play->seq = NULL; } break; @@ -716,6 +735,28 @@ } ep->tag = el->tag; +} + +/* + * Called while playing to update the play position pointer. + * + */ +static gint +play_pos_cb(gpointer data) +{ + struct play *play = data; + unsigned long t; + + t = seq_get_time(play->ctxp); + + gtk_adjustment_set_value(play->posadj, t); + + if (t > play->posadj->upper) { + play->posadj->upper = t; + gtk_adjustment_changed(play->posadj); + } + + return TRUE; } /* diff -rNu melys-0.0.13/midi/play.m melys-0.0.14/midi/play.m --- melys-0.0.13/midi/play.m Thu Sep 23 16:17:29 1999 +++ melys-0.0.14/midi/play.m Sat Sep 25 21:15:11 1999 @@ -18,6 +18,7 @@ >>header gdk/gdk.h >>header gtk/gtkmain.h +>>header gtk/gtkadjustment.h >>header seqlib.h >>header seqplay.h @@ -31,6 +32,7 @@ /* Opaque type to save all playing state */ struct play; struct seq_context; +struct _GtkAdjustment; #define ECHO_NOOP 0 #define ECHO_END_SONG 1 @@ -56,6 +58,9 @@ struct sequenceState *seq; /* To hold current sequence position */ struct element *pend_element;/* Element that is pending play */ + struct _GtkAdjustment *posadj; /* Play position adjustment */ + + int to_id; /* Timeout id */ }; #define ADDR_PARTS 4 @@ -97,8 +102,12 @@ >>code remove_io_cb(play, INPUT_ALL); + + if (play->to_id) + gtk_timeout_remove(play->to_id); + if (play->seq) - (void) md_sequence_end(play->seq); + (void) md_seq_end(play->seq); if (play->mdroot) md_free(MD_ELEMENT(play->mdroot)); @@ -121,7 +130,17 @@ play->mdroot = md_root_inc_ref(root); - return; + +>>function play_set_pos_adj +void +struct play *play; +struct _GtkAdjustment *adj; + +>>code + + if (play) + play->posadj = adj; + >>function play_set_ports void @@ -170,7 +189,7 @@ } else { play->isended = FALSE; play->isplaying = FALSE; - play->seq = md_sequence_init(play->mdroot); + play->seq = md_seq_init_merge(play->mdroot, FALSE); play->pend_element = NULL; seq_drain_output(ctxp); @@ -184,6 +203,10 @@ add_io_cb(play, INPUT_ALL); + /* Timeout is in ms */ + if (play->to_id == 0) + play->to_id = gtk_timeout_add(40, play_pos_cb, play); + /* * ALSA bug 19 Jul 1999, select does not return write possible * until after at least one write has been done. @@ -193,6 +216,7 @@ */ seq_midi_send_echo(ctxp, 0, ECHO_NOOP); + >>function play_pause void struct play *play; The play object @@ -240,7 +264,7 @@ play_pause(play); if (play->seq) - (void) md_sequence_end(play->seq); + (void) md_seq_end(play->seq); play->seq = NULL; play->ispaused = FALSE; @@ -315,7 +339,7 @@ fqueue.dest = *addr; fqueue.dest.channel = MD_ELEMENT(track)->device_channel & 0xf; fqueue.type = SND_SEQ_EVENT_NOTE; - fqueue.tag = track->number; /* XXX TEMP */ + fqueue.tag = MD_TRACKLIKE(track)->number; /* XXX TEMP */ fqueue.remove_mode = SND_SEQ_REMOVE_DEST | SND_SEQ_REMOVE_DEST_CHANNEL | @@ -409,12 +433,12 @@ SND_SEQ_REMOVE_TIME_AFTER; fqueue.dest = *seq_dev_addr(play->ctxp, dev, SEQ_ADDR_OUTPUT);/*XXX*/ fqueue.dest.channel = chan; - fqueue.tag = track->number; + fqueue.tag = MD_TRACKLIKE(track)->number; fqueue.tick = 1; fqueue.time.tick = now; snd_seq_remove_events(seq_handle(play->ctxp), &fqueue); - md_elem_seek_back(MD_CONTAINER(track), now); + md_elem_seek_back(play->seq, MD_TRACKLIKE(track), now); /* * Next need to make room for more events. It is quite likely @@ -437,10 +461,10 @@ * Seek back all tracks that are too far ahead. */ for (n = 0; n < play->mdroot->tracks; n++) { - if (n == track->number) + if (n == MD_TRACKLIKE(track)->number) continue; t = md_track_nth(play->mdroot, n); - md_elem_seek_back(MD_CONTAINER(t), ahead); + md_elem_seek_back(play->seq, MD_TRACKLIKE(t), ahead); } t2 = seq_get_time(play->ctxp); @@ -514,7 +538,7 @@ } /* Try and push out next items in the sequence */ - while ((el = md_sequence_next(play->seq)) != NULL) { + while ((el = md_seq_next(play->seq)) != NULL) { dprintf2("Sending type %d for %d at %ld", el->type, el->device_channel, el->element_time); status = send_element(play->ctxp, el); if (status < 0) { @@ -526,7 +550,7 @@ /* Detect the end of the sequence */ if (el == NULL && play->isended == FALSE) { - end = md_sequence_duration(play->seq); + end = MD_ENDTIME(play->mdroot); /* MMM this could fail */ seq_midi_send_echo(play->ctxp, end, ECHO_END_SONG); @@ -599,7 +623,7 @@ play->isended = TRUE; if (play->seq) { - md_sequence_end(play->seq); + md_seq_end(play->seq); play->seq = NULL; } break; @@ -702,6 +726,30 @@ } ep->tag = el->tag; + + +>>function play_pos_cb +static gint +gpointer data; + +>>description +Called while playing to update the play position pointer. + +>>code + struct play *play = data; + unsigned long t; + + t = seq_get_time(play->ctxp); + + gtk_adjustment_set_value(play->posadj, t); + + if (t > play->posadj->upper) { + play->posadj->upper = t; + gtk_adjustment_changed(play->posadj); + } + + return TRUE; + >>function add_io_cb static void diff -rNu melys-0.0.13/mlib/PROJECT/base.py melys-0.0.14/mlib/PROJECT/base.py --- melys-0.0.13/mlib/PROJECT/base.py Tue Sep 14 17:08:48 1999 +++ melys-0.0.14/mlib/PROJECT/base.py Sat Sep 25 21:52:03 1999 @@ -70,7 +70,7 @@ lines.append( """#define MD_%s(e) \\ - ((struct %s *)md_check_cast((struct element *)(e), MD_TYPE_%s)) + ((struct %s *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_%s)) """ % (string.upper(name), sname(name), string.upper(name))) lines.append("") diff -rNu melys-0.0.13/programs/Makefile melys-0.0.14/programs/Makefile --- melys-0.0.13/programs/Makefile Thu Sep 23 17:03:17 1999 +++ melys-0.0.14/programs/Makefile Tue Sep 28 16:09:28 1999 @@ -27,9 +27,10 @@ MELPLAYOBJS = \ melplay.o \ ../files/midiread.o ../files/midiwrite.o ../files/mdmlread.o \ - ../files/mdmlwrite.o ../files/file.o ../md/elements.o \ - ../md/mdutil.o ../util/except.o ../util/util.o \ - ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o \ + ../files/mdmlwrite.o ../files/file.o \ + ../md/elements.o ../md/mdutil.o \ + ../util/except.o ../util/util.o ../util/gxstack.o \ + ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o ../md/mdseq.o \ ../seq/seqlib.o ../seq/seqmidi.o \ ../seq/seqplay.o @@ -40,8 +41,8 @@ ../files/file.o \ ../seq/seqlib.o ../seq/seqmidi.o ../seq/sequtil.o \ ../seq/seqplay.o \ - ../util/except.o ../util/util.o \ - ../md/elements.o ../md/mdutil.o \ + ../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 \ ../gui/main.o ../gui/menus.o ../gui/trackprop.o \ ../gui/help.o \ @@ -79,10 +80,10 @@ install: all - $(INSTALL) mdmlconv $(INSTDIR) - $(INSTALL) melplay $(INSTDIR) - $(INSTALL) melys $(INSTDIR) - $(INSTALL) showseq $(INSTDIR) + $(INSTALL) -s mdmlconv $(INSTDIR) + $(INSTALL) -s melplay $(INSTDIR) + $(INSTALL) -s melys $(INSTDIR) + $(INSTALL) -s showseq $(INSTDIR) # Remove all object files and exectutables # diff -rNu melys-0.0.13/programs/melplay.c melys-0.0.14/programs/melplay.c --- melys-0.0.13/programs/melplay.c Thu Sep 23 17:03:28 1999 +++ melys-0.0.14/programs/melplay.c Tue Sep 28 16:09:45 1999 @@ -254,7 +254,7 @@ seq_timer_stop(ctxp); /* Loop through all the elements in the song and play them */ - seq = md_sequence_init(root); + seq = md_seq_init_merge(root, FALSE); #ifdef notyet /* Completly non-working */ if (beginat) { @@ -267,14 +267,14 @@ } #endif - while ((el = md_sequence_next(seq)) != NULL) { + while ((el = md_seq_next(seq)) != NULL) { play(ctxp, el); } /* Get the end time for the tracks and echo an event to * wake us up at that time */ - end = md_sequence_duration(seq); + end = MD_ENDTIME(root); seq_midi_send_echo(ctxp, end, 0); /* Wait for all the events to be played */ @@ -285,7 +285,7 @@ sleep(delay); seq_timer_stop(ctxp); - md_sequence_end(seq); + md_seq_end(seq); md_free(MD_ELEMENT(root)); file_close(file); diff -rNu melys-0.0.13/programs/melplay.m melys-0.0.14/programs/melplay.m --- melys-0.0.13/programs/melplay.m Thu Sep 23 16:17:29 1999 +++ melys-0.0.14/programs/melplay.m Sat Sep 25 17:56:46 1999 @@ -37,9 +37,10 @@ >>target melplay >>make --objects melplay.o >>make --objects ../files/midiread.o ../files/midiwrite.o ../files/mdmlread.o ->>make --objects ../files/mdmlwrite.o ../files/file.o ../md/elements.o ->>make --objects ../md/mdutil.o ../util/except.o ../util/util.o ->>make --objects ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o +>>make --objects ../files/mdmlwrite.o ../files/file.o +>>make --objects ../md/elements.o ../md/mdutil.o +>>make --objects ../util/except.o ../util/util.o ../util/gxstack.o +>>make --objects ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o ../md/mdseq.o >>make --objects ../seq/seqlib.o ../seq/seqmidi.o >>make --objects ../seq/seqplay.o @@ -247,7 +248,7 @@ seq_timer_stop(ctxp); /* Loop through all the elements in the song and play them */ - seq = md_sequence_init(root); + seq = md_seq_init_merge(root, FALSE); #ifdef notyet /* Completly non-working */ if (beginat) { @@ -260,14 +261,14 @@ } #endif - while ((el = md_sequence_next(seq)) != NULL) { + while ((el = md_seq_next(seq)) != NULL) { play(ctxp, el); } /* Get the end time for the tracks and echo an event to * wake us up at that time */ - end = md_sequence_duration(seq); + end = MD_ENDTIME(root); seq_midi_send_echo(ctxp, end, 0); /* Wait for all the events to be played */ @@ -278,7 +279,7 @@ sleep(delay); seq_timer_stop(ctxp); - md_sequence_end(seq); + md_seq_end(seq); md_free(MD_ELEMENT(root)); file_close(file); diff -rNu melys-0.0.13/programs/melys.c melys-0.0.14/programs/melys.c --- melys-0.0.13/programs/melys.c Thu Sep 23 17:03:28 1999 +++ melys-0.0.14/programs/melys.c Tue Sep 28 16:09:46 1999 @@ -59,6 +59,7 @@ char *cp; int c; struct option *op; + extern struct except *noActiveChildError; setlocale(LC_ALL, ""); //bindtextdomain(PACKAGE, LOCALEDIR); @@ -91,7 +92,7 @@ melys_app(argc, argv); - if CATCH(debugError) { + if (CATCH(debugError)) { /* * It may or may not be safe to resume. Lets try anyway. @@ -104,6 +105,18 @@ "the application as soon as possible\n" "MESSAGE: %s" ), debugError->message); + } + + if (CATCH(noActiveChildError)) { + + /* + * When there is no active child then most operations + * are invalid. + */ + mel_error( + _("This operation is not possible\n" + "because there are no open files\n" + )); } gtk_main(); diff -rNu melys-0.0.13/programs/melys.m melys-0.0.14/programs/melys.m --- melys-0.0.13/programs/melys.m Wed Sep 22 20:50:30 1999 +++ melys-0.0.14/programs/melys.m Sun Sep 26 20:53:58 1999 @@ -17,8 +17,8 @@ >>make --objects ../files/file.o >>make --objects ../seq/seqlib.o ../seq/seqmidi.o ../seq/sequtil.o >>make --objects ../seq/seqplay.o ->>make --objects ../util/except.o ../util/util.o ->>make --objects ../md/elements.o ../md/mdutil.o +>>make --objects ../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 ../gui/main.o ../gui/menus.o ../gui/trackprop.o >>make --objects ../gui/help.o @@ -71,6 +71,7 @@ char *cp; int c; struct option *op; + extern struct except *noActiveChildError; setlocale(LC_ALL, ""); //bindtextdomain(PACKAGE, LOCALEDIR); @@ -103,7 +104,7 @@ melys_app(argc, argv); - if CATCH(debugError) { + if (CATCH(debugError)) { /* * It may or may not be safe to resume. Lets try anyway. @@ -116,6 +117,18 @@ "the application as soon as possible\n" "MESSAGE: %s" ), debugError->message); + } + + if (CATCH(noActiveChildError)) { + + /* + * When there is no active child then most operations + * are invalid. + */ + mel_error( + _("This operation is not possible\n" + "because there are no open files\n" + )); } gtk_main(); diff -rNu melys-0.0.13/seq/seqlib.c melys-0.0.14/seq/seqlib.c --- melys-0.0.13/seq/seqlib.c Thu Sep 23 17:03:18 1999 +++ melys-0.0.14/seq/seqlib.c Tue Sep 28 16:09:31 1999 @@ -37,8 +37,8 @@ #define save_msg -#define POOL_LARGE 600 -#define POOL_SMALL 100 +#define POOL_LARGE 200 /* Making this quite small */ +#define POOL_SMALL 80 /* This does need to be fairly large */ static GArray *get_addr_list(seq_context_t *ctxp, int inout); static void fix_output_pool(snd_seq_t *seq, int client, int size); diff -rNu melys-0.0.13/seq/seqlib.m melys-0.0.14/seq/seqlib.m --- melys-0.0.13/seq/seqlib.m Sun Sep 19 22:39:35 1999 +++ melys-0.0.14/seq/seqlib.m Mon Sep 27 14:05:13 1999 @@ -77,8 +77,8 @@ #define save_msg -#define POOL_LARGE 600 -#define POOL_SMALL 100 +#define POOL_LARGE 200 /* Making this quite small */ +#define POOL_SMALL 80 /* This does need to be fairly large */ >>function seq_context_new seq_context_t * diff -rNu melys-0.0.13/song/song.c melys-0.0.14/song/song.c --- melys-0.0.13/song/song.c Thu Sep 23 17:03:17 1999 +++ melys-0.0.14/song/song.c Tue Sep 28 16:09:30 1999 @@ -83,6 +83,9 @@ song_play_start(struct song *song) { + if (!song) + return; + if (play_get_context(song->play) == NULL) { mel_song_error(song, NULL, _("Could not open ALSA sequencer\n" @@ -108,7 +111,8 @@ song_play_pause(struct song *song) { - play_pause(song->play); + if (song) + play_pause(song->play); } /* @@ -120,6 +124,9 @@ song_play_stop(struct song *song) { + if (!song) + return; + record_stop(song->record); play_set_record(song->play, 0); @@ -134,7 +141,7 @@ md_add_elem(MD_CONTAINER(song->mdroot), MD_ELEMENT(song->newtrack)); /* Set the new tracks channel to the track number TEMP */ - MD_ELEMENT(song->newtrack)->device_channel = song->newtrack->number; + MD_SET_DEVCHAN(song->newtrack, MD_TRACKLIKE(song->newtrack)->number); song->newtrack = md_track_new(); song->tracknum++; @@ -153,6 +160,9 @@ song_record_start(struct song *song) { + if (!song) + return; + if (song->record == NULL) { mel_song_error(song, NULL, _("Could not open ALSA sequencer\n" @@ -177,6 +187,9 @@ void song_record_stop(struct song *song) { + + if (!song) + return; record_stop(song->record); @@ -220,7 +233,6 @@ sd->child = child; sd->filename = NULL; sd->mdroot = NULL; - sd->open_dialog = 0; sd->save_dialog = 0; sd->dialog = 0; sd->play = play_new(); @@ -243,7 +255,7 @@ { struct song *sd; - dprintf1("song_destroy"); + dprintf1("Destroy song_destroy %p", data); sd = data; diff -rNu melys-0.0.13/song/song.m melys-0.0.14/song/song.m --- melys-0.0.13/song/song.m Thu Sep 23 16:17:29 1999 +++ melys-0.0.14/song/song.m Mon Sep 27 14:05:13 1999 @@ -30,6 +30,7 @@ * Properties for the parent MDI */ #define MEL_MDI_CHILD_COUNT "MDI_CHILD_COUNT" +#define MEL_OPEN_DIALOG "OPEN_DIALOG" /* * The following are properties that can be set on the mdi child @@ -49,7 +50,6 @@ GtkObject *mdi; /* Back pointer to the parent MDI */ GtkObject *child; /* Back pointer to the MDI child */ - int open_dialog; /* Open dialog box */ int save_dialog; /* Save dialog box */ int dialog; /* Set if a dialog is in action */ @@ -64,6 +64,7 @@ /* Here are all the views on this file */ GtkWidget *trackview; + int unused:1; /* This song has not been used (no file etc) */ }; >>header melgui.h @@ -116,6 +117,9 @@ Start up audio and midi streams to start playing. >>code + if (!song) + return; + if (play_get_context(song->play) == NULL) { mel_song_error(song, NULL, _("Could not open ALSA sequencer\n" @@ -141,7 +145,8 @@ The next play will resume playing from the same point. >>code - play_pause(song->play); + if (song) + play_pause(song->play); >>function song_play_stop @@ -153,6 +158,9 @@ The next play will start playing from the beginning. >>code + if (!song) + return; + record_stop(song->record); play_set_record(song->play, 0); @@ -167,7 +175,7 @@ md_add_elem(MD_CONTAINER(song->mdroot), MD_ELEMENT(song->newtrack)); /* Set the new tracks channel to the track number TEMP */ - MD_ELEMENT(song->newtrack)->device_channel = song->newtrack->number; + MD_SET_DEVCHAN(song->newtrack, MD_TRACKLIKE(song->newtrack)->number); song->newtrack = md_track_new(); song->tracknum++; @@ -187,6 +195,9 @@ >>code + if (!song) + return; + if (song->record == NULL) { mel_song_error(song, NULL, _("Could not open ALSA sequencer\n" @@ -213,6 +224,9 @@ ended) then it will carry on playing. >>code + + if (!song) + return; record_stop(song->record); @@ -253,7 +267,6 @@ sd->child = child; sd->filename = NULL; sd->mdroot = NULL; - sd->open_dialog = 0; sd->save_dialog = 0; sd->dialog = 0; sd->play = play_new(); @@ -276,7 +289,7 @@ >>code struct song *sd; - dprintf1("@func_name"); + dprintf1("Destroy @func_name %p", data); sd = data; diff -rNu melys-0.0.13/util/.cvsignore melys-0.0.14/util/.cvsignore --- melys-0.0.13/util/.cvsignore Thu Sep 23 17:03:14 1999 +++ melys-0.0.14/util/.cvsignore Tue Sep 28 16:09:24 1999 @@ -1,4 +1,5 @@ except.c +gxstack.c util.c Makefile *.mdml *.mdml.gz *.mid diff -rNu melys-0.0.13/util/Makefile melys-0.0.14/util/Makefile --- melys-0.0.13/util/Makefile Thu Sep 23 17:03:14 1999 +++ melys-0.0.14/util/Makefile Tue Sep 28 16:09:24 1999 @@ -5,8 +5,10 @@ TARGETS = OBJS = except.o \ + gxstack.o \ util.o GENCFILES = except.c \ + gxstack.c \ util.c GENHFILES = ../include/except.h \ ../include/util.h @@ -42,4 +44,5 @@ mcode $(MCODEFLAGS) -o $@ $< util.o: ../include/util.h +gxstack.o: ../include/util.h except.o: ../include/except.h diff -rNu melys-0.0.13/util/except.c melys-0.0.14/util/except.c --- melys-0.0.13/util/except.c Thu Sep 23 17:03:22 1999 +++ melys-0.0.14/util/except.c Tue Sep 28 16:09:36 1999 @@ -67,17 +67,19 @@ e->message = msg; if (e->set == ETHROW_MAGIC) { - longjmp(e->buf, 1); + longjmp(e->buf[e->level], 1); } else { g_warning(_("ethrow called without being set up")); g_warning(msg); if (debugError->set == ETHROW_MAGIC) { debugError->message = msg; - longjmp(debugError->buf, 1); + longjmp(debugError->buf[0], 1); } } + /* Dont normally reach here, but it can happen */ g_free(msg); + e->message = NULL; } /* @@ -88,18 +90,31 @@ ethrow_setup(struct except *ep) { - if (ep->set == ETHROW_MAGIC) - g_warning(_("ethrow_setup called when allready set up")); - - ep->set = ETHROW_MAGIC; + if (ep->set == ETHROW_MAGIC) { + ep->level++; + } else { + memset(ep, 0, sizeof(*ep)); + ep->set = ETHROW_MAGIC; + } + if (ep->message) + g_free(ep->message); ep->message = NULL; + + if (ep->level >= CATCH_MAX) { + g_error("Too many nested catches"); + ep->set = 0; + return; + } } void ethrow_unsetup(struct except *ep) { - ep->set = 0; + if (ep->level-- == 0) + ep->set = 0; if (ep->message) g_free(ep->message); + + ep->message = NULL; } diff -rNu melys-0.0.13/util/except.m melys-0.0.14/util/except.m --- melys-0.0.13/util/except.m Tue Aug 10 15:02:55 1999 +++ melys-0.0.14/util/except.m Mon Sep 27 14:01:03 1999 @@ -29,15 +29,17 @@ * not for user input, where errors are to be expected and should be * dealt with properly. */ +#define CATCH_MAX 4 struct except { int set; /* Flag to say if set up correctly */ - sigjmp_buf buf; /* The return point */ + int level; /* Catch nesting depth */ + sigjmp_buf buf[CATCH_MAX]; /* The return point */ char *message; /* The error message */ gpointer private; /* Pointer for application use */ }; /* Usage: if CATCH(&xError) { .. } */ -#define CATCH(e) (ethrow_setup(e), setjmp((e)->buf)) +#define CATCH(e) (ethrow_setup(e), setjmp((e)->buf[(e)->level])) #define UNCATCH(e) ethrow_unsetup(e) /* @@ -88,17 +90,19 @@ e->message = msg; if (e->set == ETHROW_MAGIC) { - longjmp(e->buf, 1); + longjmp(e->buf[e->level], 1); } else { g_warning(_("@func_name called without being set up")); g_warning(msg); if (debugError->set == ETHROW_MAGIC) { debugError->message = msg; - longjmp(debugError->buf, 1); + longjmp(debugError->buf[0], 1); } } + /* Dont normally reach here, but it can happen */ g_free(msg); + e->message = NULL; >>function ethrow_setup @@ -110,18 +114,32 @@ >>code - if (ep->set == ETHROW_MAGIC) - g_warning(_("@func_name called when allready set up")); - - ep->set = ETHROW_MAGIC; + if (ep->set == ETHROW_MAGIC) { + ep->level++; + } else { + memset(ep, 0, sizeof(*ep)); + ep->set = ETHROW_MAGIC; + } + if (ep->message) + g_free(ep->message); ep->message = NULL; + if (ep->level >= CATCH_MAX) { + g_error("Too many nested catches"); + ep->set = 0; + return; + } + + >>function ethrow_unsetup void struct except *ep; >>code - ep->set = 0; + if (ep->level-- == 0) + ep->set = 0; if (ep->message) g_free(ep->message); + + ep->message = NULL; diff -rNu melys-0.0.13/util/gxstack.c melys-0.0.14/util/gxstack.c --- melys-0.0.13/util/gxstack.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.14/util/gxstack.c Tue Sep 28 16:09:36 1999 @@ -0,0 +1,212 @@ +/* + * + * Copyright (C) 1999 Steve Ratcliffe + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * There doesn't appear to be a stack in glib. So here is one. + * Replace if glib ever gets one. + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "string.h" +#include "stdio.h" +#include "intl.h" + + + + +/* + * Creates a new stack. The element size must be greater than + * zero. + * + * Arguments: + * elemsize - Size of each element + */ +GStack * +gx_stack_new(gint elemsize) +{ + GStack *stack; + + if (elemsize <= 0) + return NULL; + + stack = g_new(GStack, 1); + stack->level = 0; + stack->elemsize = elemsize; + stack->array = g_array_new(0, 0, elemsize); + + return stack; +} + +/* + * Free the stack and its data. + * + * Arguments: + * stack - The stack to free + */ +void +gx_stack_free(GStack *stack) +{ + + g_array_free(stack->array, 1); + g_free(stack); +} + +/* + * 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) +{ + + g_return_if_fail(stack && stack->array); + g_return_if_fail(item); + + g_array_append_vals(stack->array, item, 1); + stack->level++; +} + +/* + * Copy the top most item in the stack into the memory area + * pointed to by item . The item is removed from the stack. If + * 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) +{ + gpointer p; + + g_return_val_if_fail(stack && stack->array, FALSE); + + if (stack->level < 1) + return FALSE; + + stack->level--; + + /* If we want the item save it now */ + if (item) { + p = stack->array->data + stack->level * stack->elemsize; + memcpy(item, p, stack->elemsize); + } + + /* Remove the item from the array */ + g_array_remove_index_fast(stack->array, stack->level); + + return TRUE; +} + +/* + * 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) +{ + gpointer p; + + g_return_val_if_fail(stack && stack->array, NULL); + + if (stack->level < 1) + return NULL; + + p = stack->array->data + (stack->level - 1) * stack->elemsize; + return p; +} + +/* + * Returns true if the stack is empty. + * + */ +gboolean +gx_stack_empty(GStack *stack) +{ + + return (stack->level == 0)? TRUE: FALSE; + +/* + * Test program. uncomment the two header lines as well + */ +#if 0 +} + +int +main(int argc, char **argv) +{ + struct two { + char s1[40]; + char s2[40]; + }; + GStack *stack; + int ret; + + struct two first, second, third; + struct two item; + struct two *ip; + + strcpy(first.s1, "hello"); + strcpy(first.s2, "hello2"); + strcpy(second.s1, "second hello"); + strcpy(second.s2, "second hello2"); + strcpy(third.s1, "third hello"); + strcpy(third.s2, "third hello2"); + + stack = gx_stack_new(sizeof(struct two)); + + gx_stack_push(stack, (gpointer)&first); + gx_stack_push(stack, (gpointer)&second); + gx_stack_push(stack, (gpointer)&third); + + memset(&first, 0, sizeof(first)); + memset(&second, 0, sizeof(first)); + memset(&third, 0, sizeof(first)); + + memset(&item, 0, sizeof(item)); + ip = gx_stack_top(stack); + printf("peek should be third 1: %s 2:%s\n", ip->s1, ip->s2); + + gx_stack_pop(stack, (gpointer)&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); + printf("1: %s 2:%s\n", item.s1, item.s2); + + gx_stack_push(stack, (gpointer)&first); + gx_stack_pop(stack, (gpointer)&item); + printf("1: %s 2:%s\n", item.s1, item.s2); + ret = gx_stack_pop(stack, (gpointer)&item); + printf("ret%d 1: %s 2:%s\n", ret, item.s1, item.s2); + ret = gx_stack_pop(stack, (gpointer)&item); + printf("ret%d 1: %s 2:%s\n", ret, item.s1, item.s2); + + return 0; +#endif +} diff -rNu melys-0.0.13/util/gxstack.m melys-0.0.14/util/gxstack.m --- melys-0.0.13/util/gxstack.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.14/util/gxstack.m Sat Sep 25 18:31:18 1999 @@ -0,0 +1,213 @@ +>>name gxstack.m - a stack data structure + +Copyright (C) 1999 Steve Ratcliffe + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +There doesn't appear to be a stack in glib. So here is one. +Replace if glib ever gets one. + +>>headerdef --decl util.h + +typedef struct _GStack { + gint level; + gint elemsize; + GArray *array; +} GStack; + + +>>function gx_stack_new +GStack * +gint elemsize; Size of each element + +>>description +Creates a new stack. +The element size must be greater than zero. + +>>code + GStack *stack; + + if (elemsize <= 0) + return NULL; + + stack = g_new(GStack, 1); + stack->level = 0; + stack->elemsize = elemsize; + stack->array = g_array_new(0, 0, elemsize); + + return stack; + + +>>function gx_stack_free +void +GStack *stack; The stack to free + +>>description +Free the stack and its data. + +>>code + + g_array_free(stack->array, 1); + g_free(stack); + + +>>function gx_stack_push +void +GStack *stack; The stack to push item onto +gpointer item; The item to copy onto the stack + +>>description +Copy the item pointed to by +.A item +onto the stack. + +>>code + + g_return_if_fail(stack && stack->array); + g_return_if_fail(item); + + g_array_append_vals(stack->array, item, 1); + stack->level++; + + +>>function gx_stack_pop +gboolean +GStack *stack; The stack +gpointer item; Item is returned here + +>>description +Copy the top most item in the stack into the memory area pointed +to by +.A item . +The item is removed from the stack. +If there are no items on the stack then FALSE is returned +and +.A item +is unchanged. +The +.A item +can be NULL; the stack is just popped. + +>>code + gpointer p; + + g_return_val_if_fail(stack && stack->array, FALSE); + + if (stack->level < 1) + return FALSE; + + stack->level--; + + /* If we want the item save it now */ + if (item) { + p = stack->array->data + stack->level * stack->elemsize; + memcpy(item, p, stack->elemsize); + } + + /* Remove the item from the array */ + g_array_remove_index_fast(stack->array, stack->level); + + return TRUE; + +>>function gx_stack_top +gpointer +GStack *stack; The stack + +>>description +Return a pointer to the top item on the stack. +It is not popped off. +Returns NULL if stack is emtpy. + +>>code + gpointer p; + + g_return_val_if_fail(stack && stack->array, NULL); + + if (stack->level < 1) + return NULL; + + p = stack->array->data + (stack->level - 1) * stack->elemsize; + return p; + + +>>function gx_stack_empty +gboolean +GStack *stack; + +>>description +Returns true if the stack is empty. + +>>code + + return (stack->level == 0)? TRUE: FALSE; + +/* + * Test program. uncomment the two header lines as well + */ +#if 0 +>>header string.h +>>header stdio.h +>>function main +int +int argc; +char **argv; + +>>code + struct two { + char s1[40]; + char s2[40]; + }; + GStack *stack; + int ret; + + struct two first, second, third; + struct two item; + struct two *ip; + + strcpy(first.s1, "hello"); + strcpy(first.s2, "hello2"); + strcpy(second.s1, "second hello"); + strcpy(second.s2, "second hello2"); + strcpy(third.s1, "third hello"); + strcpy(third.s2, "third hello2"); + + stack = gx_stack_new(sizeof(struct two)); + + gx_stack_push(stack, (gpointer)&first); + gx_stack_push(stack, (gpointer)&second); + gx_stack_push(stack, (gpointer)&third); + + memset(&first, 0, sizeof(first)); + memset(&second, 0, sizeof(first)); + memset(&third, 0, sizeof(first)); + + memset(&item, 0, sizeof(item)); + ip = gx_stack_top(stack); + printf("peek should be third 1: %s 2:%s\n", ip->s1, ip->s2); + + gx_stack_pop(stack, (gpointer)&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); + printf("1: %s 2:%s\n", item.s1, item.s2); + + gx_stack_push(stack, (gpointer)&first); + gx_stack_pop(stack, (gpointer)&item); + printf("1: %s 2:%s\n", item.s1, item.s2); + ret = gx_stack_pop(stack, (gpointer)&item); + printf("ret%d 1: %s 2:%s\n", ret, item.s1, item.s2); + ret = gx_stack_pop(stack, (gpointer)&item); + printf("ret%d 1: %s 2:%s\n", ret, item.s1, item.s2); + + return 0; +#endif diff -rNu melys-0.0.13/util/util.m melys-0.0.14/util/util.m --- melys-0.0.13/util/util.m Mon Aug 9 00:34:19 1999 +++ melys-0.0.14/util/util.m Sun Sep 26 20:53:58 1999 @@ -24,9 +24,10 @@ /* End of an array for use in loops */ #define ENDOF(a) ((a) + NELEM(a)) -#define DEBUG /* XXX */ -#ifdef DEBUG +/* Typedef for the affine transformations */ +typedef double affine_t[6]; +#ifdef DEBUG /* * Debugging stuff. */ diff -rNu melys-0.0.13/version melys-0.0.14/version --- melys-0.0.13/version Thu Sep 23 16:20:48 1999 +++ melys-0.0.14/version Tue Sep 28 16:06:04 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.0.13" +#define MELYS_VERSION_STRING "0.0.14" diff -rNu melys-0.0.13/widgets/Makefile melys-0.0.14/widgets/Makefile --- melys-0.0.13/widgets/Makefile Thu Sep 23 17:03:16 1999 +++ melys-0.0.14/widgets/Makefile Tue Sep 28 16:09:27 1999 @@ -61,6 +61,7 @@ melyspartitem.o: ../include/melyspartitem.h melystrackdisplay.o: ../include/melystrack.h melystrackdisplay.o: ../include/melyspartitem.h +melystrackdisplay.o: ../include/melwidgets.h melystrackdisplay.o: ../include/elements.h melystrackdisplay.o: ../include/md.h melystrackdisplay.o: ../include/melystrackdisplay.h diff -rNu melys-0.0.13/widgets/melyspartitem.c melys-0.0.14/widgets/melyspartitem.c --- melys-0.0.13/widgets/melyspartitem.c Thu Sep 23 17:03:24 1999 +++ melys-0.0.14/widgets/melyspartitem.c Tue Sep 28 16:09:39 1999 @@ -48,8 +48,6 @@ ARG_DOTTED_BORDER }; -typedef double affine_t[6]; - static void melys_part_item_init(MelysPartItem *XXX); static void melys_part_item_class_init(MelysPartItemClass *klass); static void part_item_update(GnomeCanvasItem *item, affine_t affine, diff -rNu melys-0.0.13/widgets/melyspartitem.m melys-0.0.14/widgets/melyspartitem.m --- melys-0.0.13/widgets/melyspartitem.m Thu Sep 23 15:19:53 1999 +++ melys-0.0.14/widgets/melyspartitem.m Tue Sep 28 16:04:55 1999 @@ -33,14 +33,10 @@ struct _MelysPartItem { GnomeCanvasRect gnome_canvas_rect; - GnomeCanvasGroup *group; /* Group that this is a part of */ - GnomeCanvasItem *text; /* Text for this part */ - int dotted; - struct element *part; /* The part being represented */ + struct partElement *part; /* The part being represented */ struct trackElement *track; /* Track this part belongs to */ - struct rootElement *root; /* The complete root */ }; struct _MelysPartItemClass { @@ -60,7 +56,6 @@ ARG_DOTTED_BORDER }; -typedef double affine_t[6]; >>function melys_part_item_new GnomeCanvasItem * diff -rNu melys-0.0.13/widgets/melystrack.c melys-0.0.14/widgets/melystrack.c --- melys-0.0.13/widgets/melystrack.c Thu Sep 23 17:03:25 1999 +++ melys-0.0.14/widgets/melystrack.c Tue Sep 28 16:09:39 1999 @@ -11,8 +11,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * - * */ @@ -28,6 +26,14 @@ #include "melystrack.h" #include "intl.h" +/* + * This is the main track view widget. This is the main view of the + * file and it should be the first created and the last destroyed. + * This widget uses the widgets MelysTrackInfo and MelysTrackDisplay + * which do most of the real work. + */ + + enum { // XXX symbols for all signals here LAST_SIGNAL @@ -93,6 +99,7 @@ { GtkAdjustment *hadj; GtkAdjustment *vadj; + GtkAdjustment *posadj; GtkHScrollbar *hscroll; GtkVScrollbar *vscroll; GtkHPaned *hpan; @@ -108,13 +115,18 @@ hadj = (GtkAdjustment*)gtk_adjustment_new(0.0, 0.0, 0.0, - 1.0, 16.0, - 32.0 + 1.0, 1.0, + 1.0 ); vadj = (GtkAdjustment*)gtk_adjustment_new(0.0, 0.0, 0.0, - 1.0, 16.0, - 32.0 + 1.0, 1.0, + 1.0 + ); + posadj = (GtkAdjustment*)gtk_adjustment_new(0.0, + 0.0, 0.0, + 1.0, 1.0, + 1.0 ); hscroll = (GtkHScrollbar*)gtk_hscrollbar_new(hadj); @@ -126,7 +138,7 @@ gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_IN); info = (MelysTrackInfo*)melys_track_info_new(vadj); - disp = (MelysTrackDisplay*)melys_track_display_new(hadj, vadj); + disp = (MelysTrackDisplay*)melys_track_display_new(hadj, vadj, posadj); gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(info)); gtk_container_add(GTK_CONTAINER(frame2), GTK_WIDGET(disp)); @@ -161,13 +173,17 @@ gtk_widget_show(GTK_WIDGET(tab)); mtp->vadj = vadj; - mtp->hadj = hadj; gtk_object_ref((GtkObject*)vadj); gtk_object_sink((GtkObject*)vadj); + mtp->hadj = hadj; gtk_object_ref((GtkObject*)hadj); gtk_object_sink((GtkObject*)hadj); + mtp->posadj = posadj; + gtk_object_ref((GtkObject*)posadj); + gtk_object_sink((GtkObject*)posadj); + mtp->info = info; mtp->display = disp; @@ -208,21 +224,25 @@ melys_track_set_md_root(MelysTrack *mtrack, struct rootElement *root) { - dprintf1("melys_track_set_md_root: Setting mdroot %p", root); + dprintf(3, "melys_track_set_md_root: Setting mdroot %p", root); if (root == NULL) return; mtrack->mdroot = md_root_inc_ref(root); + /* + * Reset the adjustments. We do not control the horizontal + * adjustment. That is handled by trackdisplay. + */ mtrack->vadj->lower = 0.0; mtrack->vadj->upper = root->tracks; gtk_adjustment_set_value(mtrack->vadj, 0.0); gtk_adjustment_changed(mtrack->vadj); - mtrack->hadj->lower = 0.0; - mtrack->hadj->upper = MD_ENDTIME(root); - gtk_adjustment_set_value(mtrack->hadj, 0.0); - gtk_adjustment_changed(mtrack->hadj); + mtrack->posadj->lower = 0.0; + mtrack->posadj->upper = MD_ENDTIME(root); + gtk_adjustment_set_value(mtrack->posadj, 0.0); + gtk_adjustment_changed(mtrack->posadj); melys_track_info_set_md_root(mtrack->info, root); melys_track_display_set_md_root(mtrack->display, root); @@ -252,12 +272,19 @@ mtrack->vadj->lower = 0.0; mtrack->vadj->upper = (double)mtrack->mdroot->tracks; - mtrack->hadj->lower = 0.0; - mtrack->hadj->upper = MD_ENDTIME(mtrack->mdroot); + /* We do not own the horizontal scrollbar */ + + /* Set the song position adjustment */ + mtrack->posadj->lower = 0.0; + mtrack->posadj->upper = MD_ENDTIME(mtrack->mdroot); + melys_track_info_update(mtrack->info); melys_track_display_update(mtrack->display); + //gtk_adjustment_changed(mtrack->vadj); + //gtk_adjustment_changed(mtrack->hadj); + //gtk_adjustment_changed(mtrack->posadj); /* No signal yet */ } @@ -287,6 +314,10 @@ if (mtp->hadj) { gtk_object_unref(GTK_OBJECT(mtp->hadj)); mtp->hadj = NULL; + } + if (mtp->posadj) { + gtk_object_unref(GTK_OBJECT(mtp->posadj)); + mtp->posadj = NULL; } if (GTK_OBJECT_CLASS(parent_class)->destroy) diff -rNu melys-0.0.13/widgets/melystrack.m melys-0.0.14/widgets/melystrack.m --- melys-0.0.13/widgets/melystrack.m Thu Sep 23 15:21:01 1999 +++ melys-0.0.14/widgets/melystrack.m Mon Sep 27 14:05:13 1999 @@ -10,6 +10,13 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +>>extern +/* + * This is the main track view widget. This is the main view of the + * file and it should be the first created and the last destroyed. + * This widget uses the widgets MelysTrackInfo and MelysTrackDisplay + * which do most of the real work. + */ >>header gtk/gtk.h >>header song.h @@ -30,6 +37,8 @@ GtkAdjustment *vadj; GtkAdjustment *hadj; + GtkAdjustment *posadj; /* Song position adjustment */ + struct _MelysTrackInfo *info; struct _MelysTrackDisplay *display; @@ -85,6 +94,7 @@ >>code GtkAdjustment *hadj; GtkAdjustment *vadj; + GtkAdjustment *posadj; GtkHScrollbar *hscroll; GtkVScrollbar *vscroll; GtkHPaned *hpan; @@ -100,13 +110,18 @@ hadj = (GtkAdjustment*)gtk_adjustment_new(0.0, 0.0, 0.0, - 1.0, 16.0, - 32.0 + 1.0, 1.0, + 1.0 ); vadj = (GtkAdjustment*)gtk_adjustment_new(0.0, 0.0, 0.0, - 1.0, 16.0, - 32.0 + 1.0, 1.0, + 1.0 + ); + posadj = (GtkAdjustment*)gtk_adjustment_new(0.0, + 0.0, 0.0, + 1.0, 1.0, + 1.0 ); hscroll = (GtkHScrollbar*)gtk_hscrollbar_new(hadj); @@ -118,7 +133,7 @@ gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_IN); info = (MelysTrackInfo*)melys_track_info_new(vadj); - disp = (MelysTrackDisplay*)melys_track_display_new(hadj, vadj); + disp = (MelysTrackDisplay*)melys_track_display_new(hadj, vadj, posadj); gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(info)); gtk_container_add(GTK_CONTAINER(frame2), GTK_WIDGET(disp)); @@ -153,13 +168,17 @@ gtk_widget_show(GTK_WIDGET(tab)); mtp->vadj = vadj; - mtp->hadj = hadj; gtk_object_ref((GtkObject*)vadj); gtk_object_sink((GtkObject*)vadj); + mtp->hadj = hadj; gtk_object_ref((GtkObject*)hadj); gtk_object_sink((GtkObject*)hadj); + mtp->posadj = posadj; + gtk_object_ref((GtkObject*)posadj); + gtk_object_sink((GtkObject*)posadj); + mtp->info = info; mtp->display = disp; @@ -202,21 +221,25 @@ >>code - dprintf1("@func_name: Setting mdroot %p", root); + dprintf(3, "@func_name: Setting mdroot %p", root); if (root == NULL) return; mtrack->mdroot = md_root_inc_ref(root); + /* + * Reset the adjustments. We do not control the horizontal + * adjustment. That is handled by trackdisplay. + */ mtrack->vadj->lower = 0.0; mtrack->vadj->upper = root->tracks; gtk_adjustment_set_value(mtrack->vadj, 0.0); gtk_adjustment_changed(mtrack->vadj); - mtrack->hadj->lower = 0.0; - mtrack->hadj->upper = MD_ENDTIME(root); - gtk_adjustment_set_value(mtrack->hadj, 0.0); - gtk_adjustment_changed(mtrack->hadj); + mtrack->posadj->lower = 0.0; + mtrack->posadj->upper = MD_ENDTIME(root); + gtk_adjustment_set_value(mtrack->posadj, 0.0); + gtk_adjustment_changed(mtrack->posadj); melys_track_info_set_md_root(mtrack->info, root); melys_track_display_set_md_root(mtrack->display, root); @@ -249,12 +272,19 @@ mtrack->vadj->lower = 0.0; mtrack->vadj->upper = (double)mtrack->mdroot->tracks; - mtrack->hadj->lower = 0.0; - mtrack->hadj->upper = MD_ENDTIME(mtrack->mdroot); + /* We do not own the horizontal scrollbar */ + + /* Set the song position adjustment */ + mtrack->posadj->lower = 0.0; + mtrack->posadj->upper = MD_ENDTIME(mtrack->mdroot); + melys_track_info_update(mtrack->info); melys_track_display_update(mtrack->display); + //gtk_adjustment_changed(mtrack->vadj); + //gtk_adjustment_changed(mtrack->hadj); + //gtk_adjustment_changed(mtrack->posadj); /* No signal yet */ @@ -282,6 +312,10 @@ if (mtp->hadj) { gtk_object_unref(GTK_OBJECT(mtp->hadj)); mtp->hadj = NULL; + } + if (mtp->posadj) { + gtk_object_unref(GTK_OBJECT(mtp->posadj)); + mtp->posadj = NULL; } if (GTK_OBJECT_CLASS(parent_class)->destroy) diff -rNu melys-0.0.13/widgets/melystrackdisplay.c melys-0.0.14/widgets/melystrackdisplay.c --- melys-0.0.13/widgets/melystrackdisplay.c Thu Sep 23 17:03:25 1999 +++ melys-0.0.14/widgets/melystrackdisplay.c Tue Sep 28 16:09:40 1999 @@ -27,9 +27,9 @@ #include "libgnomeui/gnome-canvas-line.h" #include "libgnomeui/gnome-canvas-util.h" #include "libgnomeui/gnome-canvas-text.h" -#include "libart_lgpl/art_affine.h" #include "melystrack.h" #include "melyspartitem.h" +#include "melwidgets.h" #include "elements.h" #include "md.h" #include "melystrackdisplay.h" @@ -40,25 +40,31 @@ + enum { LAST_SIGNAL }; -GnomeCanvasItem *item; +struct display_data { + GnomeCanvasGroup *group; + GnomeCanvasItem *item; + GnomeCanvasItem *text; +}; 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 create_part_item(MelysTrackDisplay *mdisp, struct element *part, - struct trackElement *track); +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 disp_destroy(GtkObject *obj); static void item_event(GtkWidget *widget, GdkEvent *event, gpointer data); static void disp_size_allocate(GtkWidget *widget, GtkAllocation *allocation); static void set_scroll_region(MelysTrackDisplay *mdisp); +static void set_hscroll(MelysTrackDisplay *mdisp); static gboolean title_expose(GtkWidget *widget, GdkEventExpose *event, gpointer data); -static int y_to_track(MelysTrackDisplay *mdisp, int ypix); static int track_to_y(MelysTrackDisplay *mdisp, int n); static int x_to_tick(MelysTrackDisplay *mdisp, int xpix); static int tick_to_x(MelysTrackDisplay *mdisp, int tick); @@ -99,10 +105,12 @@ * * Arguments: * hadj - Horizontal adjustment - * vadj - Horizontal adjustment + * vadj - Vertical adjustment + * posadj - Song position adjustment */ GtkWidget * -melys_track_display_new(GtkAdjustment *hadj, GtkAdjustment *vadj) +melys_track_display_new(GtkAdjustment *hadj, GtkAdjustment *vadj, + GtkAdjustment *posadj) { GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_track_display_get_type())); MelysTrackDisplay *mdisp; @@ -111,14 +119,18 @@ mdisp->hadj = hadj; mdisp->vadj = vadj; + mdisp->posadj = posadj; gtk_signal_connect((GtkObject *)hadj, "value-changed", (GtkSignalFunc)disp_scroll, mdisp); gtk_signal_connect((GtkObject *)vadj, "value-changed", (GtkSignalFunc)disp_scroll, mdisp); + gtk_signal_connect((GtkObject *)posadj, "value-changed", + (GtkSignalFunc)song_pos_cb, mdisp); gtk_object_ref((GtkObject*)hadj); gtk_object_ref((GtkObject*)vadj); + gtk_object_ref((GtkObject*)posadj); return GTK_WIDGET(mdisp); } @@ -165,26 +177,11 @@ canvas = (GnomeCanvas *)gnome_canvas_new(); #endif -#if 0 -{ -item = gnome_canvas_item_new(gnome_canvas_root(canvas), - melys_part_item_get_type(), - "x1", 10.0, - "y1", 10.0, - "x2", 200.0, - "y2", 50.0, - "fill_color", "yellow", - "width_pixels", 1, - "outline_color", "black", - NULL - ); -} -#endif - mdisp->canvas = GTK_WIDGET(canvas); mdisp->title = GTK_WIDGET(title); gtk_widget_set_usize(mdisp->title, 1, mdisp->vtitle); + /* * Build up the pane. The title row has a fixed height but * expands to fill the horizontal space. The canvas expands @@ -250,6 +247,9 @@ canvas = GNOME_CANVAS(mdisp->canvas); + mdisp->hadj->value = 0.0; + set_hscroll(mdisp); + melys_track_display_update(mdisp); } @@ -298,6 +298,67 @@ } /* + * 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) +{ + MelysTrackDisplay *mdisp = MELYS_TRACK_DISPLAY(data); + GtkAdjustment *hadj; + long t; + int x; + + hadj = mdisp->hadj; + + t = (unsigned long)mdisp->posadj->value; + x = tick_to_x(mdisp, t); + + if (x != tick_to_x(mdisp, mdisp->poffset)) { + int boundry; + int page_width; + + mdisp->poffset = t; + canvas_item_move_abs((GnomeCanvasItem*)mdisp->posline, + tick_to_x(mdisp, t), 0.0); + + /* + * First if this time is over the endtime then we are recording + * or otherwise increasing the length of the song. + * Increase the root duration to match, add on extra to + * avoid too many repeated calls -- it can be shrunk again + * later. + */ + if (t > MD_ENDTIME(mdisp->mdroot)) { + MD_SET_DURATION(mdisp->mdroot, t + hadj->page_size); + mdisp->posadj->upper = MD_ENDTIME(mdisp->mdroot); + set_scroll_region(mdisp); + } + + /* + * If we are just about to go off the end then shift the + * canvas over so that we are just over from the left. + * But if the line is already past the edge then don't + * scroll. This is so you can scroll by hand with out it + * always jumping back. + */ + page_width = x_to_tick(mdisp, GTK_WIDGET(mdisp)->allocation.width); + boundry = page_width / 10; + + if (t - mdisp->hoffset > page_width - boundry && + t - mdisp->hoffset <= page_width) { + + hadj->value += page_width - 2*boundry; + + set_scroll_region(mdisp); + } + + } +} + +/* * Look through all the parts and set up the part items for each * part. * @@ -308,7 +369,7 @@ int n; int p; struct trackElement *track; - struct element *part; /* note that this could be part or partref */ + struct partElement *part; /* note that this could be part or partref */ set_scroll_region(mdisp); @@ -318,6 +379,9 @@ for (p = 0; p < MD_CONTAINER(track)->elements->len; p++) { part = MD_CONTAINER(track)->elements->pdata[p]; + if (MD_IS_DESTROYED(part)) + printf("destroyed!\n"); + switch (MD_TYPE(part)) { case MD_TYPE_PART: case MD_TYPE_PARTREF: @@ -332,13 +396,13 @@ } static void -create_part_item(MelysTrackDisplay *mdisp, struct element *part, +create_part_item(MelysTrackDisplay *mdisp, struct partElement *part, struct trackElement *track) { gboolean ref = FALSE; GnomeCanvasItem *item; MelysPartItem *pitem; - MelysPartItem **itempp; + struct display_data *ddata; char *pname; int state; @@ -359,25 +423,14 @@ else state = GTK_STATE_NORMAL; - switch (MD_TYPE(part)) { - case MD_TYPE_PART: - itempp = (MelysPartItem **)&MD_PART(part)->item; - pname = MD_PART(part)->name; - break; - case MD_TYPE_PARTREF: - itempp = (MelysPartItem **)&MD_PARTREF(part)->item; - pname = MD_PARTREF(part)->name; - break; - default: - g_return_if_fail(0); - break; - } + pname = part->name; - item = (GnomeCanvasItem *)*itempp; - if (item == NULL) { + ddata = (struct display_data *) MD_CONTAINER(part)->data; + if (ddata == NULL) { GnomeCanvasGroup *rgroup; GnomeCanvasGroup *group; GnomeCanvasItem *text; + struct containerElement *c; char *name; rgroup = gnome_canvas_root((GnomeCanvas*)mdisp->canvas); @@ -398,37 +451,61 @@ "text", name, NULL); - MELYS_PART_ITEM(item)->group = group; - MELYS_PART_ITEM(item)->text = text; - *itempp = (MelysPartItem *)item; + pitem = MELYS_PART_ITEM(item); + + MD_WREF(part); + pitem->part = part; + + MD_WREF(track); + pitem->track = track; + + ddata = g_new(struct display_data, 1); + gtk_object_ref((GtkObject*)group); + ddata->group = group; + gtk_object_ref((GtkObject*)item); + ddata->item = item; + gtk_object_ref((GtkObject*)text); + ddata->text = text; + + c = MD_CONTAINER(part); + if (c->data) + c->data_free(c->data); + c->data = (gpointer)ddata; + c->data_free = display_data_free; + + gtk_signal_connect(GTK_OBJECT(pitem), "destroy", item_destroy, NULL); + gtk_signal_connect(GTK_OBJECT(pitem), "event", item_event, NULL); } - g_assert(item != NULL); - pitem = MELYS_PART_ITEM(item); + g_assert(ddata != NULL); + pitem = MELYS_PART_ITEM(ddata->item); /* * The scheme here is that we have a group that contains * the part rectangle and maybe text. We position the group - * as a whole. The rectangle and the text both are position + * 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 *)pitem->group, + gnome_canvas_item_set((GnomeCanvasItem *)ddata->group, "x", (double) tick_to_x(mdisp, MD_TIME(part)), - "y", (double) track_to_y(mdisp, track->number), + "y", (double) track_to_y(mdisp, MD_TRACKLIKE(track)->number), NULL); /* Set the font and text properties */ - gnome_canvas_item_set(pitem->text, + gnome_canvas_item_set(ddata->text, "x", (double) 2, "y", (double) 2, "font_gdk", GTK_WIDGET(mdisp)->style->font, "anchor", GTK_ANCHOR_NORTH_WEST, + "clip", TRUE, + "clip_width", (double) tick_to_x(mdisp, MD_DURATION(part))-2, + "clip_height", (double) mdisp->height, NULL); /* This size of the part is set here */ - gnome_canvas_item_set(item, + gnome_canvas_item_set(ddata->item, "x1", (double) 0.0, "y1", (double) 0.0, "x2", (double) tick_to_x(mdisp, MD_DURATION(part)), @@ -439,16 +516,8 @@ "dotted_border", ref, NULL); - MD_REF(part); - pitem->part = part; - - MD_REF(track); - pitem->track = track; - - pitem->root = md_root_inc_ref(mdisp->mdroot); - - gtk_signal_connect(GTK_OBJECT(item), "destroy", item_destroy, NULL); - gtk_signal_connect(GTK_OBJECT(item), "event", item_event, NULL); + if (mdisp->posline) + gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mdisp->posline); } static void @@ -456,12 +525,14 @@ { MelysPartItem *pitem = MELYS_PART_ITEM(obj); - if (pitem->part) - MD_FREE(pitem->part); - if (pitem->track) - MD_FREE(pitem->track); - if (pitem->root) - MD_FREE(pitem->root); + if (pitem->part) { + MD_WUNREF(pitem->part); + pitem->part = NULL; + } + if (pitem->track) { + MD_WUNREF(pitem->track); + pitem->track = NULL; + } } static void @@ -473,6 +544,9 @@ mdisp = (MelysTrackDisplay*)obj; + if (mdisp->posline) + gtk_object_destroy(GTK_OBJECT(mdisp->posline)); + if (mdisp->hadj) { gtk_object_unref(GTK_OBJECT(mdisp->hadj)); mdisp->hadj = NULL; @@ -481,6 +555,10 @@ gtk_object_unref(GTK_OBJECT(mdisp->vadj)); mdisp->vadj = NULL; } + if (mdisp->posadj) { + gtk_object_unref(GTK_OBJECT(mdisp->posadj)); + mdisp->posadj = NULL; + } if (mdisp->mdroot) { md_free(MD_ELEMENT(mdisp->mdroot)); @@ -499,7 +577,7 @@ pitem = MELYS_PART_ITEM(widget); - dprintf(1, "event %d for track %s\n", event->type, pitem->track->name); + dprintf(3, "event %d for track %s", event->type, pitem->track->name); } /* @@ -526,8 +604,16 @@ canvas = GNOME_CANVAS(mdisp->canvas); if (GTK_WIDGET_REALIZED(widget)) { + GnomeCanvasItem *item; + + item = (GnomeCanvasItem *)mdisp->posline; + if (item == NULL) { + item = gnome_canvas_item_new(gnome_canvas_root(canvas), + GNOME_TYPE_CANVAS_LINE, + NULL); + mdisp->posline = (gpointer)item; + } - set_scroll_region(mdisp); melys_track_display_update(mdisp); } } @@ -539,23 +625,19 @@ static void set_scroll_region(MelysTrackDisplay *mdisp) { - int width, height; + int height; GnomeCanvas *canvas = GNOME_CANVAS(mdisp->canvas); + GnomeCanvasPoints *points; + + if (!GTK_WIDGET_REALIZED(mdisp)) + return; + + /* It is our job to modify the page_size for the horizontal scroll */ + set_hscroll(mdisp); /* the allocated area is the minimum to use */ - width = GTK_WIDGET(mdisp)->allocation.width; height = GTK_WIDGET(mdisp)->allocation.height; - /* It is our job to modify the page_size for the horizontal scroll - * do not modify the bounds here - */ - mdisp->hadj->page_size = x_to_tick(mdisp, width); - mdisp->hadj->page_increment = x_to_tick(mdisp, width); - mdisp->hadj->step_increment = x_to_tick(mdisp, 20); - gtk_adjustment_changed(mdisp->hadj); - - if (width < tick_to_x(mdisp, MD_ENDTIME(mdisp->mdroot))) - width = tick_to_x(mdisp, MD_ENDTIME(mdisp->mdroot)); if (height < mdisp->mdroot->tracks * mdisp->vspace) { int last; int extra; @@ -567,9 +649,57 @@ gnome_canvas_set_scroll_region(canvas, 0.0, 0.0, - width, + mdisp->hadj->upper, height ); + + points = gnome_canvas_points_new(2); + points->coords[0] = 0.0; + points->coords[1] = 0.0; + points->coords[2] = 0.0; + points->coords[3] = height; + + gnome_canvas_item_set((GnomeCanvasItem *)mdisp->posline, + "points", points, + NULL); + + gnome_canvas_points_unref(points); +} + +/* + * We own the horizontal adjustment in the track display. + * Therefore set the bounds and keep the value correct here. + * The range is set to the duration of the piece plus a full width + * of the display area. + * + */ +static void +set_hscroll(MelysTrackDisplay *mdisp) +{ + int pageticks; + int ticklen; + GtkAdjustment *adj; + + if (!GTK_WIDGET_REALIZED(mdisp)) + return; + + adj = mdisp->hadj; + + pageticks = x_to_tick(mdisp, GTK_WIDGET(mdisp)->allocation.width); + ticklen = MD_ENDTIME(mdisp->mdroot) + pageticks; + + adj->lower = 0.0; + adj->upper = (double) ticklen; + + adj->page_size = pageticks; + adj->page_increment = adj->page_size; + adj->step_increment = x_to_tick(mdisp, 20); + gtk_adjustment_changed(adj); + + if (adj->value > adj->upper - adj->page_size) + adj->value = adj->upper - adj->page_size; + + gtk_adjustment_value_changed(adj); } /* @@ -631,32 +761,17 @@ return TRUE; } -/* - * Given a y position within the widget window, return the - * track number that belongs to that co-ordintate. Track - * numbers start at 0, -1 means no track in other words the y - * position is before the tracks start or after. - * - * Do we even need this? - * - * Arguments: - * mdisp - The widget - * ypix - Y pixel widget co-ordinate - */ -static int -y_to_track(MelysTrackDisplay *mdisp, int ypix) +void +display_data_free(gpointer _data) { - int n; - - n = ypix; - - n /= mdisp->vspace; - - n += mdisp->voffset; + struct display_data *data = _data; - dprintf(3, "Y %d, voff %d track %d", ypix, mdisp->voffset, n); + gtk_object_destroy((GtkObject *)data->group); + gtk_object_unref((GtkObject*)data->group); + gtk_object_unref((GtkObject*)data->item); + gtk_object_unref((GtkObject*)data->text); - return n; + g_free(_data); } static int @@ -685,7 +800,7 @@ g_return_val_if_fail(mdisp->hscale != 0, 0); - x = tick / mdisp->hscale; + x = (tick + mdisp->hscale/2) / mdisp->hscale; return x; } diff -rNu melys-0.0.13/widgets/melystrackdisplay.m melys-0.0.14/widgets/melystrackdisplay.m --- melys-0.0.13/widgets/melystrackdisplay.m Thu Sep 23 16:55:45 1999 +++ melys-0.0.14/widgets/melystrackdisplay.m Tue Sep 28 16:04:55 1999 @@ -23,10 +23,10 @@ >>header libgnomeui/gnome-canvas-util.h >>header libgnomeui/gnome-canvas-text.h ->>header libart_lgpl/art_affine.h >>header melystrack.h >>header melyspartitem.h +>>header melwidgets.h >>header elements.h >>header md.h @@ -41,11 +41,14 @@ /* The adjustments for scrolling */ GtkAdjustment *vadj; GtkAdjustment *hadj; + GtkAdjustment *posadj; /* Song position adjustment */ /* Amount of vertical scrolling, in tracks (you never see half a track) */ int voffset; /* Horizontal offset, in ticks */ int hoffset; + /* Play position offset, in ticks */ + int poffset; /* * The amount of vertical space used by tracks is under control of @@ -75,6 +78,7 @@ /* The sub-widgets that make up this widget */ GtkWidget *canvas; GtkWidget *title; + gpointer posline; }; @@ -83,16 +87,22 @@ }; >>extern + enum { LAST_SIGNAL }; -GnomeCanvasItem *item; +struct display_data { + GnomeCanvasGroup *group; + GnomeCanvasItem *item; + GnomeCanvasItem *text; +}; >>function melys_track_display_new GtkWidget * GtkAdjustment *hadj; Horizontal adjustment -GtkAdjustment *vadj; Horizontal adjustment +GtkAdjustment *vadj; Vertical adjustment +GtkAdjustment *posadj; Song position adjustment >>description Create a new MelysTrackDisplay object. @@ -105,17 +115,22 @@ mdisp->hadj = hadj; mdisp->vadj = vadj; + mdisp->posadj = posadj; gtk_signal_connect((GtkObject *)hadj, "value-changed", (GtkSignalFunc)disp_scroll, mdisp); gtk_signal_connect((GtkObject *)vadj, "value-changed", (GtkSignalFunc)disp_scroll, mdisp); + gtk_signal_connect((GtkObject *)posadj, "value-changed", + (GtkSignalFunc)song_pos_cb, mdisp); gtk_object_ref((GtkObject*)hadj); gtk_object_ref((GtkObject*)vadj); + gtk_object_ref((GtkObject*)posadj); return GTK_WIDGET(mdisp); + >>function melys_track_display_init static void MelysTrackDisplay *mdisp; The MelysTrackDisplay to init @@ -156,26 +171,11 @@ canvas = (GnomeCanvas *)gnome_canvas_new(); #endif -#if 0 -{ -item = gnome_canvas_item_new(gnome_canvas_root(canvas), - melys_part_item_get_type(), - "x1", 10.0, - "y1", 10.0, - "x2", 200.0, - "y2", 50.0, - "fill_color", "yellow", - "width_pixels", 1, - "outline_color", "black", - NULL - ); -} -#endif - mdisp->canvas = GTK_WIDGET(canvas); mdisp->title = GTK_WIDGET(title); gtk_widget_set_usize(mdisp->title, 1, mdisp->vtitle); + /* * Build up the pane. The title row has a fixed height but * expands to fill the horizontal space. The canvas expands @@ -242,6 +242,9 @@ canvas = GNOME_CANVAS(mdisp->canvas); + mdisp->hadj->value = 0.0; + set_hscroll(mdisp); + melys_track_display_update(mdisp); @@ -290,6 +293,67 @@ } +>>function song_pos_cb +static void +GtkAdjustment *adj; +gpointer data; +>>description +This gets called when the song position pointer is updated. +This could be because the user changed it in a different +widget or during playback. + +>>code + MelysTrackDisplay *mdisp = MELYS_TRACK_DISPLAY(data); + GtkAdjustment *hadj; + long t; + int x; + + hadj = mdisp->hadj; + + t = (unsigned long)mdisp->posadj->value; + x = tick_to_x(mdisp, t); + + if (x != tick_to_x(mdisp, mdisp->poffset)) { + int boundry; + int page_width; + + mdisp->poffset = t; + canvas_item_move_abs((GnomeCanvasItem*)mdisp->posline, + tick_to_x(mdisp, t), 0.0); + + /* + * First if this time is over the endtime then we are recording + * or otherwise increasing the length of the song. + * Increase the root duration to match, add on extra to + * avoid too many repeated calls -- it can be shrunk again + * later. + */ + if (t > MD_ENDTIME(mdisp->mdroot)) { + MD_SET_DURATION(mdisp->mdroot, t + hadj->page_size); + mdisp->posadj->upper = MD_ENDTIME(mdisp->mdroot); + set_scroll_region(mdisp); + } + + /* + * If we are just about to go off the end then shift the + * canvas over so that we are just over from the left. + * But if the line is already past the edge then don't + * scroll. This is so you can scroll by hand with out it + * always jumping back. + */ + page_width = x_to_tick(mdisp, GTK_WIDGET(mdisp)->allocation.width); + boundry = page_width / 10; + + if (t - mdisp->hoffset > page_width - boundry && + t - mdisp->hoffset <= page_width) { + + hadj->value += page_width - 2*boundry; + + set_scroll_region(mdisp); + } + + } + >>function melys_track_display_update void @@ -303,7 +367,7 @@ int n; int p; struct trackElement *track; - struct element *part; /* note that this could be part or partref */ + struct partElement *part; /* note that this could be part or partref */ set_scroll_region(mdisp); @@ -313,6 +377,9 @@ for (p = 0; p < MD_CONTAINER(track)->elements->len; p++) { part = MD_CONTAINER(track)->elements->pdata[p]; + if (MD_IS_DESTROYED(part)) + printf("destroyed!\n"); + switch (MD_TYPE(part)) { case MD_TYPE_PART: case MD_TYPE_PARTREF: @@ -326,17 +393,18 @@ } + >>function create_part_item static void MelysTrackDisplay *mdisp; -struct element *part; Part or reference to part +struct partElement *part; Part or reference to part struct trackElement *track; The track >>code gboolean ref = FALSE; GnomeCanvasItem *item; MelysPartItem *pitem; - MelysPartItem **itempp; + struct display_data *ddata; char *pname; int state; @@ -357,25 +425,14 @@ else state = GTK_STATE_NORMAL; - switch (MD_TYPE(part)) { - case MD_TYPE_PART: - itempp = (MelysPartItem **)&MD_PART(part)->item; - pname = MD_PART(part)->name; - break; - case MD_TYPE_PARTREF: - itempp = (MelysPartItem **)&MD_PARTREF(part)->item; - pname = MD_PARTREF(part)->name; - break; - default: - g_return_if_fail(0); - break; - } + pname = part->name; - item = (GnomeCanvasItem *)*itempp; - if (item == NULL) { + ddata = (struct display_data *) MD_CONTAINER(part)->data; + if (ddata == NULL) { GnomeCanvasGroup *rgroup; GnomeCanvasGroup *group; GnomeCanvasItem *text; + struct containerElement *c; char *name; rgroup = gnome_canvas_root((GnomeCanvas*)mdisp->canvas); @@ -396,37 +453,61 @@ "text", name, NULL); - MELYS_PART_ITEM(item)->group = group; - MELYS_PART_ITEM(item)->text = text; - *itempp = (MelysPartItem *)item; + pitem = MELYS_PART_ITEM(item); + + MD_WREF(part); + pitem->part = part; + + MD_WREF(track); + pitem->track = track; + + ddata = g_new(struct display_data, 1); + gtk_object_ref((GtkObject*)group); + ddata->group = group; + gtk_object_ref((GtkObject*)item); + ddata->item = item; + gtk_object_ref((GtkObject*)text); + ddata->text = text; + + c = MD_CONTAINER(part); + if (c->data) + c->data_free(c->data); + c->data = (gpointer)ddata; + c->data_free = display_data_free; + + gtk_signal_connect(GTK_OBJECT(pitem), "destroy", item_destroy, NULL); + gtk_signal_connect(GTK_OBJECT(pitem), "event", item_event, NULL); } - g_assert(item != NULL); - pitem = MELYS_PART_ITEM(item); + g_assert(ddata != NULL); + pitem = MELYS_PART_ITEM(ddata->item); /* * The scheme here is that we have a group that contains * the part rectangle and maybe text. We position the group - * as a whole. The rectangle and the text both are position + * 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 *)pitem->group, + gnome_canvas_item_set((GnomeCanvasItem *)ddata->group, "x", (double) tick_to_x(mdisp, MD_TIME(part)), - "y", (double) track_to_y(mdisp, track->number), + "y", (double) track_to_y(mdisp, MD_TRACKLIKE(track)->number), NULL); /* Set the font and text properties */ - gnome_canvas_item_set(pitem->text, + gnome_canvas_item_set(ddata->text, "x", (double) 2, "y", (double) 2, "font_gdk", GTK_WIDGET(mdisp)->style->font, "anchor", GTK_ANCHOR_NORTH_WEST, + "clip", TRUE, + "clip_width", (double) tick_to_x(mdisp, MD_DURATION(part))-2, + "clip_height", (double) mdisp->height, NULL); /* This size of the part is set here */ - gnome_canvas_item_set(item, + gnome_canvas_item_set(ddata->item, "x1", (double) 0.0, "y1", (double) 0.0, "x2", (double) tick_to_x(mdisp, MD_DURATION(part)), @@ -437,16 +518,8 @@ "dotted_border", ref, NULL); - MD_REF(part); - pitem->part = part; - - MD_REF(track); - pitem->track = track; - - pitem->root = md_root_inc_ref(mdisp->mdroot); - - gtk_signal_connect(GTK_OBJECT(item), "destroy", item_destroy, NULL); - gtk_signal_connect(GTK_OBJECT(item), "event", item_event, NULL); + if (mdisp->posline) + gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mdisp->posline); >>function item_destroy @@ -457,12 +530,14 @@ >>code MelysPartItem *pitem = MELYS_PART_ITEM(obj); - if (pitem->part) - MD_FREE(pitem->part); - if (pitem->track) - MD_FREE(pitem->track); - if (pitem->root) - MD_FREE(pitem->root); + if (pitem->part) { + MD_WUNREF(pitem->part); + pitem->part = NULL; + } + if (pitem->track) { + MD_WUNREF(pitem->track); + pitem->track = NULL; + } >>function disp_destroy @@ -476,6 +551,9 @@ mdisp = (MelysTrackDisplay*)obj; + if (mdisp->posline) + gtk_object_destroy(GTK_OBJECT(mdisp->posline)); + if (mdisp->hadj) { gtk_object_unref(GTK_OBJECT(mdisp->hadj)); mdisp->hadj = NULL; @@ -484,6 +562,10 @@ gtk_object_unref(GTK_OBJECT(mdisp->vadj)); mdisp->vadj = NULL; } + if (mdisp->posadj) { + gtk_object_unref(GTK_OBJECT(mdisp->posadj)); + mdisp->posadj = NULL; + } if (mdisp->mdroot) { md_free(MD_ELEMENT(mdisp->mdroot)); @@ -507,7 +589,7 @@ pitem = MELYS_PART_ITEM(widget); - dprintf(1, "event %d for track %s\n", event->type, pitem->track->name); + dprintf(3, "event %d for track %s", event->type, pitem->track->name); >>function disp_size_allocate @@ -536,8 +618,16 @@ canvas = GNOME_CANVAS(mdisp->canvas); if (GTK_WIDGET_REALIZED(widget)) { + GnomeCanvasItem *item; + + item = (GnomeCanvasItem *)mdisp->posline; + if (item == NULL) { + item = gnome_canvas_item_new(gnome_canvas_root(canvas), + GNOME_TYPE_CANVAS_LINE, + NULL); + mdisp->posline = (gpointer)item; + } - set_scroll_region(mdisp); melys_track_display_update(mdisp); } @@ -550,23 +640,19 @@ Set the canvas scrolling region. >>code - int width, height; + int height; GnomeCanvas *canvas = GNOME_CANVAS(mdisp->canvas); + GnomeCanvasPoints *points; + + if (!GTK_WIDGET_REALIZED(mdisp)) + return; + + /* It is our job to modify the page_size for the horizontal scroll */ + set_hscroll(mdisp); /* the allocated area is the minimum to use */ - width = GTK_WIDGET(mdisp)->allocation.width; height = GTK_WIDGET(mdisp)->allocation.height; - /* It is our job to modify the page_size for the horizontal scroll - * do not modify the bounds here - */ - mdisp->hadj->page_size = x_to_tick(mdisp, width); - mdisp->hadj->page_increment = x_to_tick(mdisp, width); - mdisp->hadj->step_increment = x_to_tick(mdisp, 20); - gtk_adjustment_changed(mdisp->hadj); - - if (width < tick_to_x(mdisp, MD_ENDTIME(mdisp->mdroot))) - width = tick_to_x(mdisp, MD_ENDTIME(mdisp->mdroot)); if (height < mdisp->mdroot->tracks * mdisp->vspace) { int last; int extra; @@ -578,10 +664,62 @@ gnome_canvas_set_scroll_region(canvas, 0.0, 0.0, - width, + mdisp->hadj->upper, height ); + points = gnome_canvas_points_new(2); + points->coords[0] = 0.0; + points->coords[1] = 0.0; + points->coords[2] = 0.0; + points->coords[3] = height; + + gnome_canvas_item_set((GnomeCanvasItem *)mdisp->posline, + "points", points, + NULL); + + gnome_canvas_points_unref(points); + + + +>>function set_hscroll +static void +MelysTrackDisplay *mdisp; + +>>description +We own the horizontal adjustment in the track display. +Therefore set the bounds and keep the value correct here. +The range is set to the duration of the piece plus a full width +of the display area. + +>>code + int pageticks; + int ticklen; + GtkAdjustment *adj; + + if (!GTK_WIDGET_REALIZED(mdisp)) + return; + + adj = mdisp->hadj; + + pageticks = x_to_tick(mdisp, GTK_WIDGET(mdisp)->allocation.width); + ticklen = MD_ENDTIME(mdisp->mdroot) + pageticks; + + adj->lower = 0.0; + adj->upper = (double) ticklen; + + adj->page_size = pageticks; + adj->page_increment = adj->page_size; + adj->step_increment = x_to_tick(mdisp, 20); + gtk_adjustment_changed(adj); + + if (adj->value > adj->upper - adj->page_size) + adj->value = adj->upper - adj->page_size; + + gtk_adjustment_value_changed(adj); + + + >>function title_expose static gboolean GtkWidget *widget; @@ -643,31 +781,21 @@ return TRUE; ->>function y_to_track -static int -MelysTrackDisplay *mdisp; The widget -int ypix; Y pixel widget co-ordinate - ->>description -Given a y position within the widget window, return -the track number that belongs to that co-ordintate. -Track numbers start at 0, -1 means no track in other words -the y position is before the tracks start or after. -Do we even need this? +>>function display_data_free +void +gpointer _data; >>code - int n; - - n = ypix; - - n /= mdisp->vspace; + struct display_data *data = _data; - n += mdisp->voffset; + gtk_object_destroy((GtkObject *)data->group); + gtk_object_unref((GtkObject*)data->group); + gtk_object_unref((GtkObject*)data->item); + gtk_object_unref((GtkObject*)data->text); - dprintf(3, "Y %d, voff %d track %d", ypix, mdisp->voffset, n); + g_free(_data); - return n; >>function track_to_y static int @@ -705,6 +833,6 @@ g_return_val_if_fail(mdisp->hscale != 0, 0); - x = tick / mdisp->hscale; + x = (tick + mdisp->hscale/2) / mdisp->hscale; return x; diff -rNu melys-0.0.13/widgets/melystrackinfo.c melys-0.0.14/widgets/melystrackinfo.c --- melys-0.0.13/widgets/melystrackinfo.c Thu Sep 23 17:03:26 1999 +++ melys-0.0.14/widgets/melystrackinfo.c Tue Sep 28 16:09:41 1999 @@ -411,7 +411,7 @@ GdkWindowAttr attributes; gint attributes_mask; - dprintf1("track_info_realise called"); + dprintf2("track_info_realise called"); g_return_if_fail (widget != NULL); g_return_if_fail (IS_MELYS_TRACK_INFO(widget)); @@ -484,6 +484,7 @@ MelysTrackInfo *minfo; g_return_if_fail(IS_MELYS_TRACK_INFO(object)); + dprintf1("Destroy: track_info_destroy %p", object); minfo = (MelysTrackInfo*)object; @@ -563,7 +564,7 @@ minfo = (MelysTrackInfo*)widget; widget->allocation = *allocation; - dprintf1("track_info_size_allocate: alloced (%d, %d) %dx%d", + dprintf2("track_info_size_allocate: alloced (%d, %d) %dx%d", allocation->x, allocation->y, allocation->width, allocation->height); if (GTK_WIDGET_REALIZED (widget)) { @@ -624,7 +625,7 @@ if (!GTK_WIDGET_DRAWABLE (widget)) return; - dprintf(1, "track_info_draw: (%d, %d) %dx%d", ap->x, ap->y, + dprintf(2, "track_info_draw: (%d, %d) %dx%d", ap->x, ap->y, ap->width, ap->height); minfo = (MelysTrackInfo*)widget; @@ -1120,7 +1121,7 @@ te = md_track_nth(minfo->mdroot, i); - if (i == track->number) + if (i == MD_TRACKLIKE(track)->number) continue; te->solo = 0; @@ -1440,10 +1441,10 @@ x = minfo->track_area.x; width = minfo->track_area.width; - y = track_to_y(minfo, track->number); + y = track_to_y(minfo, MD_TRACKLIKE(track)->number); height = minfo->vspace; - dprintf2("Q-DRAW %d: %d,%d %dx%d", track->number, x, y, width, height); + dprintf2("Q-DRAW %d: %d,%d %dx%d", MD_TRACKLIKE(track)->number, x, y, width, height); if (y >= 0) gtk_widget_queue_draw_area(GTK_WIDGET(minfo), x, y, width, height); diff -rNu melys-0.0.13/widgets/melystrackinfo.m melys-0.0.14/widgets/melystrackinfo.m --- melys-0.0.13/widgets/melystrackinfo.m Thu Sep 23 15:24:10 1999 +++ melys-0.0.14/widgets/melystrackinfo.m Mon Sep 27 14:05:13 1999 @@ -387,7 +387,7 @@ GdkWindowAttr attributes; gint attributes_mask; - dprintf1("@func_name called"); + dprintf2("@func_name called"); g_return_if_fail (widget != NULL); g_return_if_fail (IS_MELYS_TRACK_INFO(widget)); @@ -462,6 +462,7 @@ MelysTrackInfo *minfo; g_return_if_fail(IS_MELYS_TRACK_INFO(object)); + dprintf1("Destroy: @func_name %p", object); minfo = (MelysTrackInfo*)object; @@ -544,7 +545,7 @@ minfo = (MelysTrackInfo*)widget; widget->allocation = *allocation; - dprintf1("@func_name: alloced (%d, %d) %dx%d", + dprintf2("@func_name: alloced (%d, %d) %dx%d", allocation->x, allocation->y, allocation->width, allocation->height); if (GTK_WIDGET_REALIZED (widget)) { @@ -608,7 +609,7 @@ if (!GTK_WIDGET_DRAWABLE (widget)) return; - dprintf(1, "@func_name: (%d, %d) %dx%d", ap->x, ap->y, + dprintf(2, "@func_name: (%d, %d) %dx%d", ap->x, ap->y, ap->width, ap->height); minfo = (MelysTrackInfo*)widget; @@ -1142,7 +1143,7 @@ te = md_track_nth(minfo->mdroot, i); - if (i == track->number) + if (i == MD_TRACKLIKE(track)->number) continue; te->solo = 0; @@ -1490,10 +1491,10 @@ x = minfo->track_area.x; width = minfo->track_area.width; - y = track_to_y(minfo, track->number); + y = track_to_y(minfo, MD_TRACKLIKE(track)->number); height = minfo->vspace; - dprintf2("Q-DRAW %d: %d,%d %dx%d", track->number, x, y, width, height); + dprintf2("Q-DRAW %d: %d,%d %dx%d", MD_TRACKLIKE(track)->number, x, y, width, height); if (y >= 0) gtk_widget_queue_draw_area(GTK_WIDGET(minfo), x, y, width, height); diff -rNu melys-0.0.13/widgets/misc.c melys-0.0.14/widgets/misc.c --- melys-0.0.13/widgets/misc.c Thu Sep 23 17:03:26 1999 +++ melys-0.0.14/widgets/misc.c Tue Sep 28 16:09:42 1999 @@ -20,6 +20,8 @@ #include "except.h" #include "util.h" #include "gtk/gtk.h" +#include "libgnomeui/gnome-canvas.h" +#include "libart_lgpl/art_affine.h" #include "melwidgets.h" #include "intl.h" @@ -40,4 +42,19 @@ gtk_spin_button_set_wrap((GtkSpinButton *)spin, 1); return spin; +} + +/* + * 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) +{ + affine_t translate; + + art_affine_translate(translate, x, y); + gnome_canvas_item_affine_absolute(item, translate); } diff -rNu melys-0.0.13/widgets/misc.m melys-0.0.14/widgets/misc.m --- melys-0.0.13/widgets/misc.m Thu Sep 16 12:32:11 1999 +++ melys-0.0.14/widgets/misc.m Fri Sep 24 15:57:29 1999 @@ -12,9 +12,13 @@ GNU General Public License for more details. >>header gtk/gtk.h +>>header libgnomeui/gnome-canvas.h +>>header libart_lgpl/art_affine.h >>headerdef --decl melwidgets.h +struct _GnomeCanvasItem; + >>function mel_int_spinner GtkWidget * int lower; Lower value @@ -34,3 +38,22 @@ gtk_spin_button_set_wrap((GtkSpinButton *)spin, 1); return spin; + + +>>function canvas_item_move_abs +void +struct _GnomeCanvasItem *item; +double x; +double y; + +>>description +Gnome only appears to provide a relative routine at the time +of writing. +So here is the routine to give absolute coordinates. + +>>code + affine_t translate; + + art_affine_translate(translate, x, y); + gnome_canvas_item_affine_absolute(item, translate); + diff -rNu melys-0.0.13/widgets/register.c melys-0.0.14/widgets/register.c --- melys-0.0.13/widgets/register.c Thu Sep 23 17:03:26 1999 +++ melys-0.0.14/widgets/register.c Tue Sep 28 16:09:42 1999 @@ -81,7 +81,7 @@ /* Set up for the parent if required */ if (parent) { gtk_signal_connect_object_while_alive - (parent, "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroy), obj); + (parent, "destroy", GTK_SIGNAL_FUNC(gtk_object_destroy), obj); } return id; @@ -183,6 +183,9 @@ { GSList *lp; struct regid *idp; + + dprintf1("Destroy notify %s(id %d) at %p", + gtk_type_name(GTK_OBJECT_TYPE(obj)), GPOINTER_TO_INT(data), obj); for (lp = regobjs; lp; lp = lp->next) { idp = (struct regid *)lp->data; diff -rNu melys-0.0.13/widgets/register.m melys-0.0.14/widgets/register.m --- melys-0.0.13/widgets/register.m Thu Sep 16 12:33:36 1999 +++ melys-0.0.14/widgets/register.m Mon Sep 27 14:05:13 1999 @@ -76,7 +76,7 @@ /* Set up for the parent if required */ if (parent) { gtk_signal_connect_object_while_alive - (parent, "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroy), obj); + (parent, "destroy", GTK_SIGNAL_FUNC(gtk_object_destroy), obj); } return id; @@ -175,6 +175,9 @@ >>code GSList *lp; struct regid *idp; + + dprintf1("Destroy notify %s(id %d) at %p", + gtk_type_name(GTK_OBJECT_TYPE(obj)), GPOINTER_TO_INT(data), obj); for (lp = regobjs; lp; lp = lp->next) { idp = (struct regid *)lp->data;