diff -rNu melys-0.0.7/ChangeLog melys-0.0.8/ChangeLog --- melys-0.0.7/ChangeLog Wed Aug 11 14:45:03 1999 +++ melys-0.0.8/ChangeLog Mon Aug 16 12:09:44 1999 @@ -1,4 +1,61 @@ +1999-08-16 Steve Ratcliffe + + * files/mdmlwrite.m, files/midiread.m, gui/main.m, md/elements.m, + md/mdutil.m, midi/play.m, midi/record.m, programs/mdmlconv.m, + programs/melplay.m, programs/melys.m, seq/seqlib.m, song/song.m, + widgets/melystrackinfo.m, Makefile, files/mdmlread.m: Added the + mute function. Makes use of an alsa patch. + +1999-08-15 Steve Ratcliffe + + * md/mdutil.m: It is important to play the tempomap as well... + A seek function added to reset the play position on a track. + +1999-08-13 Steve Ratcliffe + + * md/mdutil.m: + Previous version didn't work (and looks like even the old method + didn't either). + Re-wrote again and code looks a lot simpler and so might stand + a chance of being right or almost right. + + * widgets/melystrackinfo.m: Added the mute, solo etc buttons. + Various interface fixes, it now looks quite good. + + * gui/main.m: fixed all the error,warning macros + + * programs/melplay.m: add code to catch fatal errors + + * pixmaps/balls.m: added + +1999-08-12 Steve Ratcliffe + + * md/elements.m, md/mdutil.m: + Completely re-wrote the sequencing stuff. It is now much simpler, + and I almost understand it now... + Still probably needs a re-think. Anyway should now be + easier to support features like mute. + + * md/elements.m, md/mdutil.m: fix md_track_nth for track number + + * widgets/melystrackinfo.m: Button drawing code is now in place + + * files/mdmlread.m, files/mdmlwrite.m: XML no longer has the + memory leak bug, so removed my workaround. Fixed some of my + own memory leaks.. xmlGetProp returns strdup information so I + have to free it. + 1999-08-11 Steve Ratcliffe + + * programs/melplay.m: + Got melplay to work. You can use it to play any file that + melys can play from a command line interface. + + * seq/seqlib.m: Fix for a crash when output ports were not set. + + * seq/seqmidi.m: Fix a crash when no output ports are set. + + * INSTALL, README: Updated readmes for release a little * ChangeLog: REL-0-0-7 diff -rNu melys-0.0.7/INSTALL melys-0.0.8/INSTALL --- melys-0.0.7/INSTALL Wed Aug 11 14:54:38 1999 +++ melys-0.0.8/INSTALL Mon Aug 16 12:09:44 1999 @@ -25,3 +25,5 @@ Go to the programs directory and type: ./melys + + diff -rNu melys-0.0.7/Makefile melys-0.0.8/Makefile --- melys-0.0.7/Makefile Tue Jul 27 10:01:39 1999 +++ melys-0.0.8/Makefile Mon Aug 16 12:00:20 1999 @@ -1,4 +1,4 @@ -DIRS=config song seq files md util gui po widgets midi programs +DIRS=config song seq files md util gui po widgets midi programs pixmaps all: build @@ -9,15 +9,18 @@ do (cd $$i; pwd;\ l="$$(echo *.m)"; \ if [ ! -f Makefile -a "$$l" != "*.m" ]; \ - then mcode -fmake *.m > Makefile; fi) || exit 1;\ + then mcode -o Makefile -fmake *.m ; fi) || exit 1;\ done headers: for i in $(DIRS); do (cd $$i; $(MAKE) headers) || exit 1; done cfiles: makefile headers for i in $(DIRS); do (cd $$i; $(MAKE) cfiles) || exit 1; done + $(MAKE) makefile build: for i in $(DIRS); do (cd $$i; $(MAKE) ) || exit 1; done clean: for i in $(DIRS); do (cd $$i; $(MAKE) clean) || exit 1; done clobber: for i in $(DIRS); do (cd $$i; $(MAKE) clobber) || exit 1; done + +dist: cfiles diff -rNu melys-0.0.7/README melys-0.0.8/README --- melys-0.0.7/README Wed Aug 11 14:54:38 1999 +++ melys-0.0.8/README Mon Aug 16 12:09:44 1999 @@ -25,7 +25,13 @@ - GTK+ 1.2 - - ALSA, preferably from CVS or a recent CVS snapshot. + - ALSA, preferably version 0.4.0 + + - There are some alsa patches that you can apply. I will try to + keep these up to date at http://www.parabola.demon.co.uk/melys/ + Patches are required to allow the mute function to work correctly + and if you are using the AWE64 to allow the reset-all-controllers + midi command work properly. - Its not required but it will help if you want to do any development to get mcode. http://www.parabola.demon.co.uk/mcode/ diff -rNu melys-0.0.7/config/ports.c melys-0.0.8/config/ports.c --- melys-0.0.7/config/ports.c Wed Aug 11 15:41:02 1999 +++ melys-0.0.8/config/ports.c Mon Aug 16 12:21:51 1999 @@ -26,6 +26,7 @@ + /* * Get the input ports that have been configured for use. * diff -rNu melys-0.0.7/files/file.c melys-0.0.8/files/file.c --- melys-0.0.7/files/file.c Wed Aug 11 15:41:04 1999 +++ melys-0.0.8/files/file.c Mon Aug 16 12:21:53 1999 @@ -54,6 +54,7 @@ {FILE_TYPE_MDML_COMPRESSED, mdml_read_file, mdml_write_file, FILE_OPT_COMPRESSED}, }; + static void guess_type(struct File *file); diff -rNu melys-0.0.7/files/mdmlread.c melys-0.0.8/files/mdmlread.c --- melys-0.0.7/files/mdmlread.c Wed Aug 11 15:41:04 1999 +++ melys-0.0.8/files/mdmlread.c Mon Aug 16 12:21:53 1999 @@ -50,6 +50,7 @@ int program; /* Saved program for track */ int note_seen:1; /* Seen first note on track */ }; + static struct element *node_to_md(struct mdmlstate *msp, xmlNodePtr node); static void common_atts(struct mdmlstate *msp, xmlNodePtr node, struct element *el); @@ -244,6 +245,7 @@ tsp = md_timesig_new(top, bottom, clocks, n32pq); retel = MD_ELEMENT(tsp); + free(prop); } else if (strcmp(name, "keysignature") == 0) { struct keysigElement *ksp; @@ -260,6 +262,8 @@ ksp = md_keysig_new(atoi(key), m); retel = MD_ELEMENT(ksp); + free(key); + free(mode); } else if (strcmp(name, "smpte") == 0) { CHAR *off; @@ -276,6 +280,8 @@ sp = md_smpteoffset_new(hours, minutes, seconds, frames, subframes); retel = MD_ELEMENT(sp); + free(off); + } else if (strcmp(name, "text") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_TEXT, xmlNodeGetContent(node))); @@ -382,10 +388,10 @@ ival = get_int(node, "channel"); if (ival == -1) - ival = msp->devchan+1; + ival = msp->devchan; else - msp->devchan = ival-1; - el->device_channel = ival-1; + msp->devchan = ival; + el->device_channel = ival; ival = get_int(node, "duration"); if (ival != -1) @@ -404,12 +410,16 @@ get_int(xmlNodePtr node, char *name) { CHAR *cp; + int n; cp = xmlGetProp(node, name); if (cp == NULL) return -1; - return atoi(cp); + n = atoi(cp); + free(cp); + + return n; } /* @@ -423,12 +433,16 @@ get_double(xmlNodePtr node, char *name) { CHAR *cp; + double d; cp = xmlGetProp(node, name); if (cp == NULL) return 0.0; - return strtod(cp, NULL); + d = strtod(cp, NULL); + free(cp); + + return d; } /* @@ -445,6 +459,7 @@ int base; int oct; CHAR *cp; + int n; note = xmlGetProp(node, name); if (note == NULL) @@ -475,7 +490,9 @@ case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': // This is not really a name at all - return atoi(note); + n = atoi(note); + free(note); + return n; default: base = 0; break; @@ -488,6 +505,8 @@ cp++; } oct = atoi(cp); + + free(note); return base + oct*12; } diff -rNu melys-0.0.7/files/mdmlread.m melys-0.0.8/files/mdmlread.m --- melys-0.0.7/files/mdmlread.m Tue Aug 10 15:02:51 1999 +++ melys-0.0.8/files/mdmlread.m Mon Aug 16 12:00:20 1999 @@ -226,6 +226,7 @@ tsp = md_timesig_new(top, bottom, clocks, n32pq); retel = MD_ELEMENT(tsp); + free(prop); } else if (strcmp(name, "keysignature") == 0) { struct keysigElement *ksp; @@ -242,6 +243,8 @@ ksp = md_keysig_new(atoi(key), m); retel = MD_ELEMENT(ksp); + free(key); + free(mode); } else if (strcmp(name, "smpte") == 0) { CHAR *off; @@ -258,6 +261,8 @@ sp = md_smpteoffset_new(hours, minutes, seconds, frames, subframes); retel = MD_ELEMENT(sp); + free(off); + } else if (strcmp(name, "text") == 0) { retel = MD_ELEMENT(md_text_new(MIDI_META_TEXT, xmlNodeGetContent(node))); @@ -365,10 +370,10 @@ ival = get_int(node, "channel"); if (ival == -1) - ival = msp->devchan+1; + ival = msp->devchan; else - msp->devchan = ival-1; - el->device_channel = ival-1; + msp->devchan = ival; + el->device_channel = ival; ival = get_int(node, "duration"); if (ival != -1) @@ -385,12 +390,16 @@ >>code CHAR *cp; + int n; cp = xmlGetProp(node, name); if (cp == NULL) return -1; - return atoi(cp); + n = atoi(cp); + free(cp); + + return n; >>function get_double static double @@ -401,12 +410,16 @@ >>code CHAR *cp; + double d; cp = xmlGetProp(node, name); if (cp == NULL) return 0.0; - return strtod(cp, NULL); + d = strtod(cp, NULL); + free(cp); + + return d; >>function get_note @@ -421,6 +434,7 @@ int base; int oct; CHAR *cp; + int n; note = xmlGetProp(node, name); if (note == NULL) @@ -451,7 +465,9 @@ case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': // This is not really a name at all - return atoi(note); + n = atoi(note); + free(note); + return n; default: base = 0; break; @@ -464,6 +480,8 @@ cp++; } oct = atoi(cp); + + free(note); return base + oct*12; diff -rNu melys-0.0.7/files/mdmlwrite.c melys-0.0.8/files/mdmlwrite.c --- melys-0.0.7/files/mdmlwrite.c Wed Aug 11 15:41:04 1999 +++ melys-0.0.8/files/mdmlwrite.c Mon Aug 16 12:21:54 1999 @@ -32,6 +32,7 @@ int devchan; /* Current device channel */ unsigned long starttime; /* Use to do relative times */ }; + static void mdml_write(struct File *file, FILE *fp, struct rootElement *root); static void build_section(struct mdmlstate *msp, xmlNodePtr base, struct containerElement *c); @@ -130,12 +131,13 @@ case MD_TYPE_TRACK: mstate.lasttime = 0; - mstate.devchan = 0; + mstate.devchan = -1; xtrack = xmlNewChild(doc->root, 0, "track", 0); set_prop_int(xtrack, "duration", MD_CONTAINER(el)->duration); if (MD_TRACK(el)->name) xmlSetProp(xtrack, "name", MD_TRACK(el)->name); mstate.starttime = 0; + set_time_chan(&mstate, xtrack, el); build_section(&mstate, xtrack, MD_CONTAINER(el)); break; case MD_TYPE_TEMPOMAP: @@ -150,7 +152,7 @@ } } -#define XML_MEM_LEAK_BUG +/* #define XML_MEM_LEAK_BUG */ #ifdef XML_MEM_LEAK_BUG { CHAR *mem; @@ -321,7 +323,7 @@ msp->lasttime = t; //} if (el->device_channel != msp->devchan) { - set_prop_int(node, "channel", el->device_channel+1); + set_prop_int(node, "channel", el->device_channel); msp->devchan = el->device_channel; } } diff -rNu melys-0.0.7/files/mdmlwrite.m melys-0.0.8/files/mdmlwrite.m --- melys-0.0.7/files/mdmlwrite.m Tue Aug 10 15:02:51 1999 +++ melys-0.0.8/files/mdmlwrite.m Mon Aug 16 12:00:21 1999 @@ -113,12 +113,13 @@ case MD_TYPE_TRACK: mstate.lasttime = 0; - mstate.devchan = 0; + mstate.devchan = -1; xtrack = xmlNewChild(doc->root, 0, "track", 0); set_prop_int(xtrack, "duration", MD_CONTAINER(el)->duration); if (MD_TRACK(el)->name) xmlSetProp(xtrack, "name", MD_TRACK(el)->name); mstate.starttime = 0; + set_time_chan(&mstate, xtrack, el); build_section(&mstate, xtrack, MD_CONTAINER(el)); break; case MD_TYPE_TEMPOMAP: @@ -133,7 +134,7 @@ } } -#define XML_MEM_LEAK_BUG +/* #define XML_MEM_LEAK_BUG */ #ifdef XML_MEM_LEAK_BUG { CHAR *mem; @@ -300,7 +301,7 @@ msp->lasttime = t; //} if (el->device_channel != msp->devchan) { - set_prop_int(node, "channel", el->device_channel+1); + set_prop_int(node, "channel", el->device_channel); msp->devchan = el->device_channel; } diff -rNu melys-0.0.7/files/midiread.c melys-0.0.8/files/midiread.c --- melys-0.0.7/files/midiread.c Wed Aug 11 15:41:04 1999 +++ melys-0.0.8/files/midiread.c Mon Aug 16 12:21:54 1999 @@ -55,11 +55,13 @@ char lsb_bank; /* LSB of bank select */ char msb_bank; /* MSB of bank select */ int program; /* Track program applying to whole track */ + int track_devchan; /* Track device channel */ int note_seen:1; /* Note has been seen for this track */ struct except error; /* For exceptional errors */ }; + static struct rootElement *midi_read(struct midistate *msp, FILE *fp); static struct rootElement *read_head(struct midistate *msp); static struct trackElement *read_track(struct midistate *msp); @@ -275,6 +277,7 @@ msp->msb_bank = 0; msp->program = 0; msp->note_seen = 0; + msp->track_devchan = -1; track = md_track_new(); part = md_part_new(); @@ -311,8 +314,12 @@ goto restart; } + MD_ELEMENT(track)->device_channel = msp->track_devchan; + MD_ELEMENT(part)->device_channel = msp->track_devchan; + track->name = msp->trackname; track->program = msp->program; + MD_CONTAINER(track)->duration = msp->track_duration; msp->track_duration = 0; @@ -346,11 +353,14 @@ * Do not set the device if the type is 0xf0 as these commands are * not channel specific */ - device = 0; + device = msp->port<<4; if (type != 0xf0) - device = (msp->port<<4) + ch; + device |= ch; msp->device = device; + if (msp->track_devchan == -1 && type != 0xf0) + msp->track_devchan = device; + el = NULL; switch (type) { @@ -363,6 +373,7 @@ case MIDI_NOTE_ON: msp->note_seen = 1; + note = read_int(msp, 1); vel = read_int(msp, 1); diff -rNu melys-0.0.7/files/midiread.m melys-0.0.8/files/midiread.m --- melys-0.0.7/files/midiread.m Tue Aug 10 15:02:51 1999 +++ melys-0.0.8/files/midiread.m Mon Aug 16 12:00:21 1999 @@ -86,6 +86,7 @@ char lsb_bank; /* LSB of bank select */ char msb_bank; /* MSB of bank select */ int program; /* Track program applying to whole track */ + int track_devchan; /* Track device channel */ int note_seen:1; /* Note has been seen for this track */ @@ -291,6 +292,7 @@ msp->msb_bank = 0; msp->program = 0; msp->note_seen = 0; + msp->track_devchan = -1; track = md_track_new(); part = md_part_new(); @@ -327,8 +329,12 @@ goto restart; } + MD_ELEMENT(track)->device_channel = msp->track_devchan; + MD_ELEMENT(part)->device_channel = msp->track_devchan; + track->name = msp->trackname; track->program = msp->program; + MD_CONTAINER(track)->duration = msp->track_duration; msp->track_duration = 0; @@ -361,11 +367,14 @@ * Do not set the device if the type is 0xf0 as these commands are * not channel specific */ - device = 0; + device = msp->port<<4; if (type != 0xf0) - device = (msp->port<<4) + ch; + device |= ch; msp->device = device; + if (msp->track_devchan == -1 && type != 0xf0) + msp->track_devchan = device; + el = NULL; switch (type) { @@ -378,6 +387,7 @@ case MIDI_NOTE_ON: msp->note_seen = 1; + note = read_int(msp, 1); vel = read_int(msp, 1); diff -rNu melys-0.0.7/files/midiwrite.c melys-0.0.8/files/midiwrite.c --- melys-0.0.7/files/midiwrite.c Wed Aug 11 15:41:05 1999 +++ melys-0.0.8/files/midiwrite.c Mon Aug 16 12:21:54 1999 @@ -42,6 +42,7 @@ GSList *notes; /* Pending off notes */ int inQ; /* Running through the notes queue */ }; + static void midi_write(struct File *file, FILE *fp, struct rootElement *root); static void write_elem(struct element *el, void *arg, int flags); static void put_int(struct midiwstate *msp, int n, int val); diff -rNu melys-0.0.7/gui/main.c melys-0.0.8/gui/main.c --- melys-0.0.7/gui/main.c Wed Aug 11 15:41:06 1999 +++ melys-0.0.8/gui/main.c Mon Aug 16 12:21:56 1999 @@ -36,6 +36,7 @@ #include "melmsg.h" #include "intl.h" + static GtkWidget *create_view(GnomeMDIChild *child, gpointer data); static int add_view_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data); static void view_changed_cb(GtkObject *mdi, GtkWidget *widget, @@ -381,7 +382,6 @@ if (widget == NULL) return; - mel_debug_print_type("hello", widget); gtk_widget_grab_focus(widget); return; diff -rNu melys-0.0.7/gui/main.m melys-0.0.8/gui/main.m --- melys-0.0.7/gui/main.m Wed Aug 11 14:37:56 1999 +++ melys-0.0.8/gui/main.m Mon Aug 16 12:00:21 1999 @@ -26,6 +26,7 @@ >>headerdef --decl melgui.h +>># This header is written to be independent of gnome >>headerdef melmsg.h enum message_type { @@ -37,21 +38,22 @@ }; /* Yes this is GNUC extension -- patches accepted */ -#define mel_song_error(s, p, f...) \ - mel_song_display((s), (p), MEL_MSG_ERROR, (f), ##f) -#define mel_song_warning(s, p, f...) \ - mel_song_display((s), (p), MEL_MSG_WARNING, (f), ##f) -#define mel_song_info(s, p, f...) \ - mel_song_display((s), (p), MEL_MSG_INFO, (f), ##f) - -#define mel_error(f...) \ - mel_song_display(NULL, NULL, MEL_MSG_ERROR, (f), ##f) -#define mel_warning(f...) \ - mel_song_display(NULL, NULL, MEL_MSG_WARNING, (f), ##f) -#define mel_info(f...) \ - mel_song_display(NULL, NULL, MEL_MSG_INFO, (f), ##f) +#define mel_song_error(s, p, f, args...) \ + mel_song_display((s), (p), MEL_MSG_ERROR, f, ##args) +#define mel_song_warning(s, p, f, args...) \ + mel_song_display((s), (p), MEL_MSG_WARNING, f, ##args) +#define mel_song_info(s, p, f, args...) \ + mel_song_display((s), (p), MEL_MSG_INFO, f, ##args) + +#define mel_error(f, args...) \ + mel_song_display(NULL, NULL, MEL_MSG_ERROR, f, ##args) +#define mel_warning(f, args...) \ + mel_song_display(NULL, NULL, MEL_MSG_WARNING, f, ##args) +#define mel_info(f, args...) \ + mel_song_display(NULL, NULL, MEL_MSG_INFO, f, ##args) struct song; +struct _GtkObject; extern void mel_song_display(struct song *sd, struct _GtkObject *parent, int _type, char *fmt, ...); @@ -395,7 +397,6 @@ if (widget == NULL) return; - mel_debug_print_type("hello", widget); gtk_widget_grab_focus(widget); return; diff -rNu melys-0.0.7/gui/menus.c melys-0.0.8/gui/menus.c --- melys-0.0.7/gui/menus.c Wed Aug 11 15:41:06 1999 +++ melys-0.0.8/gui/menus.c Mon Aug 16 12:21:56 1999 @@ -30,6 +30,7 @@ #include "menus.h" #include "intl.h" + static void new_cb(GtkWidget *wid, gpointer data); static void open_cb(GtkWidget *wid, gpointer data); static void open_ok_cb(GtkWidget *button, gpointer data); diff -rNu melys-0.0.7/include/elements.h melys-0.0.8/include/elements.h --- melys-0.0.7/include/elements.h Wed Aug 11 15:41:01 1999 +++ melys-0.0.8/include/elements.h Mon Aug 16 12:21:48 1999 @@ -43,6 +43,7 @@ struct element parent; GPtrArray *elements; /* List of elements */ guint32 duration; /* duration time for this container */ + struct element **playptr; /* Play position pointer */ }; #define MD_CONTAINER(e) \ ((struct containerElement *)md_check_cast((struct element *)(e), MD_TYPE_CONTAINER)) @@ -75,8 +76,14 @@ struct trackElement { struct containerElement parent; + int number; /* Track number from 1 */ char *name; /* Name of track */ int program; /* Extended program number */ + /* Flags (Maybe should go on container) */ + int selected:1; /* track is selected */ + int record:1; /* Set for record */ + int solo:1; /* Set for solo */ + int mute:1; /* Track muted */ }; #define MD_TRACK(e) \ ((struct trackElement *)md_check_cast((struct element *)(e), MD_TYPE_TRACK)) diff -rNu melys-0.0.7/include/md.h melys-0.0.8/include/md.h --- melys-0.0.7/include/md.h Wed Aug 11 15:41:01 1999 +++ melys-0.0.8/include/md.h Mon Aug 16 12:21:48 1999 @@ -32,22 +32,20 @@ * is being merged. */ struct sequenceState { - int nmerge; /* Number of tracks in trackPos to merge */ - GPtrArray **track_ptrs; /* Position pointers */ - struct rootElement *root; /* Root to be returned first */ + 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 */ }; -struct trackPos { - int len; /* Total length of this container element */ - int count; /* Current position count */ - struct element **currel; /* Pointer to current position */ -}; 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); void md_sequence_end(struct sequenceState *seq); unsigned long md_sequence_duration(struct sequenceState *seq); struct rootElement *md_empty(void); diff -rNu melys-0.0.7/include/melmidi.h melys-0.0.8/include/melmidi.h --- melys-0.0.7/include/melmidi.h Wed Aug 11 15:41:02 1999 +++ melys-0.0.8/include/melmidi.h Mon Aug 16 12:21:50 1999 @@ -30,6 +30,8 @@ struct seq_context *play_get_context(struct play *play); void XX_play_add_midi_echo(struct play *play, int indev, int inchan, int outdev, int outchan); +void play_mute(struct play *play, struct trackElement *track); +void play_unmute(struct play *play, struct trackElement *track); /* Opaque type to store all record state */ struct record; diff -rNu melys-0.0.7/include/melmsg.h melys-0.0.8/include/melmsg.h --- melys-0.0.7/include/melmsg.h Wed Aug 11 15:41:01 1999 +++ melys-0.0.8/include/melmsg.h Mon Aug 16 12:21:49 1999 @@ -24,21 +24,22 @@ }; /* Yes this is GNUC extension -- patches accepted */ -#define mel_song_error(s, p, f...) \ - mel_song_display((s), (p), MEL_MSG_ERROR, (f), ##f) -#define mel_song_warning(s, p, f...) \ - mel_song_display((s), (p), MEL_MSG_WARNING, (f), ##f) -#define mel_song_info(s, p, f...) \ - mel_song_display((s), (p), MEL_MSG_INFO, (f), ##f) +#define mel_song_error(s, p, f, args...) \ + mel_song_display((s), (p), MEL_MSG_ERROR, f, ##args) +#define mel_song_warning(s, p, f, args...) \ + mel_song_display((s), (p), MEL_MSG_WARNING, f, ##args) +#define mel_song_info(s, p, f, args...) \ + mel_song_display((s), (p), MEL_MSG_INFO, f, ##args) -#define mel_error(f...) \ - mel_song_display(NULL, NULL, MEL_MSG_ERROR, (f), ##f) -#define mel_warning(f...) \ - mel_song_display(NULL, NULL, MEL_MSG_WARNING, (f), ##f) -#define mel_info(f...) \ - mel_song_display(NULL, NULL, MEL_MSG_INFO, (f), ##f) +#define mel_error(f, args...) \ + mel_song_display(NULL, NULL, MEL_MSG_ERROR, f, ##args) +#define mel_warning(f, args...) \ + mel_song_display(NULL, NULL, MEL_MSG_WARNING, f, ##args) +#define mel_info(f, args...) \ + mel_song_display(NULL, NULL, MEL_MSG_INFO, f, ##args) struct song; +struct _GtkObject; extern void mel_song_display(struct song *sd, struct _GtkObject *parent, int _type, char *fmt, ...); diff -rNu melys-0.0.7/include/melys.h melys-0.0.8/include/melys.h --- melys-0.0.7/include/melys.h Wed Aug 11 15:41:02 1999 +++ melys-0.0.8/include/melys.h Mon Aug 16 12:21:51 1999 @@ -17,5 +17,5 @@ #define PACKAGE "melys" #define LOCALEDIR "foo" -#define MELYS_VERSION_STRING "0.0.4" +#define MELYS_VERSION_STRING "0.0.8" diff -rNu melys-0.0.7/include/melystrackinfo.h melys-0.0.8/include/melystrackinfo.h --- melys-0.0.7/include/melystrackinfo.h Wed Aug 11 15:41:02 1999 +++ melys-0.0.8/include/melystrackinfo.h Mon Aug 16 12:21:50 1999 @@ -38,9 +38,6 @@ /* Amount of vertical scrolling, in tracks (you never see half a track) */ int voffset; - /* The titles are drawn in their own window (do we really need this?) */ - GdkWindow *title_window; - /* * The columns are configurable in terms of which ones exist and * which order they appear in (or will be). @@ -69,11 +66,22 @@ /* The actual composition that is being displayed */ struct rootElement *mdroot; + + /* Labels and masks for the various buttons */ + GdkPixmap *rec_label; + GdkBitmap *rec_mask; + GdkPixmap *mute_label; + GdkBitmap *mute_mask; + GdkPixmap *solo_label; + GdkBitmap *solo_mask; + }; struct _MelysTrackInfoClass { GtkWidgetClass parent_class; - // XXX class definition here + + void (*mute_track)(MelysTrackInfo *, struct trackElement *); + void (*unmute_track)(MelysTrackInfo *, struct trackElement *); }; guint melys_track_info_get_type(void); diff -rNu melys-0.0.7/include/pixmaps.h melys-0.0.8/include/pixmaps.h --- melys-0.0.7/include/pixmaps.h Thu Jan 1 00:00:00 1970 +++ melys-0.0.8/include/pixmaps.h Mon Aug 16 12:21:51 1999 @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 1999 Steve Ratcliffe + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ZNY WARRANTY; without even the implied warranty of + * MERCHZNTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Some button labels. Feel free to draw some better ones. + * + * + */ + +extern char *blueball_xpm[]; +extern char *redball_xpm[]; +extern char *greenball_xpm[]; +extern char *yellowball_xpm[]; + + diff -rNu melys-0.0.7/include/song.h melys-0.0.8/include/song.h --- melys-0.0.7/include/song.h Wed Aug 11 15:40:59 1999 +++ melys-0.0.8/include/song.h Mon Aug 16 12:21:47 1999 @@ -55,8 +55,6 @@ void song_setup(struct song *song, char *filename, struct rootElement *root); -void song_set_echo(void); -void song_reset_echo(void); void song_play_start(struct song *song); void song_play_pause(struct song *song); void song_play_stop(struct song *song); diff -rNu melys-0.0.7/md/elements.c melys-0.0.8/md/elements.c --- melys-0.0.7/md/elements.c Wed Aug 11 15:41:05 1999 +++ melys-0.0.8/md/elements.c Mon Aug 16 12:21:55 1999 @@ -27,6 +27,7 @@ #include "md.h" #include "intl.h" + static void md_container_init(struct containerElement *e); @@ -67,6 +68,7 @@ { e->elements = g_ptr_array_new(); + e->playptr = NULL; e->duration = 0; } @@ -414,6 +416,7 @@ if (e->type == MD_TYPE_NOTE) { t += MD_NOTE(e)->length; } else if (e->type == MD_TYPE_TRACK) { + MD_TRACK(e)->number = MD_ROOT(c)->tracks; MD_ROOT(c)->tracks++; } else if (iscontainer(e)) { t += MD_CONTAINER(e)->duration; @@ -439,6 +442,11 @@ if (el->type == MD_TYPE_ROOT) { if (--MD_ROOT(el)->refcount > 0) return; + if (MD_ROOT(el)->refcount < 0) { + ethrow(debugError, _("Freed an mdroot %d with bad reference count"), + MD_ROOT(el)->refcount); + return; + } } if (el->type >= MD_CONTAINER_BEGIN) { diff -rNu melys-0.0.7/md/elements.m melys-0.0.8/md/elements.m --- melys-0.0.7/md/elements.m Mon Aug 9 19:05:57 1999 +++ melys-0.0.8/md/elements.m Mon Aug 16 12:00:21 1999 @@ -44,8 +44,10 @@ >>elementdef container element GPtrArray *elements; /* List of elements */ guint32 duration; /* duration time for this container */ + struct element **playptr; /* Play position pointer */ init e->elements = g_ptr_array_new(); + e->playptr = NULL; e->duration = 0; /* @@ -77,8 +79,15 @@ new->comment = NULL; >>elementdef track container + int number; /* Track number from 1 */ char *name; /* Name of track */ int program; /* Extended program number */ + + /* Flags (Maybe should go on container) */ + int selected:1; /* track is selected */ + int record:1; /* Set for record */ + int solo:1; /* Set for solo */ + int mute:1; /* Track muted */ new new->name = NULL; new->program = 0; @@ -244,6 +253,7 @@ if (e->type == MD_TYPE_NOTE) { t += MD_NOTE(e)->length; } else if (e->type == MD_TYPE_TRACK) { + MD_TRACK(e)->number = MD_ROOT(c)->tracks; MD_ROOT(c)->tracks++; } else if (iscontainer(e)) { t += MD_CONTAINER(e)->duration; @@ -267,6 +277,11 @@ if (el->type == MD_TYPE_ROOT) { if (--MD_ROOT(el)->refcount > 0) return; + if (MD_ROOT(el)->refcount < 0) { + ethrow(debugError, _("Freed an mdroot %d with bad reference count"), + MD_ROOT(el)->refcount); + return; + } } if (el->type >= MD_CONTAINER_BEGIN) { diff -rNu melys-0.0.7/md/mdutil.c melys-0.0.8/md/mdutil.c --- melys-0.0.7/md/mdutil.c Wed Aug 11 15:41:06 1999 +++ melys-0.0.8/md/mdutil.c Mon Aug 16 12:21:55 1999 @@ -25,12 +25,13 @@ #include "md.h" #include "intl.h" -static struct trackPos *push_track_info(GPtrArray *sp, - struct containerElement *c); -static struct trackPos *pop_track_info(GPtrArray *sp); -static struct trackPos *track_info_top(GPtrArray *sp); -static struct element *get_current(GPtrArray *sp, struct trackPos *tp); -static struct element *curr_element(struct trackPos *tp); + +#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); /* @@ -103,41 +104,47 @@ { struct sequenceState *state; int nchild; - int ntracks; - int i; state = g_new(struct sequenceState, 1); nchild = MD_CONTAINER(root)->elements->len; - state->track_ptrs = g_new(GPtrArray *, nchild); + root->refcount++; state->root = root; + + state->retroot = root; + state->ntracks = 0; state->duration = 0; - /* Initialise the pointers */ - ntracks = 0; - for (i = 0; i < nchild; i++) { - struct containerElement *c; - - /* c is a track or a tempo element */ - c = MD_CONTAINER(MD_CONTAINER(root)->elements->pdata[i]); - if (MD_ELEMENT(c)->type == MD_TYPE_HEAD) { - /* Save so that it can be given to the user */ - state->head = MD_HEAD(c); - continue; - } + md_walk(MD_CONTAINER(root), seqinit, state, 0); + + return state; +} - /* This is a track or tempo map */ - state->track_ptrs[ntracks] = g_ptr_array_new(); - push_track_info(state->track_ptrs[ntracks], c); - ntracks++; - if (MD_ELEMENT(c)->type == MD_TYPE_TRACK) - if (c->duration > state->duration) - state->duration = c->duration; +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); } - state->nmerge = ntracks; + /* + * 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); - return state; + c->playptr = FIRST_ELEMENTP(c); + if (el->type == MD_TYPE_TRACK) { + seq->ntracks++; + if (c->duration > seq->duration) + seq->duration = c->duration; + } + } } /* @@ -152,18 +159,19 @@ md_sequence_next(struct sequenceState *seq) { struct element *el; + struct trackElement *track; + struct trackElement *besttrack = NULL; + struct element *bestelem = NULL; unsigned long leasttime; - struct trackPos *besttp; - struct trackPos *tp; int i; if (seq == NULL) return NULL; - if (seq->root) { + if (seq->retroot) { /* The first time we return the root element */ - el = MD_ELEMENT(seq->root); - seq->root = NULL; + el = MD_ELEMENT(seq->retroot); + seq->retroot = NULL; return el; } if (seq->head) { @@ -174,35 +182,48 @@ } leasttime = -1; - besttp = NULL; /* * Now look at the next element in each track and see which - * one should come first. + * one should come first. The track -1 is the tempo map. */ - for (i = 0; i < seq->nmerge; i++) { - tp = track_info_top(seq->track_ptrs[i]); - if (tp == NULL) - continue; - - el = get_current(seq->track_ptrs[i], tp); + 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; - /* XXX get_current changes what tp should point to */ - tp = track_info_top(seq->track_ptrs[i]); 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; - besttp = tp; + besttrack = track; + bestelem = el; } } /* We found the next one so return it */ - if (besttp) { - el = *besttp->currel; - besttp->count++; - besttp->currel++; - return el; + if (bestelem) { + + /* Step onto the next event for selected track */ + + (void)inc_elem(MD_CONTAINER(besttrack)); + return bestelem; } /* Nothing left */ @@ -210,6 +231,126 @@ } /* + * 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 . + * + */ +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) + dprintf1("after seek to %ld, el time is %ld\n", time, el->element_time); + else { + dprintf1("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\n", time, el->element_time); + } + } +} + +/* * Finish with a sequence object. Frees all resources. The * object cannot be used any more. * Arguments: @@ -218,17 +359,13 @@ void md_sequence_end(struct sequenceState *seq) { - int i; if (!seq) return; - if (seq->track_ptrs) { - for (i = 0; i < seq->nmerge; i++) { - if (seq->track_ptrs[i]) - g_ptr_array_free(seq->track_ptrs[i], 1); - } - g_free(seq->track_ptrs); - } + + if (seq->root) + md_free(MD_ELEMENT(seq->root)); + g_free(seq); } @@ -285,7 +422,8 @@ /* * Get the nth track of the composition. Track numbers start at - * 0. + * 0. Routine assumes that tempomap is at position 1 and that + * the music tracks start right after. * */ struct trackElement * @@ -293,149 +431,20 @@ { GPtrArray *p; struct trackElement *track = NULL; + int idx; - if (root == NULL) + if (n < 0 || root == NULL) return NULL; /* Allow for head and tempomap */ - n += 2; + idx = n + 2; p = MD_CONTAINER(root)->elements; - if (n < p->len) - track = MD_TRACK(g_ptr_array_index(p, n)); - - return track; -} - -/* - * Push a new set of pointers for this container. We can then - * sequence through the container and pick up with the - * containing one when finished. The new top of stack is - * returned. - * - * Arguments: - * sp - The stack of track position structures - * c - The container to be sequenced over - */ -static struct trackPos * -push_track_info(GPtrArray *sp, struct containerElement *c) -{ - struct trackPos *tp; - - tp = g_new(struct trackPos, 1); - - tp->len = c->elements->len; - tp->count = 0; - tp->currel = (struct element**)c->elements->pdata; - - g_ptr_array_add(sp, tp); - - return tp; -} - -/* - * Pop off the top element from the track position stack. The - * new top of stack is returned (not the one that was popped). - * - * Arguments: - * sp - Track position stack - */ -static struct trackPos * -pop_track_info(GPtrArray *sp) -{ - struct trackPos *tp; - - tp = track_info_top(sp); - if (tp) - g_ptr_array_remove(sp, tp); - - /* return new top */ - return track_info_top(sp); -} - -/* - * Get the top element from the track position stack and return - * it. - * - * Arguments: - * sp - Track position stack - */ -static struct trackPos * -track_info_top(GPtrArray *sp) -{ - struct trackPos *tp; - - if (sp->len <= 0) - return NULL; - - tp = sp->pdata[sp->len - 1]; - return tp; -} - -/* - * Get the current music event on this track. If the current one - * is a container then it will be skipped and the data - * structures set up so that a normal element is at the top. - * - * Arguments: - * sp - Stack of track position pointers - * tp - Track position information - */ -static struct element * -get_current(GPtrArray *sp, struct trackPos *tp) -{ - struct element *el; - - /* While finished, pop down to lower layers */ - while (tp && tp->count >= tp->len) { - tp = pop_track_info(sp); - if (tp) { - tp->count++; - tp->currel++; - } + if (idx < p->len) { + track = MD_TRACK(g_ptr_array_index(p, idx)); + track->number = n; } - if (tp == NULL) - return NULL; - - el = curr_element(tp); - g_assert(el != NULL); - - while (iscontainer(el)) { - tp = push_track_info(sp, MD_CONTAINER(el)); - el = curr_element(tp); - if (!el) - break; -#if 0 /* not yet */ - if (el && el->type == MD_TYPE_TAKE) { - if (MD_TAKE(el)->selected == FALSE) { - /* - * Not selected so this is no good, pop off - * straight away should get back to part so - * we can loop to the next take. - */ - tp = pop_track_info(sp); - el = curr_element(tp); - } - } -#endif - } - - return el; -} - -/* - * Step to the next element in the container. - * - * Arguments: - * tp - Track position - */ -static struct element * -curr_element(struct trackPos *tp) -{ - - if (tp->len == 0) - return NULL; - return *tp->currel; + return track; } diff -rNu melys-0.0.7/md/mdutil.m melys-0.0.8/md/mdutil.m --- melys-0.0.7/md/mdutil.m Mon Aug 9 19:05:57 1999 +++ melys-0.0.8/md/mdutil.m Mon Aug 16 12:00:21 1999 @@ -85,17 +85,19 @@ * is being merged. */ struct sequenceState { - int nmerge; /* Number of tracks in trackPos to merge */ - GPtrArray **track_ptrs; /* Position pointers */ - struct rootElement *root; /* Root to be returned first */ + 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 */ }; -struct trackPos { - int len; /* Total length of this container element */ - int count; /* Current position count */ - struct element **currel; /* Pointer to current position */ -}; + +>>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 * @@ -113,41 +115,50 @@ >>code struct sequenceState *state; int nchild; - int ntracks; - int i; state = g_new(struct sequenceState, 1); nchild = MD_CONTAINER(root)->elements->len; - state->track_ptrs = g_new(GPtrArray *, nchild); + root->refcount++; state->root = root; + + state->retroot = root; + state->ntracks = 0; state->duration = 0; - /* Initialise the pointers */ - ntracks = 0; - for (i = 0; i < nchild; i++) { - struct containerElement *c; - - /* c is a track or a tempo element */ - c = MD_CONTAINER(MD_CONTAINER(root)->elements->pdata[i]); - if (MD_ELEMENT(c)->type == MD_TYPE_HEAD) { - /* Save so that it can be given to the user */ - state->head = MD_HEAD(c); - continue; - } + md_walk(MD_CONTAINER(root), seqinit, state, 0); + + return state; + +>>function seqinit +static void +struct element *el; +void *arg; +int flags; - /* This is a track or tempo map */ - state->track_ptrs[ntracks] = g_ptr_array_new(); - push_track_info(state->track_ptrs[ntracks], c); - ntracks++; - if (MD_ELEMENT(c)->type == MD_TYPE_TRACK) - if (c->duration > state->duration) - state->duration = c->duration; +>>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); } - state->nmerge = ntracks; + /* + * 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); - return state; + 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 @@ -161,18 +172,19 @@ >>code struct element *el; + struct trackElement *track; + struct trackElement *besttrack = NULL; + struct element *bestelem = NULL; unsigned long leasttime; - struct trackPos *besttp; - struct trackPos *tp; int i; if (seq == NULL) return NULL; - if (seq->root) { + if (seq->retroot) { /* The first time we return the root element */ - el = MD_ELEMENT(seq->root); - seq->root = NULL; + el = MD_ELEMENT(seq->retroot); + seq->retroot = NULL; return el; } if (seq->head) { @@ -183,40 +195,171 @@ } leasttime = -1; - besttp = NULL; /* * Now look at the next element in each track and see which - * one should come first. + * one should come first. The track -1 is the tempo map. */ - for (i = 0; i < seq->nmerge; i++) { - tp = track_info_top(seq->track_ptrs[i]); - if (tp == NULL) - continue; - - el = get_current(seq->track_ptrs[i], tp); + 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; - /* XXX get_current changes what tp should point to */ - tp = track_info_top(seq->track_ptrs[i]); 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; - besttp = tp; + besttrack = track; + bestelem = el; } } /* We found the next one so return it */ - if (besttp) { - el = *besttp->currel; - besttp->count++; - besttp->currel++; - return el; + if (bestelem) { + + /* Step onto the next event for selected track */ + + (void)inc_elem(MD_CONTAINER(besttrack)); + 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 . + +>>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) + dprintf1("after seek to %ld, el time is %ld\n", time, el->element_time); + else { + dprintf1("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\n", time, el->element_time); + } + } >>function md_sequence_end void @@ -227,17 +370,13 @@ Frees all resources. The object cannot be used any more. >>code - int i; if (!seq) return; - if (seq->track_ptrs) { - for (i = 0; i < seq->nmerge; i++) { - if (seq->track_ptrs[i]) - g_ptr_array_free(seq->track_ptrs[i], 1); - } - g_free(seq->track_ptrs); - } + + if (seq->root) + md_free(MD_ELEMENT(seq->root)); + g_free(seq); >>function md_sequence_duration @@ -297,148 +436,28 @@ >>description Get the nth track of the composition. Track numbers start at 0. +Routine assumes that tempomap is at position 1 and that the +music tracks start right after. >>code GPtrArray *p; struct trackElement *track = NULL; + int idx; - if (root == NULL) + if (n < 0 || root == NULL) return NULL; /* Allow for head and tempomap */ - n += 2; + idx = n + 2; p = MD_CONTAINER(root)->elements; - if (n < p->len) - track = MD_TRACK(g_ptr_array_index(p, n)); + if (idx < p->len) { + track = MD_TRACK(g_ptr_array_index(p, idx)); + track->number = n; + } return track; >># ### Static functions #### ->>function push_track_info -static struct trackPos * -GPtrArray *sp; The stack of track position structures -struct containerElement *c; The container to be sequenced over - ->>description -Push a new set of pointers for this container. -We can then sequence through the container and pick up with -the containing one when finished. -The new top of stack is returned. - ->>code - struct trackPos *tp; - - tp = g_new(struct trackPos, 1); - - tp->len = c->elements->len; - tp->count = 0; - tp->currel = (struct element**)c->elements->pdata; - - g_ptr_array_add(sp, tp); - - return tp; - ->>function pop_track_info -static struct trackPos * -GPtrArray *sp; Track position stack - ->>description -Pop off the top element from the track position stack. -The new top of stack is returned (not the one that was -popped). - ->>code - struct trackPos *tp; - - tp = track_info_top(sp); - if (tp) - g_ptr_array_remove(sp, tp); - - /* return new top */ - return track_info_top(sp); - ->>function track_info_top -static struct trackPos * -GPtrArray *sp; Track position stack - ->>description -Get the top element from the track position stack and -return it. - ->>code - struct trackPos *tp; - - if (sp->len <= 0) - return NULL; - - tp = sp->pdata[sp->len - 1]; - return tp; - - ->>function get_current -static struct element * -GPtrArray *sp; Stack of track position pointers -struct trackPos *tp; Track position information - ->>description -Get the current music event on this track. -If the current one is a container then it will be skipped -and the data structures set up so that a normal element is -at the top. - ->>code - struct element *el; - - /* While finished, pop down to lower layers */ - while (tp && tp->count >= tp->len) { - tp = pop_track_info(sp); - if (tp) { - tp->count++; - tp->currel++; - } - } - - if (tp == NULL) - return NULL; - - el = curr_element(tp); - g_assert(el != NULL); - - while (iscontainer(el)) { - tp = push_track_info(sp, MD_CONTAINER(el)); - el = curr_element(tp); - if (!el) - break; -#if 0 /* not yet */ - if (el && el->type == MD_TYPE_TAKE) { - if (MD_TAKE(el)->selected == FALSE) { - /* - * Not selected so this is no good, pop off - * straight away should get back to part so - * we can loop to the next take. - */ - tp = pop_track_info(sp); - el = curr_element(tp); - } - } -#endif - } - - return el; - - ->>function curr_element -static struct element * -struct trackPos *tp; Track position - ->>description -Step to the next element in the container. - ->>code - - if (tp->len == 0) - return NULL; - return *tp->currel; diff -rNu melys-0.0.7/midi/play.c melys-0.0.8/midi/play.c --- melys-0.0.7/midi/play.c Wed Aug 11 15:41:08 1999 +++ melys-0.0.8/midi/play.c Mon Aug 16 12:21:58 1999 @@ -28,6 +28,7 @@ #include "md.h" #include "config.h" #include "gdk/gdk.h" +#include "melmsg.h" #include "melmidi.h" #include "intl.h" @@ -66,6 +67,7 @@ snd_seq_addr_t outaddr; /* Output address */ int outchan; /* Output channel to send event to */ }; + static void run_events(gpointer vplay, gint fd, GdkInputCondition cond); static void get_events(gpointer vplay, gint fd, GdkInputCondition cond); static void do_special(struct play *play, int type); @@ -96,6 +98,11 @@ play->mdroot = NULL; play->pend_element = NULL; play->ctxp = seq_context_new("Melys sequencer"); + if (play->ctxp == NULL) { + mel_error(_("Could not open ALSA sequencer\n" + "Perhaps modules are not loaded\n")); + return NULL; + } snd_seq_block_mode(seq_handle(play->ctxp), 0); play->seq = NULL; play->write_id = 0; @@ -179,7 +186,7 @@ { snd_seq_event_t ev; - if (play->isplaying || play->mdroot == NULL) + if (!play || play->isplaying || play->mdroot == NULL) return; /* Init the sequence */ @@ -204,7 +211,7 @@ * you don't necessarily want to always do this... */ seq_midi_event_init(play->ctxp, &ev, 0, 0); - seq_midi_control(play->ctxp, &ev, 121, 127); + seq_midi_control(play->ctxp, &ev, SND_MCTL_RESET_CONTROLLERS, 0); seq_send_to_all(play->ctxp, &ev); } @@ -306,6 +313,9 @@ struct seq_context * play_get_context(struct play *play) { + if (play == NULL) + return NULL; + return play->ctxp; } @@ -359,6 +369,70 @@ play->isecho_on = TRUE; } +void +play_mute(struct play *play, struct trackElement *track) +{ + snd_seq_event_t ev; +#ifdef SND_SEQ_FLUSH_DEST + snd_seq_flush_queue_t fqueue; +#endif + int dev; + int chan; + + dprintf1("Hey we are in the midi play mute\n"); + + /* Send an all sounds off message to the affected channel */ + dev = ((struct element *)track)->device_channel >> 4; + chan = ((struct element *)track)->device_channel & 0x0f; + + if (dev < 0) + return; + + seq_midi_event_init(play->ctxp, &ev, 0, chan); + seq_midi_control(play->ctxp, &ev, SND_MCTL_ALL_SOUNDS_OFF, 0); + seq_sendto(play->ctxp, &ev, dev, chan); + +#ifdef SND_SEQ_FLUSH_DEST + memset(&fqueue, 0, sizeof(fqueue)); + fqueue.output = 1; + fqueue.dest = *seq_dev_addr(play->ctxp, dev, SEQ_ADDR_OUTPUT); + fqueue.dest.channel = MD_ELEMENT(track)->device_channel & 0xf; + fqueue.data = SND_SEQ_EVENT_NOTEON; + fqueue.flush_mode = + SND_SEQ_FLUSH_DEST | + SND_SEQ_FLUSH_DEST_CHANNEL | + SND_SEQ_FLUSH_EVENT_TYPE + ; + snd_seq_remove_events(seq_handle(play->ctxp), &fqueue); +#else + { + static int warned; + + if (!warned) { + warned = 1; + mel_warning(_("Melys was not built with the ALSA remove_events\n" + "patch. The muting function will work very poorly") + ); + } + } +#endif +} + +void +play_unmute(struct play *play, struct trackElement *track) +{ + unsigned long time; + + dprintf1("Hey we are in the midi play unmute\n"); + time = seq_get_time(play->ctxp); + + md_elem_seek(MD_CONTAINER(track), time); + + /* Should flush all events after the current time on this track? */ + + run_events(play, 0, 0); +} + /* * This is called when the front end is not busy and is used to * control the interaction between the front end and the midi @@ -404,8 +478,10 @@ if (el == NULL && play->isfinish == FALSE) { end = md_sequence_duration(play->seq); - play->seq = NULL; + /* This now doesn't mean much, the sequence could still be + * active, there are just no appropriate events at present + */ play->isfinish = 1; /* MMM this could fail */ @@ -481,7 +557,10 @@ } play->isended = TRUE; - play->seq = NULL; + if (play->seq) { + md_sequence_end(play->seq); + play->seq = NULL; + } break; default: diff -rNu melys-0.0.7/midi/play.m melys-0.0.8/midi/play.m --- melys-0.0.7/midi/play.m Mon Aug 9 19:11:06 1999 +++ melys-0.0.8/midi/play.m Mon Aug 16 12:00:21 1999 @@ -20,6 +20,7 @@ >>header md.h >>header config.h >>header gdk/gdk.h +>>header melmsg.h >>headerdef --decl melmidi.h @@ -76,6 +77,11 @@ play->mdroot = NULL; play->pend_element = NULL; play->ctxp = seq_context_new("Melys sequencer"); + if (play->ctxp == NULL) { + mel_error(_("Could not open ALSA sequencer\n" + "Perhaps modules are not loaded\n")); + return NULL; + } snd_seq_block_mode(seq_handle(play->ctxp), 0); play->seq = NULL; play->write_id = 0; @@ -155,7 +161,7 @@ >>code snd_seq_event_t ev; - if (play->isplaying || play->mdroot == NULL) + if (!play || play->isplaying || play->mdroot == NULL) return; /* Init the sequence */ @@ -180,7 +186,7 @@ * you don't necessarily want to always do this... */ seq_midi_event_init(play->ctxp, &ev, 0, 0); - seq_midi_control(play->ctxp, &ev, 121, 127); + seq_midi_control(play->ctxp, &ev, SND_MCTL_RESET_CONTROLLERS, 0); seq_send_to_all(play->ctxp, &ev); } @@ -279,8 +285,10 @@ >>description Get the sequencer context. >>code - return play->ctxp; + if (play == NULL) + return NULL; + return play->ctxp; >>extern @@ -342,6 +350,76 @@ play->isecho_on = TRUE; +>>function play_mute +void +struct play *play; +struct trackElement *track; + +>>code + snd_seq_event_t ev; +#ifdef SND_SEQ_FLUSH_DEST + snd_seq_flush_queue_t fqueue; +#endif + int dev; + int chan; + + dprintf1("Hey we are in the midi play mute\n"); + + /* Send an all sounds off message to the affected channel */ + dev = ((struct element *)track)->device_channel >> 4; + chan = ((struct element *)track)->device_channel & 0x0f; + + if (dev < 0) + return; + + seq_midi_event_init(play->ctxp, &ev, 0, chan); + seq_midi_control(play->ctxp, &ev, SND_MCTL_ALL_SOUNDS_OFF, 0); + seq_sendto(play->ctxp, &ev, dev, chan); + +#ifdef SND_SEQ_FLUSH_DEST + memset(&fqueue, 0, sizeof(fqueue)); + fqueue.output = 1; + fqueue.dest = *seq_dev_addr(play->ctxp, dev, SEQ_ADDR_OUTPUT); + fqueue.dest.channel = MD_ELEMENT(track)->device_channel & 0xf; + fqueue.data = SND_SEQ_EVENT_NOTEON; + fqueue.flush_mode = + SND_SEQ_FLUSH_DEST | + SND_SEQ_FLUSH_DEST_CHANNEL | + SND_SEQ_FLUSH_EVENT_TYPE + ; + snd_seq_remove_events(seq_handle(play->ctxp), &fqueue); +#else + { + static int warned; + + if (!warned) { + warned = 1; + mel_warning(_("Melys was not built with the ALSA remove_events\n" + "patch. The muting function will work very poorly") + ); + } + } +#endif + +>>function play_unmute +void +struct play *play; +struct trackElement *track; + +>>code + unsigned long time; + + dprintf1("Hey we are in the midi play unmute\n"); + time = seq_get_time(play->ctxp); + + md_elem_seek(MD_CONTAINER(track), time); + + /* Should flush all events after the current time on this track? */ + + run_events(play, 0, 0); + + + >>function run_events static void gpointer vplay; This will be a play object @@ -387,8 +465,10 @@ if (el == NULL && play->isfinish == FALSE) { end = md_sequence_duration(play->seq); - play->seq = NULL; + /* This now doesn't mean much, the sequence could still be + * active, there are just no appropriate events at present + */ play->isfinish = 1; /* MMM this could fail */ @@ -461,7 +541,10 @@ } play->isended = TRUE; - play->seq = NULL; + if (play->seq) { + md_sequence_end(play->seq); + play->seq = NULL; + } break; default: diff -rNu melys-0.0.7/midi/record.c melys-0.0.8/midi/record.c --- melys-0.0.7/midi/record.c Wed Aug 11 15:41:08 1999 +++ melys-0.0.8/midi/record.c Mon Aug 16 12:21:58 1999 @@ -51,6 +51,7 @@ #define INPUT_ALL (GDK_INPUT_READ|GDK_INPUT_WRITE) #define EPTR struct element * + static void run_events(gpointer vrecord, gint fd, GdkInputCondition cond); static void save_event(struct record *record, snd_seq_event_t *ep); static void push_events(gpointer vrecord, gint fd, GdkInputCondition cond); @@ -75,6 +76,9 @@ { struct record *record; + if (ctxp == NULL) + return NULL; + record = g_new0(struct record, 1); record->ctxp = seq_add_subcontext(ctxp); @@ -200,7 +204,7 @@ struct element *el; int i; - if (!record->isrecording) + if (!record || !record->isrecording) return; record->isrecording = FALSE; diff -rNu melys-0.0.7/midi/record.m melys-0.0.8/midi/record.m --- melys-0.0.7/midi/record.m Sat Aug 7 11:21:32 1999 +++ melys-0.0.8/midi/record.m Mon Aug 16 12:00:21 1999 @@ -58,6 +58,9 @@ >>code struct record *record; + if (ctxp == NULL) + return NULL; + record = g_new0(struct record, 1); record->ctxp = seq_add_subcontext(ctxp); @@ -182,7 +185,7 @@ struct element *el; int i; - if (!record->isrecording) + if (!record || !record->isrecording) return; record->isrecording = FALSE; Binary files melys-0.0.7/mlib/PROJECT/__init__.pyo and melys-0.0.8/mlib/PROJECT/__init__.pyo differ Binary files melys-0.0.7/mlib/PROJECT/base.pyo and melys-0.0.8/mlib/PROJECT/base.pyo differ Binary files melys-0.0.7/mlib/PROJECT/cmds.pyo and melys-0.0.8/mlib/PROJECT/cmds.pyo differ Binary files melys-0.0.7/mlib/PROJECT/code.pyo and melys-0.0.8/mlib/PROJECT/code.pyo differ Binary files melys-0.0.7/mlib/PROJECT/header.pyo and melys-0.0.8/mlib/PROJECT/header.pyo differ Binary files melys-0.0.7/mlib/PROJECT/make.pyo and melys-0.0.8/mlib/PROJECT/make.pyo differ Binary files melys-0.0.7/mlib/PROJECT/mgtk.pyo and melys-0.0.8/mlib/PROJECT/mgtk.pyo differ diff -rNu melys-0.0.7/pixmaps/.cvsignore melys-0.0.8/pixmaps/.cvsignore --- melys-0.0.7/pixmaps/.cvsignore Thu Jan 1 00:00:00 1970 +++ melys-0.0.8/pixmaps/.cvsignore Mon Aug 16 12:21:46 1999 @@ -0,0 +1,4 @@ +balls.c +Makefile +*.mdml *.mdml.gz *.mid +.cvsignore diff -rNu melys-0.0.7/pixmaps/Makefile melys-0.0.8/pixmaps/Makefile --- melys-0.0.7/pixmaps/Makefile Thu Jan 1 00:00:00 1970 +++ melys-0.0.8/pixmaps/Makefile Mon Aug 16 12:21:46 1999 @@ -0,0 +1,37 @@ + + +TOP = .. +include $(TOP)/make.conf + +TARGETS = +OBJS = balls.o +GENCFILES = balls.c +GENHFILES = ../include/pixmaps.h + + + +# Build all the targets. +# +all: $(TARGETS) $(OBJS) + + + +# Remove all object files and exectutables +# +clean: + rm -f $(TARGETS) $(OBJS) core a.out + +# Remove all generated and built files. +# +clobber: clean + rm -f $(GENCFILES) $(GENHFILES) Makefile + +cfiles: $(GENCFILES) + +hfiles headers: + mcode -f header *.m + +.SUFFIXES: .m +.m.c: + mcode $(MCODEFLAGS) -o $@ $< + diff -rNu melys-0.0.7/pixmaps/balls.c melys-0.0.8/pixmaps/balls.c --- melys-0.0.7/pixmaps/balls.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.8/pixmaps/balls.c Mon Aug 16 12:21:59 1999 @@ -0,0 +1,215 @@ +/* + * + * Copyright (C) 1999 Steve Ratcliffe + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ZNY WARRANTY; without even the implied warranty of + * MERCHZNTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Some button labels. Feel free to draw some better ones. + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "pixmaps.h" +#include "intl.h" + +/* XPM */ +char * blueball_xpm[] = { +"12 11 38 1", +" c None", +". c #F2F1FD", +"+ c #D4D0F9", +"@ c #776BEF", +"# c #5243EB", +"$ c #D3D0F9", +"% c #CECAF9", +"& c #5041EB", +"* c #5F52EC", +"= c #675AED", +"- c #4737EA", +"; c #4535E9", +"> c #F8F7FE", +", c #695CED", +"' c #4C3DEA", +") c #CFCBF9", +"! c #DEDBFA", +"~ c #6D60EE", +"{ c #4435E9", +"] c #4435EA", +"^ c #DBD7FA", +"/ c #4839EA", +"( c #7A6EEF", +"_ c #938AF2", +": c #4535EA", +"< c #DAD7FA", +"[ c #CBC6F8", +"} c #4536EA", +"| c #CAC6F8", +"1 c #DCD9FA", +"2 c #4939EA", +"3 c #F9F8FE", +"4 c #4434E9", +"5 c #5345EB", +"6 c #4434EA", +"7 c #8075F0", +"8 c #5749EB", +"9 c #F6F6FD", +" .. ", +" +@##@$ ", +" %&*=-;&% ", +" >,')!~{],> ", +" ^/-(_#;:/< ", +" [};;;{;:}| ", +" 12{{{{{;21 ", +" 3~{4{{4{~3 ", +" +5:]6:5+ ", +" ^7887^ ", +" 99 "}; + +/* XPM */ +char * greenball_xpm[] = { +"12 11 37 1", +" c None", +". c #F2FEFF", +"+ c #D4FEFF", +"@ c #77FDDC", +"# c #52F991", +"$ c #D3FEFF", +"% c #CEFEFF", +"& c #50F891", +"* c #5FFBA1", +"= c #67FCB5", +"- c #47F683", +"; c #45F677", +"> c #F8FEFF", +", c #69FCB5", +"' c #4CF783", +") c #CFFEFF", +"! c #DEFEFF", +"~ c #6DFCC9", +"{ c #44F677", +"] c #44F683", +"^ c #DBFEFF", +"/ c #48F783", +"( c #7AFEDC", +"_ c #93FFFA", +": c #45F683", +"< c #DAFEFF", +"[ c #CBFFFF", +"} c #CAFFFF", +"| c #DCFEFF", +"1 c #49F783", +"2 c #F9FEFF", +"3 c #44F577", +"4 c #53F991", +"5 c #44F583", +"6 c #80FEEA", +"7 c #57FA91", +"8 c #F6FEFF", +" .. ", +" +@##@$ ", +" %&*=-;&% ", +" >,')!~{],> ", +" ^/-(_#;:/< ", +" [:;;;{;::} ", +" |1{{{{{;1| ", +" 2~{3{{3{~2 ", +" +4:]5:4+ ", +" ^6776^ ", +" 88 "}; + +/* XPM */ +char * redball_xpm[] = { +"12 11 32 1", +" c None", +". c #FEF1FF", +"+ c #FDD0FF", +"@ c #F96BCE", +"# c #F44369", +"$ c #FDCAFF", +"% c #F44169", +"& c #F65279", +"* c #F85A91", +"= c #F1375D", +"- c #F13553", +"; c #FEF7FF", +"> c #F85C91", +", c #F33D5D", +"' c #FDCBFF", +") c #FDDBFF", +"! c #F860B3", +"~ c #F1355D", +"{ c #FDD7FF", +"] c #F2395D", +"^ c #FA6ECE", +"/ c #FB8AE9", +"( c #FDC6FF", +"_ c #F1365D", +": c #FDD9FF", +"< c #FEF8FF", +"[ c #F13453", +"} c #F44569", +"| c #F1345D", +"1 c #FA75DC", +"2 c #F54969", +"3 c #FEF6FF", +" .. ", +" +@##@+ ", +" $%&*=-%$ ", +" ;>,')!-~>; ", +" {]=^/#-~]{ ", +" (_-----~_( ", +" :]------]: ", +" c #FCF49E", +", c #F6E958", +"' c #F6E960", +") c #FEF9E7", +"! c #F7E960", +"~ c #F6E858", +"{ c #F6E860", +"] c #FDF7D2", +"^ c #FAEF6A", +" ", +" .++. ", +" @#$%&@ ", +" *=-;>,'* ", +" %%.)+&!% ", +" !&&&,&!! ", +" %,,,,,&% ", +" >,~,,~,> ", +" +!'{!+ ", +" ]^^] ", +" "}; + + + diff -rNu melys-0.0.7/pixmaps/balls.m melys-0.0.8/pixmaps/balls.m --- melys-0.0.7/pixmaps/balls.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.8/pixmaps/balls.m Fri Aug 13 11:23:50 1999 @@ -0,0 +1,215 @@ +>>name balls.m - pixmaps for the ball like labels on mute etc buttons. + +Copyright (C) 1999 Steve Ratcliffe + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ZNY WARRANTY; without even the implied warranty of + MERCHZNTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +Some button labels. Feel free to draw some better ones. + +>>headerdef pixmaps.h + +extern char *blueball_xpm[]; +extern char *redball_xpm[]; +extern char *greenball_xpm[]; +extern char *yellowball_xpm[]; + +>>set __escapechar__ "Z" + +>>extern +/* XPM */ +char * blueball_xpm[] = { +"12 11 38 1", +" c None", +". c #F2F1FD", +"+ c #D4D0F9", +"@ c #776BEF", +"# c #5243EB", +"$ c #D3D0F9", +"% c #CECAF9", +"& c #5041EB", +"* c #5F52EC", +"= c #675AED", +"- c #4737EA", +"; c #4535E9", +"> c #F8F7FE", +", c #695CED", +"' c #4C3DEA", +") c #CFCBF9", +"! c #DEDBFA", +"~ c #6D60EE", +"{ c #4435E9", +"] c #4435EA", +"^ c #DBD7FA", +"/ c #4839EA", +"( c #7A6EEF", +"_ c #938AF2", +": c #4535EA", +"< c #DAD7FA", +"[ c #CBC6F8", +"} c #4536EA", +"| c #CAC6F8", +"1 c #DCD9FA", +"2 c #4939EA", +"3 c #F9F8FE", +"4 c #4434E9", +"5 c #5345EB", +"6 c #4434EA", +"7 c #8075F0", +"8 c #5749EB", +"9 c #F6F6FD", +" .. ", +" +@##@$ ", +" %&*=-;&% ", +" >,')!~{],> ", +" ^/-(_#;:/< ", +" [};;;{;:}| ", +" 12{{{{{;21 ", +" 3~{4{{4{~3 ", +" +5:]6:5+ ", +" ^7887^ ", +" 99 "}; + +>>extern +/* XPM */ +char * greenball_xpm[] = { +"12 11 37 1", +" c None", +". c #F2FEFF", +"+ c #D4FEFF", +"@ c #77FDDC", +"# c #52F991", +"$ c #D3FEFF", +"% c #CEFEFF", +"& c #50F891", +"* c #5FFBA1", +"= c #67FCB5", +"- c #47F683", +"; c #45F677", +"> c #F8FEFF", +", c #69FCB5", +"' c #4CF783", +") c #CFFEFF", +"! c #DEFEFF", +"~ c #6DFCC9", +"{ c #44F677", +"] c #44F683", +"^ c #DBFEFF", +"/ c #48F783", +"( c #7AFEDC", +"_ c #93FFFA", +": c #45F683", +"< c #DAFEFF", +"[ c #CBFFFF", +"} c #CAFFFF", +"| c #DCFEFF", +"1 c #49F783", +"2 c #F9FEFF", +"3 c #44F577", +"4 c #53F991", +"5 c #44F583", +"6 c #80FEEA", +"7 c #57FA91", +"8 c #F6FEFF", +" .. ", +" +@##@$ ", +" %&*=-;&% ", +" >,')!~{],> ", +" ^/-(_#;:/< ", +" [:;;;{;::} ", +" |1{{{{{;1| ", +" 2~{3{{3{~2 ", +" +4:]5:4+ ", +" ^6776^ ", +" 88 "}; + +>>extern +/* XPM */ +char * redball_xpm[] = { +"12 11 32 1", +" c None", +". c #FEF1FF", +"+ c #FDD0FF", +"@ c #F96BCE", +"# c #F44369", +"$ c #FDCAFF", +"% c #F44169", +"& c #F65279", +"* c #F85A91", +"= c #F1375D", +"- c #F13553", +"; c #FEF7FF", +"> c #F85C91", +", c #F33D5D", +"' c #FDCBFF", +") c #FDDBFF", +"! c #F860B3", +"~ c #F1355D", +"{ c #FDD7FF", +"] c #F2395D", +"^ c #FA6ECE", +"/ c #FB8AE9", +"( c #FDC6FF", +"_ c #F1365D", +": c #FDD9FF", +"< c #FEF8FF", +"[ c #F13453", +"} c #F44569", +"| c #F1345D", +"1 c #FA75DC", +"2 c #F54969", +"3 c #FEF6FF", +" .. ", +" +@##@+ ", +" $%&*=-%$ ", +" ;>,')!-~>; ", +" {]=^/#-~]{ ", +" (_-----~_( ", +" :]------]: ", +" >extern +/* XPM */ +char * yellowball_xpm[] = { +"12 11 21 1", +" c None", +". c #FDF6BC", +"+ c #F9EE6A", +"@ c #F9ED6A", +"# c #FBF177", +"$ c #FBF387", +"% c #F7EA60", +"& c #F7E958", +"* c #FCF387", +"= c #F8EC60", +"- c #FEFCFF", +"; c #FEFDFF", +"> c #FCF49E", +", c #F6E958", +"' c #F6E960", +") c #FEF9E7", +"! c #F7E960", +"~ c #F6E858", +"{ c #F6E860", +"] c #FDF7D2", +"^ c #FAEF6A", +" ", +" .++. ", +" @#$%&@ ", +" *=-;>,'* ", +" %%.)+&!% ", +" !&&&,&!! ", +" %,,,,,&% ", +" >,~,,~,> ", +" +!'{!+ ", +" ]^^] ", +" "}; diff -rNu melys-0.0.7/programs/Makefile melys-0.0.8/programs/Makefile --- melys-0.0.7/programs/Makefile Wed Aug 11 15:40:59 1999 +++ melys-0.0.8/programs/Makefile Mon Aug 16 12:21:46 1999 @@ -21,7 +21,7 @@ mdmlconv.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 + ../md/mdutil.o ../util/except.o ../util/util.o MELPLAYOBJS = \ melplay.o \ @@ -29,7 +29,8 @@ ../files/mdmlread.o ../files/mdmlwrite.o \ ../seq/seqlib.o ../seq/seqmidi.o \ ../util/except.o ../md/elements.o ../md/mdutil.o \ - ../files/file.o + ../files/file.o \ + ../util/util.o MELYSOBJS = \ melys.o \ @@ -45,7 +46,8 @@ ../song/song.o \ ../config/ports.o \ ../widgets/melystrack.o ../widgets/melystrackinfo.o \ - ../widgets/melystrackdisplay.o + ../widgets/melystrackdisplay.o \ + ../pixmaps/balls.o SHOWSEQOBJS = \ showseq.o \ diff -rNu melys-0.0.7/programs/mdmlconv.c melys-0.0.8/programs/mdmlconv.c --- melys-0.0.7/programs/mdmlconv.c Wed Aug 11 15:41:08 1999 +++ melys-0.0.8/programs/mdmlconv.c Mon Aug 16 12:21:59 1999 @@ -39,6 +39,7 @@ {"output-file", HAS_ARG, NULL, 'o'}, {0, 0, 0, 0}, }; + static void show_usage(void); diff -rNu melys-0.0.7/programs/mdmlconv.m melys-0.0.8/programs/mdmlconv.m --- melys-0.0.7/programs/mdmlconv.m Tue Aug 10 15:02:55 1999 +++ melys-0.0.8/programs/mdmlconv.m Mon Aug 16 12:00:21 1999 @@ -18,7 +18,7 @@ >>make --objects mdmlconv.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 +>>make --objects ../md/mdutil.o ../util/except.o ../util/util.o >>extern >>header diff -rNu melys-0.0.7/programs/melplay.c melys-0.0.8/programs/melplay.c --- melys-0.0.7/programs/melplay.c Wed Aug 11 15:41:08 1999 +++ melys-0.0.8/programs/melplay.c Mon Aug 16 12:21:59 1999 @@ -12,6 +12,7 @@ * GNU General Public License for more details. * * + * */ @@ -33,7 +34,7 @@ #include "intl.h" /* - * Play a midi file + * Play a melys file (midi, mdml, whatever melys supports). * melplay [-p client:port,... ] [-l] [-d delay] file ... * * -p client:port - A alsa client and port number to send midi to @@ -55,6 +56,7 @@ #define ADDR_PARTS 4 /* Number of part in a port description addr 1:2:3:4 */ #define SEP ", \t" /* Separators for port description */ + static seq_context_t *openports(char *portdesc); static void playfile(seq_context_t *ctxp, char *filename); static void showlist(void); @@ -77,8 +79,8 @@ main(int argc, char **argv) { char opts[NELEM(long_opts) * 2 + 1]; - char *portdesc; seq_context_t *ctxp; + char *portdesc; char *cp; int c; struct option *op; @@ -91,6 +93,12 @@ *cp++ = ':'; } + if (CATCH(debugError)) { + fprintf(stderr, "A fatal debugging error occurred\n"); + fprintf(stderr, "The message was: %s\n", debugError->message); + return 1; + } + portdesc = NULL; /* Deal with the options */ @@ -116,12 +124,13 @@ } } + if (portdesc == NULL) { - portdesc = getenv("ALSA_OUT_PORT"); + portdesc = getenv("ALSA_OUTPUT_PORTS"); if (portdesc == NULL) { fprintf(stderr, "No client/port specified.\n" "You must supply one with the -p option or with the\n" - "environment variable ALSA_OUT_PORT\n" + "environment variable ALSA_OUTPUT_PORTS\n" ); exit(1); } @@ -136,6 +145,9 @@ playfile(ctxp, argv[optind]); seq_context_free(ctxp); + + UNCATCH(debugError); + return 0; } @@ -154,7 +166,6 @@ snd_seq_addr_t *ap; int a[ADDR_PARTS]; int count, naddr; - int i; if (portdesc == NULL) return NULL; @@ -188,22 +199,13 @@ naddr++; } - count = 0; - for (i = 0; i < naddr; i++) { - int err = 0; - - //XXX err = seq_connect_add(ctxp, addr[i].client, addr[i].port); - printf("openports need seq_connect_add\n"); - if (err < 0) { - fprintf(stderr, _("Could not connect to port %d:%d\n"), - addr[i].client, addr[i].port); - } else - count++; - } + seq_set_addresses(ctxp, SEQ_ADDR_OUTPUT, addr, naddr); + seq_connect_addresses(ctxp, SEQ_ADDR_OUTPUT); g_free(addr); - if (count == 0) { + if (naddr == 0) { + fprintf(stderr, "Could not set up any output sequencer ports\n"); seq_context_free(ctxp); return NULL; } diff -rNu melys-0.0.7/programs/melplay.m melys-0.0.8/programs/melplay.m --- melys-0.0.7/programs/melplay.m Tue Aug 10 16:56:39 1999 +++ melys-0.0.8/programs/melplay.m Mon Aug 16 12:00:21 1999 @@ -10,6 +10,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + >>target melplay >>make --objects melplay.o >>make --objects ../files/midiread.o ../files/midiwrite.o @@ -17,10 +18,11 @@ >>make --objects ../seq/seqlib.o ../seq/seqmidi.o >>make --objects ../util/except.o ../md/elements.o ../md/mdutil.o >>make --objects ../files/file.o +>>make --objects ../util/util.o >>extern /* - * Play a midi file + * Play a melys file (midi, mdml, whatever melys supports). * melplay [-p client:port,... ] [-l] [-d delay] file ... * * -p client:port - A alsa client and port number to send midi to @@ -67,8 +69,8 @@ -d, --delay=SECS - Delay after song ends (default 2 sec) >>code char opts[NELEM(long_opts) * 2 + 1]; - char *portdesc; seq_context_t *ctxp; + char *portdesc; char *cp; int c; struct option *op; @@ -81,6 +83,12 @@ *cp++ = ':'; } + if (CATCH(debugError)) { + fprintf(stderr, "A fatal debugging error occurred\n"); + fprintf(stderr, "The message was: %s\n", debugError->message); + return 1; + } + portdesc = NULL; /* Deal with the options */ @@ -106,12 +114,13 @@ } } + if (portdesc == NULL) { - portdesc = getenv("ALSA_OUT_PORT"); + portdesc = getenv("ALSA_OUTPUT_PORTS"); if (portdesc == NULL) { fprintf(stderr, "No client/port specified.\n" "You must supply one with the -p option or with the\n" - "environment variable ALSA_OUT_PORT\n" + "environment variable ALSA_OUTPUT_PORTS\n" ); exit(1); } @@ -126,6 +135,9 @@ playfile(ctxp, argv[optind]); seq_context_free(ctxp); + + UNCATCH(debugError); + return 0; >>header @@ -146,7 +158,6 @@ snd_seq_addr_t *ap; int a[ADDR_PARTS]; int count, naddr; - int i; if (portdesc == NULL) return NULL; @@ -180,22 +191,13 @@ naddr++; } - count = 0; - for (i = 0; i < naddr; i++) { - int err = 0; - - //XXX err = seq_connect_add(ctxp, addr[i].client, addr[i].port); - printf("@func_name need seq_connect_add\n"); - if (err < 0) { - fprintf(stderr, _("Could not connect to port %d:%d\n"), - addr[i].client, addr[i].port); - } else - count++; - } + seq_set_addresses(ctxp, SEQ_ADDR_OUTPUT, addr, naddr); + seq_connect_addresses(ctxp, SEQ_ADDR_OUTPUT); g_free(addr); - if (count == 0) { + if (naddr == 0) { + fprintf(stderr, "Could not set up any output sequencer ports\n"); seq_context_free(ctxp); return NULL; } diff -rNu melys-0.0.7/programs/melys.c melys-0.0.8/programs/melys.c --- melys-0.0.7/programs/melys.c Wed Aug 11 15:41:09 1999 +++ melys-0.0.8/programs/melys.c Mon Aug 16 12:21:59 1999 @@ -43,6 +43,7 @@ }; extern int melys_app(int argc, char **argv); + static void showusage(void); diff -rNu melys-0.0.7/programs/melys.m melys-0.0.8/programs/melys.m --- melys-0.0.7/programs/melys.m Tue Aug 10 16:56:39 1999 +++ melys-0.0.8/programs/melys.m Mon Aug 16 12:09:44 1999 @@ -25,6 +25,7 @@ >>make --objects ../config/ports.o >>make --objects ../widgets/melystrack.o ../widgets/melystrackinfo.o >>make --objects ../widgets/melystrackdisplay.o +>>make --objects ../pixmaps/balls.o >>header >>header @@ -38,7 +39,7 @@ #define PACKAGE "melys" #define LOCALEDIR "foo" -#define MELYS_VERSION_STRING "0.0.4" +#define MELYS_VERSION_STRING "0.0.8" >>extern /* diff -rNu melys-0.0.7/programs/showseq.c melys-0.0.8/programs/showseq.c --- melys-0.0.7/programs/showseq.c Wed Aug 11 15:41:09 1999 +++ melys-0.0.8/programs/showseq.c Mon Aug 16 12:21:59 1999 @@ -37,6 +37,7 @@ #define ADDR_PARTS 4 /* Number of part in a port description addr 1:2:3:4 */ #define SEP ", \t" /* Separators for port description */ + static void showlist(void); static void showusage(void); diff -rNu melys-0.0.7/seq/seqlib.c melys-0.0.8/seq/seqlib.c --- melys-0.0.7/seq/seqlib.c Wed Aug 11 15:41:03 1999 +++ melys-0.0.8/seq/seqlib.c Mon Aug 16 12:21:52 1999 @@ -36,7 +36,7 @@ #define save_msg -static char *lastmsg; + static GArray *get_addr_list(seq_context_t *ctxp, int inout); @@ -51,7 +51,6 @@ { seq_context_t *ctxp; snd_seq_queue_client_t qclient; - int err; int q; ctxp = g_new0(seq_context_t, 1); @@ -88,7 +87,7 @@ q = snd_seq_alloc_queue(ctxp->control->handle); ctxp->queue = q; ctxp->source.queue = q; - //q = snd_seq_alloc_queue(ctxp->control->handle); + ctxp->control->queue = q; ctxp->control->source.queue = q; diff -rNu melys-0.0.7/seq/seqlib.m melys-0.0.8/seq/seqlib.m --- melys-0.0.7/seq/seqlib.m Wed Aug 11 15:40:23 1999 +++ melys-0.0.8/seq/seqlib.m Mon Aug 16 12:00:21 1999 @@ -56,7 +56,6 @@ >>extern #define save_msg -static char *lastmsg; >>function seq_context_new seq_context_t * @@ -67,7 +66,6 @@ >>code seq_context_t *ctxp; snd_seq_queue_client_t qclient; - int err; int q; ctxp = g_new0(seq_context_t, 1); @@ -104,7 +102,7 @@ q = snd_seq_alloc_queue(ctxp->control->handle); ctxp->queue = q; ctxp->source.queue = q; - //q = snd_seq_alloc_queue(ctxp->control->handle); + ctxp->control->queue = q; ctxp->control->source.queue = q; diff -rNu melys-0.0.7/seq/seqmidi.c melys-0.0.8/seq/seqmidi.c --- melys-0.0.7/seq/seqmidi.c Wed Aug 11 15:41:03 1999 +++ melys-0.0.8/seq/seqmidi.c Mon Aug 16 12:21:52 1999 @@ -27,6 +27,7 @@ + /* * Initialize a midi event from the context. The source and * destination addresses will be set from the information diff -rNu melys-0.0.7/seq/sequtil.c melys-0.0.8/seq/sequtil.c --- melys-0.0.7/seq/sequtil.c Wed Aug 11 15:41:04 1999 +++ melys-0.0.8/seq/sequtil.c Mon Aug 16 12:21:53 1999 @@ -29,6 +29,7 @@ #define SEP " ,\t\n" /* Separators between addresses */ + /* * Parse the client/port description given in portdesc and * construct an array of addresses. The array is returned into diff -rNu melys-0.0.7/song/song.c melys-0.0.8/song/song.c --- melys-0.0.7/song/song.c Wed Aug 11 15:41:03 1999 +++ melys-0.0.8/song/song.c Mon Aug 16 12:21:52 1999 @@ -17,11 +17,12 @@ #include "glib.h" #include "except.h" #include "util.h" -#include "gtk/gtkwidget.h" +#include "gtk/gtk.h" #include "elements.h" #include "md.h" #include "melmidi.h" #include "melreg.h" +#include "melystrack.h" #include #include "melfile.h" #include "mdrw.h" @@ -31,6 +32,11 @@ +static void song_mute_track(gpointer notused, struct trackElement *track, + struct song *song); +static void song_unmute_track(GtkObject *notused, struct trackElement *track, + struct song *song); + /* * Open the file specified by filename and read it into the song @@ -44,6 +50,9 @@ g_return_if_fail(root != NULL); + if (song->play == NULL) + return; + if (song->mdroot) md_free(MD_ELEMENT(song->mdroot)); song->mdroot = root; @@ -67,34 +76,17 @@ } /* - * Set up the midi echo to reflect the currently selected - * track. If the current track is associated with channel 6 on - * logical device 2, for example, then midi events must be - * echoed there. XXX shouldn't be here - * - */ -void -song_set_echo(void) -{ -} - -/* - * Disable the midi echo. This is usually done before - * switching to another track. XXX shouldn't be here - * - */ -void -song_reset_echo(void) -{ -} - -/* * Start up audio and midi streams to start playing. */ void song_play_start(struct song *song) { + gtk_signal_connect((GtkObject *)((MelysTrack *)song->trackview)->info, + "mute_track", song_mute_track, song); + gtk_signal_connect((GtkObject *)((MelysTrack*)song->trackview)->info, + "unmute_track", song_unmute_track, song); + play_start(song->play); } @@ -131,6 +123,9 @@ g_message("adding the new track"); md_add(MD_CONTAINER(song->mdroot), MD_ELEMENT(song->newtrack)); + /* Set the new tracks channel to the track number TEMP */ + MD_ELEMENT(song->newtrack)->device_channel = song->newtrack->number; + song->newtrack = md_track_new(); song->tracknum++; @@ -260,4 +255,27 @@ /* Free the data itself */ g_free(sd); +} + +static void +song_mute_track(gpointer notused, struct trackElement *track, + struct song *song) +{ + + /* Determine if this is an audio or midi track */ + + /* Its a midi track.... */ + + play_mute(song->play, track); +} + +static void +song_unmute_track(GtkObject *notused, struct trackElement *track, + struct song *song) +{ + /* Determine if this is an audio or midi track */ + + /* Its a midi track.... */ + + play_unmute(song->play, track); } diff -rNu melys-0.0.7/song/song.m melys-0.0.8/song/song.m --- melys-0.0.7/song/song.m Wed Aug 11 14:38:57 1999 +++ melys-0.0.8/song/song.m Mon Aug 16 12:00:21 1999 @@ -12,11 +12,12 @@ GNU General Public License for more details. >>extern ->>header gtk/gtkwidget.h +>>header gtk/gtk.h >>header elements.h >>header md.h >>header melmidi.h >>header melreg.h +>>header melystrack.h >>header >>header melfile.h @@ -82,6 +83,9 @@ g_return_if_fail(root != NULL); + if (song->play == NULL) + return; + if (song->mdroot) md_free(MD_ELEMENT(song->mdroot)); song->mdroot = root; @@ -103,21 +107,6 @@ "It is easy enough to fix given the right encouragement...\n"), NULL); ->>function song_set_echo -void ->>description -Set up the midi echo to reflect the currently selected track. -If the current track is associated with channel 6 on logical -device 2, for example, -then midi events must be echoed there. -XXX shouldn't be here - ->>function song_reset_echo -void ->>description -Disable the midi echo. -This is usually done before switching to another track. -XXX shouldn't be here >>function song_play_start void @@ -126,6 +115,11 @@ Start up audio and midi streams to start playing. >>code + gtk_signal_connect((GtkObject *)((MelysTrack *)song->trackview)->info, + "mute_track", song_mute_track, song); + gtk_signal_connect((GtkObject *)((MelysTrack*)song->trackview)->info, + "unmute_track", song_unmute_track, song); + play_start(song->play); @@ -162,6 +156,9 @@ g_message("adding the new track"); md_add(MD_CONTAINER(song->mdroot), MD_ELEMENT(song->newtrack)); + /* Set the new tracks channel to the track number TEMP */ + MD_ELEMENT(song->newtrack)->device_channel = song->newtrack->number; + song->newtrack = md_track_new(); song->tracknum++; @@ -291,4 +288,31 @@ /* Free the data itself */ g_free(sd); + + +>>function song_mute_track +static void +gpointer notused; +struct trackElement *track; +struct song *song; +>>code + + /* Determine if this is an audio or midi track */ + + /* Its a midi track.... */ + + play_mute(song->play, track); + +>>function song_unmute_track +static void +GtkObject *notused; +struct trackElement *track; +struct song *song; + +>>code + /* Determine if this is an audio or midi track */ + + /* Its a midi track.... */ + + play_unmute(song->play, track); diff -rNu melys-0.0.7/util/except.c melys-0.0.8/util/except.c --- melys-0.0.7/util/except.c Wed Aug 11 15:41:06 1999 +++ melys-0.0.8/util/except.c Mon Aug 16 12:21:55 1999 @@ -40,6 +40,7 @@ #define ETHROW_MAGIC 0x671299AB + /* * This routine was a bad idea. It allows a limited emulation of * exceptions, but if not used with care it is going to leave diff -rNu melys-0.0.7/util/util.c melys-0.0.8/util/util.c --- melys-0.0.7/util/util.c Wed Aug 11 15:41:06 1999 +++ melys-0.0.8/util/util.c Mon Aug 16 12:21:55 1999 @@ -31,6 +31,7 @@ #endif + /* * A routine for conditionally printing out debugging * information. If the level argument is greater than or equal diff -rNu melys-0.0.7/widgets/melystrack.c melys-0.0.8/widgets/melystrack.c --- melys-0.0.7/widgets/melystrack.c Wed Aug 11 15:41:07 1999 +++ melys-0.0.8/widgets/melystrack.c Mon Aug 16 12:21:56 1999 @@ -30,6 +30,7 @@ // XXX symbols for all signals here LAST_SIGNAL }; + static void melys_track_init(MelysTrack *mtp); static void melys_track_class_init(MelysTrackClass *klass); static void destroy(GtkObject *object); diff -rNu melys-0.0.7/widgets/melystrackdisplay.c melys-0.0.8/widgets/melystrackdisplay.c --- melys-0.0.7/widgets/melystrackdisplay.c Wed Aug 11 15:41:07 1999 +++ melys-0.0.8/widgets/melystrackdisplay.c Mon Aug 16 12:21:57 1999 @@ -26,6 +26,7 @@ // XXX symbols for all signals here LAST_SIGNAL }; + static void melys_track_display_init(MelysTrackDisplay *XXX); static void melys_track_display_class_init(MelysTrackDisplayClass *klass); diff -rNu melys-0.0.7/widgets/melystrackinfo.c melys-0.0.8/widgets/melystrackinfo.c --- melys-0.0.7/widgets/melystrackinfo.c Wed Aug 11 15:41:07 1999 +++ melys-0.0.8/widgets/melystrackinfo.c Mon Aug 16 12:21:57 1999 @@ -26,6 +26,8 @@ #include "gtk/gtkadjustment.h" #include "gtk/gtksignal.h" #include "gtk/gtkvbox.h" +#include "melmsg.h" +#include "pixmaps.h" #include "elements.h" #include "md.h" #include "melystrackinfo.h" @@ -34,26 +36,54 @@ enum { - // XXX symbols for all signals here + MUTE_TRACK, + UNMUTE_TRACK, LAST_SIGNAL }; +/* + * The type of column. Each possible column that could be displayed + * has a type here. They are not all necessarily shown though. + */ enum column_type { NUMBER, NAME, PROGRAM, + MUTE, + RECORD, + SOLO, LAST_COLUMN_TYPE }; +/* + * The different kinds of column content. + */ +enum column_kind { + COL_TEXT, + COL_BUTTON +}; + + +/* + * Information about the possible column types. + */ static struct col_info { enum column_type type; + enum column_kind kind; char *title; int width; - gboolean present; + gboolean present; /* Is this in the default configuration */ + + /* All below here are calculated and therefore do not need init */ + int totwidth; /* Total width up to end of this column */ + } def_col_info[] = { - {NUMBER, "", 20, TRUE}, /* No real need to have this included */ - {NAME, N_("Name"), 100, TRUE}, - {PROGRAM, N_("Prog"), 27, TRUE}, + {NUMBER, COL_TEXT, "", 20, TRUE}, /* No real need to have this included */ + {NAME, COL_TEXT, N_("Name"), 100, TRUE}, + {PROGRAM, COL_TEXT, N_("Prog"), 30, TRUE}, + {MUTE, COL_BUTTON, N_("Mute"), 28, TRUE}, + {SOLO, COL_BUTTON, N_("Solo"), 28, FALSE}, + {RECORD, COL_BUTTON, N_("Rec"), 28, FALSE}, }; /* A border to the protect the column lines */ @@ -66,6 +96,7 @@ #define TMP_BUF_SIZE 100 + static void melys_track_info_init(MelysTrackInfo *minfo); static void melys_track_info_class_init(MelysTrackInfoClass *klass); static void track_info_realise(GtkWidget *widget); @@ -74,12 +105,33 @@ static void track_info_size_request(GtkWidget *widget, GtkRequisition *req); static void track_info_size_allocate(GtkWidget *widget, GtkAllocation *allocation); -static void track_info_draw(GtkWidget *widget, GdkRectangle *area); +static void track_info_draw(GtkWidget *widget, GdkRectangle *ap); +static void draw_row(MelysTrackInfo *minfo, int ntrack); +static void draw_col(MelysTrackInfo *minfo, int ntrack, + struct trackElement *track, GdkRectangle *ap, struct col_info *cip, GdkGC *gc); +static void draw_col_text(MelysTrackInfo *minfo, int ntrack, + struct trackElement *track, GdkRectangle *ap, struct col_info *cip, GdkGC *gc); +static void draw_col_button(MelysTrackInfo *minfo, int ntrack, + struct trackElement *track, GdkRectangle *ap, struct col_info *cip, GdkGC *gc); static int track_info_expose(GtkWidget *widget, GdkEventExpose *event); -static void track_info_enter(GtkWidget *widget, gpointer data); +static gint track_info_enter(GtkWidget *widget, GdkEventCrossing *data); static int track_info_button_press(GtkWidget *widget, GdkEventButton *event); +static void button1_text(MelysTrackInfo *minfo, struct trackElement *track, + struct col_info *cip, GdkEventButton *event); +static void button1_button(MelysTrackInfo *minfo, struct trackElement *track, + struct col_info *cip, GdkEventButton *event); +static void select_track(MelysTrackInfo *minfo, struct trackElement *track); +static void unselect_track(MelysTrackInfo *minfo, struct trackElement *track); +static void mute_track(MelysTrackInfo *minfo, struct trackElement *track); +static void unmute_track(MelysTrackInfo *minfo, struct trackElement *track); +static void real_mute_track(MelysTrackInfo *minfo, struct trackElement *track); +static void real_unmute_track(MelysTrackInfo *minfo, + struct trackElement *track); static int track_to_y(MelysTrackInfo *minfo, int n); +static struct col_info *x_to_col_info(MelysTrackInfo *minfo, int x); static void track_info_scroll(GtkAdjustment *adj, gpointer data); +static void track_redraw(MelysTrackInfo *minfo, int number, + struct trackElement *track); static gint melys_track_info_signals[LAST_SIGNAL]; @@ -150,11 +202,15 @@ GTK_WIDGET_SET_FLAGS(minfo, GTK_CAN_FOCUS); minfo->vadj = NULL; - minfo->title_window = NULL; used = 0; minfo->col_infos = g_new0(struct col_info, MAX_COLUMNS); + /* + * Go through the default list of column information and + * copy these defaults into our own structure where they + * can be modified. + */ for (i = 0; i < NELEM(def_col_info); i++) { cinfo = def_col_info+i; @@ -196,9 +252,26 @@ parent_class = gtk_type_class(gtk_widget_get_type()); - // XXX Add args - // XXX Create signals + /* + * Create all the signals for this class and add them to + * the system. + */ + melys_track_info_signals[MUTE_TRACK] = gtk_signal_new("mute_track", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET(MelysTrackInfoClass, mute_track), + gtk_marshal_NONE__POINTER, + GTK_TYPE_NONE, 1, + GTK_TYPE_POINTER); + melys_track_info_signals[UNMUTE_TRACK] = gtk_signal_new("unmute_track", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET(MelysTrackInfoClass, unmute_track), + gtk_marshal_NONE__POINTER, + GTK_TYPE_NONE, 1, + GTK_TYPE_POINTER); + gtk_object_class_add_signals (object_class, melys_track_info_signals, LAST_SIGNAL); @@ -215,7 +288,8 @@ widget_class->enter_notify_event = track_info_enter; widget_class->button_press_event = track_info_button_press; - // XXX Our functions + klass->mute_track = real_mute_track; + klass->unmute_track = real_unmute_track; } /* @@ -313,22 +387,27 @@ widget->style = gtk_style_attach(widget->style, widget->window); gtk_style_set_background(widget->style, widget->window, GTK_STATE_NORMAL); - /* The title window */ - attributes.x = 0; - attributes.y = 0; - attributes.height = minfo->vtitle; - minfo->title_window = gdk_window_new(widget->window, - &attributes, attributes_mask); - - gdk_window_set_user_data(minfo->title_window, minfo); - - widget->style = gtk_style_attach(widget->style, minfo->title_window); - gtk_style_set_background(widget->style, minfo->title_window, - GTK_STATE_NORMAL); - - gdk_window_show(minfo->title_window); - minfo->vtextoffset = GTK_WIDGET(minfo)->style->font->ascent + 1.5; + + /* + * Now that we have a main window, we can create the pixmaps that + * belong to it. + */ + minfo->rec_label = gdk_pixmap_create_from_xpm_d( + widget->window, + &minfo->rec_mask, + NULL, + redball_xpm); + minfo->mute_label = gdk_pixmap_create_from_xpm_d( + widget->window, + &minfo->mute_mask, + NULL, + yellowball_xpm); + minfo->solo_label = gdk_pixmap_create_from_xpm_d( + widget->window, + &minfo->solo_mask, + NULL, + blueball_xpm); } static void @@ -350,9 +429,6 @@ minfo = (MelysTrackInfo*)object; - gdk_window_destroy(minfo->title_window); - minfo->title_window = NULL; - g_free(minfo->col_infos); if (minfo->vadj) { @@ -397,12 +473,21 @@ * Add up all the column widths and include the separator * width. */ - tot = 0; + tot = widget->style->klass->xthickness; for (i = 0; i < minfo->col_used; i++) { tot += minfo->col_infos[i].width; - tot += widget->style->klass->xthickness; tot += 2*COL_PADDING; + + /* + * This is our position, you can find out which column by finding + * the first for which totwidth includes the x position + */ + minfo->col_infos[i].totwidth = tot; + + /* Add the width of the dividing line */ + tot += widget->style->klass->xthickness; } + tot += widget->style->klass->xthickness; req->width = tot; @@ -435,131 +520,300 @@ allocation->x, allocation->y, allocation->width - PAN_PADDING, allocation->height); - gdk_window_move_resize(minfo->title_window, - 0, 0, allocation->width, minfo->vtitle); - - /* Calculate how many tracks are visible on the page */ + /* + * Calculate how many tracks are visible on the page and set this + * as the page increment. Verge on the low side. + */ minfo->vadj->page_size = ((gfloat)minfo->track_area.height / minfo->vspace) - 1.5; minfo->vadj->page_increment = minfo->vadj->page_size; - dprintf1("page_size %f, upper %f lower %f", minfo->vadj->page_size, minfo->vadj->upper, minfo->vadj->lower); + gtk_adjustment_changed(minfo->vadj); } } +/* + * This is the main routine that draws the whole widget. To + * simplify the code, it is split into routines for drawing + * each line (and the title is line -1 for this purpose), and for + * each column. + * + * Arguments: + * ap - Area to draw within + */ static void -track_info_draw(GtkWidget *widget, GdkRectangle *area) +track_info_draw(GtkWidget *widget, GdkRectangle *ap) { MelysTrackInfo *minfo; GtkStyle *style; GdkGC *fg_gc; - GdkRectangle clip_rectangle; - int offset; int start, end; - int i; int ntrack; g_return_if_fail(widget != NULL); g_return_if_fail(IS_MELYS_TRACK_INFO(widget)); - g_return_if_fail(area != NULL); + g_return_if_fail(ap != NULL); if (!GTK_WIDGET_DRAWABLE (widget)) return; + dprintf(1, "track_info_draw: (%d, %d) %dx%d", ap->x, ap->y, + ap->width, ap->height); + minfo = (MelysTrackInfo*)widget; style = widget->style; - fg_gc = widget->style->fg_gc[GTK_STATE_NORMAL]; + fg_gc = style->fg_gc[GTK_STATE_NORMAL]; - dprintf(2, "track_info_draw: (%d, %d) %dx%d", area->x, area->y, - area->width, area->height); /* Needed for scrolling... may be removed in future */ - gdk_window_clear_area(widget->window, area->x, area->y, - area->width, area->height); + gdk_window_clear_area(widget->window, ap->x, ap->y, + ap->width, ap->height); gtk_draw_shadow(widget->style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_IN, 0, 0, minfo->track_area.width, minfo->vtitle + minfo->track_area.height); - /* Have to draw in the title box as well, the bottom is not meant to draw*/ - gtk_draw_shadow(widget->style, minfo->title_window, - GTK_STATE_NORMAL, GTK_SHADOW_IN, - 0, 0, - minfo->track_area.width, minfo->vtitle + 10); - offset = COL_PADDING; + /* This draws in the title row */ + draw_row(minfo, -1); + + /* Draw in the separator line bewtween the titles and rows */ + gdk_draw_line(widget->window, fg_gc, + 0, minfo->vtitle-1, minfo->track_area.width, minfo->vtitle-1); + + /* Ideally this should not be allowed anyway... */ + if (minfo->mdroot == NULL) + return; /* Nothing more to do */ + + start = y_to_track(minfo, ap->y); + end = y_to_track(minfo, ap->y + ap->height) + 1; + if (end > minfo->mdroot->tracks) + end = minfo->mdroot->tracks; + + dprintf2("start %d end %d, tracks %d", start, end, minfo->mdroot->tracks); + for (ntrack = start; ntrack < end; ntrack++) + draw_row(minfo, ntrack); +} + +/* + * Draw the specified track. The track -1 means the titles. + * + * Arguments: + * ntrack - The track number to draw (0 based). + */ +static void +draw_row(MelysTrackInfo *minfo, int ntrack) +{ + GtkWidget *widget; + GtkStyle *style; + GdkGC *fg_gc; + GdkGC *bg_gc; + GdkRectangle area; + struct trackElement *track; + struct col_info *cip; + int xpos; + int i; + + widget = (GtkWidget *)minfo; + style = widget->style; + + track = md_track_nth(minfo->mdroot, ntrack); + + xpos = style->klass->xthickness; for (i = 0; i < minfo->col_used; i++) { - clip_rectangle.x = offset; - clip_rectangle.y = 0; - clip_rectangle.width = minfo->col_infos[i].width; - clip_rectangle.height = minfo->vtitle; - - dprintf2("offset %d, name %s", offset, minfo->col_infos[i].title); - - gdk_gc_set_clip_rectangle(fg_gc, &clip_rectangle); - gdk_draw_string(minfo->title_window, style->font, - fg_gc, - offset, - minfo->htitle - widget->style->font->descent - 1, - _(minfo->col_infos[i].title)); + if (ntrack >= 0 && track && track->selected) { + fg_gc = widget->style->fg_gc[GTK_STATE_SELECTED]; + bg_gc = widget->style->bg_gc[GTK_STATE_SELECTED]; + } else { + fg_gc = widget->style->fg_gc[GTK_STATE_NORMAL]; + bg_gc = widget->style->bg_gc[GTK_STATE_NORMAL]; + } + + cip = minfo->col_infos+i; + + area.x = xpos; + area.y = track_to_y(minfo, ntrack); + area.width = cip->width + 2*COL_PADDING; + area.height = minfo->vspace; + + if (cip->kind == COL_TEXT) { + gdk_draw_rectangle(widget->window, bg_gc, TRUE, area.x, area.y, + area.width, area.height); + } + + /* + * Set up a clipping region for the content area of this cell. + * This is mainly to clip text columns that are too large for + * their cell. Buttons are supposed to be the correct size.. + */ + xpos += COL_PADDING; + area.x = xpos; + area.width = cip->width; + + gdk_gc_set_clip_rectangle(fg_gc, &area); + + draw_col(minfo, ntrack, track, &area, cip, fg_gc); gdk_gc_set_clip_rectangle(fg_gc, NULL); - offset += minfo->col_infos[i].width + COL_PADDING; - gtk_draw_vline(widget->style, minfo->title_window, GTK_STATE_NORMAL, - 0, minfo->vtitle, offset); + xpos += cip->width + COL_PADDING; + xpos += style->klass->xthickness; + } +} - /* Do the main window while we are here */ - gtk_draw_vline(widget->style, widget->window, GTK_STATE_ACTIVE, - minfo->track_area.y, minfo->track_area.y+minfo->track_area.height, - offset); +/* + * Draw a single column cell. If track is NULL that means to + * write the title. + * + * Arguments: + * ntrack - The track number + * track - The track to display + * ap - Allocated area, mainly for x,y position to use + * cip - The column information + * gc - The GC to use for drawing + */ +static void +draw_col(MelysTrackInfo *minfo, int ntrack, struct trackElement *track, + GdkRectangle *ap, struct col_info *cip, GdkGC *gc) +{ - offset += style->klass->xthickness + COL_PADDING; + /* + * Deal with title cells first. They are text. + */ + if (ntrack == -1) { + draw_col_text(minfo, ntrack, NULL, ap, cip, gc); + return; } - gdk_draw_line(minfo->title_window, fg_gc, - 0, minfo->vtitle-1, minfo->track_area.width, minfo->vtitle-1); + /* + * Depending on the kind of column we have, draw it. + */ + switch (cip->kind) { + case COL_TEXT: + draw_col_text(minfo, ntrack, track, ap, cip, gc); + break; + case COL_BUTTON: + draw_col_button(minfo, ntrack, track, ap, cip, gc); + break; + } +} - /* Ideally this should be allowed anyway... */ - if (minfo->mdroot == NULL) - return; /* Nothing more to do */ +static void +draw_col_text(MelysTrackInfo *minfo, int ntrack, struct trackElement *track, + GdkRectangle *ap, struct col_info *cip, GdkGC *gc) +{ + GtkWidget *widget; + char buf[TMP_BUF_SIZE]; + char *str; - start = y_to_track(minfo, area->y); - end = y_to_track(minfo, area->y + area->height) + 1; - if (end > minfo->mdroot->tracks) - end = minfo->mdroot->tracks; + widget = (GtkWidget *)minfo; + str = "N/YET"; /* A default to catch unimplemented columns */ - dprintf2("start %d end %d, tracks %d", start, end, minfo->mdroot->tracks); - for (ntrack = start; ntrack < end; ntrack++) { - char *str; - struct col_info *col; - - offset = COL_PADDING; - for (i = 0; i < minfo->col_used; i++) { - - col = minfo->col_infos+i; - - /* This clips the text to fit, don't care about the height */ - clip_rectangle.x = offset; - clip_rectangle.y = minfo->track_area.y; - clip_rectangle.width = col->width; - clip_rectangle.height = minfo->track_area.height; - - str = get_info_string(minfo, col->type, ntrack); - dprintf(4, "offset %d, string %s at %d", offset, str, track_to_y(minfo, ntrack)); - - /* Now draw it */ - gdk_gc_set_clip_rectangle(fg_gc, &clip_rectangle); - gdk_draw_string(widget->window, style->font, fg_gc, - offset, track_to_y(minfo, ntrack) + minfo->vtextoffset, str); - gdk_gc_set_clip_rectangle(fg_gc, NULL); + if (ntrack == -1) { + str = cip->title; + + /* Have to draw the vertical lines */ + gtk_draw_vline(widget->style, widget->window, GTK_STATE_NORMAL, + 0, minfo->track_area.height + minfo->vtitle, + ap->x + cip->width + COL_PADDING); - offset += col->width + COL_PADDING; - offset += style->klass->xthickness + COL_PADDING; + } else switch (cip->type) { + case NUMBER: + g_snprintf(buf, TMP_BUF_SIZE, "%2d", ntrack+1); + str = buf; + break; + case NAME: + if (track && track->name) { + str = track->name; + } else { + g_snprintf(buf, TMP_BUF_SIZE, "Track %d", ntrack+1); + str = buf; } - + break; + case PROGRAM: + if (track) + g_snprintf(buf, TMP_BUF_SIZE, "%d", track->program & 0x7f); + str = buf; + break; + default: + break; + } + + gdk_draw_string(GTK_WIDGET(minfo)->window, GTK_WIDGET(minfo)->style->font, + gc, ap->x, ap->y + minfo->vtextoffset, str); +} + +static void +draw_col_button(MelysTrackInfo *minfo, int ntrack, struct trackElement *track, + GdkRectangle *ap, struct col_info *cip, GdkGC *gc) +{ + GtkWidget *widget; + GdkPixmap *pixmap; + GdkBitmap *mask; + int width, height; + int x, y; + +#define BUTTON_SURROUND 2 + + if (ntrack == -1) + return; + + widget = (GtkWidget *)minfo; + + gtk_draw_shadow(widget->style, widget->window, + GTK_STATE_NORMAL, GTK_SHADOW_OUT, + ap->x, ap->y + BUTTON_SURROUND, + ap->width, ap->height - 2*BUTTON_SURROUND); + + pixmap = NULL; + mask = NULL; + + switch (cip->type) { + case RECORD: + if (track->record) { + pixmap = minfo->rec_label; + mask = minfo->rec_mask; + } + break; + case MUTE: + if (track->mute) { + pixmap = minfo->mute_label; + mask = minfo->mute_mask; + } + break; + case SOLO: + if (track->solo) { + pixmap = minfo->solo_label; + mask = minfo->solo_mask; + } + break; + default: + mel_warning(_("Internal error.\n" + "There is a missing case in draw_col_button\n" + "Value was %d\n"), cip->type); + pixmap = NULL; + mask = NULL; + break; + } + + if (pixmap) { + gdk_window_get_size(pixmap, &width, &height); + x = ap->x + ap->width/2 - width/2; + y = ap->y + ap->height/2 - height/2; + + gdk_gc_set_clip_mask (widget->style->black_gc, mask); + gdk_gc_set_clip_origin (widget->style->black_gc, x, y); + + + gdk_draw_pixmap(widget->window, + widget->style->black_gc, + pixmap, + 0, 0, x, y, -1, -1); + + gdk_gc_set_clip_mask (widget->style->black_gc, NULL); + gdk_gc_set_clip_origin (widget->style->black_gc, 0, 0); } } @@ -585,43 +839,190 @@ return FALSE; /* XXX what does this mean */ } -static void -track_info_enter(GtkWidget *widget, gpointer data) +static gint +track_info_enter(GtkWidget *widget, GdkEventCrossing *data) { if (widget == NULL) - return; - mel_debug_print_type("enter", widget); + {dprintf1("enter widget is NULL"); return FALSE;} + + gtk_widget_grab_focus(widget); - //gtk_widget_grab_focus(widget); + return FALSE; } /* * Button presses select tracks and bring up dialogs to modify - * the properties of tracks. The first button press on a track - * selects it. A button1 press on a track that is already - * selected will bring up the track properties dialog. If the - * click is in the patch column then the instrument selecter - * dialog will be displayed. A control click will allow the - * selection state on a column to be toggled. A shift click will - * select a range of tracks. A button3 click will bring up a menu - * of track actions -- add delete etc. + * the properties of tracks. The action taken depends on which + * column is clicked and whether the track is already selected + * and the modifiers. + * + * On the button columns, each click presses or release the + * button. + * + * The first button press elsewhere on a track selects it. A + * button1 press on a track that is already selected will bring + * up the track properties dialog. If the click is in the patch + * column then the instrument selecter dialog will be + * displayed. + * + * A control click will allow the selection state on a column to + * be toggled. A shift click will select a range of tracks. + * + * A button3 click will bring up a menu of track actions -- add + * delete etc. * */ static int track_info_button_press(GtkWidget *widget, GdkEventButton *event) { - int n; + int row; + int y; + struct col_info *cip; + struct trackElement *track; MelysTrackInfo *minfo; minfo = MELYS_TRACK_INFO(widget); - n = y_to_track(minfo, event->y); + /* Get the appropriate track for this button press */ + row = y_to_track(minfo, event->y); + track = md_track_nth(minfo->mdroot, row); + + if (track == NULL) + return FALSE; + + + /* Now work out the column */ + cip = x_to_col_info(minfo, event->x); + if (cip == NULL) + return FALSE; + + dprintf1("Click on track %d, col %s", row, cip->title); + + switch (event->button) { + case 1: + if (cip->kind == COL_TEXT) + button1_text(minfo, track, cip, event); + else + button1_button(minfo, track, cip, event); + break; + + default: + break; + } + + y = track_to_y(minfo, row); + gtk_widget_queue_draw_area(widget, + 0, y, minfo->track_area.width, minfo->vspace); - dprintf1("Click on track %d", n); return TRUE; } +static void +button1_text(MelysTrackInfo *minfo, struct trackElement *track, + struct col_info *cip, GdkEventButton *event) +{ + int masks; + int i; + struct trackElement *otrack; + + masks = event->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK); + if (masks == 0) { + + /* Unselect all other tracks first */ + for (i = 0; ; i++) { + + otrack = md_track_nth(minfo->mdroot, i); + if (!otrack) + break; + + if (otrack->selected && otrack != track) + unselect_track(minfo, otrack); + } + + if (!track->selected) + select_track(minfo, track); + else + ;/* column action */ + + } else if (masks == GDK_CONTROL_MASK) { + if (track->selected) + unselect_track(minfo, track); + else + select_track(minfo, track); + + } else if (masks == GDK_SHIFT_MASK) { + } +} + +static void +button1_button(MelysTrackInfo *minfo, struct trackElement *track, + struct col_info *cip, GdkEventButton *event) +{ + + switch (cip->type) { + case MUTE: + if (track->mute) + unmute_track(minfo, track); + else + mute_track(minfo, track); + break; + case SOLO: + track->solo ^= 1; + break; + case RECORD: + track->record ^= 1; + break; + default: + break; + } +} + +static void +select_track(MelysTrackInfo *minfo, struct trackElement *track) +{ + + track->selected = 1; +} + +static void +unselect_track(MelysTrackInfo *minfo, struct trackElement *track) +{ + + track->selected = 0; + track_redraw(minfo, -1, track); +} + +static void +mute_track(MelysTrackInfo *minfo, struct trackElement *track) +{ + gtk_signal_emit(GTK_OBJECT(minfo), + melys_track_info_signals[MUTE_TRACK], track); +} + +static void +unmute_track(MelysTrackInfo *minfo, struct trackElement *track) +{ + gtk_signal_emit(GTK_OBJECT(minfo), + melys_track_info_signals[UNMUTE_TRACK], track); +} + +static void +real_mute_track(MelysTrackInfo *minfo, struct trackElement *track) +{ + + track->mute = 1; + track_redraw(minfo, -1, track); +} + +static void +real_unmute_track(MelysTrackInfo *minfo, struct trackElement *track) +{ + + track->mute = 0; + track_redraw(minfo, -1, track); +} + /* * Given a y position within the widget window, return the * track number that belongs to that co-ordintate. Track @@ -662,11 +1063,31 @@ { int ypix; + if (n == -1) + return GTK_WIDGET(minfo)->style->klass->xthickness; + n -= minfo->voffset; - ypix = (n * minfo->vspace) + minfo->vtitle; + ypix = n * minfo->vspace + minfo->vtitle; + return ypix; } +static struct col_info * +x_to_col_info(MelysTrackInfo *minfo, int x) +{ + struct col_info *cip; + int i; + + for (i = 0; i < minfo->col_used; i++) { + cip = minfo->col_infos + i; + + if (x <= cip->totwidth) + return cip; + } + + return NULL; +} + /* * Return a text string which is the correct contents for the * given track and column type. @@ -677,7 +1098,7 @@ { enum column_type type = itype; struct trackElement *track; - /* I keep typing defbug, I think its trying to tell be something... */ + /* I keep typing defbug, I think its trying to tell me something... */ static char defbuf[TMP_BUF_SIZE]; char *str; @@ -733,6 +1154,43 @@ * to me at the moment. Perhaps this will change */ gtk_widget_queue_clear((GtkWidget*)minfo); - gtk_widget_queue_draw((GtkWidget*)minfo); + gtk_widget_queue_draw_area((GtkWidget*)minfo, + minfo->track_area.x, minfo->track_area.y, + minfo->track_area.width, minfo->track_area.height); + } +} + +/* + * Queues up a redraw for the specified track which can be given + * either by number or by track structure. If number is given it + * will take priority. You can call this several times in the + * course of an action and gtk should combine them into as few + * real re-draw requests as possible. + * + * Arguments: + * number - Track number or -1 + * track - Track or NULL + */ +static void +track_redraw(MelysTrackInfo *minfo, int number, struct trackElement *track) +{ + int x, y; + int width, height; + + if (number >= 0) + track = md_track_nth(minfo->mdroot, number); + + if (track) { + + x = minfo->track_area.x; + width = minfo->track_area.width; + + y = track_to_y(minfo, track->number); + height = minfo->vspace; + + dprintf2("Q-DRAW %d: %d,%d %dx%d", 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.7/widgets/melystrackinfo.m melys-0.0.8/widgets/melystrackinfo.m --- melys-0.0.7/widgets/melystrackinfo.m Wed Aug 11 14:41:02 1999 +++ melys-0.0.8/widgets/melystrackinfo.m Mon Aug 16 12:00:21 1999 @@ -1,4 +1,4 @@ ->>name melystrackinfo.m - XXX +>>name melystrackinfo.m - Track information pane Copyright (C) 1999 Steve Ratcliffe @@ -19,6 +19,8 @@ >>header gtk/gtkadjustment.h >>header gtk/gtksignal.h >>header gtk/gtkvbox.h +>>header melmsg.h +>>header pixmaps.h >>header elements.h >>header md.h >>gtkobject melys_track_info gtk_widget @@ -37,9 +39,6 @@ /* Amount of vertical scrolling, in tracks (you never see half a track) */ int voffset; - /* The titles are drawn in their own window (do we really need this?) */ - GdkWindow *title_window; - /* * The columns are configurable in terms of which ones exist and * which order they appear in (or will be). @@ -68,37 +67,76 @@ /* The actual composition that is being displayed */ struct rootElement *mdroot; + + /* Labels and masks for the various buttons */ + GdkPixmap *rec_label; + GdkBitmap *rec_mask; + GdkPixmap *mute_label; + GdkBitmap *mute_mask; + GdkPixmap *solo_label; + GdkBitmap *solo_mask; + }; struct _MelysTrackInfoClass { GtkWidgetClass parent_class; - // XXX class definition here + + void (*mute_track)(MelysTrackInfo *, struct trackElement *); + void (*unmute_track)(MelysTrackInfo *, struct trackElement *); }; >>header melystrack.h >>extern enum { - // XXX symbols for all signals here + MUTE_TRACK, + UNMUTE_TRACK, LAST_SIGNAL }; +/* + * The type of column. Each possible column that could be displayed + * has a type here. They are not all necessarily shown though. + */ enum column_type { NUMBER, NAME, PROGRAM, + MUTE, + RECORD, + SOLO, LAST_COLUMN_TYPE }; +/* + * The different kinds of column content. + */ +enum column_kind { + COL_TEXT, + COL_BUTTON +}; + + +/* + * Information about the possible column types. + */ static struct col_info { enum column_type type; + enum column_kind kind; char *title; int width; - gboolean present; + gboolean present; /* Is this in the default configuration */ + + /* All below here are calculated and therefore do not need init */ + int totwidth; /* Total width up to end of this column */ + } def_col_info[] = { - {NUMBER, "", 20, TRUE}, /* No real need to have this included */ - {NAME, N_("Name"), 100, TRUE}, - {PROGRAM, N_("Prog"), 27, TRUE}, + {NUMBER, COL_TEXT, "", 20, TRUE}, /* No real need to have this included */ + {NAME, COL_TEXT, N_("Name"), 100, TRUE}, + {PROGRAM, COL_TEXT, N_("Prog"), 30, TRUE}, + {MUTE, COL_BUTTON, N_("Mute"), 28, TRUE}, + {SOLO, COL_BUTTON, N_("Solo"), 28, FALSE}, + {RECORD, COL_BUTTON, N_("Rec"), 28, FALSE}, }; /* A border to the protect the column lines */ @@ -142,11 +180,15 @@ GTK_WIDGET_SET_FLAGS(minfo, GTK_CAN_FOCUS); minfo->vadj = NULL; - minfo->title_window = NULL; used = 0; minfo->col_infos = g_new0(struct col_info, MAX_COLUMNS); + /* + * Go through the default list of column information and + * copy these defaults into our own structure where they + * can be modified. + */ for (i = 0; i < NELEM(def_col_info); i++) { cinfo = def_col_info+i; @@ -185,9 +227,26 @@ parent_class = gtk_type_class(gtk_widget_get_type()); - // XXX Add args - // XXX Create signals + /* + * Create all the signals for this class and add them to + * the system. + */ + melys_track_info_signals[MUTE_TRACK] = gtk_signal_new("mute_track", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET(MelysTrackInfoClass, mute_track), + gtk_marshal_NONE__POINTER, + GTK_TYPE_NONE, 1, + GTK_TYPE_POINTER); + melys_track_info_signals[UNMUTE_TRACK] = gtk_signal_new("unmute_track", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET(MelysTrackInfoClass, unmute_track), + gtk_marshal_NONE__POINTER, + GTK_TYPE_NONE, 1, + GTK_TYPE_POINTER); + gtk_object_class_add_signals (object_class, melys_track_info_signals, LAST_SIGNAL); @@ -204,7 +263,8 @@ widget_class->enter_notify_event = track_info_enter; widget_class->button_press_event = track_info_button_press; - // XXX Our functions + klass->mute_track = real_mute_track; + klass->unmute_track = real_unmute_track; >>function melys_track_info_set_height @@ -303,23 +363,27 @@ widget->style = gtk_style_attach(widget->style, widget->window); gtk_style_set_background(widget->style, widget->window, GTK_STATE_NORMAL); - /* The title window */ - attributes.x = 0; - attributes.y = 0; - attributes.height = minfo->vtitle; - minfo->title_window = gdk_window_new(widget->window, - &attributes, attributes_mask); - - gdk_window_set_user_data(minfo->title_window, minfo); - - widget->style = gtk_style_attach(widget->style, minfo->title_window); - gtk_style_set_background(widget->style, minfo->title_window, - GTK_STATE_NORMAL); - - gdk_window_show(minfo->title_window); - minfo->vtextoffset = GTK_WIDGET(minfo)->style->font->ascent + 1.5; + /* + * Now that we have a main window, we can create the pixmaps that + * belong to it. + */ + minfo->rec_label = gdk_pixmap_create_from_xpm_d( + widget->window, + &minfo->rec_mask, + NULL, + redball_xpm); + minfo->mute_label = gdk_pixmap_create_from_xpm_d( + widget->window, + &minfo->mute_mask, + NULL, + yellowball_xpm); + minfo->solo_label = gdk_pixmap_create_from_xpm_d( + widget->window, + &minfo->solo_mask, + NULL, + blueball_xpm); >>function track_info_unrealise static void @@ -343,9 +407,6 @@ minfo = (MelysTrackInfo*)object; - gdk_window_destroy(minfo->title_window); - minfo->title_window = NULL; - g_free(minfo->col_infos); if (minfo->vadj) { @@ -390,12 +451,21 @@ * Add up all the column widths and include the separator * width. */ - tot = 0; + tot = widget->style->klass->xthickness; for (i = 0; i < minfo->col_used; i++) { tot += minfo->col_infos[i].width; - tot += widget->style->klass->xthickness; tot += 2*COL_PADDING; + + /* + * This is our position, you can find out which column by finding + * the first for which totwidth includes the x position + */ + minfo->col_infos[i].totwidth = tot; + + /* Add the width of the dividing line */ + tot += widget->style->klass->xthickness; } + tot += widget->style->klass->xthickness; req->width = tot; @@ -431,14 +501,14 @@ allocation->x, allocation->y, allocation->width - PAN_PADDING, allocation->height); - gdk_window_move_resize(minfo->title_window, - 0, 0, allocation->width, minfo->vtitle); - - /* Calculate how many tracks are visible on the page */ + /* + * Calculate how many tracks are visible on the page and set this + * as the page increment. Verge on the low side. + */ minfo->vadj->page_size = ((gfloat)minfo->track_area.height / minfo->vspace) - 1.5; minfo->vadj->page_increment = minfo->vadj->page_size; - dprintf1("page_size %f, upper %f lower %f", minfo->vadj->page_size, minfo->vadj->upper, minfo->vadj->lower); + gtk_adjustment_changed(minfo->vadj); } @@ -446,122 +516,296 @@ >>function track_info_draw static void GtkWidget *widget; -GdkRectangle *area; Area to draw within +GdkRectangle *ap; Area to draw within + +>>description +This is the main routine that draws the whole widget. +To simplify the code, it is split into routines for drawing +each line (and the title is line -1 for this purpose), and +for each column. >>code MelysTrackInfo *minfo; GtkStyle *style; GdkGC *fg_gc; - GdkRectangle clip_rectangle; - int offset; int start, end; - int i; int ntrack; g_return_if_fail(widget != NULL); g_return_if_fail(IS_MELYS_TRACK_INFO(widget)); - g_return_if_fail(area != NULL); + g_return_if_fail(ap != NULL); if (!GTK_WIDGET_DRAWABLE (widget)) return; + dprintf(1, "@func_name: (%d, %d) %dx%d", ap->x, ap->y, + ap->width, ap->height); + minfo = (MelysTrackInfo*)widget; style = widget->style; - fg_gc = widget->style->fg_gc[GTK_STATE_NORMAL]; + fg_gc = style->fg_gc[GTK_STATE_NORMAL]; - dprintf(2, "@func_name: (%d, %d) %dx%d", area->x, area->y, - area->width, area->height); /* Needed for scrolling... may be removed in future */ - gdk_window_clear_area(widget->window, area->x, area->y, - area->width, area->height); + gdk_window_clear_area(widget->window, ap->x, ap->y, + ap->width, ap->height); gtk_draw_shadow(widget->style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_IN, 0, 0, minfo->track_area.width, minfo->vtitle + minfo->track_area.height); - /* Have to draw in the title box as well, the bottom is not meant to draw*/ - gtk_draw_shadow(widget->style, minfo->title_window, - GTK_STATE_NORMAL, GTK_SHADOW_IN, - 0, 0, - minfo->track_area.width, minfo->vtitle + 10); - offset = COL_PADDING; + /* This draws in the title row */ + draw_row(minfo, -1); + + /* Draw in the separator line bewtween the titles and rows */ + gdk_draw_line(widget->window, fg_gc, + 0, minfo->vtitle-1, minfo->track_area.width, minfo->vtitle-1); + + /* Ideally this should not be allowed anyway... */ + if (minfo->mdroot == NULL) + return; /* Nothing more to do */ + + start = y_to_track(minfo, ap->y); + end = y_to_track(minfo, ap->y + ap->height) + 1; + if (end > minfo->mdroot->tracks) + end = minfo->mdroot->tracks; + + dprintf2("start %d end %d, tracks %d", start, end, minfo->mdroot->tracks); + for (ntrack = start; ntrack < end; ntrack++) + draw_row(minfo, ntrack); + + +>>function draw_row +static void +MelysTrackInfo *minfo; +int ntrack; The track number to draw (0 based). + +>>description +Draw the specified track. +The track -1 means the titles. + +>>code + GtkWidget *widget; + GtkStyle *style; + GdkGC *fg_gc; + GdkGC *bg_gc; + GdkRectangle area; + struct trackElement *track; + struct col_info *cip; + int xpos; + int i; + + widget = (GtkWidget *)minfo; + style = widget->style; + + track = md_track_nth(minfo->mdroot, ntrack); + + xpos = style->klass->xthickness; for (i = 0; i < minfo->col_used; i++) { - clip_rectangle.x = offset; - clip_rectangle.y = 0; - clip_rectangle.width = minfo->col_infos[i].width; - clip_rectangle.height = minfo->vtitle; - - dprintf2("offset %d, name %s", offset, minfo->col_infos[i].title); - - gdk_gc_set_clip_rectangle(fg_gc, &clip_rectangle); - gdk_draw_string(minfo->title_window, style->font, - fg_gc, - offset, - minfo->htitle - widget->style->font->descent - 1, - _(minfo->col_infos[i].title)); + if (ntrack >= 0 && track && track->selected) { + fg_gc = widget->style->fg_gc[GTK_STATE_SELECTED]; + bg_gc = widget->style->bg_gc[GTK_STATE_SELECTED]; + } else { + fg_gc = widget->style->fg_gc[GTK_STATE_NORMAL]; + bg_gc = widget->style->bg_gc[GTK_STATE_NORMAL]; + } + + cip = minfo->col_infos+i; + + area.x = xpos; + area.y = track_to_y(minfo, ntrack); + area.width = cip->width + 2*COL_PADDING; + area.height = minfo->vspace; + + if (cip->kind == COL_TEXT) { + gdk_draw_rectangle(widget->window, bg_gc, TRUE, area.x, area.y, + area.width, area.height); + } + + /* + * Set up a clipping region for the content area of this cell. + * This is mainly to clip text columns that are too large for + * their cell. Buttons are supposed to be the correct size.. + */ + xpos += COL_PADDING; + area.x = xpos; + area.width = cip->width; + + gdk_gc_set_clip_rectangle(fg_gc, &area); + + draw_col(minfo, ntrack, track, &area, cip, fg_gc); gdk_gc_set_clip_rectangle(fg_gc, NULL); - offset += minfo->col_infos[i].width + COL_PADDING; - gtk_draw_vline(widget->style, minfo->title_window, GTK_STATE_NORMAL, - 0, minfo->vtitle, offset); + xpos += cip->width + COL_PADDING; + xpos += style->klass->xthickness; + } + +>>function draw_col +static void +MelysTrackInfo *minfo; +int ntrack; The track number +struct trackElement *track; The track to display +GdkRectangle *ap; Allocated area, mainly for x,y position to use +struct col_info *cip; The column information +GdkGC *gc; The GC to use for drawing + +>>description +Draw a single column cell. +If track is NULL that means to write the title. - /* Do the main window while we are here */ - gtk_draw_vline(widget->style, widget->window, GTK_STATE_ACTIVE, - minfo->track_area.y, minfo->track_area.y+minfo->track_area.height, - offset); +>>code - offset += style->klass->xthickness + COL_PADDING; + /* + * Deal with title cells first. They are text. + */ + if (ntrack == -1) { + draw_col_text(minfo, ntrack, NULL, ap, cip, gc); + return; } - gdk_draw_line(minfo->title_window, fg_gc, - 0, minfo->vtitle-1, minfo->track_area.width, minfo->vtitle-1); + /* + * Depending on the kind of column we have, draw it. + */ + switch (cip->kind) { + case COL_TEXT: + draw_col_text(minfo, ntrack, track, ap, cip, gc); + break; + case COL_BUTTON: + draw_col_button(minfo, ntrack, track, ap, cip, gc); + break; + } - /* Ideally this should be allowed anyway... */ - if (minfo->mdroot == NULL) - return; /* Nothing more to do */ +>>function draw_col_text +static void +MelysTrackInfo *minfo; +int ntrack; The track number +struct trackElement *track; The track being displayed +GdkRectangle *ap; Allocated area, mainly for x,y position to use +struct col_info *cip; The column information +GdkGC *gc; The GC to use for drawing - start = y_to_track(minfo, area->y); - end = y_to_track(minfo, area->y + area->height) + 1; - if (end > minfo->mdroot->tracks) - end = minfo->mdroot->tracks; +>>code + GtkWidget *widget; + char buf[TMP_BUF_SIZE]; + char *str; - dprintf2("start %d end %d, tracks %d", start, end, minfo->mdroot->tracks); - for (ntrack = start; ntrack < end; ntrack++) { - char *str; - struct col_info *col; - - offset = COL_PADDING; - for (i = 0; i < minfo->col_used; i++) { - - col = minfo->col_infos+i; - - /* This clips the text to fit, don't care about the height */ - clip_rectangle.x = offset; - clip_rectangle.y = minfo->track_area.y; - clip_rectangle.width = col->width; - clip_rectangle.height = minfo->track_area.height; - - str = get_info_string(minfo, col->type, ntrack); - dprintf(4, "offset %d, string %s at %d", offset, str, track_to_y(minfo, ntrack)); - - /* Now draw it */ - gdk_gc_set_clip_rectangle(fg_gc, &clip_rectangle); - gdk_draw_string(widget->window, style->font, fg_gc, - offset, track_to_y(minfo, ntrack) + minfo->vtextoffset, str); - gdk_gc_set_clip_rectangle(fg_gc, NULL); + widget = (GtkWidget *)minfo; + str = "N/YET"; /* A default to catch unimplemented columns */ + + if (ntrack == -1) { + str = cip->title; + + /* Have to draw the vertical lines */ + gtk_draw_vline(widget->style, widget->window, GTK_STATE_NORMAL, + 0, minfo->track_area.height + minfo->vtitle, + ap->x + cip->width + COL_PADDING); - offset += col->width + COL_PADDING; - offset += style->klass->xthickness + COL_PADDING; + } else switch (cip->type) { + case NUMBER: + g_snprintf(buf, TMP_BUF_SIZE, "%2d", ntrack+1); + str = buf; + break; + case NAME: + if (track && track->name) { + str = track->name; + } else { + g_snprintf(buf, TMP_BUF_SIZE, "Track %d", ntrack+1); + str = buf; } - + break; + case PROGRAM: + if (track) + g_snprintf(buf, TMP_BUF_SIZE, "%d", track->program & 0x7f); + str = buf; + break; + default: + break; } + gdk_draw_string(GTK_WIDGET(minfo)->window, GTK_WIDGET(minfo)->style->font, + gc, ap->x, ap->y + minfo->vtextoffset, str); + + +>>function draw_col_button +static void +MelysTrackInfo *minfo; +int ntrack; The track number being displayed +struct trackElement *track; Track being displayed +GdkRectangle *ap; Allocated area, mainly for x,y position to use +struct col_info *cip; The column information +GdkGC *gc; The GC to use for drawing + +>>code + GtkWidget *widget; + GdkPixmap *pixmap; + GdkBitmap *mask; + int width, height; + int x, y; +#define BUTTON_SURROUND 2 + + if (ntrack == -1) + return; + + widget = (GtkWidget *)minfo; + + gtk_draw_shadow(widget->style, widget->window, + GTK_STATE_NORMAL, GTK_SHADOW_OUT, + ap->x, ap->y + BUTTON_SURROUND, + ap->width, ap->height - 2*BUTTON_SURROUND); + + pixmap = NULL; + mask = NULL; + + switch (cip->type) { + case RECORD: + if (track->record) { + pixmap = minfo->rec_label; + mask = minfo->rec_mask; + } + break; + case MUTE: + if (track->mute) { + pixmap = minfo->mute_label; + mask = minfo->mute_mask; + } + break; + case SOLO: + if (track->solo) { + pixmap = minfo->solo_label; + mask = minfo->solo_mask; + } + break; + default: + mel_warning(_("Internal error.\n" + "There is a missing case in @func_name\n" + "Value was %d\n"), cip->type); + pixmap = NULL; + mask = NULL; + break; + } + + if (pixmap) { + gdk_window_get_size(pixmap, &width, &height); + x = ap->x + ap->width/2 - width/2; + y = ap->y + ap->height/2 - height/2; + + gdk_gc_set_clip_mask (widget->style->black_gc, mask); + gdk_gc_set_clip_origin (widget->style->black_gc, x, y); + + + gdk_draw_pixmap(widget->window, + widget->style->black_gc, + pixmap, + 0, 0, x, y, -1, -1); + + gdk_gc_set_clip_mask (widget->style->black_gc, NULL); + gdk_gc_set_clip_origin (widget->style->black_gc, 0, 0); + } >>function track_info_expose static int @@ -589,17 +833,18 @@ return FALSE; /* XXX what does this mean */ >>function track_info_enter -static void +static gint GtkWidget *widget; -gpointer data; +GdkEventCrossing *data; >>code if (widget == NULL) - return; - mel_debug_print_type("enter", widget); + {dprintf1("enter widget is NULL"); return FALSE;} - //gtk_widget_grab_focus(widget); + gtk_widget_grab_focus(widget); + + return FALSE; >>function track_info_button_press @@ -610,27 +855,208 @@ >>description Button presses select tracks and bring up dialogs to modify the properties of tracks. -The first button press on a track selects it. +The action taken depends on which column is clicked and +whether the track is already selected and the modifiers. + +On the button columns, each click presses or release the button. + +The first button press elsewhere on a track selects it. A button1 press on a track that is already selected will bring up the track properties dialog. If the click is in the patch column then the instrument selecter dialog will be displayed. + A control click will allow the selection state on a column to be toggled. A shift click will select a range of tracks. + A button3 click will bring up a menu of track actions -- add delete etc. >>code - int n; + int row; + int y; + struct col_info *cip; + struct trackElement *track; MelysTrackInfo *minfo; minfo = MELYS_TRACK_INFO(widget); - n = y_to_track(minfo, event->y); + /* Get the appropriate track for this button press */ + row = y_to_track(minfo, event->y); + track = md_track_nth(minfo->mdroot, row); + + if (track == NULL) + return FALSE; + + + /* Now work out the column */ + cip = x_to_col_info(minfo, event->x); + if (cip == NULL) + return FALSE; + + dprintf1("Click on track %d, col %s", row, cip->title); + + switch (event->button) { + case 1: + if (cip->kind == COL_TEXT) + button1_text(minfo, track, cip, event); + else + button1_button(minfo, track, cip, event); + break; + + default: + break; + } + + y = track_to_y(minfo, row); + gtk_widget_queue_draw_area(widget, + 0, y, minfo->track_area.width, minfo->vspace); - dprintf1("Click on track %d", n); return TRUE; +>>function button1_text +static void +MelysTrackInfo *minfo; +struct trackElement *track; Track that was clicked in +struct col_info *cip; Column that was clicked in +GdkEventButton *event; + +>>code +If no modifiers: + unselect all others + if not selected: + select this track + else + do the column action + +If control: + toggle select status of this track + +If shift: + don't know; any ideas? + +>>code + int masks; + int i; + struct trackElement *otrack; + + masks = event->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK); + if (masks == 0) { + + /* Unselect all other tracks first */ + for (i = 0; ; i++) { + + otrack = md_track_nth(minfo->mdroot, i); + if (!otrack) + break; + + if (otrack->selected && otrack != track) + unselect_track(minfo, otrack); + } + + if (!track->selected) + select_track(minfo, track); + else + ;/* column action */ + + } else if (masks == GDK_CONTROL_MASK) { + if (track->selected) + unselect_track(minfo, track); + else + select_track(minfo, track); + + } else if (masks == GDK_SHIFT_MASK) { + } + + +>>function button1_button +static void +MelysTrackInfo *minfo; +struct trackElement *track; Track that was clicked in +struct col_info *cip; Column that was clicked in +GdkEventButton *event; + +>>code + + switch (cip->type) { + case MUTE: + if (track->mute) + unmute_track(minfo, track); + else + mute_track(minfo, track); + break; + case SOLO: + track->solo ^= 1; + break; + case RECORD: + track->record ^= 1; + break; + default: + break; + } + +>># ==== Selection and click actions + +>>function select_track +static void +MelysTrackInfo *minfo; +struct trackElement *track; + +>>code + + track->selected = 1; + +>>function unselect_track +static void +MelysTrackInfo *minfo; +struct trackElement *track; + +>>code + + track->selected = 0; + track_redraw(minfo, -1, track); + +>>function mute_track +static void +MelysTrackInfo *minfo; +struct trackElement *track; + +>>code + gtk_signal_emit(GTK_OBJECT(minfo), + melys_track_info_signals[MUTE_TRACK], track); + +>>function unmute_track +static void +MelysTrackInfo *minfo; +struct trackElement *track; + +>>code + gtk_signal_emit(GTK_OBJECT(minfo), + melys_track_info_signals[UNMUTE_TRACK], track); + +>>function real_mute_track +static void +MelysTrackInfo *minfo; +struct trackElement *track; + +>>code + + track->mute = 1; + track_redraw(minfo, -1, track); + + +>>function real_unmute_track +static void +MelysTrackInfo *minfo; +struct trackElement *track; + +>>code + + track->mute = 0; + track_redraw(minfo, -1, track); + + + >># ==== Utility routines >>function y_to_track @@ -670,10 +1096,31 @@ >>code int ypix; + if (n == -1) + return GTK_WIDGET(minfo)->style->klass->xthickness; + n -= minfo->voffset; - ypix = (n * minfo->vspace) + minfo->vtitle; + ypix = n * minfo->vspace + minfo->vtitle; + return ypix; +>>function x_to_col_info +static struct col_info * +MelysTrackInfo *minfo; +int x; + +>>code + struct col_info *cip; + int i; + + for (i = 0; i < minfo->col_used; i++) { + cip = minfo->col_infos + i; + + if (x <= cip->totwidth) + return cip; + } + + return NULL; >>extern @@ -692,7 +1139,7 @@ >>code enum column_type type = itype; struct trackElement *track; - /* I keep typing defbug, I think its trying to tell be something... */ + /* I keep typing defbug, I think its trying to tell me something... */ static char defbuf[TMP_BUF_SIZE]; char *str; @@ -749,6 +1196,45 @@ * to me at the moment. Perhaps this will change */ gtk_widget_queue_clear((GtkWidget*)minfo); - gtk_widget_queue_draw((GtkWidget*)minfo); + gtk_widget_queue_draw_area((GtkWidget*)minfo, + minfo->track_area.x, minfo->track_area.y, + minfo->track_area.width, minfo->track_area.height); + } + + +>>function track_redraw +static void +MelysTrackInfo *minfo; +int number; Track number or -1 +struct trackElement *track; Track or NULL + +>>description +Queues up a redraw for the specified track which can be +given either by number or by track structure. +If +.A number +is given it will take priority. +You can call this several times in the course of an action and gtk +should combine them into as few real re-draw requests as possible. + +>>code + int x, y; + int width, height; + + if (number >= 0) + track = md_track_nth(minfo->mdroot, number); + + if (track) { + + x = minfo->track_area.x; + width = minfo->track_area.width; + + y = track_to_y(minfo, track->number); + height = minfo->vspace; + + dprintf2("Q-DRAW %d: %d,%d %dx%d", 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.7/widgets/melystransport.c melys-0.0.8/widgets/melystransport.c --- melys-0.0.7/widgets/melystransport.c Wed Aug 11 15:41:07 1999 +++ melys-0.0.8/widgets/melystransport.c Mon Aug 16 12:21:57 1999 @@ -26,6 +26,7 @@ // XXX symbols for all signals here LAST_SIGNAL }; + static void melys_transport_init(MelysTransport *XXX); static void melys_transport_class_init(MelysTransportClass *klass); diff -rNu melys-0.0.7/widgets/register.c melys-0.0.8/widgets/register.c --- melys-0.0.7/widgets/register.c Wed Aug 11 15:41:07 1999 +++ melys-0.0.8/widgets/register.c Mon Aug 16 12:21:58 1999 @@ -37,6 +37,7 @@ /* The id generator, start at 1 as 0 is the invalid value */ static int nextId = 1; + static void destroy_cb(GtkObject *obj, gpointer data);