diff -rNu melys-0.1.9/ChangeLog melys-0.1.10/ChangeLog --- melys-0.1.9/ChangeLog Mon Nov 29 22:01:43 1999 +++ melys-0.1.10/ChangeLog Thu Dec 2 17:44:35 1999 @@ -1,4 +1,69 @@ +1999-12-02 Steve Ratcliffe + + * widgets/melysview.m: + Fix the anti-aliased branch of the canvas creation (that + we are not using). + + * examples/screenshot.mdml: Added the screenshot mdml file. + + * widgets/melyssig.m: + Changed an incorrect reference into a weak reference. The elements + are now all freed properly when the file is closed. + + * README: Updated with the information that 1.0.40 gnome-libs + seems to work. + +1999-12-01 Steve Ratcliffe + + * md/mdconv.m: Fix crash when only reading a midi file when the + only track is empty. + + * widgets/melyskeysig.m: Fixed the conversion to the string. + + * README: Updated the requirements section. Early versions of + gnome-libs give a solid black block instead of a nice piano. + + * seq/seqlib.m, seq/seqplay.m: + Add some defines for converting from nsec to sec and prepare + for increasing the delay for sysex messages. + + * widgets/melyssig.m: + Improved the look a little and took out debugging. + + * widgets/melysscroll.m: display info structure moved into here + * widgets/viewcontrol.m: The snap type moved here. + * widgets/melysview.m: Some things moved down to melys_scroll + + * widgets/melystempo.m: The keysignature widget added. + * widgets/melyskeysig.m: The keysignature widget. + + * widgets/melyssig.m, widgets/melystimesig.m: + Pushed more of the code from timesig down to sig so that + it can be used for both timesig and keysig. + Keysig will now be a very quick widget to write. + + * md/elements.m: + Modify check_cast so that it will deal with NULL pointers. + + * widgets/melystempo.m: Add the timesignature widget. + + * widgets/melyssig.m, widgets/melystimesig.m: + The first working timesignature display. + +1999-11-30 Steve Ratcliffe + + * examples/notes.mdml, examples/timesig.mdml: + Some test example mdml files. + 1999-11-29 Steve Ratcliffe + + * version: Version 0.1.9 + + * widgets/melysview.m: Fixed occasional crash on opening a file. + + * midi/record.m: A define in the ALSA headers has changed. + + * version: Version 0.1.8 * md/mdutil.m: Removed dataset_destroy, which I am not convinced should be there when clearing a selection. Caused problems when diff -rNu melys-0.1.9/README melys-0.1.10/README --- melys-0.1.9/README Mon Nov 29 08:40:56 1999 +++ melys-0.1.10/README Thu Dec 2 00:39:15 1999 @@ -53,11 +53,11 @@ Requirements. ------------- - - You will need the gnome libraries. I am trying not - to require anything too up-to-the minute and so anything past version - 1.0 should be OK. But do get the latest version you can, just for - the bug fixes if nothing else. I recommend getting the "October Gnome" - release. + - You will need the gnome libraries. + You need gnome-libs version 1.0.40 or above, I am using 1.0.53. + Version 1.0.10, which I believe is supplied with RedHat 6.0 works + very badly with Melys, version 1.0.15 just about works but there + are problems. - libxml version 1.7 or above. diff -rNu melys-0.1.9/examples/notes.mdml melys-0.1.10/examples/notes.mdml --- melys-0.1.9/examples/notes.mdml Thu Jan 1 01:00:00 1970 +++ melys-0.1.10/examples/notes.mdml Tue Nov 30 15:08:07 1999 @@ -0,0 +1,53 @@ + + + + Steve Ratcliffe, 1999 + + + + This is a test for the piano roll view. We have notes + covering the whole possible midi range. The notes 0 + and 127 are longer as are all the notes in the octave + above middle C. + + A few notes are selected. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -rNu melys-0.1.9/examples/screenshot.mdml melys-0.1.10/examples/screenshot.mdml --- melys-0.1.9/examples/screenshot.mdml Thu Jan 1 01:00:00 1970 +++ melys-0.1.10/examples/screenshot.mdml Thu Dec 2 15:03:32 1999 @@ -0,0 +1,219 @@ + + + + + + + This is the file used to generate the screenshots. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -rNu melys-0.1.9/examples/timesig.mdml melys-0.1.10/examples/timesig.mdml --- melys-0.1.9/examples/timesig.mdml Thu Jan 1 01:00:00 1970 +++ melys-0.1.10/examples/timesig.mdml Tue Nov 30 15:08:07 1999 @@ -0,0 +1,82 @@ + + + + + + + This is a test file for timesignatures in the tempo view. + + This file contains very short parts at each of the time + signature boundries with a name reflecting the time signature. + So from the track view you can see where the changes occur. + + There are also some tempo changes. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + f0 41 10 42 12 40 00 7f 00 41 f7 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -rNu melys-0.1.9/include/elements.h melys-0.1.10/include/elements.h --- melys-0.1.9/include/elements.h Mon Nov 29 23:51:03 1999 +++ melys-0.1.10/include/elements.h Thu Dec 2 17:45:37 1999 @@ -135,7 +135,7 @@ char note; /* Note number */ char vel; /* Velocity */ char offvel; /* Note Off velocity */ - short length; /* Length of note */ + int length; /* Length of note */ }; #define MD_NOTE(e) \ ((struct noteElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_NOTE)) @@ -305,7 +305,7 @@ 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); +struct noteElement *md_note_new(char note, char vel, int length); struct partElement *md_part_new(void); struct partrefElement *md_partref_new(void); struct takeElement *md_take_new(void); diff -rNu melys-0.1.9/include/melwidgets.h melys-0.1.10/include/melwidgets.h --- melys-0.1.9/include/melwidgets.h Mon Nov 29 23:51:06 1999 +++ melys-0.1.10/include/melwidgets.h Thu Dec 2 17:45:41 1999 @@ -17,5 +17,15 @@ struct _GnomeCanvasItem; +/* + * A structure to keep track of displayed elements. + */ +struct display_info { + GtkObject *item; /* The associated display item */ + struct containerElement *con; /* Container for elem */ + struct element *elem; /* The element being displayed */ +}; + GtkWidget *mel_int_spinner(int lower, int upper, int val); void canvas_item_move_abs(struct _GnomeCanvasItem *item, double x, double y); +void display_info_free(gpointer _dinfo); diff -rNu melys-0.1.9/include/melyskeysig.h melys-0.1.10/include/melyskeysig.h --- melys-0.1.9/include/melyskeysig.h Thu Jan 1 01:00:00 1970 +++ melys-0.1.10/include/melyskeysig.h Thu Dec 2 17:45:39 1999 @@ -0,0 +1,43 @@ +/* + * + * Copyright (C) 1999 Steve Ratcliffe + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#define MELYS_KEYSIG(obj) GTK_CHECK_CAST(obj, melys_keysig_get_type(), MelysKeysig) +#define MELYS_KEYSIG_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, melys_keysig_get_type(), MelysKeysigClass) +#define IS_MELYS_KEYSIG(obj) GTK_CHECK_TYPE(obj, melys_keysig_get_type()) + +typedef struct _MelysKeysig MelysKeysig; +typedef struct _MelysKeysigClass MelysKeysigClass; + + +/* + * The MelysKeysig structure. Each instance of the class is + * allocated one of these structures. + */ +struct _MelysKeysig { + MelysSig melys_sig; +}; + +/* + * The MelysKeysigClass structure. There is only one of these + * allocated for the class. + */ +struct _MelysKeysigClass { + MelysSigClass parent_class; + +}; + +guint melys_keysig_get_type(void); +GtkWidget *melys_keysig_new(ViewControl *vcp); +char *keysig_to_string(struct keysigElement *ks); diff -rNu melys-0.1.9/include/melysscroll.h melys-0.1.10/include/melysscroll.h --- melys-0.1.9/include/melysscroll.h Mon Nov 29 23:51:05 1999 +++ melys-0.1.10/include/melysscroll.h Thu Dec 2 17:45:40 1999 @@ -55,6 +55,7 @@ void (*scale_changed)(MelysScroll *); }; + guint melys_scroll_get_type(void); GtkWidget *melys_scroll_new(ViewControl *vcp, int which, int width, int height); diff -rNu melys-0.1.9/include/melyssig.h melys-0.1.10/include/melyssig.h --- melys-0.1.9/include/melyssig.h Thu Jan 1 01:00:00 1970 +++ melys-0.1.10/include/melyssig.h Thu Dec 2 17:45:40 1999 @@ -0,0 +1,63 @@ +/* + * + * 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. + * + */ + +#define MELYS_SIG(obj) GTK_CHECK_CAST(obj, melys_sig_get_type(), MelysSig) +#define MELYS_SIG_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, melys_sig_get_type(), MelysSigClass) +#define IS_MELYS_SIG(obj) GTK_CHECK_TYPE(obj, melys_sig_get_type()) + +typedef struct _MelysSig MelysSig; +typedef struct _MelysSigClass MelysSigClass; + + +/* + * Extra display info for the items. + */ +struct edisplay_info { + struct display_info std; + GtkObject *rect; + GtkObject *text; +}; + +/* + * The MelysSig structure. Each instance of the class is + * allocated one of these structures. + */ +struct _MelysSig { + MelysScroll melys_scroll; + + struct tempomapElement *tmap; + char *infostr; + + int type; /* timesig or keysig */ +}; + +/* + * The MelysSigClass structure. There is only one of these + * allocated for the class. + */ +struct _MelysSigClass { + MelysScrollClass parent_class; + + /* Class methods to do the actual work */ + void (*update_item)(MelysSig *, struct edisplay_info *einfo, + struct tempomapElement *tmap, + struct mapElement *map1, struct mapElement *map2, + gboolean force); +}; + + + +guint melys_sig_get_type(void); +void melys_sig_set_map(MelysSig *msig, struct tempomapElement *tmap); diff -rNu melys-0.1.9/include/melystempo.h melys-0.1.10/include/melystempo.h --- melys-0.1.9/include/melystempo.h Mon Nov 29 23:51:05 1999 +++ melys-0.1.10/include/melystempo.h Thu Dec 2 17:45:40 1999 @@ -33,6 +33,8 @@ MelysView melys_view; GtkObject *lines; /* The lines connecting the changes */ + GtkWidget *tsig; /* Time signature widget */ + GtkWidget *ksig; /* Key signature widget */ }; /* diff -rNu melys-0.1.9/include/melystimesig.h melys-0.1.10/include/melystimesig.h --- melys-0.1.9/include/melystimesig.h Thu Jan 1 01:00:00 1970 +++ melys-0.1.10/include/melystimesig.h Thu Dec 2 17:45:40 1999 @@ -0,0 +1,42 @@ +/* + * + * 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. + * + */ + +#define MELYS_TIMESIG(obj) GTK_CHECK_CAST(obj, melys_timesig_get_type(), MelysTimesig) +#define MELYS_TIMESIG_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, melys_timesig_get_type(), MelysTimesigClass) +#define IS_MELYS_TIMESIG(obj) GTK_CHECK_TYPE(obj, melys_timesig_get_type()) + +typedef struct _MelysTimesig MelysTimesig; +typedef struct _MelysTimesigClass MelysTimesigClass; + + +/* + * The MelysTimesig structure. Each instance of the class is + * allocated one of these structures. + */ +struct _MelysTimesig { + MelysSig melys_sig; +}; + +/* + * The MelysTimesigClass structure. There is only one of these + * allocated for the class. + */ +struct _MelysTimesigClass { + MelysSigClass parent_class; + +}; + +guint melys_timesig_get_type(void); +GtkWidget *melys_timesig_new(ViewControl *vcp); diff -rNu melys-0.1.9/include/melysview.h melys-0.1.10/include/melysview.h --- melys-0.1.9/include/melysview.h Mon Nov 29 23:51:06 1999 +++ melys-0.1.10/include/melysview.h Thu Dec 2 17:45:41 1999 @@ -26,20 +26,6 @@ typedef struct _MelysViewClass MelysViewClass; -/* - * Snap to grid types. - */ -enum snap_type { - SNAP_NONE, - SNAP_BAR, - SNAP_1, - SNAP_1_2, - SNAP_1_4, - SNAP_1_8, - SNAP_1_16, - SNAP_1_32, - ETC -}; struct _MelysView { GtkVBox vbox; @@ -116,17 +102,7 @@ int (*get_nthing)(MelysView *, struct element *); }; -/* - * A structure to keep track of displayed elements. - */ -struct display_info { - GtkObject *item; /* The associated display item */ - struct containerElement *con; /* Container for elem */ - struct element *elem; /* The element being displayed */ -}; - guint melys_view_get_type(void); -void view_display_info_free(gpointer _dinfo); void melys_view_set_song(MelysView *mview, struct song *song); int melys_view_item_event(GtkObject *item, GdkEvent *event, gpointer data); diff -rNu melys-0.1.9/include/seqlib.h melys-0.1.10/include/seqlib.h --- melys-0.1.9/include/seqlib.h Mon Nov 29 23:51:01 1999 +++ melys-0.1.10/include/seqlib.h Thu Dec 2 17:45:35 1999 @@ -39,6 +39,11 @@ #endif +/* Defines for dealing with nano-second timestamps */ +#define NS_TO_MICRO_SECOND 1000 +#define NS_TO_MILI_SECOND 1000000 +#define NS_TO_SECOND 1000000000 + typedef struct seq_context seq_context_t; /* The device part of a devchan */ diff -rNu melys-0.1.9/include/viewcontrol.h melys-0.1.10/include/viewcontrol.h --- melys-0.1.9/include/viewcontrol.h Mon Nov 29 23:51:06 1999 +++ melys-0.1.10/include/viewcontrol.h Thu Dec 2 17:45:41 1999 @@ -33,6 +33,20 @@ VC_BOTH = (VC_HORIZONTAL|VC_VERTICAL) }; +/* + * Snap to grid types. + */ +enum snap_type { + SNAP_NONE, + SNAP_BAR, + SNAP_1, + SNAP_1_2, + SNAP_1_4, + SNAP_1_8, + SNAP_1_16, + SNAP_1_32, + ETC +}; struct _ViewControl { GtkObject object; diff -rNu melys-0.1.9/md/elements.c melys-0.1.10/md/elements.c --- melys-0.1.9/md/elements.c Mon Nov 29 23:51:18 1999 +++ melys-0.1.10/md/elements.c Thu Dec 2 17:45:53 1999 @@ -435,7 +435,7 @@ * Create and initialise a note element. */ struct noteElement * -md_note_new(char note, char vel, short length) +md_note_new(char note, char vel, int length) { struct noteElement * e; @@ -1106,6 +1106,10 @@ struct element * md_check_cast(struct element *el, int type) { + + /* Check for null first so we can cast null pointers */ + if (el == NULL) + return el; /* If it's the same type then this is always OK */ if (type == el->type) diff -rNu melys-0.1.9/md/elements.m melys-0.1.10/md/elements.m --- melys-0.1.9/md/elements.m Sat Nov 27 11:43:22 1999 +++ melys-0.1.10/md/elements.m Wed Dec 1 10:58:11 1999 @@ -198,8 +198,8 @@ char note; /* Note number */ char vel; /* Velocity */ char offvel; /* Note Off velocity */ - short length; /* Length of note */ -new char note, char vel, short length + int length; /* Length of note */ +new char note, char vel, int length e->note = note; e->vel = vel; e->length = length; @@ -381,6 +381,10 @@ want the program to exit if the check fails. >>code + + /* Check for null first so we can cast null pointers */ + if (el == NULL) + return el; /* If it's the same type then this is always OK */ if (type == el->type) diff -rNu melys-0.1.9/md/mdconv.c melys-0.1.10/md/mdconv.c --- melys-0.1.9/md/mdconv.c Mon Nov 29 23:51:19 1999 +++ melys-0.1.10/md/mdconv.c Thu Dec 2 17:45:54 1999 @@ -125,7 +125,7 @@ md_add(MD_CONTAINER(parts[tnum]), el); } - md_ensure_track(root, maxtnum - 1); + md_ensure_track(root, (maxtnum>0)? maxtnum-1: maxtnum); for (i = 0; i < maxtnum; i++) { trk = md_track_nth(root, i); md_add(MD_CONTAINER(trk), MD_ELEMENT(parts[i])); diff -rNu melys-0.1.9/md/mdconv.m melys-0.1.10/md/mdconv.m --- melys-0.1.9/md/mdconv.m Mon Nov 29 08:41:49 1999 +++ melys-0.1.10/md/mdconv.m Wed Dec 1 13:51:36 1999 @@ -119,7 +119,7 @@ md_add(MD_CONTAINER(parts[tnum]), el); } - md_ensure_track(root, maxtnum - 1); + md_ensure_track(root, (maxtnum>0)? maxtnum-1: maxtnum); for (i = 0; i < maxtnum; i++) { trk = md_track_nth(root, i); md_add(MD_CONTAINER(trk), MD_ELEMENT(parts[i])); diff -rNu melys-0.1.9/programs/Makefile melys-0.1.10/programs/Makefile --- melys-0.1.9/programs/Makefile Mon Nov 29 23:51:14 1999 +++ melys-0.1.10/programs/Makefile Thu Dec 2 17:45:49 1999 @@ -60,6 +60,8 @@ ../widgets/melyspiano.o ../widgets/melyskeys.o \ ../widgets/melystempo.o ../widgets/melysscale.o \ ../widgets/melysscroll.o \ + ../widgets/melyssig.o ../widgets/melystimesig.o \ + ../widgets/melyskeysig.o \ ../pixmaps/balls.o ../pixmaps/menu_icons.o ../pixmaps/mag.o SHOWSEQOBJS = \ diff -rNu melys-0.1.9/programs/melys.m melys-0.1.10/programs/melys.m --- melys-0.1.9/programs/melys.m Mon Nov 29 08:42:18 1999 +++ melys-0.1.10/programs/melys.m Wed Dec 1 13:11:12 1999 @@ -34,6 +34,8 @@ >>make --objects ../widgets/melyspiano.o ../widgets/melyskeys.o >>make --objects ../widgets/melystempo.o ../widgets/melysscale.o >>make --objects ../widgets/melysscroll.o +>>make --objects ../widgets/melyssig.o ../widgets/melystimesig.o +>>make --objects ../widgets/melyskeysig.o >>make --objects ../pixmaps/balls.o ../pixmaps/menu_icons.o ../pixmaps/mag.o >>header diff -rNu melys-0.1.9/seq/seqlib.m melys-0.1.10/seq/seqlib.m --- melys-0.1.9/seq/seqlib.m Sat Nov 27 11:43:23 1999 +++ melys-0.1.10/seq/seqlib.m Wed Dec 1 13:08:59 1999 @@ -42,6 +42,11 @@ #endif +/* Defines for dealing with nano-second timestamps */ +#define NS_TO_MICRO_SECOND 1000 +#define NS_TO_MILI_SECOND 1000000 +#define NS_TO_SECOND 1000000000 + typedef struct seq_context seq_context_t; /* The device part of a devchan */ diff -rNu melys-0.1.9/seq/seqplay.c melys-0.1.10/seq/seqplay.c --- melys-0.1.9/seq/seqplay.c Mon Nov 29 23:51:15 1999 +++ melys-0.1.10/seq/seqplay.c Thu Dec 2 17:45:51 1999 @@ -269,7 +269,13 @@ ep->time.real.tv_sec = time.real.tv_sec; ep->time.real.tv_sec = time.real.tv_sec; - time.real.tv_nsec += 1000000; + switch (ep->type) { + /* XXX set the delay according to type */ + default: + time.real.tv_nsec += 1 * NS_TO_MILI_SECOND; + break; + } + while (time.real.tv_nsec > 1000000000) { time.real.tv_nsec -= 1000000000; time.real.tv_sec++; diff -rNu melys-0.1.9/seq/seqplay.m melys-0.1.10/seq/seqplay.m --- melys-0.1.9/seq/seqplay.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.10/seq/seqplay.m Wed Dec 1 13:08:59 1999 @@ -259,7 +259,13 @@ ep->time.real.tv_sec = time.real.tv_sec; ep->time.real.tv_sec = time.real.tv_sec; - time.real.tv_nsec += 1000000; + switch (ep->type) { + /* XXX set the delay according to type */ + default: + time.real.tv_nsec += 1 * NS_TO_MILI_SECOND; + break; + } + while (time.real.tv_nsec > 1000000000) { time.real.tv_nsec -= 1000000000; time.real.tv_sec++; diff -rNu melys-0.1.9/version melys-0.1.10/version --- melys-0.1.9/version Mon Nov 29 23:47:22 1999 +++ melys-0.1.10/version Thu Dec 2 17:44:41 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.1.9" +#define MELYS_VERSION_STRING "0.1.10" diff -rNu melys-0.1.9/widgets/.cvsignore melys-0.1.10/widgets/.cvsignore --- melys-0.1.9/widgets/.cvsignore Mon Nov 29 23:51:13 1999 +++ melys-0.1.10/widgets/.cvsignore Thu Dec 2 17:45:48 1999 @@ -1,11 +1,14 @@ melyskeys.c +melyskeysig.c melyspartitem.c melyspiano.c melyspos.c melysrule.c melysscale.c melysscroll.c +melyssig.c melystempo.c +melystimesig.c melystrack.c melystrackdisplay.c melystrackinfo.c diff -rNu melys-0.1.9/widgets/Makefile melys-0.1.10/widgets/Makefile --- melys-0.1.9/widgets/Makefile Mon Nov 29 23:51:13 1999 +++ melys-0.1.10/widgets/Makefile Thu Dec 2 17:45:48 1999 @@ -5,13 +5,16 @@ TARGETS = OBJS = melyskeys.o \ + melyskeysig.o \ melyspartitem.o \ melyspiano.o \ melyspos.o \ melysrule.o \ melysscale.o \ melysscroll.o \ + melyssig.o \ melystempo.o \ + melystimesig.o \ melystrack.o \ melystrackdisplay.o \ melystrackinfo.o \ @@ -21,13 +24,16 @@ register.o \ viewcontrol.o GENCFILES = melyskeys.c \ + melyskeysig.c \ melyspartitem.c \ melyspiano.c \ melyspos.c \ melysrule.c \ melysscale.c \ melysscroll.c \ + melyssig.c \ melystempo.c \ + melystimesig.c \ melystrack.c \ melystrackdisplay.c \ melystrackinfo.c \ @@ -37,13 +43,16 @@ register.c \ viewcontrol.c GENHFILES = ../include/melyskeys.h \ + ../include/melyskeysig.h \ ../include/melyspartitem.h \ ../include/melyspiano.h \ ../include/melyspos.h \ ../include/melysrule.h \ ../include/melysscale.h \ ../include/melysscroll.h \ + ../include/melyssig.h \ ../include/melystempo.h \ + ../include/melystimesig.h \ ../include/melystrack.h \ ../include/melystrackdisplay.h \ ../include/melystrackinfo.h \ @@ -87,6 +96,18 @@ viewcontrol.o: ../include/pixmaps.h viewcontrol.o: ../include/melgui.h viewcontrol.o: ../include/viewcontrol.h +melystrack.o: ../include/song.h +melystrack.o: ../include/elements.h +melystrack.o: ../include/pixmaps.h +melystrack.o: ../include/md.h +melystrack.o: ../include/melgui.h +melystrack.o: ../include/viewcontrol.h +melystrack.o: ../include/melysscroll.h +melystrack.o: ../include/melysview.h +melystrack.o: ../include/melystrackinfo.h +melystrack.o: ../include/melystrackdisplay.h +melystrack.o: ../include/melwidgets.h +melystrack.o: ../include/melystrack.h melysview.o: ../include/elements.h melysview.o: ../include/md.h melysview.o: ../include/viewcontrol.h @@ -96,6 +117,13 @@ melysview.o: ../include/song.h melysview.o: ../include/melysview.h melysview.o: ../include/meldnd.h +melyskeysig.o: ../include/elements.h +melyskeysig.o: ../include/md.h +melyskeysig.o: ../include/melwidgets.h +melyskeysig.o: ../include/viewcontrol.h +melyskeysig.o: ../include/melysscroll.h +melyskeysig.o: ../include/melyssig.h +melyskeysig.o: ../include/melyskeysig.h melyspiano.o: ../include/elements.h melyspiano.o: ../include/md.h melyspiano.o: ../include/viewcontrol.h @@ -105,11 +133,20 @@ melyspiano.o: ../include/melyspiano.h melystransport.o: ../include/melystransport.h register.o: ../include/melreg.h -melysscale.o: ../include/viewcontrol.h -melysscale.o: ../include/melysscroll.h -melysscale.o: ../include/melysscale.h +melysrule.o: ../include/elements.h +melysrule.o: ../include/viewcontrol.h +melysrule.o: ../include/melystrack.h +melysrule.o: ../include/md.h +melysrule.o: ../include/melysrule.h melysscroll.o: ../include/viewcontrol.h melysscroll.o: ../include/melysscroll.h +melystimesig.o: ../include/elements.h +melystimesig.o: ../include/md.h +melystimesig.o: ../include/melwidgets.h +melystimesig.o: ../include/viewcontrol.h +melystimesig.o: ../include/melysscroll.h +melystimesig.o: ../include/melyssig.h +melystimesig.o: ../include/melystimesig.h melyspartitem.o: ../include/elements.h melyspartitem.o: ../include/md.h melyspartitem.o: ../include/melyspartitem.h @@ -129,12 +166,15 @@ melystrackdisplay.o: ../include/melystrackdisplay.h misc.o: ../include/pixmaps.h misc.o: ../include/melgui.h +misc.o: ../include/elements.h +misc.o: ../include/md.h misc.o: ../include/melwidgets.h -melysrule.o: ../include/elements.h -melysrule.o: ../include/viewcontrol.h -melysrule.o: ../include/melystrack.h -melysrule.o: ../include/md.h -melysrule.o: ../include/melysrule.h +melyssig.o: ../include/elements.h +melyssig.o: ../include/md.h +melyssig.o: ../include/viewcontrol.h +melyssig.o: ../include/melysscroll.h +melyssig.o: ../include/melwidgets.h +melyssig.o: ../include/melyssig.h melystrackinfo.o: ../include/melmsg.h melystrackinfo.o: ../include/melgui.h melystrackinfo.o: ../include/pixmaps.h @@ -152,25 +192,19 @@ melyspos.o: ../include/elements.h melyspos.o: ../include/md.h melyspos.o: ../include/melyspos.h -melystrack.o: ../include/song.h -melystrack.o: ../include/elements.h -melystrack.o: ../include/pixmaps.h -melystrack.o: ../include/md.h -melystrack.o: ../include/melgui.h -melystrack.o: ../include/viewcontrol.h -melystrack.o: ../include/melysscroll.h -melystrack.o: ../include/melysview.h -melystrack.o: ../include/melystrackinfo.h -melystrack.o: ../include/melystrackdisplay.h -melystrack.o: ../include/melwidgets.h -melystrack.o: ../include/melystrack.h +melysscale.o: ../include/viewcontrol.h +melysscale.o: ../include/melysscroll.h +melysscale.o: ../include/melysscale.h +melystempo.o: ../include/elements.h +melystempo.o: ../include/md.h +melystempo.o: ../include/melwidgets.h melystempo.o: ../include/viewcontrol.h melystempo.o: ../include/melysscroll.h melystempo.o: ../include/melysview.h melystempo.o: ../include/melysscale.h melystempo.o: ../include/melysrule.h -melystempo.o: ../include/melwidgets.h -melystempo.o: ../include/elements.h -melystempo.o: ../include/md.h +melystempo.o: ../include/melyssig.h +melystempo.o: ../include/melystimesig.h +melystempo.o: ../include/melyskeysig.h melystempo.o: ../include/song.h melystempo.o: ../include/melystempo.h diff -rNu melys-0.1.9/widgets/melyskeysig.c melys-0.1.10/widgets/melyskeysig.c --- melys-0.1.9/widgets/melyskeysig.c Thu Jan 1 01:00:00 1970 +++ melys-0.1.10/widgets/melyskeysig.c Thu Dec 2 17:45:58 1999 @@ -0,0 +1,216 @@ +/* + * + * 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 "libgnomeui/gnome-canvas.h" +#include "elements.h" +#include "md.h" +#include "melwidgets.h" +#include "viewcontrol.h" +#include "melysscroll.h" +#include "melyssig.h" +#include "melyskeysig.h" +#include "intl.h" + + + + + +#define tick_to_x(ms, tick) ( view_control_tick_to_x( \ + MELYS_SCROLL(ms)->vcp, (tick)) ) + +/* + * Tables to convert from the keysignature as stored in Midi to + * a string representation. + * To use the tables use the index: + * keysig->key * 2 + keysig->minor + * The sharp key table applies when keysig->key is greater than or + * equal to zero, the flat table otherwise. + */ +static char *sharp_key_to_string[] = { + "C", "A", + "G", "E", + "D", "B", + "A", "F#", + "E", "C#", + "B", "G#", + "F#", "D#", + "C#", "A#", + }; +static char *flat_key_to_string[] = { + "F", "D", + "Bb", "G", + "Eb", "C", + "Ab", "F", + "Db", "Bb", + "Gb", "Eb", + "Cb", "Ab", + }; + +/* Static functions */ +static void melys_keysig_init(MelysKeysig *mksig); +static void melys_keysig_class_init(MelysKeysigClass *klass); +static void ksig_update_item(MelysSig *msig, struct edisplay_info *einfo, + struct tempomapElement *tmap, struct mapElement *map1, + struct mapElement *map2, gboolean force); + + +static MelysSigClass *parent_class = NULL; + +/* + * Return a unique integer that represents the object type. + */ +guint +melys_keysig_get_type(void) +{ + static guint mtype = 0; + + if (!mtype) { + GtkTypeInfo minfo = { + "MelysKeysig", + sizeof(MelysKeysig), + sizeof(MelysKeysigClass), + (GtkClassInitFunc) melys_keysig_class_init, + (GtkObjectInitFunc) melys_keysig_init, + (GtkArgSetFunc) NULL, + (GtkArgGetFunc) NULL, + (GtkClassInitFunc) NULL, + }; + + mtype = gtk_type_unique(melys_sig_get_type(), &minfo); + } + + return mtype; +} + +/* + * Create a new MelysKeysig object. + */ +GtkWidget * +melys_keysig_new(ViewControl *vcp) +{ + MelysKeysig *mksig = MELYS_KEYSIG(gtk_type_new(melys_keysig_get_type())); + + melys_scroll_set_control(MELYS_SCROLL(mksig), vcp, + VC_HORIZONTAL, 0, vcp->vtitle); + + return GTK_WIDGET(mksig); +} + +/* + * Initialise the MelysKeysig. + * + * Arguments: + * mksig - The MelysKeysig to init + */ +static void +melys_keysig_init(MelysKeysig *mksig) +{ + + MELYS_SIG(mksig)->type = MD_TYPE_KEYSIG; +} + +/* + * Initialize the class. + * + * Arguments: + * klass - The class to initialise + */ +static void +melys_keysig_class_init(MelysKeysigClass *klass) +{ + MelysSigClass *melys_sig_class; + + parent_class = gtk_type_class(melys_sig_get_type()); + + melys_sig_class = (MelysSigClass *)klass; + melys_sig_class->update_item = ksig_update_item; +} + +static void +ksig_update_item(MelysSig *msig, struct edisplay_info *einfo, + struct tempomapElement *tmap, struct mapElement *map1, + struct mapElement *map2, gboolean force) +{ + struct keysigElement *ks1 = MD_KEYSIG(map1); + struct keysigElement *ks2 = MD_KEYSIG(map2); + char *str; + char *name; + ticktime_t end; + int state; + + if (MD_SELECTED(ks1)) + state = GTK_STATE_SELECTED; + else + state = GTK_STATE_NORMAL; + + /* Get the end time which is either the start of the next change + * or the end of the song. + */ + if (ks2) + end = MD_TIME(ks2); + else + end = MD_ENDTIME(tmap); + + /* + * We know that the common routine created any needed einfo + * for us. + */ + g_return_if_fail(einfo); + + canvas_item_move_abs(GNOME_CANVAS_ITEM(einfo->std.item), + tick_to_x(msig, MD_TIME(ks1)), 0); + + /* + * This will produce something like C, Cm, Bbm etc. + */ + name = keysig_to_string(ks1); + + str = g_strdup_printf("%s%s", name, ks1->minor? _("m"): ""); + gnome_canvas_item_set(GNOME_CANVAS_ITEM(einfo->text), + "text", str, "fill_color_gdk", + >K_WIDGET(msig)->style->fg[state], NULL); + g_free(str); + + gnome_canvas_item_set(GNOME_CANVAS_ITEM(einfo->rect), + "x2", (double) tick_to_x(msig, end), + NULL); +} + +/* + * Convert keysignature to a string. + */ +char * +keysig_to_string(struct keysigElement *ks) +{ + int key; + int minor; + char **table; + + key = CLAMP(ks->key, -7, 7); + minor = CLAMP(ks->minor, 0, 1); + + if (key < 0) { + table = flat_key_to_string; + key = - key - 1; + } else { + table = sharp_key_to_string; + } + + return table[2 * key + minor]; +} diff -rNu melys-0.1.9/widgets/melyskeysig.m melys-0.1.10/widgets/melyskeysig.m --- melys-0.1.9/widgets/melyskeysig.m Thu Jan 1 01:00:00 1970 +++ melys-0.1.10/widgets/melyskeysig.m Thu Dec 2 17:19:52 1999 @@ -0,0 +1,194 @@ +>>name melyskeysig.m - Key signature display widget + +Copyright (C) 1999 Steve Ratcliffe + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. +>>extern + +>>header libgnomeui/gnome-canvas.h + +>>header elements.h +>>header md.h +>>header melwidgets.h +>>header viewcontrol.h +>>header melysscroll.h +>>header melyssig.h + +>>set nosignals +>>gtkobject melys_keysig melys_sig + +>>headerdef @header + +/* + * The MelysKeysig structure. Each instance of the class is + * allocated one of these structures. + */ +struct _MelysKeysig { + MelysSig melys_sig; +}; + +/* + * The MelysKeysigClass structure. There is only one of these + * allocated for the class. + */ +struct _MelysKeysigClass { + MelysSigClass parent_class; + +}; + +>>extern + +#define tick_to_x(ms, tick) ( view_control_tick_to_x( \ + MELYS_SCROLL(ms)->vcp, (tick)) ) + +/* + * Tables to convert from the keysignature as stored in Midi to + * a string representation. + * To use the tables use the index: + * keysig->key * 2 + keysig->minor + * The sharp key table applies when keysig->key is greater than or + * equal to zero, the flat table otherwise. + */ +static char *sharp_key_to_string[] = { + "C", "A", + "G", "E", + "D", "B", + "A", "F#", + "E", "C#", + "B", "G#", + "F#", "D#", + "C#", "A#", + }; +static char *flat_key_to_string[] = { + "F", "D", + "Bb", "G", + "Eb", "C", + "Ab", "F", + "Db", "Bb", + "Gb", "Eb", + "Cb", "Ab", + }; + +>>function melys_keysig_new +GtkWidget * +ViewControl *vcp; +>>description +Create a new MelysKeysig object. +>>code + MelysKeysig *mksig = MELYS_KEYSIG(gtk_type_new(melys_keysig_get_type())); + + melys_scroll_set_control(MELYS_SCROLL(mksig), vcp, + VC_HORIZONTAL, 0, vcp->vtitle); + + return GTK_WIDGET(mksig); + + +>>function melys_keysig_init +static void +MelysKeysig *mksig; The MelysKeysig to init +>>description +Initialise the MelysKeysig. +>>code + + MELYS_SIG(mksig)->type = MD_TYPE_KEYSIG; + +>>function melys_keysig_class_init +static void +MelysKeysigClass *klass; The class to initialise + +>>description +Initialize the class. + +>>code + MelysSigClass *melys_sig_class; + + parent_class = gtk_type_class(melys_sig_get_type()); + + melys_sig_class = (MelysSigClass *)klass; + melys_sig_class->update_item = ksig_update_item; + + +>>function ksig_update_item +static void +MelysSig *msig; +struct edisplay_info *einfo; +struct tempomapElement *tmap; +struct mapElement *map1; +struct mapElement *map2; +gboolean force; + +>>code + struct keysigElement *ks1 = MD_KEYSIG(map1); + struct keysigElement *ks2 = MD_KEYSIG(map2); + char *str; + char *name; + ticktime_t end; + int state; + + if (MD_SELECTED(ks1)) + state = GTK_STATE_SELECTED; + else + state = GTK_STATE_NORMAL; + + /* Get the end time which is either the start of the next change + * or the end of the song. + */ + if (ks2) + end = MD_TIME(ks2); + else + end = MD_ENDTIME(tmap); + + /* + * We know that the common routine created any needed einfo + * for us. + */ + g_return_if_fail(einfo); + + canvas_item_move_abs(GNOME_CANVAS_ITEM(einfo->std.item), + tick_to_x(msig, MD_TIME(ks1)), 0); + + /* + * This will produce something like C, Cm, Bbm etc. + */ + name = keysig_to_string(ks1); + + str = g_strdup_printf("%s%s", name, ks1->minor? _("m"): ""); + gnome_canvas_item_set(GNOME_CANVAS_ITEM(einfo->text), + "text", str, "fill_color_gdk", + >K_WIDGET(msig)->style->fg[state], NULL); + g_free(str); + + gnome_canvas_item_set(GNOME_CANVAS_ITEM(einfo->rect), + "x2", (double) tick_to_x(msig, end), + NULL); + + +>>function keysig_to_string +char * +struct keysigElement *ks; + +>>description +Convert keysignature to a string. +>>code + int key; + int minor; + char **table; + + key = CLAMP(ks->key, -7, 7); + minor = CLAMP(ks->minor, 0, 1); + + if (key < 0) { + table = flat_key_to_string; + key = - key - 1; + } else { + table = sharp_key_to_string; + } + + return table[2 * key + minor]; diff -rNu melys-0.1.9/widgets/melyspiano.c melys-0.1.10/widgets/melyspiano.c --- melys-0.1.9/widgets/melyspiano.c Mon Nov 29 23:51:23 1999 +++ melys-0.1.10/widgets/melyspiano.c Thu Dec 2 17:45:58 1999 @@ -377,7 +377,7 @@ dinfo->con = con; g_dataset_set_data_full(note, mview->infostr, - dinfo, view_display_info_free); + dinfo, display_info_free); gtk_object_set_data(GTK_OBJECT(item), mview->infostr, dinfo); gtk_signal_connect(GTK_OBJECT(item), "event", diff -rNu melys-0.1.9/widgets/melyspiano.m melys-0.1.10/widgets/melyspiano.m --- melys-0.1.9/widgets/melyspiano.m Mon Nov 29 21:36:48 1999 +++ melys-0.1.10/widgets/melyspiano.m Thu Dec 2 17:19:52 1999 @@ -357,7 +357,7 @@ dinfo->con = con; g_dataset_set_data_full(note, mview->infostr, - dinfo, view_display_info_free); + dinfo, display_info_free); gtk_object_set_data(GTK_OBJECT(item), mview->infostr, dinfo); gtk_signal_connect(GTK_OBJECT(item), "event", diff -rNu melys-0.1.9/widgets/melysscroll.m melys-0.1.10/widgets/melysscroll.m --- melys-0.1.9/widgets/melysscroll.m Mon Nov 29 15:31:55 1999 +++ melys-0.1.10/widgets/melysscroll.m Thu Dec 2 17:19:52 1999 @@ -56,6 +56,7 @@ void (*scale_changed)(MelysScroll *); }; + >>extern /* The list of signal id's that are being added for MelysScroll. */ diff -rNu melys-0.1.9/widgets/melyssig.c melys-0.1.10/widgets/melyssig.c --- melys-0.1.9/widgets/melyssig.c Thu Jan 1 01:00:00 1970 +++ melys-0.1.10/widgets/melyssig.c Thu Dec 2 17:46:00 1999 @@ -0,0 +1,296 @@ +/* + * + * 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 "libgnomeui/gnome-canvas.h" +#include "libgnomeui/gnome-canvas-text.h" +#include "libgnomeui/gnome-canvas-rect-ellipse.h" +#include "elements.h" +#include "md.h" +#include "viewcontrol.h" +#include "melysscroll.h" +#include "melwidgets.h" +#include "melyssig.h" +#include "intl.h" + + + + + +static int nextinfo; + +#define SIG_CLASS(ms) ( MELYS_SIG_CLASS(GTK_OBJECT(ms)->klass) ) + +/* Static functions */ +static void melys_sig_init(MelysSig *msig); +static void melys_sig_class_init(MelysSigClass *klass); +static void sig_destroy(GtkObject *obj); +static void sig_scale_changed(MelysScroll *mscroll); +static void sig_draw(GtkWidget *w, GdkRectangle *area); +static void sig_common_draw(MelysSig *msig, int force); +static gboolean update_sig(MelysSig *msig, struct tempomapElement *tmap, + struct mapElement *map, int force); +static void einfo_free(gpointer data); + + +static MelysScrollClass *parent_class = NULL; + +/* + * Return a unique integer that represents the object type. + */ +guint +melys_sig_get_type(void) +{ + static guint mtype = 0; + + if (!mtype) { + GtkTypeInfo minfo = { + "MelysSig", + sizeof(MelysSig), + sizeof(MelysSigClass), + (GtkClassInitFunc) melys_sig_class_init, + (GtkObjectInitFunc) melys_sig_init, + (GtkArgSetFunc) NULL, + (GtkArgGetFunc) NULL, + (GtkClassInitFunc) NULL, + }; + + mtype = gtk_type_unique(melys_scroll_get_type(), &minfo); + } + + return mtype; +} + +/* + * Initialise the MelysSig. + * + * Arguments: + * msig - The MelysSig to init + */ +static void +melys_sig_init(MelysSig *msig) +{ + + msig->tmap = NULL; + msig->infostr = g_strdup_printf("%d-siginfo", nextinfo++); +} + +/* + * Initialize the class. + * + * Arguments: + * klass - The class to initialise + */ +static void +melys_sig_class_init(MelysSigClass *klass) +{ + GtkObjectClass *object_class; + GtkWidgetClass *widget_class; + MelysScrollClass *melys_scroll_class; + + object_class = (GtkObjectClass *)klass; + widget_class = (GtkWidgetClass *)klass; + melys_scroll_class = (MelysScrollClass *)klass; + + parent_class = gtk_type_class(melys_scroll_get_type()); + + // XXX Add args + + // XXX Create signals + + + object_class->destroy = sig_destroy; + + widget_class->draw = sig_draw; + + melys_scroll_class->scale_changed = sig_scale_changed; + + klass->update_item = NULL; +} + +void +melys_sig_set_map(MelysSig *msig, struct tempomapElement *tmap) +{ + msig->tmap = tmap; + MD_REF(tmap); +} + +static void +sig_destroy(GtkObject *obj) +{ + MelysSig *msig; + + msig = MELYS_SIG(obj); + if (msig->tmap) + MD_UNREF(msig->tmap); + + g_free(msig->infostr); + + GTK_OBJECT_CLASS(parent_class)->destroy(obj); +} + +static void +sig_scale_changed(MelysScroll *mscroll) +{ + + if (MELYS_SCROLL_CLASS(parent_class)->scale_changed) + MELYS_SCROLL_CLASS(parent_class)->scale_changed(mscroll); + + sig_common_draw(MELYS_SIG(mscroll), TRUE); +} + +static void +sig_draw(GtkWidget *w, GdkRectangle *area) +{ + MelysSig *msig = MELYS_SIG(w); + + sig_common_draw(msig, TRUE); + + GTK_WIDGET_CLASS(parent_class)->draw(w, area); +} + +static void +sig_common_draw(MelysSig *msig, int force) +{ + struct tempomapElement *tmap; + struct element *el; + struct mapElement *map1; + struct mapElement *map2; + struct edisplay_info *einfo; + GList *list; + int n; + + tmap = msig->tmap; + + if (tmap == NULL) + return; + + /* + * Go through and build a list of the relavent tempomap items. + * The display info is created if it does not exist. + */ + list = NULL; + for (n = 0; n < MD_CONTAINER_LEN(tmap); n++) { + el = MD_GET_INDEX(tmap, n); + + if (MD_TYPE(el) == msig->type) { + if (update_sig(msig, tmap, MD_MAP(el), force)) + list = g_list_append(list, el); + } + } + + /* + * Now step through the list and pass up to the class update routine. + * We pass the next item because that is needed to know the + * duration of the current item. + */ + while (list) { + map1 = MD_MAP(list->data); + if (list->next) + map2 = MD_MAP(list->next->data); + else + map2 = NULL; + einfo = g_dataset_get_data(map1, msig->infostr); + SIG_CLASS(msig)->update_item(msig, einfo, tmap, map1, map2, force); + list = list->next; + } + g_list_free(list); +} + +static gboolean +update_sig(MelysSig *msig, struct tempomapElement *tmap, + struct mapElement *map, int force) +{ + struct edisplay_info *einfo; + int state; + + if (MD_IS_DESTROYED(tmap) || MD_IS_DESTROYED(map)) + return FALSE; + + if (!force && !MD_MODIFIED(tmap) && !MD_MODIFIED(map)) + return FALSE; + + if (GTK_OBJECT_DESTROYED(msig)) + return FALSE; + + if (MD_SELECTED(map)) + state = GTK_STATE_SELECTED; + else + state = GTK_STATE_NORMAL; + + einfo = g_dataset_get_data(map, msig->infostr); + if (einfo == NULL) { + GnomeCanvasGroup *rgroup; + GnomeCanvasGroup *group; + + einfo = g_new(struct edisplay_info, 1); + + einfo->std.con = MD_CONTAINER(tmap); + MD_WREF(tmap); + + einfo->std.elem = MD_ELEMENT(map); + MD_WREF(map); + + rgroup = gnome_canvas_root((GnomeCanvas *)msig); + + group = (GnomeCanvasGroup *)gnome_canvas_item_new(rgroup, + GNOME_TYPE_CANVAS_GROUP, + NULL); + gtk_object_ref((GtkObject *)group); + einfo->std.item = GTK_OBJECT(group); + + einfo->rect = (GtkObject *)gnome_canvas_item_new(group, + GNOME_TYPE_CANVAS_RECT, + "x1", (double) 0, + "y1", (double) 1, + "x2", (double) 0, + "y2", (double) MELYS_SCROLL(msig)->vcp->vtitle-1, + "fill_color_gdk", + >K_WIDGET(msig)->style->base[GTK_STATE_NORMAL], + "width_pixels", 1, + "outline_color", "black", + NULL); + gtk_object_ref(einfo->rect); + + einfo->text = (GtkObject *)gnome_canvas_item_new(group, + GNOME_TYPE_CANVAS_TEXT, + "x", (double) 2, + "y", (double) 2, + "text", "", + "anchor", GTK_ANCHOR_NORTH_WEST, + "font_gdk", GTK_WIDGET(msig)->style->font, + "fill_color_gdk", + >K_WIDGET(msig)->style->fg[GTK_STATE_NORMAL], + NULL); + gtk_object_ref(einfo->text); + + g_dataset_set_data_full(map, msig->infostr, einfo, einfo_free); + } + + return TRUE; +} + +static void +einfo_free(gpointer data) +{ + struct edisplay_info *einfo = data; + + gtk_object_unref(einfo->rect); + gtk_object_unref(einfo->text); + display_info_free((struct display_info *)einfo); +} diff -rNu melys-0.1.9/widgets/melyssig.m melys-0.1.10/widgets/melyssig.m --- melys-0.1.9/widgets/melyssig.m Thu Jan 1 01:00:00 1970 +++ melys-0.1.10/widgets/melyssig.m Thu Dec 2 17:19:52 1999 @@ -0,0 +1,304 @@ +>>name melyssig.m - Base for time and key signature widgets + +Copyright (C) 1999 Steve Ratcliffe + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. +>>extern + +>>header libgnomeui/gnome-canvas.h +>>header libgnomeui/gnome-canvas-text.h +>>header libgnomeui/gnome-canvas-rect-ellipse.h + +>>header elements.h +>>header md.h +>>header viewcontrol.h +>>header melysscroll.h +>>header melwidgets.h + +>>set nosignals +>>gtkobject melys_sig melys_scroll + +>>headerdef @header + +/* + * Extra display info for the items. + */ +struct edisplay_info { + struct display_info std; + GtkObject *rect; + GtkObject *text; +}; + +/* + * The MelysSig structure. Each instance of the class is + * allocated one of these structures. + */ +struct _MelysSig { + MelysScroll melys_scroll; + + struct tempomapElement *tmap; + char *infostr; + + int type; /* timesig or keysig */ +}; + +/* + * The MelysSigClass structure. There is only one of these + * allocated for the class. + */ +struct _MelysSigClass { + MelysScrollClass parent_class; + + /* Class methods to do the actual work */ + void (*update_item)(MelysSig *, struct edisplay_info *einfo, + struct tempomapElement *tmap, + struct mapElement *map1, struct mapElement *map2, + gboolean force); +}; + + + +>>extern + +static int nextinfo; + +#define SIG_CLASS(ms) ( MELYS_SIG_CLASS(GTK_OBJECT(ms)->klass) ) + +>>function melys_sig_init +static void +MelysSig *msig; The MelysSig to init +>>description +Initialise the MelysSig. +>>code + + msig->tmap = NULL; + msig->infostr = g_strdup_printf("%d-siginfo", nextinfo++); + + +>>function melys_sig_class_init +static void +MelysSigClass *klass; The class to initialise + +>>description +Initialize the class. + +>>code + GtkObjectClass *object_class; + GtkWidgetClass *widget_class; + MelysScrollClass *melys_scroll_class; + + object_class = (GtkObjectClass *)klass; + widget_class = (GtkWidgetClass *)klass; + melys_scroll_class = (MelysScrollClass *)klass; + + parent_class = gtk_type_class(melys_scroll_get_type()); + + // XXX Add args + + // XXX Create signals + + + object_class->destroy = sig_destroy; + + widget_class->draw = sig_draw; + + melys_scroll_class->scale_changed = sig_scale_changed; + + klass->update_item = NULL; + + +>>function melys_sig_set_map +void +MelysSig *msig; +struct tempomapElement *tmap; + +>>code + msig->tmap = tmap; + MD_REF(tmap); + + +>>function sig_destroy +static void +GtkObject *obj; +>>code + MelysSig *msig; + + msig = MELYS_SIG(obj); + if (msig->tmap) + MD_UNREF(msig->tmap); + + g_free(msig->infostr); + + GTK_OBJECT_CLASS(parent_class)->destroy(obj); + + +>>function sig_scale_changed +static void +MelysScroll *mscroll; + +>>code + + if (MELYS_SCROLL_CLASS(parent_class)->scale_changed) + MELYS_SCROLL_CLASS(parent_class)->scale_changed(mscroll); + + sig_common_draw(MELYS_SIG(mscroll), TRUE); + + +>>function sig_draw +static void +GtkWidget *w; +GdkRectangle *area; + +>>code + MelysSig *msig = MELYS_SIG(w); + + sig_common_draw(msig, TRUE); + + GTK_WIDGET_CLASS(parent_class)->draw(w, area); + + +>>function sig_common_draw +static void +MelysSig *msig; +int force; + +>>code + struct tempomapElement *tmap; + struct element *el; + struct mapElement *map1; + struct mapElement *map2; + struct edisplay_info *einfo; + GList *list; + int n; + + tmap = msig->tmap; + + if (tmap == NULL) + return; + + /* + * Go through and build a list of the relavent tempomap items. + * The display info is created if it does not exist. + */ + list = NULL; + for (n = 0; n < MD_CONTAINER_LEN(tmap); n++) { + el = MD_GET_INDEX(tmap, n); + + if (MD_TYPE(el) == msig->type) { + if (update_sig(msig, tmap, MD_MAP(el), force)) + list = g_list_append(list, el); + } + } + + /* + * Now step through the list and pass up to the class update routine. + * We pass the next item because that is needed to know the + * duration of the current item. + */ + while (list) { + map1 = MD_MAP(list->data); + if (list->next) + map2 = MD_MAP(list->next->data); + else + map2 = NULL; + einfo = g_dataset_get_data(map1, msig->infostr); + SIG_CLASS(msig)->update_item(msig, einfo, tmap, map1, map2, force); + list = list->next; + } + g_list_free(list); + + +>>function update_sig +static gboolean +MelysSig *msig; +struct tempomapElement *tmap; +struct mapElement *map; +int force; + +>>code + struct edisplay_info *einfo; + int state; + + if (MD_IS_DESTROYED(tmap) || MD_IS_DESTROYED(map)) + return FALSE; + + if (!force && !MD_MODIFIED(tmap) && !MD_MODIFIED(map)) + return FALSE; + + if (GTK_OBJECT_DESTROYED(msig)) + return FALSE; + + if (MD_SELECTED(map)) + state = GTK_STATE_SELECTED; + else + state = GTK_STATE_NORMAL; + + einfo = g_dataset_get_data(map, msig->infostr); + if (einfo == NULL) { + GnomeCanvasGroup *rgroup; + GnomeCanvasGroup *group; + + einfo = g_new(struct edisplay_info, 1); + + einfo->std.con = MD_CONTAINER(tmap); + MD_WREF(tmap); + + einfo->std.elem = MD_ELEMENT(map); + MD_WREF(map); + + rgroup = gnome_canvas_root((GnomeCanvas *)msig); + + group = (GnomeCanvasGroup *)gnome_canvas_item_new(rgroup, + GNOME_TYPE_CANVAS_GROUP, + NULL); + gtk_object_ref((GtkObject *)group); + einfo->std.item = GTK_OBJECT(group); + + einfo->rect = (GtkObject *)gnome_canvas_item_new(group, + GNOME_TYPE_CANVAS_RECT, + "x1", (double) 0, + "y1", (double) 1, + "x2", (double) 0, + "y2", (double) MELYS_SCROLL(msig)->vcp->vtitle-1, + "fill_color_gdk", + >K_WIDGET(msig)->style->base[GTK_STATE_NORMAL], + "width_pixels", 1, + "outline_color", "black", + NULL); + gtk_object_ref(einfo->rect); + + einfo->text = (GtkObject *)gnome_canvas_item_new(group, + GNOME_TYPE_CANVAS_TEXT, + "x", (double) 2, + "y", (double) 2, + "text", "", + "anchor", GTK_ANCHOR_NORTH_WEST, + "font_gdk", GTK_WIDGET(msig)->style->font, + "fill_color_gdk", + >K_WIDGET(msig)->style->fg[GTK_STATE_NORMAL], + NULL); + gtk_object_ref(einfo->text); + + g_dataset_set_data_full(map, msig->infostr, einfo, einfo_free); + } + + return TRUE; + + +>>function einfo_free +static void +gpointer data; + +>>code + struct edisplay_info *einfo = data; + + gtk_object_unref(einfo->rect); + gtk_object_unref(einfo->text); + display_info_free((struct display_info *)einfo); diff -rNu melys-0.1.9/widgets/melystempo.c melys-0.1.10/widgets/melystempo.c --- melys-0.1.9/widgets/melystempo.c Mon Nov 29 23:51:25 1999 +++ melys-0.1.10/widgets/melystempo.c Thu Dec 2 17:46:00 1999 @@ -31,14 +31,17 @@ #include "libgnomeui/gnome-canvas-util.h" #include "libgnomeui/gnome-canvas-line.h" #include "libgnomeui/gnome-canvas-rect-ellipse.h" +#include "elements.h" +#include "md.h" +#include "melwidgets.h" #include "viewcontrol.h" #include "melysscroll.h" #include "melysview.h" #include "melysscale.h" #include "melysrule.h" -#include "melwidgets.h" -#include "elements.h" -#include "md.h" +#include "melyssig.h" +#include "melystimesig.h" +#include "melyskeysig.h" #include "song.h" #include "melystempo.h" #include "intl.h" @@ -121,11 +124,15 @@ melys_tempo_new(struct tempomapElement *tmap) { GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_tempo_get_type())); + MelysTempo *mtempo = MELYS_TEMPO(w); MelysView *mview = MELYS_VIEW(w); mview->viewcon = MD_CONTAINER(tmap); MD_REF(tmap); + melys_sig_set_map(MELYS_SIG(mtempo->tsig), tmap); + melys_sig_set_map(MELYS_SIG(mtempo->ksig), tmap); + return w; } @@ -147,12 +154,23 @@ GtkWidget *invis; GtkWidget *frame1; GtkWidget *frame2; + GtkWidget *tsig; + GtkWidget *ksig; mview->type = MD_TYPE_TEMPO; + tsig = melys_timesig_new(mview->vcp); + mtempo->tsig = tsig; + ksig = melys_keysig_new(mview->vcp); + mtempo->ksig = ksig; + mview->vcp->vspace = 0; /* No separation between items on scale */ + MELYS_SCROLL(mview->canvas)->hbase = 5; MELYS_RULE(mview->ruler)->hbase = 5; /* TEMP */ + MELYS_SCROLL(tsig)->hbase = 5; + MELYS_SCROLL(ksig)->hbase = 5; + view_control_set_vertical(mview->vcp, 1); view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE * 4); view_control_set_limits(mview->vcp, 1, 0, 1, 0); @@ -177,6 +195,8 @@ gtk_frame_set_shadow_type(GTK_FRAME(frame1), GTK_SHADOW_IN); gtk_box_pack_start(vbox, mview->ruler, 0, 0, 0); + gtk_box_pack_start(vbox, tsig, 0, 0, 0); + gtk_box_pack_start(vbox, ksig, 0, 0, 0); gtk_box_pack_start(vbox, mview->canvas, 1, 1, 0); gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(vbox)); @@ -201,7 +221,7 @@ 0, 0 ); - gtk_widget_set_usize(invis, 0, mview->vcp->vtitle); + gtk_widget_set_usize(invis, 0, 3*mview->vcp->vtitle); gtk_widget_set_usize(mview->ruler, 0, mview->vcp->vtitle); mview->vthings = MAX_BPM; /* Allow up to this many bpm */ @@ -431,7 +451,7 @@ dinfo->con = MD_CONTAINER(tmap); g_dataset_set_data_full(tempo, mview->infostr, - dinfo, view_display_info_free); + dinfo, display_info_free); gtk_object_set_data(GTK_OBJECT(item), mview->infostr, dinfo); gtk_signal_connect(GTK_OBJECT(item), "event", diff -rNu melys-0.1.9/widgets/melystempo.m melys-0.1.10/widgets/melystempo.m --- melys-0.1.9/widgets/melystempo.m Mon Nov 29 21:36:48 1999 +++ melys-0.1.10/widgets/melystempo.m Thu Dec 2 17:19:52 1999 @@ -23,15 +23,18 @@ >>header libgnomeui/gnome-canvas-line.h >>header libgnomeui/gnome-canvas-rect-ellipse.h +>>header elements.h +>>header md.h +>>header melwidgets.h >>header viewcontrol.h >>header melysscroll.h >>header melysview.h >>header melysscale.h >># /* TEMP */ >>header melysrule.h ->>header melwidgets.h ->>header elements.h ->>header md.h +>>header melyssig.h +>>header melystimesig.h +>>header melyskeysig.h >>header song.h >>gtkobject melys_tempo melys_view @@ -46,6 +49,8 @@ MelysView melys_view; GtkObject *lines; /* The lines connecting the changes */ + GtkWidget *tsig; /* Time signature widget */ + GtkWidget *ksig; /* Key signature widget */ }; /* @@ -95,11 +100,15 @@ Create a new MelysTempo object. >>code GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_tempo_get_type())); + MelysTempo *mtempo = MELYS_TEMPO(w); MelysView *mview = MELYS_VIEW(w); mview->viewcon = MD_CONTAINER(tmap); MD_REF(tmap); + melys_sig_set_map(MELYS_SIG(mtempo->tsig), tmap); + melys_sig_set_map(MELYS_SIG(mtempo->ksig), tmap); + return w; @@ -118,12 +127,23 @@ GtkWidget *invis; GtkWidget *frame1; GtkWidget *frame2; + GtkWidget *tsig; + GtkWidget *ksig; mview->type = MD_TYPE_TEMPO; + tsig = melys_timesig_new(mview->vcp); + mtempo->tsig = tsig; + ksig = melys_keysig_new(mview->vcp); + mtempo->ksig = ksig; + mview->vcp->vspace = 0; /* No separation between items on scale */ + MELYS_SCROLL(mview->canvas)->hbase = 5; MELYS_RULE(mview->ruler)->hbase = 5; /* TEMP */ + MELYS_SCROLL(tsig)->hbase = 5; + MELYS_SCROLL(ksig)->hbase = 5; + view_control_set_vertical(mview->vcp, 1); view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE * 4); view_control_set_limits(mview->vcp, 1, 0, 1, 0); @@ -148,6 +168,8 @@ gtk_frame_set_shadow_type(GTK_FRAME(frame1), GTK_SHADOW_IN); gtk_box_pack_start(vbox, mview->ruler, 0, 0, 0); + gtk_box_pack_start(vbox, tsig, 0, 0, 0); + gtk_box_pack_start(vbox, ksig, 0, 0, 0); gtk_box_pack_start(vbox, mview->canvas, 1, 1, 0); gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(vbox)); @@ -172,7 +194,7 @@ 0, 0 ); - gtk_widget_set_usize(invis, 0, mview->vcp->vtitle); + gtk_widget_set_usize(invis, 0, 3*mview->vcp->vtitle); gtk_widget_set_usize(mview->ruler, 0, mview->vcp->vtitle); mview->vthings = MAX_BPM; /* Allow up to this many bpm */ @@ -411,7 +433,7 @@ dinfo->con = MD_CONTAINER(tmap); g_dataset_set_data_full(tempo, mview->infostr, - dinfo, view_display_info_free); + dinfo, display_info_free); gtk_object_set_data(GTK_OBJECT(item), mview->infostr, dinfo); gtk_signal_connect(GTK_OBJECT(item), "event", diff -rNu melys-0.1.9/widgets/melystimesig.c melys-0.1.10/widgets/melystimesig.c --- melys-0.1.9/widgets/melystimesig.c Thu Jan 1 01:00:00 1970 +++ melys-0.1.10/widgets/melystimesig.c Thu Dec 2 17:46:00 1999 @@ -0,0 +1,160 @@ +/* + * + * 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 "libgnomeui/gnome-canvas.h" +#include "elements.h" +#include "md.h" +#include "melwidgets.h" +#include "viewcontrol.h" +#include "melysscroll.h" +#include "melyssig.h" +#include "melystimesig.h" +#include "intl.h" + + + + + +#define tick_to_x(ms, tick) ( view_control_tick_to_x( \ + MELYS_SCROLL(ms)->vcp, (tick)) ) + +/* Static functions */ +static void melys_timesig_init(MelysTimesig *mtsig); +static void melys_timesig_class_init(MelysTimesigClass *klass); +static void tsig_update_item(MelysSig *msig, struct edisplay_info *einfo, + struct tempomapElement *tmap, struct mapElement *map1, + struct mapElement *map2, gboolean force); + + +static MelysSigClass *parent_class = NULL; + +/* + * Return a unique integer that represents the object type. + */ +guint +melys_timesig_get_type(void) +{ + static guint mtype = 0; + + if (!mtype) { + GtkTypeInfo minfo = { + "MelysTimesig", + sizeof(MelysTimesig), + sizeof(MelysTimesigClass), + (GtkClassInitFunc) melys_timesig_class_init, + (GtkObjectInitFunc) melys_timesig_init, + (GtkArgSetFunc) NULL, + (GtkArgGetFunc) NULL, + (GtkClassInitFunc) NULL, + }; + + mtype = gtk_type_unique(melys_sig_get_type(), &minfo); + } + + return mtype; +} + +/* + * Create a new MelysTimesig object. + */ +GtkWidget * +melys_timesig_new(ViewControl *vcp) +{ + MelysTimesig *mtsig = MELYS_TIMESIG(gtk_type_new(melys_timesig_get_type())); + + melys_scroll_set_control(MELYS_SCROLL(mtsig), vcp, + VC_HORIZONTAL, 0, vcp->vtitle); + + return GTK_WIDGET(mtsig); +} + +/* + * Initialise the MelysTimesig. + * + * Arguments: + * mtsig - The MelysTimesig to init + */ +static void +melys_timesig_init(MelysTimesig *mtsig) +{ + + MELYS_SIG(mtsig)->type = MD_TYPE_TIMESIG; +} + +/* + * Initialize the class. + * + * Arguments: + * klass - The class to initialise + */ +static void +melys_timesig_class_init(MelysTimesigClass *klass) +{ + MelysSigClass *melys_sig_class; + + parent_class = gtk_type_class(melys_sig_get_type()); + + melys_sig_class = (MelysSigClass *)klass; + melys_sig_class->update_item = tsig_update_item; +} + +static void +tsig_update_item(MelysSig *msig, struct edisplay_info *einfo, + struct tempomapElement *tmap, struct mapElement *map1, + struct mapElement *map2, gboolean force) +{ + struct timesigElement *ts1 = MD_TIMESIG(map1); + struct timesigElement *ts2 = MD_TIMESIG(map2); + char *str; + ticktime_t end; + int state; + + if (MD_SELECTED(ts1)) + state = GTK_STATE_SELECTED; + else + state = GTK_STATE_NORMAL; + + /* Get the end time which is either the start of the next change + * or the end of the song. + */ + if (ts2) + end = MD_TIME(ts2); + else + end = MD_ENDTIME(tmap); + + /* + * We know that the common routine created any needed einfo + * for us. + */ + g_return_if_fail(einfo); + + canvas_item_move_abs(GNOME_CANVAS_ITEM(einfo->std.item), + tick_to_x(msig, MD_TIME(ts1)), 0); + + str = g_strdup_printf("%d/%d", ts1->top, ts1->bottom); + gnome_canvas_item_set(GNOME_CANVAS_ITEM(einfo->text), + "text", str, + "fill_color_gdk", >K_WIDGET(msig)->style->fg[state], + NULL); + g_free(str); + + gnome_canvas_item_set(GNOME_CANVAS_ITEM(einfo->rect), + "x2", (double) tick_to_x(msig, end), + NULL); +} diff -rNu melys-0.1.9/widgets/melystimesig.m melys-0.1.10/widgets/melystimesig.m --- melys-0.1.9/widgets/melystimesig.m Thu Jan 1 01:00:00 1970 +++ melys-0.1.10/widgets/melystimesig.m Thu Dec 2 17:19:52 1999 @@ -0,0 +1,138 @@ +>>name melystimesig.m - Time signature widget + +Copyright (C) 1999 Steve Ratcliffe + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. +>>extern + +>>header libgnomeui/gnome-canvas.h + +>>header elements.h +>>header md.h +>>header melwidgets.h +>>header viewcontrol.h +>>header melysscroll.h +>>header melyssig.h + +>>set nosignals +>>gtkobject melys_timesig melys_sig + +>>headerdef @header + +/* + * The MelysTimesig structure. Each instance of the class is + * allocated one of these structures. + */ +struct _MelysTimesig { + MelysSig melys_sig; +}; + +/* + * The MelysTimesigClass structure. There is only one of these + * allocated for the class. + */ +struct _MelysTimesigClass { + MelysSigClass parent_class; + +}; + +>>extern + +#define tick_to_x(ms, tick) ( view_control_tick_to_x( \ + MELYS_SCROLL(ms)->vcp, (tick)) ) + + +>>function melys_timesig_new +GtkWidget * +ViewControl *vcp; +>>description +Create a new MelysTimesig object. +>>code + MelysTimesig *mtsig = MELYS_TIMESIG(gtk_type_new(melys_timesig_get_type())); + + melys_scroll_set_control(MELYS_SCROLL(mtsig), vcp, + VC_HORIZONTAL, 0, vcp->vtitle); + + return GTK_WIDGET(mtsig); + + +>>function melys_timesig_init +static void +MelysTimesig *mtsig; The MelysTimesig to init +>>description +Initialise the MelysTimesig. +>>code + + MELYS_SIG(mtsig)->type = MD_TYPE_TIMESIG; + +>>function melys_timesig_class_init +static void +MelysTimesigClass *klass; The class to initialise + +>>description +Initialize the class. + +>>code + MelysSigClass *melys_sig_class; + + parent_class = gtk_type_class(melys_sig_get_type()); + + melys_sig_class = (MelysSigClass *)klass; + melys_sig_class->update_item = tsig_update_item; + + +>>function tsig_update_item +static void +MelysSig *msig; +struct edisplay_info *einfo; +struct tempomapElement *tmap; +struct mapElement *map1; +struct mapElement *map2; +gboolean force; + +>>code + struct timesigElement *ts1 = MD_TIMESIG(map1); + struct timesigElement *ts2 = MD_TIMESIG(map2); + char *str; + ticktime_t end; + int state; + + if (MD_SELECTED(ts1)) + state = GTK_STATE_SELECTED; + else + state = GTK_STATE_NORMAL; + + /* Get the end time which is either the start of the next change + * or the end of the song. + */ + if (ts2) + end = MD_TIME(ts2); + else + end = MD_ENDTIME(tmap); + + /* + * We know that the common routine created any needed einfo + * for us. + */ + g_return_if_fail(einfo); + + canvas_item_move_abs(GNOME_CANVAS_ITEM(einfo->std.item), + tick_to_x(msig, MD_TIME(ts1)), 0); + + str = g_strdup_printf("%d/%d", ts1->top, ts1->bottom); + gnome_canvas_item_set(GNOME_CANVAS_ITEM(einfo->text), + "text", str, + "fill_color_gdk", >K_WIDGET(msig)->style->fg[state], + NULL); + g_free(str); + + gnome_canvas_item_set(GNOME_CANVAS_ITEM(einfo->rect), + "x2", (double) tick_to_x(msig, end), + NULL); diff -rNu melys-0.1.9/widgets/melystrackdisplay.c melys-0.1.10/widgets/melystrackdisplay.c --- melys-0.1.9/widgets/melystrackdisplay.c Mon Nov 29 23:51:25 1999 +++ melys-0.1.10/widgets/melystrackdisplay.c Thu Dec 2 17:46:01 1999 @@ -531,7 +531,7 @@ gtk_object_unref((GtkObject*)einfo->pitem); gtk_object_unref((GtkObject*)einfo->text); - view_display_info_free((struct display_info *)einfo); + display_info_free((struct display_info *)einfo); } /* diff -rNu melys-0.1.9/widgets/melystrackdisplay.m melys-0.1.10/widgets/melystrackdisplay.m --- melys-0.1.9/widgets/melystrackdisplay.m Mon Nov 29 21:56:45 1999 +++ melys-0.1.10/widgets/melystrackdisplay.m Thu Dec 2 17:19:52 1999 @@ -516,7 +516,7 @@ gtk_object_unref((GtkObject*)einfo->pitem); gtk_object_unref((GtkObject*)einfo->text); - view_display_info_free((struct display_info *)einfo); + display_info_free((struct display_info *)einfo); >># ----- The menu callbacks ----- diff -rNu melys-0.1.9/widgets/melysview.c melys-0.1.10/widgets/melysview.c --- melys-0.1.9/widgets/melysview.c Mon Nov 29 23:51:27 1999 +++ melys-0.1.10/widgets/melysview.c Thu Dec 2 17:46:02 1999 @@ -207,7 +207,8 @@ /* The aa canvas is buggy at present Oct 1999 */ gtk_widget_push_visual(gdk_rgb_get_visual()); gtk_widget_push_colormap(gdk_rgb_get_cmap()); - canvas = (GnomeCanvas *)gnome_canvas_new_aa(); + canvas = (GnomeCanvas *)melys_scroll_new(mview->vcp, VC_BOTH, 0, 0); + canvas->aa = 1; #else gtk_widget_push_visual(gdk_imlib_get_visual()); gtk_widget_push_colormap(gdk_imlib_get_colormap()); @@ -348,19 +349,6 @@ if (GTK_OBJECT_CLASS(parent_class)->destroy) (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); -} - -void -view_display_info_free(gpointer _dinfo) -{ - struct display_info *dinfo = _dinfo; - - gtk_object_destroy((GtkObject *) dinfo->item); - gtk_object_unref((GtkObject *) dinfo->item); - MD_WUNREF(dinfo->con); - MD_WUNREF(dinfo->elem); - - g_free(_dinfo); } /* diff -rNu melys-0.1.9/widgets/melysview.m melys-0.1.10/widgets/melysview.m --- melys-0.1.9/widgets/melysview.m Mon Nov 29 23:47:01 1999 +++ melys-0.1.10/widgets/melysview.m Thu Dec 2 17:19:52 1999 @@ -41,20 +41,6 @@ >>headerdef @header -/* - * Snap to grid types. - */ -enum snap_type { - SNAP_NONE, - SNAP_BAR, - SNAP_1, - SNAP_1_2, - SNAP_1_4, - SNAP_1_8, - SNAP_1_16, - SNAP_1_32, - ETC -}; struct _MelysView { GtkVBox vbox; @@ -131,15 +117,6 @@ int (*get_nthing)(MelysView *, struct element *); }; -/* - * A structure to keep track of displayed elements. - */ -struct display_info { - GtkObject *item; /* The associated display item */ - struct containerElement *con; /* Container for elem */ - struct element *elem; /* The element being displayed */ -}; - >>headerdef meldnd.h @@ -264,7 +241,8 @@ /* The aa canvas is buggy at present Oct 1999 */ gtk_widget_push_visual(gdk_rgb_get_visual()); gtk_widget_push_colormap(gdk_rgb_get_cmap()); - canvas = (GnomeCanvas *)gnome_canvas_new_aa(); + canvas = (GnomeCanvas *)melys_scroll_new(mview->vcp, VC_BOTH, 0, 0); + canvas->aa = 1; #else gtk_widget_push_visual(gdk_imlib_get_visual()); gtk_widget_push_colormap(gdk_imlib_get_colormap()); @@ -407,21 +385,6 @@ if (GTK_OBJECT_CLASS(parent_class)->destroy) (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); - - ->>function view_display_info_free -void -gpointer _dinfo; - ->>code - struct display_info *dinfo = _dinfo; - - gtk_object_destroy((GtkObject *) dinfo->item); - gtk_object_unref((GtkObject *) dinfo->item); - MD_WUNREF(dinfo->con); - MD_WUNREF(dinfo->elem); - - g_free(_dinfo); >>function view_draw diff -rNu melys-0.1.9/widgets/misc.c melys-0.1.10/widgets/misc.c --- melys-0.1.9/widgets/misc.c Mon Nov 29 23:51:27 1999 +++ melys-0.1.10/widgets/misc.c Thu Dec 2 17:46:02 1999 @@ -24,6 +24,8 @@ #include "libart_lgpl/art_affine.h" #include "pixmaps.h" #include "melgui.h" +#include "elements.h" +#include "md.h" #include "melwidgets.h" #include "intl.h" @@ -59,4 +61,17 @@ art_affine_translate(translate, x, y); gnome_canvas_item_affine_absolute(item, translate); +} + +void +display_info_free(gpointer _dinfo) +{ + struct display_info *dinfo = _dinfo; + + gtk_object_destroy((GtkObject *) dinfo->item); + gtk_object_unref((GtkObject *) dinfo->item); + MD_WUNREF(dinfo->con); + MD_WUNREF(dinfo->elem); + + g_free(_dinfo); } diff -rNu melys-0.1.9/widgets/misc.m melys-0.1.10/widgets/misc.m --- melys-0.1.9/widgets/misc.m Mon Nov 8 13:03:02 1999 +++ melys-0.1.10/widgets/misc.m Thu Dec 2 17:19:52 1999 @@ -16,11 +16,22 @@ >>header libart_lgpl/art_affine.h >>header pixmaps.h >>header melgui.h +>>header elements.h +>>header md.h >>headerdef --decl melwidgets.h struct _GnomeCanvasItem; +/* + * A structure to keep track of displayed elements. + */ +struct display_info { + GtkObject *item; /* The associated display item */ + struct containerElement *con; /* Container for elem */ + struct element *elem; /* The element being displayed */ +}; + >>function mel_int_spinner GtkWidget * int lower; Lower value @@ -58,5 +69,20 @@ art_affine_translate(translate, x, y); gnome_canvas_item_affine_absolute(item, translate); + + +>>function display_info_free +void +gpointer _dinfo; + +>>code + struct display_info *dinfo = _dinfo; + + gtk_object_destroy((GtkObject *) dinfo->item); + gtk_object_unref((GtkObject *) dinfo->item); + MD_WUNREF(dinfo->con); + MD_WUNREF(dinfo->elem); + + g_free(_dinfo); diff -rNu melys-0.1.9/widgets/viewcontrol.m melys-0.1.10/widgets/viewcontrol.m --- melys-0.1.9/widgets/viewcontrol.m Mon Nov 29 01:22:23 1999 +++ melys-0.1.10/widgets/viewcontrol.m Wed Dec 1 11:52:01 1999 @@ -44,6 +44,20 @@ VC_BOTH = (VC_HORIZONTAL|VC_VERTICAL) }; +/* + * Snap to grid types. + */ +enum snap_type { + SNAP_NONE, + SNAP_BAR, + SNAP_1, + SNAP_1_2, + SNAP_1_4, + SNAP_1_8, + SNAP_1_16, + SNAP_1_32, + ETC +}; struct _ViewControl { GtkObject object;