diff -rNu melys-0.0.8/ChangeLog melys-0.0.9/ChangeLog --- melys-0.0.8/ChangeLog Mon Aug 16 12:09:44 1999 +++ melys-0.0.9/ChangeLog Thu Aug 19 13:07:36 1999 @@ -1,4 +1,23 @@ +1999-08-19 Steve Ratcliffe + + * midi/play.m: Updated for latest version of the kernel patch. + +1999-08-18 Steve Ratcliffe + + * widgets/melystrackinfo.m: + Fixed some scribbling over the shadow along the dividing + line when pane is resized smaller. + + * md/elements.m, md/mdutil.m, midi/play.m, seq/seqlib.m, + song/song.m, widgets/melystrack.m, widgets/melystrackinfo.m: + solo function now working + + * midi/record.m: + Fixed bug where subpart was getting the wrong device/channel. + 1999-08-16 Steve Ratcliffe + + * ChangeLog, INSTALL, README, programs/melys.m: For REL-0-0-8 * files/mdmlwrite.m, files/midiread.m, gui/main.m, md/elements.m, md/mdutil.m, midi/play.m, midi/record.m, programs/mdmlconv.m, diff -rNu melys-0.0.8/README melys-0.0.9/README --- melys-0.0.8/README Mon Aug 16 12:09:44 1999 +++ melys-0.0.9/README Thu Aug 19 13:07:36 1999 @@ -12,9 +12,10 @@ 4. Save the file. -There is very little of the gui implemented so it is very difficult -to see what is going on. This release is only for the very -adventurous. +5. Mute and solo tracks. + +There is little of the gui implemented so it is difficult to see what +is going on. This release is only for the adventurous. Requirements. ------------- diff -rNu melys-0.0.8/include/elements.h melys-0.0.9/include/elements.h --- melys-0.0.8/include/elements.h Mon Aug 16 12:21:48 1999 +++ melys-0.0.9/include/elements.h Thu Aug 19 13:11:51 1999 @@ -32,8 +32,9 @@ */ struct element { guint32 element_time; /* Time for this element */ - short type; /* Element type */ short device_channel; /* Device/channel for this element */ + char type; /* Element type */ + char tag; /* Element tag */ }; #define MD_ELEMENT(e) \ ((struct element *)md_check_cast((struct element *)(e), MD_TYPE_ELEMENT)) @@ -52,7 +53,7 @@ struct rootElement { struct containerElement parent; struct headElement *head; /* Pointer to the head information */ - short tracks; /* Number of tracks */ + short tracks; /* Number of music tracks */ int refcount; /* Reference count of users */ }; #define MD_ROOT(e) \ @@ -82,8 +83,10 @@ /* 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 */ + int solo:1; /* Set for solo */ + int solomute:1; /* Track muted because of solo */ + int sololast:1; /* The last solo */ }; #define MD_TRACK(e) \ ((struct trackElement *)md_check_cast((struct element *)(e), MD_TYPE_TRACK)) diff -rNu melys-0.0.8/include/md.h melys-0.0.9/include/md.h --- melys-0.0.8/include/md.h Mon Aug 16 12:21:48 1999 +++ melys-0.0.9/include/md.h Thu Aug 19 13:11:51 1999 @@ -46,6 +46,7 @@ struct sequenceState *md_sequence_init(struct rootElement *root); struct element *md_sequence_next(struct sequenceState *seq); void md_elem_seek(struct containerElement *c, unsigned long time); +gboolean md_elem_seek_back(struct containerElement *c, unsigned long time); void md_sequence_end(struct sequenceState *seq); unsigned long md_sequence_duration(struct sequenceState *seq); struct rootElement *md_empty(void); diff -rNu melys-0.0.8/include/melmidi.h melys-0.0.9/include/melmidi.h --- melys-0.0.8/include/melmidi.h Mon Aug 16 12:21:50 1999 +++ melys-0.0.9/include/melmidi.h Thu Aug 19 13:11:52 1999 @@ -28,8 +28,6 @@ void play_stop(struct play *play); void play_set_record(struct play *play, int recmode); 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); diff -rNu melys-0.0.8/include/melystrackinfo.h melys-0.0.9/include/melystrackinfo.h --- melys-0.0.8/include/melystrackinfo.h Mon Aug 16 12:21:50 1999 +++ melys-0.0.9/include/melystrackinfo.h Thu Aug 19 13:11:52 1999 @@ -82,6 +82,10 @@ void (*mute_track)(MelysTrackInfo *, struct trackElement *); void (*unmute_track)(MelysTrackInfo *, struct trackElement *); + void (*solo_track)(MelysTrackInfo *, struct rootElement *, + struct trackElement *); + void (*unsolo_track)(MelysTrackInfo *, struct rootElement *, + struct trackElement *); }; guint melys_track_info_get_type(void); diff -rNu melys-0.0.8/md/elements.m melys-0.0.9/md/elements.m --- melys-0.0.8/md/elements.m Mon Aug 16 12:00:21 1999 +++ melys-0.0.9/md/elements.m Thu Aug 19 00:08:04 1999 @@ -34,8 +34,9 @@ */ >>elementdef element guint32 element_time; /* Time for this element */ - short type; /* Element type */ short device_channel; /* Device/channel for this element */ + char type; /* Element type */ + char tag; /* Element tag */ /* * An element that holds others. This includes tracks, parts and the @@ -51,18 +52,19 @@ e->duration = 0; /* - * The top element, used to hold all the other elements. - * Also holds some information that is used when - * reading and writing to files. + * The root element, used to hold all the other elements. */ >>elementdef root container struct headElement *head; /* Pointer to the head information */ - short tracks; /* Number of tracks */ + short tracks; /* Number of music tracks */ int refcount; /* Reference count of users */ new new->head = NULL; new->refcount = 1; +/* + * A holder for all kinds of information about the file. + */ >>elementdef head container short ver_major; /* Major part of version number */ short ver_minor; /* Minor part of version number */ @@ -86,8 +88,10 @@ /* 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 */ + int solo:1; /* Set for solo */ + int solomute:1; /* Track muted because of solo */ + int sololast:1; /* The last solo */ new new->name = NULL; new->program = 0; diff -rNu melys-0.0.8/md/mdutil.c melys-0.0.9/md/mdutil.c --- melys-0.0.8/md/mdutil.c Mon Aug 16 12:21:55 1999 +++ melys-0.0.9/md/mdutil.c Thu Aug 19 13:11:56 1999 @@ -223,6 +223,10 @@ /* Step onto the next event for selected track */ (void)inc_elem(MD_CONTAINER(besttrack)); + + /* TEMP set tag to track number */ + bestelem->tag = besttrack->number; + return bestelem; } @@ -302,7 +306,8 @@ /* * 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 . + * specified time . NB: This routine is almost certainly + * incorrect, needs proving. * */ void @@ -339,15 +344,39 @@ struct element *el; el = get_curr_elem(c); if (el) - dprintf1("after seek to %ld, el time is %ld\n", time, el->element_time); + dprintf(3, "after seek to %ld, el%d time is %ld", time, el->type, el->element_time); else { - dprintf1("after seek to %ld, there was NO EL\n", time); + dprintf(3, "after seek to %ld, there was NO EL\n", time); inc_elem(c); el = get_curr_elem(c); if (el) - dprintf1(" second attempt after seek to %ld, el time is %ld\n", time, el->element_time); + dprintf1(" second attempt after seek to %ld, el time is %ld", time, el->element_time); } } +} + +/* + * Seek to the specified time, but only in the backward + * direction. If the current play position is already + * earlier, then this routine returns FALSE. Otherwise set + * the play position and return TRUE. It may be the case that + * this track has no more events left, in this case it still + * returns TRUE. + * + */ +gboolean +md_elem_seek_back(struct containerElement *c, unsigned long time) +{ + struct element *el; + + el = get_curr_elem(c); + if (el && el->element_time < time) + return FALSE; + + md_elem_seek(c, time); + return TRUE; + + } /* diff -rNu melys-0.0.8/md/mdutil.m melys-0.0.9/md/mdutil.m --- melys-0.0.8/md/mdutil.m Mon Aug 16 12:00:21 1999 +++ melys-0.0.9/md/mdutil.m Thu Aug 19 00:08:04 1999 @@ -236,6 +236,10 @@ /* Step onto the next event for selected track */ (void)inc_elem(MD_CONTAINER(besttrack)); + + /* TEMP set tag to track number */ + bestelem->tag = besttrack->number; + return bestelem; } @@ -318,6 +322,7 @@ event to play from the track will be at or later than the specified .A time . +NB: This routine is almost certainly incorrect, needs proving. >>code struct element **nextpp; @@ -351,16 +356,41 @@ struct element *el; el = get_curr_elem(c); if (el) - dprintf1("after seek to %ld, el time is %ld\n", time, el->element_time); + dprintf(3, "after seek to %ld, el%d time is %ld", time, el->type, el->element_time); else { - dprintf1("after seek to %ld, there was NO EL\n", time); + dprintf(3, "after seek to %ld, there was NO EL\n", time); inc_elem(c); el = get_curr_elem(c); if (el) - dprintf1(" second attempt after seek to %ld, el time is %ld\n", time, el->element_time); + dprintf1(" second attempt after seek to %ld, el time is %ld", time, el->element_time); } } +>>function md_elem_seek_back +gboolean +struct containerElement *c; +unsigned long time; + +>>description +Seek to the specified time, but only in the backward +direction. +If the current play position is already earlier, then this routine +returns FALSE. +Otherwise set the play position and return TRUE. +It may be the case that this track has no more events left, in +this case it still returns TRUE. + +>>code + struct element *el; + + el = get_curr_elem(c); + if (el && el->element_time < time) + return FALSE; + + md_elem_seek(c, time); + return TRUE; + + >>function md_sequence_end void struct sequenceState *seq; Sequence state information diff -rNu melys-0.0.8/midi/play.c melys-0.0.9/midi/play.c --- melys-0.0.8/midi/play.c Mon Aug 16 12:21:58 1999 +++ melys-0.0.9/midi/play.c Thu Aug 19 13:11:58 1999 @@ -28,6 +28,7 @@ #include "md.h" #include "config.h" #include "gdk/gdk.h" +#include "gtk/gtkmain.h" #include "melmsg.h" #include "melmidi.h" #include "intl.h" @@ -41,11 +42,11 @@ struct play { int isplaying:1, /* True if playing now */ ispaused:1, /* True if paused */ - isfinish:1, /* True if sequence is finished */ - isecho_on:1, /* True if midi echo is active */ isrecording:1, /* True if recording */ isended:1 /* True if song ended */ ; + int run_sched:1; /* A run_events is scheduled */ + guint write_id; /* ID of write handler */ guint read_id; /* ID of read handler */ @@ -54,21 +55,14 @@ struct sequenceState *seq; /* To hold current sequence position */ struct element *pend_element;/* Element that is pending play */ - GArray *echolist; /* Midi echo list */ }; #define ADDR_PARTS 4 #define SEP ", \t\n" -/* Data for midi echo */ -struct echo_data { - snd_seq_addr_t inaddr; /* Input address */ - int inchan; /* Input channel to receive on */ - 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 gint run_events_idle(gpointer data); +static void run_events_cb(gpointer vplay, gint fd, GdkInputCondition cond); +static void run_events(struct play *play); static void get_events(gpointer vplay, gint fd, GdkInputCondition cond); static void do_special(struct play *play, int type); static int send_element(struct seq_context *ctxp, struct element *el); @@ -76,6 +70,7 @@ snd_seq_event_t *ep); static void add_io_cb(struct play *play, int which); static void remove_io_cb(struct play *play, int which); +static void debug_pool(struct play *play); /* @@ -91,8 +86,6 @@ play->isplaying = 0; play->ispaused = 0; - play->isfinish = 0; - play->isecho_on = 0; play->isended = 0; play->mdroot = NULL; @@ -108,8 +101,6 @@ play->write_id = 0; play->read_id = 0; - play->echolist = g_array_new(0, 0, sizeof(struct echo_data)); - return play; } @@ -133,9 +124,6 @@ if (play->ctxp) seq_context_free(play->ctxp); - if (play->echolist) - g_array_free(play->echolist, 1); - g_free(play); } @@ -193,7 +181,6 @@ if (play->ispaused) { seq_timer_continue(play->ctxp); } else { - play->isfinish = FALSE; play->isended = FALSE; play->seq = md_sequence_init(play->mdroot); play->pend_element = NULL; @@ -319,68 +306,16 @@ return play->ctxp; } -/* - * Set up a midi echo. Events arriving on one port are - * immediately output to the corresponding output port. In a - * complete system there may be multiple inputs that all need - * to go to a different output. Conversely in another complete - * system this routine may not be needed at all as the echo - * function could be handled by a separate kernel client. - * - * Is this really needed? - * - * Arguments: - * play - Play state - * indev - Events from this device... - * inchan - Channel to accept, or -1 for all - * outdev - Are echoed to this device/channel - * outchan - Channel to send event to - */ -void -XX_play_add_midi_echo(struct play *play, int indev, int inchan, int outdev, - int outchan) -{ - struct echo_data edata; - snd_seq_addr_t *addr; - - - /* - * There is a list of echo routes. Although we will just be - * using one to begin with. - */ - - /* Save actual address, rather than device to avoid constant lookups */ - addr = seq_dev_addr(play->ctxp, indev, SEQ_ADDR_INPUT); - if (!addr) - return; - edata.inaddr = *addr; - - /* Now the output */ - addr = seq_dev_addr(play->ctxp, outdev, SEQ_ADDR_OUTPUT); - if (!addr) - return; - edata.outaddr = *addr; - - edata.inchan = inchan; - edata.outchan = outchan; - - g_array_append_val(play->echolist, edata); - - 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; +#ifdef SND_SEQ_REMOVE_DEST + snd_seq_remove_events_t fqueue; + snd_seq_addr_t *addr; #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; @@ -388,30 +323,69 @@ 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_REMOVE_DEST + addr = seq_dev_addr(play->ctxp, dev, SEQ_ADDR_OUTPUT); + if (!addr) + return; -#ifdef SND_SEQ_FLUSH_DEST + /* + * Remove all note events from this channel, resticted by + * channel tag. + */ memset(&fqueue, 0, sizeof(fqueue)); fqueue.output = 1; - fqueue.dest = *seq_dev_addr(play->ctxp, dev, SEQ_ADDR_OUTPUT); + fqueue.dest = *addr; 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 + fqueue.type = SND_SEQ_EVENT_NOTE; + fqueue.tag = track->number; /* XXX TEMP */ + fqueue.remove_mode = + SND_SEQ_REMOVE_DEST | + SND_SEQ_REMOVE_DEST_CHANNEL | + SND_SEQ_REMOVE_TAG_MATCH | + SND_SEQ_REMOVE_EVENT_TYPE ; + snd_seq_remove_events(seq_handle(play->ctxp), &fqueue); -#else +#elif defined(SND_SEQ_IOCTL_RESET_POOL) { + snd_seq_reset_pool_t reset; + unsigned long now; + int i; static int warned; if (!warned) { warned = 1; mel_warning(_("Melys was not built with the ALSA remove_events\n" - "patch. The muting function will work very poorly") + "patch. The muting function will not work very well\n" + "You will get hanging notes, for example") + ); + } + + /* + * The best we can do is flush everything and reset all our + * play position pointers. This works quite well, but + * you get hanging note problems. + */ + now = seq_get_time(play->ctxp); + + memset(&reset, 0, sizeof(reset)); + reset.reset_output = SND_SEQ_RESET_POOL_ALL; + ioctl(seq_descriptor(play->ctxp), SND_SEQ_IOCTL_RESET_POOL, &reset); + + for (i = 0; i < play->mdroot->tracks; i++) { + track = md_track_nth(play->mdroot, i); + md_elem_seek_back(MD_CONTAINER(track), now); + } + + } +#else + { + static int warned; + + if (!warned) { + warned = 1; + mel_warning(_("Melys should be built with ALSA version 0.4.0\n" + "patch. The muting function will hardly work at all") ); } } @@ -421,16 +395,105 @@ void play_unmute(struct play *play, struct trackElement *track) { - unsigned long time; + unsigned long now; + unsigned long ahead; - dprintf1("Hey we are in the midi play unmute\n"); - time = seq_get_time(play->ctxp); + dprintf1("midi play unmute\n"); + now = seq_get_time(play->ctxp); - md_elem_seek(MD_CONTAINER(track), time); - /* Should flush all events after the current time on this track? */ +#ifdef SND_SEQ_REMOVE_DEST + { + snd_seq_remove_events_t fqueue; + snd_seq_addr_t *addr; + struct trackElement *t; + unsigned long t2; + int dev; + int chan; + int n; + + dev = ((struct element *)track)->device_channel >> 4; + chan = ((struct element *)track)->device_channel & 0x0f; + + addr = seq_dev_addr(play->ctxp, dev, SEQ_ADDR_OUTPUT); + if (addr == NULL) + return; + + /* Should flush all events after the current time on this track */ + memset(&fqueue, 0, sizeof(fqueue)); + fqueue.output = 1; + fqueue.remove_mode = SND_SEQ_REMOVE_DEST | + SND_SEQ_REMOVE_DEST_CHANNEL | + SND_SEQ_REMOVE_IGNORE_OFF | + SND_SEQ_REMOVE_TAG_MATCH | + SND_SEQ_REMOVE_TIME_AFTER; + fqueue.dest = *seq_dev_addr(play->ctxp, dev, SEQ_ADDR_OUTPUT);/*XXX*/ + fqueue.dest.channel = chan; + fqueue.tag = track->number; + fqueue.tick = 1; + fqueue.time.tick = now; + + snd_seq_remove_events(seq_handle(play->ctxp), &fqueue); + md_elem_seek_back(MD_CONTAINER(track), now); + + /* + * Next need to make room for more events. It is quite likely + * that the queue is full up of events that will not be playing + * for a long time. We need to make room for our events that + * are just about to be entered on the queue. + */ + ahead = now + 500; /* Totally random value that I made up */ + fqueue.time.tick = ahead; + fqueue.remove_mode = SND_SEQ_REMOVE_DEST | + SND_SEQ_REMOVE_IGNORE_OFF | + SND_SEQ_REMOVE_TIME_AFTER; + + debug_pool(play); + dprintf1("Removing MOST events"); + snd_seq_remove_events(seq_handle(play->ctxp), &fqueue); + debug_pool(play); + + /* + * Seek back all tracks that are too far ahead. + */ + for (n = 0; n < play->mdroot->tracks; n++) { + if (n == track->number) + continue; + t = md_track_nth(play->mdroot, n); + md_elem_seek_back(MD_CONTAINER(t), ahead); + } + + t2 = seq_get_time(play->ctxp); + if (t2 > ahead) + mel_warning(_("BUG: play_unmute: t2=%ld, ahead time=%ld\n"), + t2, ahead); + } +#endif - run_events(play, 0, 0); + if (!play->run_sched) { + play->run_sched = 1; + gtk_idle_add(run_events_idle, play); + } +} + +static gint +run_events_idle(gpointer data) +{ + struct play *play = data; + dprintf2("run_events_idle play_id %d", play->write_id); + play->run_sched = 0; + if (play->isplaying) { + run_events(play); + add_io_cb(play, GDK_INPUT_WRITE); + } + return FALSE; +} + +static void +run_events_cb(gpointer vplay, gint fd, GdkInputCondition cond) +{ + dprintf2("run_events_cb"); + run_events((struct play *)vplay); } /* @@ -440,33 +503,32 @@ * thread in future, but there still has to be an interface * between threads and this is it. * - * Arguments: - * vplay - This will be a play object - * fd - The file descriptor that is ready - * cond - The condition that matched */ static void -run_events(gpointer vplay, gint fd, GdkInputCondition cond) +run_events(struct play *play) { - struct play *play = vplay; struct element *el; unsigned long end; int status; + debug_pool(play); if (play->isplaying == FALSE) ethrow(debugError, "Not playing in run_events"); /* Push out any pending element */ if (play->pend_element) { status = send_element(play->ctxp, play->pend_element); - if (status < 0) + if (status < 0) { + dprintf2("Couldn't send the pending event"); return; + } play->pend_element = NULL; } /* Try and push out next items in the sequence */ while ((el = md_sequence_next(play->seq)) != NULL) { + //dprintf2("Sending type %d for %d at %ld", el->type, el->device_channel, el->element_time); status = send_element(play->ctxp, el); if (status < 0) { play->pend_element = el; @@ -475,21 +537,16 @@ } /* Detect the end of the sequence */ - if (el == NULL && play->isfinish == FALSE) { + if (el == NULL && play->isended == FALSE) { end = md_sequence_duration(play->seq); - /* 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 */ seq_midi_send_echo(play->ctxp, end, ECHO_ENDSONG); /* XXX */ } status = snd_seq_flush_output(seq_handle(play->ctxp)); - if (status == 0 && play->isfinish) + if (status == 0 && play->isended) remove_io_cb(play, GDK_INPUT_WRITE); return; @@ -607,6 +664,7 @@ { seq_midi_event_init(ctxp, ep, el->element_time, el->device_channel); + switch (el->type) { case MD_TYPE_ROOT: break; @@ -653,6 +711,8 @@ printf("WARNING: play: not implemented yet %d\n", el->type); break; } + + ep->tag = el->tag; } /* @@ -667,11 +727,11 @@ { /* Set up callbacks for IO activity */ - if (which & GDK_INPUT_WRITE) + if ((which & GDK_INPUT_WRITE) && !play->write_id) play->write_id = gdk_input_add(seq_descriptor(play->ctxp), - GDK_INPUT_WRITE, run_events, play); + GDK_INPUT_WRITE, run_events_cb, play); - if (which & GDK_INPUT_READ) + if ((which & GDK_INPUT_READ) && !play->read_id) play->read_id = gdk_input_add(seq_descriptor(play->ctxp), GDK_INPUT_READ, get_events, play); } @@ -689,6 +749,7 @@ /* Set up callbacks for IO activity */ if ((which & GDK_INPUT_WRITE) && play->write_id) { + dprintf2("Removing write cb"); gdk_input_remove(play->write_id); play->write_id = 0; } @@ -696,4 +757,18 @@ gdk_input_remove(play->read_id); play->read_id = 0; } +} + +static void +debug_pool(struct play *play) +{ + snd_seq_client_pool_t poolinfo; + + poolinfo.client = snd_seq_client_id(seq_handle(play->ctxp)); + snd_seq_get_client_pool(seq_handle(play->ctxp), &poolinfo); + + dprintf1("Pool %d, room %d, free %d", + poolinfo.output_pool, + poolinfo.output_room, + poolinfo.output_free); } diff -rNu melys-0.0.8/midi/play.m melys-0.0.9/midi/play.m --- melys-0.0.8/midi/play.m Mon Aug 16 12:00:21 1999 +++ melys-0.0.9/midi/play.m Thu Aug 19 12:31:49 1999 @@ -20,6 +20,7 @@ >>header md.h >>header config.h >>header gdk/gdk.h +>>header gtk/gtkmain.h >>header melmsg.h >>headerdef --decl melmidi.h @@ -38,11 +39,11 @@ struct play { int isplaying:1, /* True if playing now */ ispaused:1, /* True if paused */ - isfinish:1, /* True if sequence is finished */ - isecho_on:1, /* True if midi echo is active */ isrecording:1, /* True if recording */ isended:1 /* True if song ended */ ; + int run_sched:1; /* A run_events is scheduled */ + guint write_id; /* ID of write handler */ guint read_id; /* ID of read handler */ @@ -51,7 +52,6 @@ struct sequenceState *seq; /* To hold current sequence position */ struct element *pend_element;/* Element that is pending play */ - GArray *echolist; /* Midi echo list */ }; #define ADDR_PARTS 4 @@ -70,8 +70,6 @@ play->isplaying = 0; play->ispaused = 0; - play->isfinish = 0; - play->isecho_on = 0; play->isended = 0; play->mdroot = NULL; @@ -87,8 +85,6 @@ play->write_id = 0; play->read_id = 0; - play->echolist = g_array_new(0, 0, sizeof(struct echo_data)); - return play; @@ -111,9 +107,6 @@ if (play->ctxp) seq_context_free(play->ctxp); - if (play->echolist) - g_array_free(play->echolist, 1); - g_free(play); >>function play_set_mdroot @@ -168,7 +161,6 @@ if (play->ispaused) { seq_timer_continue(play->ctxp); } else { - play->isfinish = FALSE; play->isended = FALSE; play->seq = md_sequence_init(play->mdroot); play->pend_element = NULL; @@ -291,64 +283,6 @@ return play->ctxp; ->>extern -/* Data for midi echo */ -struct echo_data { - snd_seq_addr_t inaddr; /* Input address */ - int inchan; /* Input channel to receive on */ - snd_seq_addr_t outaddr; /* Output address */ - int outchan; /* Output channel to send event to */ -}; - ->>function XX_play_add_midi_echo -void -struct play *play; Play state -int indev; Events from this device... -int inchan; Channel to accept, or -1 for all -int outdev; Are echoed to this device/channel -int outchan; Channel to send event to - ->>description -Set up a midi echo. -Events arriving on one port are immediately output to the corresponding -output port. -In a complete system there may be multiple inputs that all -need to go to a different output. -Conversely in another complete system this routine may not -be needed at all as the echo function could be handled -by a separate kernel client. - -Is this really needed? - ->>code - struct echo_data edata; - snd_seq_addr_t *addr; - - - /* - * There is a list of echo routes. Although we will just be - * using one to begin with. - */ - - /* Save actual address, rather than device to avoid constant lookups */ - addr = seq_dev_addr(play->ctxp, indev, SEQ_ADDR_INPUT); - if (!addr) - return; - edata.inaddr = *addr; - - /* Now the output */ - addr = seq_dev_addr(play->ctxp, outdev, SEQ_ADDR_OUTPUT); - if (!addr) - return; - edata.outaddr = *addr; - - edata.inchan = inchan; - edata.outchan = outchan; - - g_array_append_val(play->echolist, edata); - - play->isecho_on = TRUE; - >>function play_mute void @@ -356,15 +290,13 @@ struct trackElement *track; >>code - snd_seq_event_t ev; -#ifdef SND_SEQ_FLUSH_DEST - snd_seq_flush_queue_t fqueue; +#ifdef SND_SEQ_REMOVE_DEST + snd_seq_remove_events_t fqueue; + snd_seq_addr_t *addr; #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; @@ -372,30 +304,69 @@ 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_REMOVE_DEST + addr = seq_dev_addr(play->ctxp, dev, SEQ_ADDR_OUTPUT); + if (!addr) + return; -#ifdef SND_SEQ_FLUSH_DEST + /* + * Remove all note events from this channel, resticted by + * channel tag. + */ memset(&fqueue, 0, sizeof(fqueue)); fqueue.output = 1; - fqueue.dest = *seq_dev_addr(play->ctxp, dev, SEQ_ADDR_OUTPUT); + fqueue.dest = *addr; 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 + fqueue.type = SND_SEQ_EVENT_NOTE; + fqueue.tag = track->number; /* XXX TEMP */ + fqueue.remove_mode = + SND_SEQ_REMOVE_DEST | + SND_SEQ_REMOVE_DEST_CHANNEL | + SND_SEQ_REMOVE_TAG_MATCH | + SND_SEQ_REMOVE_EVENT_TYPE ; + snd_seq_remove_events(seq_handle(play->ctxp), &fqueue); -#else +#elif defined(SND_SEQ_IOCTL_RESET_POOL) { + snd_seq_reset_pool_t reset; + unsigned long now; + int i; static int warned; if (!warned) { warned = 1; mel_warning(_("Melys was not built with the ALSA remove_events\n" - "patch. The muting function will work very poorly") + "patch. The muting function will not work very well\n" + "You will get hanging notes, for example") + ); + } + + /* + * The best we can do is flush everything and reset all our + * play position pointers. This works quite well, but + * you get hanging note problems. + */ + now = seq_get_time(play->ctxp); + + memset(&reset, 0, sizeof(reset)); + reset.reset_output = SND_SEQ_RESET_POOL_ALL; + ioctl(seq_descriptor(play->ctxp), SND_SEQ_IOCTL_RESET_POOL, &reset); + + for (i = 0; i < play->mdroot->tracks; i++) { + track = md_track_nth(play->mdroot, i); + md_elem_seek_back(MD_CONTAINER(track), now); + } + + } +#else + { + static int warned; + + if (!warned) { + warned = 1; + mel_warning(_("Melys should be built with ALSA version 0.4.0\n" + "patch. The muting function will hardly work at all") ); } } @@ -407,25 +378,113 @@ struct trackElement *track; >>code - unsigned long time; + unsigned long now; + unsigned long ahead; - dprintf1("Hey we are in the midi play unmute\n"); - time = seq_get_time(play->ctxp); + dprintf1("midi play unmute\n"); + now = seq_get_time(play->ctxp); - md_elem_seek(MD_CONTAINER(track), time); - /* Should flush all events after the current time on this track? */ +#ifdef SND_SEQ_REMOVE_DEST + { + snd_seq_remove_events_t fqueue; + snd_seq_addr_t *addr; + struct trackElement *t; + unsigned long t2; + int dev; + int chan; + int n; - run_events(play, 0, 0); + dev = ((struct element *)track)->device_channel >> 4; + chan = ((struct element *)track)->device_channel & 0x0f; + addr = seq_dev_addr(play->ctxp, dev, SEQ_ADDR_OUTPUT); + if (addr == NULL) + return; + + /* Should flush all events after the current time on this track */ + memset(&fqueue, 0, sizeof(fqueue)); + fqueue.output = 1; + fqueue.remove_mode = SND_SEQ_REMOVE_DEST | + SND_SEQ_REMOVE_DEST_CHANNEL | + SND_SEQ_REMOVE_IGNORE_OFF | + SND_SEQ_REMOVE_TAG_MATCH | + SND_SEQ_REMOVE_TIME_AFTER; + fqueue.dest = *seq_dev_addr(play->ctxp, dev, SEQ_ADDR_OUTPUT);/*XXX*/ + fqueue.dest.channel = chan; + fqueue.tag = track->number; + fqueue.tick = 1; + fqueue.time.tick = now; + snd_seq_remove_events(seq_handle(play->ctxp), &fqueue); + md_elem_seek_back(MD_CONTAINER(track), now); ->>function run_events + /* + * Next need to make room for more events. It is quite likely + * that the queue is full up of events that will not be playing + * for a long time. We need to make room for our events that + * are just about to be entered on the queue. + */ + ahead = now + 500; /* Totally random value that I made up */ + fqueue.time.tick = ahead; + fqueue.remove_mode = SND_SEQ_REMOVE_DEST | + SND_SEQ_REMOVE_IGNORE_OFF | + SND_SEQ_REMOVE_TIME_AFTER; + + debug_pool(play); + dprintf1("Removing MOST events"); + snd_seq_remove_events(seq_handle(play->ctxp), &fqueue); + debug_pool(play); + + /* + * Seek back all tracks that are too far ahead. + */ + for (n = 0; n < play->mdroot->tracks; n++) { + if (n == track->number) + continue; + t = md_track_nth(play->mdroot, n); + md_elem_seek_back(MD_CONTAINER(t), ahead); + } + + t2 = seq_get_time(play->ctxp); + if (t2 > ahead) + mel_warning(_("BUG: @func_name: t2=%ld, ahead time=%ld\n"), + t2, ahead); + } +#endif + + if (!play->run_sched) { + play->run_sched = 1; + gtk_idle_add(run_events_idle, play); + } + + +>>function run_events_idle +static gint +gpointer data; +>>code + struct play *play = data; + dprintf2("@func_name play_id %d", play->write_id); + play->run_sched = 0; + if (play->isplaying) { + run_events(play); + add_io_cb(play, GDK_INPUT_WRITE); + } + return FALSE; + +>>function run_events_cb static void gpointer vplay; This will be a play object gint fd; The file descriptor that is ready GdkInputCondition cond; The condition that matched +>>code + dprintf2("@func_name"); + run_events((struct play *)vplay); + +>>function run_events +static void +struct play *play; >>description This is called when the front end is not busy and is used to control the interaction between the front end and @@ -435,25 +494,28 @@ and this is it. >>code - struct play *play = vplay; struct element *el; unsigned long end; int status; + debug_pool(play); if (play->isplaying == FALSE) ethrow(debugError, "Not playing in @func_name"); /* Push out any pending element */ if (play->pend_element) { status = send_element(play->ctxp, play->pend_element); - if (status < 0) + if (status < 0) { + dprintf2("Couldn't send the pending event"); return; + } play->pend_element = NULL; } /* Try and push out next items in the sequence */ while ((el = md_sequence_next(play->seq)) != NULL) { + //dprintf2("Sending type %d for %d at %ld", el->type, el->device_channel, el->element_time); status = send_element(play->ctxp, el); if (status < 0) { play->pend_element = el; @@ -462,21 +524,16 @@ } /* Detect the end of the sequence */ - if (el == NULL && play->isfinish == FALSE) { + if (el == NULL && play->isended == FALSE) { end = md_sequence_duration(play->seq); - /* 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 */ seq_midi_send_echo(play->ctxp, end, ECHO_ENDSONG); /* XXX */ } status = snd_seq_flush_output(seq_handle(play->ctxp)); - if (status == 0 && play->isfinish) + if (status == 0 && play->isended) remove_io_cb(play, GDK_INPUT_WRITE); return; @@ -589,6 +646,7 @@ >>code seq_midi_event_init(ctxp, ep, el->element_time, el->device_channel); + switch (el->type) { case MD_TYPE_ROOT: break; @@ -636,6 +694,8 @@ break; } + ep->tag = el->tag; + >>function add_io_cb static void struct play *play; The play object @@ -647,11 +707,11 @@ >>code /* Set up callbacks for IO activity */ - if (which & GDK_INPUT_WRITE) + if ((which & GDK_INPUT_WRITE) && !play->write_id) play->write_id = gdk_input_add(seq_descriptor(play->ctxp), - GDK_INPUT_WRITE, run_events, play); + GDK_INPUT_WRITE, run_events_cb, play); - if (which & GDK_INPUT_READ) + if ((which & GDK_INPUT_READ) && !play->read_id) play->read_id = gdk_input_add(seq_descriptor(play->ctxp), GDK_INPUT_READ, get_events, play); @@ -668,6 +728,7 @@ /* Set up callbacks for IO activity */ if ((which & GDK_INPUT_WRITE) && play->write_id) { + dprintf2("Removing write cb"); gdk_input_remove(play->write_id); play->write_id = 0; } @@ -677,3 +738,17 @@ } +>>function debug_pool +static void +struct play *play; + +>>code + snd_seq_client_pool_t poolinfo; + + poolinfo.client = snd_seq_client_id(seq_handle(play->ctxp)); + snd_seq_get_client_pool(seq_handle(play->ctxp), &poolinfo); + + dprintf1("Pool %d, room %d, free %d", + poolinfo.output_pool, + poolinfo.output_room, + poolinfo.output_free); diff -rNu melys-0.0.8/midi/record.c melys-0.0.9/midi/record.c --- melys-0.0.8/midi/record.c Mon Aug 16 12:21:58 1999 +++ melys-0.0.9/midi/record.c Thu Aug 19 13:11:58 1999 @@ -189,6 +189,7 @@ t = seq_get_time(record->ctxp); MD_ELEMENT(record->newpart)->element_time = t; + MD_ELEMENT(record->newpart)->device_channel = record->curchan; } /* @@ -276,8 +277,6 @@ time = ep->time.tick; /* What if REAL and not TICK? */ devchan = record->curchan; - // devchan |= (input dev << 4); xxx - el = NULL; switch (ep->type) { @@ -285,8 +284,6 @@ /* Don't expect to see this from realy midi devices */ el = (EPTR)md_note_new(ep->data.note.note, ep->data.note.velocity, ep->data.note.duration); - //el->element_time = time; - //el->devchan = devchan; break; case SND_SEQ_EVENT_NOTEON: if (ep->data.note.velocity == 0) @@ -370,7 +367,6 @@ struct record *record = vrecord; n = snd_seq_flush_output(seq_handle(record->ctxp)); -//g_message("push event %d\n", n); if (n == 0) remove_io_cb(record, GDK_INPUT_WRITE); } diff -rNu melys-0.0.8/midi/record.m melys-0.0.9/midi/record.m --- melys-0.0.8/midi/record.m Mon Aug 16 12:00:21 1999 +++ melys-0.0.9/midi/record.m Wed Aug 18 22:17:03 1999 @@ -172,6 +172,7 @@ t = seq_get_time(record->ctxp); MD_ELEMENT(record->newpart)->element_time = t; + MD_ELEMENT(record->newpart)->device_channel = record->curchan; >>function record_stop void @@ -256,8 +257,6 @@ time = ep->time.tick; /* What if REAL and not TICK? */ devchan = record->curchan; - // devchan |= (input dev << 4); xxx - el = NULL; switch (ep->type) { @@ -265,8 +264,6 @@ /* Don't expect to see this from realy midi devices */ el = (EPTR)md_note_new(ep->data.note.note, ep->data.note.velocity, ep->data.note.duration); - //el->element_time = time; - //el->devchan = devchan; break; case SND_SEQ_EVENT_NOTEON: if (ep->data.note.velocity == 0) @@ -349,7 +346,6 @@ struct record *record = vrecord; n = snd_seq_flush_output(seq_handle(record->ctxp)); -//g_message("push event %d\n", n); if (n == 0) remove_io_cb(record, GDK_INPUT_WRITE); Binary files melys-0.0.8/mlib/PROJECT/__init__.pyo and melys-0.0.9/mlib/PROJECT/__init__.pyo differ Binary files melys-0.0.8/mlib/PROJECT/base.pyo and melys-0.0.9/mlib/PROJECT/base.pyo differ Binary files melys-0.0.8/mlib/PROJECT/cmds.pyo and melys-0.0.9/mlib/PROJECT/cmds.pyo differ Binary files melys-0.0.8/mlib/PROJECT/code.pyo and melys-0.0.9/mlib/PROJECT/code.pyo differ Binary files melys-0.0.8/mlib/PROJECT/header.pyo and melys-0.0.9/mlib/PROJECT/header.pyo differ Binary files melys-0.0.8/mlib/PROJECT/make.pyo and melys-0.0.9/mlib/PROJECT/make.pyo differ Binary files melys-0.0.8/mlib/PROJECT/mgtk.pyo and melys-0.0.9/mlib/PROJECT/mgtk.pyo differ diff -rNu melys-0.0.8/po/FILES melys-0.0.9/po/FILES --- melys-0.0.8/po/FILES Mon Aug 9 19:07:27 1999 +++ melys-0.0.9/po/FILES Thu Aug 19 13:06:35 1999 @@ -1,5 +1,5 @@ config/ports.c -files/format.c +files/file.c files/mdmlread.c files/mdmlwrite.c files/midiread.c @@ -12,7 +12,7 @@ midi/record.c programs/mdmlconv.c programs/melys.c -programs/pmidi.c +programs/melplay.c programs/showseq.c seq/seqlib.c seq/seqmidi.c diff -rNu melys-0.0.8/po/melys.pot melys-0.0.9/po/melys.pot --- melys-0.0.8/po/melys.pot Mon Aug 9 19:07:27 1999 +++ melys-0.0.9/po/melys.pot Thu Aug 19 13:06:35 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-08-09 15:17+0100\n" +"POT-Creation-Date: 1999-08-19 13:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,229 +14,290 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: format.m:145 format.m:151 -msgid "Unrecognised file type" +#: file.m:162 file.m:416 +msgid "The file type was not recognised" msgstr "" -#: format.m:158 -msgid "Could not read file" +#: file.m:269 +msgid "No information available, sorry" msgstr "" -#: mdmlwrite.m:144 +#: file.m:343 +msgid "" +"Could not read file\n" +"This is probably a bug" +msgstr "" + +#: file.m:377 +msgid "" +"Could not write file\n" +"This is probably a bug" +msgstr "" + +#: mdmlread.m:68 +msgid "Failed to read file" +msgstr "" + +#: mdmlwrite.m:42 msgid "Could not open file" msgstr "" -#: midiread.m:151 +#: midiread.m:116 #, c-format -msgid "Could not open file %s" +msgid "" +"Could not open file\n" +"\n" +"%s" msgstr "" -#: midiread.m:182 +#: midiread.m:166 +#, c-format +msgid "" +"Could not read file\n" +"\n" +"%s" +msgstr "" + +#: midiread.m:228 #, c-format msgid "Bad header (%x), probably not a real midi file" msgstr "" -#: midiread.m:188 +#: midiread.m:239 msgid "Bad header length, probably not a real midi file" msgstr "" -#: midiread.m:225 +#: midiread.m:280 #, c-format msgid "Bad track header (%x), probably not a midi file" msgstr "" -#: midiread.m:414 +#: midiread.m:478 #, c-format msgid "Bad status type 0x%x" msgstr "" -#: midiread.m:483 +#: midiread.m:547 #, c-format msgid "Meta event %d not implemented\n" msgstr "" -#: midiread.m:517 midiread.m:542 midiread.m:564 +#: midiread.m:581 midiread.m:606 midiread.m:628 msgid "Unexpected end of file" msgstr "" -#: midiwrite.m:51 +#: midiwrite.m:58 +msgid "Can not open file" +msgstr "" + +#: midiwrite.m:381 #, c-format -msgid "Can not open file %s" +msgid "Negative time difference (%d) writing midi file" +msgstr "" + +#: midiwrite.m:383 +msgid " difference set to zero" msgstr "" -#: main.m:41 +#: main.m:76 msgid "The Melys sequencer" msgstr "" #. Create the first child -#: main.m:53 +#: main.m:90 menus.m:148 msgid "Untitled" msgstr "" -#: menus.m:42 +#: menus.m:28 +msgid "New" +msgstr "" + +#: menus.m:44 msgid "_Close all" msgstr "" -#: menus.m:42 +#: menus.m:44 msgid "Close all open windows" msgstr "" -#: menus.m:54 +#: menus.m:56 msgid "_Start" msgstr "" -#: menus.m:54 +#: menus.m:56 msgid "Start playing" msgstr "" -#: menus.m:60 +#: menus.m:62 msgid "_Pause" msgstr "" -#: menus.m:60 +#: menus.m:62 msgid "Pause playing" msgstr "" -#: menus.m:66 +#: menus.m:68 msgid "S_top" msgstr "" -#: menus.m:66 +#: menus.m:68 msgid "Stop and return to beginning" msgstr "" -#: menus.m:72 +#: menus.m:74 msgid "_Record" msgstr "" -#: menus.m:72 +#: menus.m:74 msgid "Start recording" msgstr "" -#: menus.m:78 +#: menus.m:80 msgid "Record stop" msgstr "" -#: menus.m:78 +#: menus.m:80 msgid "Stop recording" msgstr "" -#: menus.m:97 +#: menus.m:99 msgid "_Actions" msgstr "" -#: menus.m:148 +#: menus.m:206 msgid "Select the file to read in..." msgstr "" -#. Failed so put up a message for the user -#: menus.m:199 menus.m:314 +#: menus.m:310 +msgid "Select the file name to write to..." +msgstr "" + +#: menus.m:524 +msgid "Copyright Steve Ratcliffe (C) 1999" +msgstr "" + +#: menus.m:526 +msgid "Melys is a sequencer application for ALSA" +msgstr "" + +#: elements.m:285 #, c-format +msgid "Freed an mdroot %d with bad reference count" +msgstr "" + +#: play.m:79 msgid "" -"The file %s\n" -"does not have a known extension.\n" -"Please select a file with an\n" -"extension of .mid or .mdml" +"Could not open ALSA sequencer\n" +"Perhaps modules are not loaded\n" msgstr "" -#: menus.m:265 -msgid "Select the file name to write to..." +#: play.m:339 +msgid "" +"Melys was not built with the ALSA remove_events\n" +"patch. The muting function will not work very well\n" +"You will get hanging notes, for example" msgstr "" -#: menus.m:498 -msgid "Copyright Steve Ratcliffe (C) 1999" +#: play.m:368 +msgid "" +"Melys should be built with ALSA version 0.4.0\n" +"patch. The muting function will hardly work at all" msgstr "" -#: menus.m:500 -msgid "Melys is a sequencer application for ALSA" +#: play.m:451 +#, c-format +msgid "BUG: play_unmute: t2=%ld, ahead time=%ld\n" msgstr "" -#: record.m:64 +#: record.m:67 msgid "Melys sequencer (record)" msgstr "" -#: melys.m:123 -msgid "Usage: melys [-x level]" +#: mdmlconv.m:125 mdmlconv.m:133 +#, c-format +msgid "Reading %s: %s\n" msgstr "" -#: melys.m:125 -msgid " -x, --debug=LEVEL Set debuging level" +#: melys.m:110 +#, c-format +msgid "" +"A debugging error occurred\n" +"Melys may now crash unexpectedly\n" +"Please save your work and exit\n" +"the application as soon as possible\n" +"MESSAGE: %s" msgstr "" -#: pmidi.m:186 -#, c-format -msgid "Could not connect to port %d:%d\n" +#: melys.m:142 +msgid "Usage: melys [-x level]" +msgstr "" + +#: melys.m:144 +msgid " -x, --debug=LEVEL Set debuging level" msgstr "" -#: pmidi.m:259 showseq.m:98 +#: melplay.m:271 showseq.m:98 #, c-format msgid "Could not open sequencer %s" msgstr "" -#: pmidi.m:263 showseq.m:102 +#: melplay.m:277 showseq.m:104 #, c-format msgid "Could not get sequencer information %s" msgstr "" -#: pmidi.m:266 +#: melplay.m:282 #, c-format msgid " Port %-30.30s %s\n" msgstr "" -#: pmidi.m:266 +#: melplay.m:282 msgid "Client name" msgstr "" -#: pmidi.m:266 showseq.m:105 +#: melplay.m:282 showseq.m:109 msgid "Port name" msgstr "" -#: pmidi.m:295 -msgid "Usage: pmidi [-p client:port ...] [-l] [-d delay] file ..." +#: melplay.m:311 +msgid "Usage: melplay [-p client:port ...] [-l] [-d delay] file ..." msgstr "" -#: pmidi.m:297 +#: melplay.m:313 msgid " -p client:port - A alsa client and port number to send midi to" msgstr "" -#: pmidi.m:298 +#: melplay.m:314 msgid " -l - List possible output ports that could be used" msgstr "" -#: pmidi.m:299 +#: melplay.m:315 msgid " -d delay - Delay after song ends (default 2 sec)" msgstr "" -#: showseq.m:105 +#: showseq.m:109 #, c-format msgid " %4s %-30.30s\n" msgstr "" -#: showseq.m:105 +#: showseq.m:109 msgid "Port" msgstr "" -#: showseq.m:156 +#: showseq.m:160 msgid "Usage: showseq" msgstr "" -#: seqlib.m:73 seqlib.m:140 +#: seqlib.m:80 seqlib.m:145 #, c-format msgid "Could not open sequencer: %s" msgstr "" -#: seqlib.m:217 +#: seqlib.m:232 #, c-format msgid "Error (%s) creating sequencer port\n" msgstr "" -#: song.m:94 -#, c-format -msgid "" -"Could not read file %s\n" -"%s\n" -msgstr "" - #: song.m:104 msgid "" "You have selected a type 0 midi file\n" @@ -245,11 +306,43 @@ "It is easy enough to fix given the right encouragement...\n" msgstr "" +#: except.m:93 +msgid "ethrow called without being set up" +msgstr "" + +#: except.m:114 +msgid "ethrow_setup called when allready set up" +msgstr "" + #. No real need to have this included -#: melystrackinfo.m:100 +#: melystrackinfo.m:142 msgid "Name" msgstr "" -#: melystrackinfo.m:101 +#: melystrackinfo.m:143 msgid "Prog" +msgstr "" + +#: melystrackinfo.m:144 +msgid "C" +msgstr "" + +#: melystrackinfo.m:145 +msgid "Mute" +msgstr "" + +#: melystrackinfo.m:146 +msgid "Solo" +msgstr "" + +#: melystrackinfo.m:147 +msgid "Rec" +msgstr "" + +#: melystrackinfo.m:826 +#, c-format +msgid "" +"Internal error.\n" +"There is a missing case in draw_col_button\n" +"Value was %d\n" msgstr "" diff -rNu melys-0.0.8/po/zz.po melys-0.0.9/po/zz.po --- melys-0.0.8/po/zz.po Mon Aug 9 19:07:27 1999 +++ melys-0.0.9/po/zz.po Thu Aug 19 13:06:35 1999 @@ -6,237 +6,318 @@ msgid "" msgstr "" -#: format.m:145 format.m:151 -msgid "Unrecognised file type" -msgstr "U.N.R.E.C.O.G.N.I.S.E.D. F.I.L.E. T.Y.P.E." - -#: format.m:158 -msgid "Could not read file" -msgstr "C.O.U.L.D. N.O.T. R.E.A.D. F.I.L.E." +#: file.m:162 file.m:416 +msgid "The file type was not recognised" +msgstr "T.H.E. F.I.L.E. T.Y.P.E. W.A.S. N.O.T. R.E.C.O.G.N.I.S.E.D." + +#: file.m:269 +msgid "No information available, sorry" +msgstr "N.O. I.N.F.O.R.M.A.T.I.O.N. A.V.A.I.L.A.B.L.E., S.O.R.R.Y." -#: mdmlwrite.m:144 +#: file.m:343 +#, fuzzy +msgid "" +"Could not read file\n" +"This is probably a bug" +msgstr "" +"C.O.U.L.D. N.O.T. R.E.A.D. F.I.L.E.\n" +"T.H.I.S. I.S. P.R.O.B.A.B.L.Y. A. B.U.G." + +#: file.m:377 +msgid "" +"Could not write file\n" +"This is probably a bug" +msgstr "" +"C.O.U.L.D. N.O.T. W.R.I.T.E. F.I.L.E.\n" +"T.H.I.S. I.S. P.R.O.B.A.B.L.Y. A. B.U.G." + +#: mdmlread.m:68 +#, fuzzy +msgid "Failed to read file" +msgstr "F.A.I.L.E.D. T.O. R.E.A.D. F.I.L.E." + +#: mdmlwrite.m:42 msgid "Could not open file" msgstr "C.O.U.L.D. N.O.T. O.P.E.N. F.I.L.E." -#: midiread.m:151 -#, c-format -msgid "Could not open file %s" -msgstr "C.O.U.L.D. N.O.T. O.P.E.N. F.I.L.E. %s" +#: midiread.m:116 +#, fuzzy, c-format +msgid "" +"Could not open file\n" +"\n" +"%s" +msgstr "" +"C.O.U.L.D. N.O.T. O.P.E.N. F.I.L.E.\n" +"\n" +"%s" -#: midiread.m:182 +#: midiread.m:166 +#, fuzzy, c-format +msgid "" +"Could not read file\n" +"\n" +"%s" +msgstr "" +"C.O.U.L.D. N.O.T. R.E.A.D. F.I.L.E.\n" +"\n" +"%s" + +#: midiread.m:228 #, c-format msgid "Bad header (%x), probably not a real midi file" msgstr "B.A.D. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. N.O.T. A. R.E.A.L. M.I.D.I. F.I.L.E." -#: midiread.m:188 +#: midiread.m:239 msgid "Bad header length, probably not a real midi file" msgstr "B.A.D. H.E.A.D.E.R. L.E.N.G.T.H., P.R.O.B.A.B.L.Y. N.O.T. A. R.E.A.L. M.I.D.I. F.I.L.E." -#: midiread.m:225 +#: midiread.m:280 #, c-format msgid "Bad track header (%x), probably not a midi file" msgstr "B.A.D. T.R.A.C.K. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. N.O.T. A. M.I.D.I. F.I.L.E." -#: midiread.m:414 +#: midiread.m:478 #, c-format msgid "Bad status type 0x%x" msgstr "B.A.D. S.T.A.T.U.S. T.Y.P.E. 0X.%x" -#: midiread.m:483 +#: midiread.m:547 #, c-format msgid "Meta event %d not implemented\n" msgstr "M.E.T.A. E.V.E.N.T. %d N.O.T. I.M.P.L.E.M.E.N.T.E.D.\n" -#: midiread.m:517 midiread.m:542 midiread.m:564 +#: midiread.m:581 midiread.m:606 midiread.m:628 msgid "Unexpected end of file" msgstr "U.N.E.X.P.E.C.T.E.D. E.N.D. O.F. F.I.L.E." -#: midiwrite.m:51 +#: midiwrite.m:58 +#, fuzzy +msgid "Can not open file" +msgstr "C.A.N. N.O.T. O.P.E.N. F.I.L.E." + +#: midiwrite.m:381 #, c-format -msgid "Can not open file %s" -msgstr "C.A.N. N.O.T. O.P.E.N. F.I.L.E. %s" +msgid "Negative time difference (%d) writing midi file" +msgstr "N.E.G.A.T.I.V.E. T.I.M.E. D.I.F.F.E.R.E.N.C.E. (%d) W.R.I.T.I.N.G. M.I.D.I. F.I.L.E." + +#: midiwrite.m:383 +msgid " difference set to zero" +msgstr " D.I.F.F.E.R.E.N.C.E. S.E.T. T.O. Z.E.R.O." -#: main.m:41 +#: main.m:76 msgid "The Melys sequencer" msgstr "T.H.E. M.E.L.Y.S. S.E.Q.U.E.N.C.E.R." #. Create the first child -#: main.m:53 +#: main.m:90 menus.m:148 msgid "Untitled" msgstr "U.N.T.I.T.L.E.D." -#: menus.m:42 +#: menus.m:28 +msgid "New" +msgstr "N.E.W." + +#: menus.m:44 msgid "_Close all" msgstr "_C.L.O.S.E. A.L.L." -#: menus.m:42 +#: menus.m:44 msgid "Close all open windows" msgstr "C.L.O.S.E. A.L.L. O.P.E.N. W.I.N.D.O.W.S." -#: menus.m:54 +#: menus.m:56 msgid "_Start" msgstr "_S.T.A.R.T." -#: menus.m:54 +#: menus.m:56 msgid "Start playing" msgstr "S.T.A.R.T. P.L.A.Y.I.N.G." -#: menus.m:60 +#: menus.m:62 msgid "_Pause" msgstr "_P.A.U.S.E." -#: menus.m:60 +#: menus.m:62 msgid "Pause playing" msgstr "P.A.U.S.E. P.L.A.Y.I.N.G." -#: menus.m:66 +#: menus.m:68 msgid "S_top" msgstr "S._T.O.P." -#: menus.m:66 +#: menus.m:68 msgid "Stop and return to beginning" msgstr "S.T.O.P. A.N.D. R.E.T.U.R.N. T.O. B.E.G.I.N.N.I.N.G." -#: menus.m:72 +#: menus.m:74 msgid "_Record" msgstr "_R.E.C.O.R.D." -#: menus.m:72 +#: menus.m:74 msgid "Start recording" msgstr "S.T.A.R.T. R.E.C.O.R.D.I.N.G." -#: menus.m:78 +#: menus.m:80 msgid "Record stop" msgstr "R.E.C.O.R.D. S.T.O.P." -#: menus.m:78 +#: menus.m:80 msgid "Stop recording" msgstr "S.T.O.P. R.E.C.O.R.D.I.N.G." -#: menus.m:97 +#: menus.m:99 msgid "_Actions" msgstr "_A.C.T.I.O.N.S." -#: menus.m:148 +#: menus.m:206 msgid "Select the file to read in..." msgstr "S.E.L.E.C.T. T.H.E. F.I.L.E. T.O. R.E.A.D. I.N...." -#. Failed so put up a message for the user -#: menus.m:199 menus.m:314 -#, c-format -msgid "" -"The file %s\n" -"does not have a known extension.\n" -"Please select a file with an\n" -"extension of .mid or .mdml" -msgstr "" -"T.H.E. F.I.L.E. %s\n" -"D.O.E.S. N.O.T. H.A.V.E. A. K.N.O.W.N. E.X.T.E.N.S.I.O.N..\n" -"P.L.E.A.S.E. S.E.L.E.C.T. A. F.I.L.E. W.I.T.H. A.N.\n" -"E.X.T.E.N.S.I.O.N. O.F. .M.I.D. O.R. .M.D.M.L." - -#: menus.m:265 +#: menus.m:310 #, fuzzy msgid "Select the file name to write to..." msgstr "S.E.L.E.C.T. T.H.E. F.I.L.E. N.A.M.E. T.O. W.R.I.T.E. T.O...." -#: menus.m:498 +#: menus.m:524 msgid "Copyright Steve Ratcliffe (C) 1999" msgstr "C.O.P.Y.R.I.G.H.T. S.T.E.V.E. R.A.T.C.L.I.F.F.E. (C.) 1999" -#: menus.m:500 +#: menus.m:526 msgid "Melys is a sequencer application for ALSA" msgstr "M.E.L.Y.S. I.S. A. S.E.Q.U.E.N.C.E.R. A.P.P.L.I.C.A.T.I.O.N. F.O.R. A.L.S.A." -#: record.m:64 +#: elements.m:285 +#, c-format +msgid "Freed an mdroot %d with bad reference count" +msgstr "F.R.E.E.D. A.N. M.D.R.O.O.T. %d W.I.T.H. B.A.D. R.E.F.E.R.E.N.C.E. C.O.U.N.T." + +#: play.m:79 +msgid "" +"Could not open ALSA sequencer\n" +"Perhaps modules are not loaded\n" +msgstr "" +"C.O.U.L.D. N.O.T. O.P.E.N. A.L.S.A. S.E.Q.U.E.N.C.E.R.\n" +"P.E.R.H.A.P.S. M.O.D.U.L.E.S. A.R.E. N.O.T. L.O.A.D.E.D.\n" + +#: play.m:339 +msgid "" +"Melys was not built with the ALSA remove_events\n" +"patch. The muting function will not work very well\n" +"You will get hanging notes, for example" +msgstr "" +"M.E.L.Y.S. W.A.S. N.O.T. B.U.I.L.T. W.I.T.H. T.H.E. A.L.S.A. R.E.M.O.V.E._E.V.E.N.T.S.\n" +"P.A.T.C.H.. T.H.E. M.U.T.I.N.G. F.U.N.C.T.I.O.N. W.I.L.L. N.O.T. W.O.R.K. V.E.R.Y. W.E.L.L.\n" +"Y.O.U. W.I.L.L. G.E.T. H.A.N.G.I.N.G. N.O.T.E.S., F.O.R. E.X.A.M.P.L.E." + +#: play.m:368 +msgid "" +"Melys should be built with ALSA version 0.4.0\n" +"patch. The muting function will hardly work at all" +msgstr "" +"M.E.L.Y.S. S.H.O.U.L.D. B.E. B.U.I.L.T. W.I.T.H. A.L.S.A. V.E.R.S.I.O.N. 0.4.0\n" +"P.A.T.C.H.. T.H.E. M.U.T.I.N.G. F.U.N.C.T.I.O.N. W.I.L.L. H.A.R.D.L.Y. W.O.R.K. A.T. A.L.L." + +#: play.m:451 +#, c-format +msgid "BUG: play_unmute: t2=%ld, ahead time=%ld\n" +msgstr "B.U.G.: P.L.A.Y._U.N.M.U.T.E.: T.2=%lD., A.H.E.A.D. T.I.M.E.=%lD.\n" + +#: record.m:67 #, fuzzy msgid "Melys sequencer (record)" msgstr "M.E.L.Y.S. S.E.Q.U.E.N.C.E.R. (R.E.C.O.R.D.)" -#: melys.m:123 +#: mdmlconv.m:125 mdmlconv.m:133 +#, c-format +msgid "Reading %s: %s\n" +msgstr "R.E.A.D.I.N.G. %s: %s\n" + +#: melys.m:110 +#, c-format +msgid "" +"A debugging error occurred\n" +"Melys may now crash unexpectedly\n" +"Please save your work and exit\n" +"the application as soon as possible\n" +"MESSAGE: %s" +msgstr "" +"A. D.E.B.U.G.G.I.N.G. E.R.R.O.R. O.C.C.U.R.R.E.D.\n" +"M.E.L.Y.S. M.A.Y. N.O.W. C.R.A.S.H. U.N.E.X.P.E.C.T.E.D.L.Y.\n" +"P.L.E.A.S.E. S.A.V.E. Y.O.U.R. W.O.R.K. A.N.D. E.X.I.T.\n" +"T.H.E. A.P.P.L.I.C.A.T.I.O.N. A.S. S.O.O.N. A.S. P.O.S.S.I.B.L.E.\n" +"M.E.S.S.A.G.E.: %s" + +#: melys.m:142 msgid "Usage: melys [-x level]" msgstr "U.S.A.G.E.: M.E.L.Y.S. [-X. L.E.V.E.L.]" -#: melys.m:125 +#: melys.m:144 msgid " -x, --debug=LEVEL Set debuging level" msgstr " -X., --D.E.B.U.G.=L.E.V.E.L. S.E.T. D.E.B.U.G.I.N.G. L.E.V.E.L." -#: pmidi.m:186 -#, c-format -msgid "Could not connect to port %d:%d\n" -msgstr "C.O.U.L.D. N.O.T. C.O.N.N.E.C.T. T.O. P.O.R.T. %d:%d\n" - -#: pmidi.m:259 showseq.m:98 +#: melplay.m:271 showseq.m:98 #, fuzzy, c-format msgid "Could not open sequencer %s" msgstr "C.O.U.L.D. N.O.T. O.P.E.N. S.E.Q.U.E.N.C.E.R. %s" -#: pmidi.m:263 showseq.m:102 +#: melplay.m:277 showseq.m:104 #, fuzzy, c-format msgid "Could not get sequencer information %s" msgstr "C.O.U.L.D. N.O.T. G.E.T. S.E.Q.U.E.N.C.E.R. I.N.F.O.R.M.A.T.I.O.N. %s" -#: pmidi.m:266 +#: melplay.m:282 #, c-format msgid " Port %-30.30s %s\n" msgstr " P.O.R.T. %-30.30S. %s\n" -#: pmidi.m:266 +#: melplay.m:282 msgid "Client name" msgstr "C.L.I.E.N.T. N.A.M.E." -#: pmidi.m:266 showseq.m:105 +#: melplay.m:282 showseq.m:109 msgid "Port name" msgstr "P.O.R.T. N.A.M.E." -#: pmidi.m:295 -msgid "Usage: pmidi [-p client:port ...] [-l] [-d delay] file ..." -msgstr "U.S.A.G.E.: P.M.I.D.I. [-P. C.L.I.E.N.T.:P.O.R.T. ...] [-L.] [-D. D.E.L.A.Y.] F.I.L.E. ..." +#: melplay.m:311 +#, fuzzy +msgid "Usage: melplay [-p client:port ...] [-l] [-d delay] file ..." +msgstr "U.S.A.G.E.: M.E.L.P.L.A.Y. [-P. C.L.I.E.N.T.:P.O.R.T. ...] [-L.] [-D. D.E.L.A.Y.] F.I.L.E. ..." -#: pmidi.m:297 +#: melplay.m:313 msgid " -p client:port - A alsa client and port number to send midi to" msgstr " -P. C.L.I.E.N.T.:P.O.R.T. - A. A.L.S.A. C.L.I.E.N.T. A.N.D. P.O.R.T. N.U.M.B.E.R. T.O. S.E.N.D. M.I.D.I. T.O." -#: pmidi.m:298 +#: melplay.m:314 msgid " -l - List possible output ports that could be used" msgstr " -L. - L.I.S.T. P.O.S.S.I.B.L.E. O.U.T.P.U.T. P.O.R.T.S. T.H.A.T. C.O.U.L.D. B.E. U.S.E.D." -#: pmidi.m:299 +#: melplay.m:315 msgid " -d delay - Delay after song ends (default 2 sec)" msgstr " -D. D.E.L.A.Y. - D.E.L.A.Y. A.F.T.E.R. S.O.N.G. E.N.D.S. (D.E.F.A.U.L.T. 2 S.E.C.)" -#: showseq.m:105 +#: showseq.m:109 #, c-format msgid " %4s %-30.30s\n" msgstr " %4S. %-30.30S.\n" -#: showseq.m:105 +#: showseq.m:109 msgid "Port" msgstr "P.O.R.T." -#: showseq.m:156 +#: showseq.m:160 msgid "Usage: showseq" msgstr "U.S.A.G.E.: S.H.O.W.S.E.Q." -#: seqlib.m:73 seqlib.m:140 +#: seqlib.m:80 seqlib.m:145 #, c-format msgid "Could not open sequencer: %s" msgstr "C.O.U.L.D. N.O.T. O.P.E.N. S.E.Q.U.E.N.C.E.R.: %s" -#: seqlib.m:217 +#: seqlib.m:232 #, c-format msgid "Error (%s) creating sequencer port\n" msgstr "E.R.R.O.R. (%s) C.R.E.A.T.I.N.G. S.E.Q.U.E.N.C.E.R. P.O.R.T.\n" -#: song.m:94 -#, fuzzy, c-format -msgid "" -"Could not read file %s\n" -"%s\n" -msgstr "" -"C.O.U.L.D. N.O.T. R.E.A.D. F.I.L.E. %s\n" -"%s\n" - #: song.m:104 msgid "" "You have selected a type 0 midi file\n" @@ -249,11 +330,72 @@ "A.T. T.H.E. C.U.R.R.E.N.T. T.I.M.E., B.U.T. S.H.O.U.L.D. P.L.A.Y..\n" "I.T. I.S. E.A.S.Y. E.N.O.U.G.H. T.O. F.I.X. G.I.V.E.N. T.H.E. R.I.G.H.T. E.N.C.O.U.R.A.G.E.M.E.N.T....\n" +#: except.m:93 +msgid "ethrow called without being set up" +msgstr "E.T.H.R.O.W. C.A.L.L.E.D. W.I.T.H.O.U.T. B.E.I.N.G. S.E.T. U.P." + +#: except.m:114 +msgid "ethrow_setup called when allready set up" +msgstr "E.T.H.R.O.W._S.E.T.U.P. C.A.L.L.E.D. W.H.E.N. A.L.L.R.E.A.D.Y. S.E.T. U.P." + #. No real need to have this included -#: melystrackinfo.m:100 +#: melystrackinfo.m:142 msgid "Name" msgstr "N.A.M.E." -#: melystrackinfo.m:101 +#: melystrackinfo.m:143 msgid "Prog" msgstr "P.R.O.G." + +#: melystrackinfo.m:144 +msgid "C" +msgstr "C." + +#: melystrackinfo.m:145 +msgid "Mute" +msgstr "M.U.T.E." + +#: melystrackinfo.m:146 +msgid "Solo" +msgstr "S.O.L.O." + +#: melystrackinfo.m:147 +#, fuzzy +msgid "Rec" +msgstr "R.E.C." + +#: melystrackinfo.m:826 +#, c-format +msgid "" +"Internal error.\n" +"There is a missing case in draw_col_button\n" +"Value was %d\n" +msgstr "" +"I.N.T.E.R.N.A.L. E.R.R.O.R..\n" +"T.H.E.R.E. I.S. A. M.I.S.S.I.N.G. C.A.S.E. I.N. D.R.A.W._C.O.L._B.U.T.T.O.N.\n" +"V.A.L.U.E. W.A.S. %d\n" + +#~ msgid "Unrecognised file type" +#~ msgstr "U.N.R.E.C.O.G.N.I.S.E.D. F.I.L.E. T.Y.P.E." + +#~ msgid "" +#~ "The file %s\n" +#~ "does not have a known extension.\n" +#~ "Please select a file with an\n" +#~ "extension of .mid or .mdml" +#~ msgstr "" +#~ "T.H.E. F.I.L.E. %s\n" +#~ "D.O.E.S. N.O.T. H.A.V.E. A. K.N.O.W.N. E.X.T.E.N.S.I.O.N..\n" +#~ "P.L.E.A.S.E. S.E.L.E.C.T. A. F.I.L.E. W.I.T.H. A.N.\n" +#~ "E.X.T.E.N.S.I.O.N. O.F. .M.I.D. O.R. .M.D.M.L." + +#~ msgid "Could not connect to port %d:%d\n" +#~ msgstr "C.O.U.L.D. N.O.T. C.O.N.N.E.C.T. T.O. P.O.R.T. %d:%d\n" + +#, fuzzy +#~ msgid "" +#~ "Could not read file %s\n" +#~ "%s\n" +#~ msgstr "" +#~ "C.O.U.L.D. N.O.T. R.E.A.D. F.I.L.E. %s\n" +#~ "%s\n" diff -rNu melys-0.0.8/seq/seqlib.c melys-0.0.9/seq/seqlib.c --- melys-0.0.8/seq/seqlib.c Mon Aug 16 12:21:52 1999 +++ melys-0.0.9/seq/seqlib.c Thu Aug 19 13:11:54 1999 @@ -37,7 +37,11 @@ #define save_msg +#define POOL_LARGE 600 +#define POOL_SMALL 100 + static GArray *get_addr_list(seq_context_t *ctxp, int inout); +static void fix_output_pool(snd_seq_t *seq, int client, int size); /* @@ -65,6 +69,7 @@ } ctxp->client = snd_seq_client_id(ctxp->handle); + fix_output_pool(ctxp->handle, ctxp->client, POOL_LARGE); ctxp->destlist = g_array_new(0, 0, sizeof(snd_seq_addr_t)); ctxp->srclist = g_array_new(0, 0, sizeof(snd_seq_addr_t)); @@ -135,6 +140,8 @@ nctxp->client = snd_seq_client_id(nctxp->handle); nctxp->source.client = nctxp->client; + fix_output_pool(nctxp->handle, nctxp->client, POOL_SMALL); + /* Get qclient info from control and set it on the new client */ if (ctxp->control) { snd_seq_get_queue_client(ctxp->control->handle, ctxp->queue, &qclient); @@ -683,12 +690,19 @@ } /* - * Flush the output queue so that there are no events left in it. + * Flush all output queues across all output devices so that + * there are no events left in them. * */ void seq_drain_output(seq_context_t *ctxp) { +#ifdef SND_SEQ_REMOVE_DEST + + snd_seq_drain_output(ctxp->handle); + snd_seq_drain_output(ctxp->control->handle); + /* What about sub contexts? */ +#else snd_seq_queue_client_t qclient; /* Since there is not yet a proper flush call we will just @@ -698,6 +712,7 @@ snd_seq_close(ctxp->handle); snd_seq_open(&ctxp->handle, SND_SEQ_OPEN); ctxp->client = snd_seq_client_id(ctxp->handle); + fix_output_pool(ctxp->handle, ctxp->client, POOL_LARGE); snd_seq_block_mode(ctxp->handle, 0); /* XXX */ if (ctxp->inconnected) @@ -710,6 +725,7 @@ /* Always need at least one port */ seq_new_port(ctxp); +#endif } /* @@ -791,4 +807,32 @@ ethrow(debugError, "Unrecognised type to get_addr_list"); return list; +} + +/* + * The defaults on the pool size behaviour are fine for simple + * playback but need adjusting for this application. In + * particular the default only wake you from select when the + * pool is more than half empty, we need to know much earlier + * than that. + * + * Arguments: + * seq - Sequencer handle + * client - Client number + * size - Size for pool + */ +static void +fix_output_pool(snd_seq_t *seq, int client, int size) +{ + snd_seq_client_pool_t pool; + int n; + + snd_seq_get_client_pool(seq, &pool); + + pool.output_pool = size; + + n = (10 * size)/100; + pool.output_room = n; + + snd_seq_set_client_pool(seq, &pool); } diff -rNu melys-0.0.8/seq/seqlib.m melys-0.0.9/seq/seqlib.m --- melys-0.0.8/seq/seqlib.m Mon Aug 16 12:00:21 1999 +++ melys-0.0.9/seq/seqlib.m Thu Aug 19 00:08:04 1999 @@ -57,6 +57,9 @@ #define save_msg +#define POOL_LARGE 600 +#define POOL_SMALL 100 + >>function seq_context_new seq_context_t * char *name; Name of the client. @@ -80,6 +83,7 @@ } ctxp->client = snd_seq_client_id(ctxp->handle); + fix_output_pool(ctxp->handle, ctxp->client, POOL_LARGE); ctxp->destlist = g_array_new(0, 0, sizeof(snd_seq_addr_t)); ctxp->srclist = g_array_new(0, 0, sizeof(snd_seq_addr_t)); @@ -151,6 +155,8 @@ nctxp->client = snd_seq_client_id(nctxp->handle); nctxp->source.client = nctxp->client; + fix_output_pool(nctxp->handle, nctxp->client, POOL_SMALL); + /* Get qclient info from control and set it on the new client */ if (ctxp->control) { snd_seq_get_queue_client(ctxp->control->handle, ctxp->queue, &qclient); @@ -711,9 +717,16 @@ seq_context_t *ctxp; >>description -Flush the output queue so that there are no events left in it. +Flush all output queues across +all output devices so that there are no events left in them. >>code +#ifdef SND_SEQ_REMOVE_DEST + + snd_seq_drain_output(ctxp->handle); + snd_seq_drain_output(ctxp->control->handle); + /* What about sub contexts? */ +#else snd_seq_queue_client_t qclient; /* Since there is not yet a proper flush call we will just @@ -723,6 +736,7 @@ snd_seq_close(ctxp->handle); snd_seq_open(&ctxp->handle, SND_SEQ_OPEN); ctxp->client = snd_seq_client_id(ctxp->handle); + fix_output_pool(ctxp->handle, ctxp->client, POOL_LARGE); snd_seq_block_mode(ctxp->handle, 0); /* XXX */ if (ctxp->inconnected) @@ -735,6 +749,7 @@ /* Always need at least one port */ seq_new_port(ctxp); +#endif >>function seq_event_data_free void @@ -814,3 +829,28 @@ ethrow(debugError, "Unrecognised type to @func_name"); return list; + +>>function fix_output_pool +static void +snd_seq_t *seq; Sequencer handle +int client; Client number +int size; Size for pool + +>>description +The defaults on the pool size behaviour are fine for simple playback +but need adjusting for this application. +In particular the default only wake you from select when the pool is +more than half empty, we need to know much earlier than that. + +>>code + snd_seq_client_pool_t pool; + int n; + + snd_seq_get_client_pool(seq, &pool); + + pool.output_pool = size; + + n = (10 * size)/100; + pool.output_room = n; + + snd_seq_set_client_pool(seq, &pool); diff -rNu melys-0.0.8/song/song.c melys-0.0.9/song/song.c --- melys-0.0.8/song/song.c Mon Aug 16 12:21:52 1999 +++ melys-0.0.9/song/song.c Thu Aug 19 13:11:54 1999 @@ -264,7 +264,7 @@ /* Determine if this is an audio or midi track */ - /* Its a midi track.... */ + /* Mmm, yes its a midi track.... */ play_mute(song->play, track); } diff -rNu melys-0.0.8/song/song.m melys-0.0.9/song/song.m --- melys-0.0.8/song/song.m Mon Aug 16 12:00:21 1999 +++ melys-0.0.9/song/song.m Thu Aug 19 00:08:04 1999 @@ -299,7 +299,7 @@ /* Determine if this is an audio or midi track */ - /* Its a midi track.... */ + /* Mmm, yes its a midi track.... */ play_mute(song->play, track); diff -rNu melys-0.0.8/widgets/melystrack.c melys-0.0.9/widgets/melystrack.c --- melys-0.0.8/widgets/melystrack.c Mon Aug 16 12:21:56 1999 +++ melys-0.0.9/widgets/melystrack.c Thu Aug 19 13:11:57 1999 @@ -78,8 +78,6 @@ melys_track_set_md_root((MelysTrack *)mtrack, root); - - return mtrack; } diff -rNu melys-0.0.8/widgets/melystrack.m melys-0.0.9/widgets/melystrack.m --- melys-0.0.8/widgets/melystrack.m Mon Aug 9 19:03:07 1999 +++ melys-0.0.9/widgets/melystrack.m Thu Aug 19 00:08:04 1999 @@ -64,8 +64,6 @@ melys_track_set_md_root((MelysTrack *)mtrack, root); - - return mtrack; >>function melys_track_init diff -rNu melys-0.0.8/widgets/melystrackinfo.c melys-0.0.9/widgets/melystrackinfo.c --- melys-0.0.8/widgets/melystrackinfo.c Mon Aug 16 12:21:57 1999 +++ melys-0.0.9/widgets/melystrackinfo.c Thu Aug 19 13:11:57 1999 @@ -38,6 +38,8 @@ enum { MUTE_TRACK, UNMUTE_TRACK, + SOLO_TRACK, + UNSOLO_TRACK, LAST_SIGNAL }; @@ -52,6 +54,7 @@ MUTE, RECORD, SOLO, + CHANNEL, LAST_COLUMN_TYPE }; @@ -81,8 +84,9 @@ {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}, + {CHANNEL, COL_TEXT, N_("C"), 14, TRUE}, {MUTE, COL_BUTTON, N_("Mute"), 28, TRUE}, - {SOLO, COL_BUTTON, N_("Solo"), 28, FALSE}, + {SOLO, COL_BUTTON, N_("Solo"), 28, TRUE}, {RECORD, COL_BUTTON, N_("Rec"), 28, FALSE}, }; @@ -120,6 +124,8 @@ struct col_info *cip, GdkEventButton *event); static void button1_button(MelysTrackInfo *minfo, struct trackElement *track, struct col_info *cip, GdkEventButton *event); +static void set_solo(MelysTrackInfo *minfo, struct trackElement *track); +static void unset_solo(MelysTrackInfo *minfo, struct trackElement *track); 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); @@ -127,6 +133,14 @@ static void real_mute_track(MelysTrackInfo *minfo, struct trackElement *track); static void real_unmute_track(MelysTrackInfo *minfo, struct trackElement *track); +static void solo_track(MelysTrackInfo *minfo, struct rootElement *root, + struct trackElement *track); +static void real_solo_track(MelysTrackInfo *minfo, struct rootElement *root, + struct trackElement *track); +static void unsolo_track(MelysTrackInfo *minfo, struct rootElement *root, + struct trackElement *track); +static void real_unsolo_track(MelysTrackInfo *minfo, struct rootElement *root, + 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); @@ -271,6 +285,22 @@ gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); + melys_track_info_signals[SOLO_TRACK] = gtk_signal_new("solo_track", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET(MelysTrackInfoClass, solo_track), + gtk_marshal_NONE__POINTER_POINTER, + GTK_TYPE_NONE, 2, + GTK_TYPE_POINTER, + GTK_TYPE_POINTER); + melys_track_info_signals[UNSOLO_TRACK] = gtk_signal_new("unsolo_track", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET(MelysTrackInfoClass, unsolo_track), + gtk_marshal_NONE__POINTER_POINTER, + GTK_TYPE_NONE, 2, + GTK_TYPE_POINTER, + GTK_TYPE_POINTER); gtk_object_class_add_signals @@ -290,6 +320,8 @@ klass->mute_track = real_mute_track; klass->unmute_track = real_unmute_track; + klass->solo_track = real_solo_track; + klass->unsolo_track = real_unsolo_track; } /* @@ -614,6 +646,7 @@ struct trackElement *track; struct col_info *cip; int xpos; + int wid; int i; widget = (GtkWidget *)minfo; @@ -639,6 +672,11 @@ area.width = cip->width + 2*COL_PADDING; area.height = minfo->vspace; + /* Check not scribbling on our shadow */ + wid = minfo->track_area.width - style->klass->xthickness; + if (area.x + area.width > wid && area.x < wid) + area.width = wid - area.x; + if (cip->kind == COL_TEXT) { gdk_draw_rectangle(widget->window, bg_gc, TRUE, area.x, area.y, area.width, area.height); @@ -653,6 +691,11 @@ area.x = xpos; area.width = cip->width; + /* Check not scribbling on our shadow */ + wid = minfo->track_area.width - style->klass->xthickness; + if (area.x + area.width > wid && area.x < wid) + area.width = wid - area.x; + gdk_gc_set_clip_rectangle(fg_gc, &area); draw_col(minfo, ntrack, track, &area, cip, fg_gc); @@ -737,6 +780,11 @@ g_snprintf(buf, TMP_BUF_SIZE, "%d", track->program & 0x7f); str = buf; break; + case CHANNEL: + if (track) + g_snprintf(buf, TMP_BUF_SIZE, "%2d", + MD_ELEMENT(track)->device_channel & 0xf); + str = buf; default: break; } @@ -968,7 +1016,12 @@ mute_track(minfo, track); break; case SOLO: - track->solo ^= 1; + if (track->solo) + //unsolo_track(minfo, minfo->mdroot, track); + unset_solo(minfo, track); + else + //solo_track(minfo, minfo->mdroot, track); + set_solo(minfo, track); break; case RECORD: track->record ^= 1; @@ -978,6 +1031,69 @@ } } +/* + * Solo is a shorthand for setting mute on other tracks. + * Therefore we always light up the mute indicators to show + * exactly which tracks are being played. While in solo mode + * you can unmute certain tracks, these are remembered so that + * you can toggle between these tracks and the full set of + * tracks by clicking on the solo button. + * + */ +static void +set_solo(MelysTrackInfo *minfo, struct trackElement *track) +{ + struct trackElement *te; + int i; + + for (i = 0; i < minfo->mdroot->tracks; i++) { + + te = md_track_nth(minfo->mdroot, i); + + /* XXX TEMP */ + if (i != track->number) { + te->solo = 0; + mute_track(minfo, te); + te->mute = 1; + te->solomute = 1; + } else { + track->solo = 1; + track->sololast = 1; + unmute_track(minfo, te); + te->mute = 0; + te->solomute = 0; + } + } +} + +/* + * Solo is a shorthand for setting mute on other tracks. + * Therefore we always light up the mute indicators to show + * exactly which tracks are being played. While in solo mode + * you can unmute certain tracks, these are remembered so that + * you can toggle between these tracks and the full set of + * tracks by clicking on the solo button. + * + */ +static void +unset_solo(MelysTrackInfo *minfo, struct trackElement *track) +{ + struct trackElement *te; + int i; + + track->solo = 0; + + for (i = 0; i < minfo->mdroot->tracks; i++) { + + te = md_track_nth(minfo->mdroot, i); + + if (te->solomute) { + unmute_track(minfo, te); + te->mute = 0; + } + } +} + static void select_track(MelysTrackInfo *minfo, struct trackElement *track) { @@ -996,6 +1112,7 @@ static void mute_track(MelysTrackInfo *minfo, struct trackElement *track) { + gtk_signal_emit(GTK_OBJECT(minfo), melys_track_info_signals[MUTE_TRACK], track); } @@ -1020,7 +1137,49 @@ { track->mute = 0; + track->solomute = 0; track_redraw(minfo, -1, track); +} + +static void +solo_track(MelysTrackInfo *minfo, struct rootElement *root, + struct trackElement *track) +{ + dprintf(0, "unreal solo track %d", track->number); + gtk_signal_emit(GTK_OBJECT(minfo), + melys_track_info_signals[SOLO_TRACK], root, track); +} + +static void +real_solo_track(MelysTrackInfo *minfo, struct rootElement *root, + struct trackElement *track) +{ + dprintf(0, "solo track %d", track->number); + set_solo(minfo, track); + gtk_widget_queue_draw_area(GTK_WIDGET(minfo), + minfo->track_area.x, minfo->track_area.y, + minfo->track_area.width, minfo->track_area.height); +} + +static void +unsolo_track(MelysTrackInfo *minfo, struct rootElement *root, + struct trackElement *track) +{ + dprintf(0, "unreal unsolo track %d", track->number); + + gtk_signal_emit(GTK_OBJECT(minfo), + melys_track_info_signals[UNSOLO_TRACK], root, track); +} + +static void +real_unsolo_track(MelysTrackInfo *minfo, struct rootElement *root, + struct trackElement *track) +{ + dprintf(0, "UN-solo track %d", track->number); + unset_solo(minfo, track); + gtk_widget_queue_draw_area(GTK_WIDGET(minfo), + minfo->track_area.x, minfo->track_area.y, + minfo->track_area.width, minfo->track_area.height); } /* diff -rNu melys-0.0.8/widgets/melystrackinfo.m melys-0.0.9/widgets/melystrackinfo.m --- melys-0.0.8/widgets/melystrackinfo.m Mon Aug 16 12:00:21 1999 +++ melys-0.0.9/widgets/melystrackinfo.m Thu Aug 19 00:44:39 1999 @@ -83,6 +83,10 @@ void (*mute_track)(MelysTrackInfo *, struct trackElement *); void (*unmute_track)(MelysTrackInfo *, struct trackElement *); + void (*solo_track)(MelysTrackInfo *, struct rootElement *, + struct trackElement *); + void (*unsolo_track)(MelysTrackInfo *, struct rootElement *, + struct trackElement *); }; >>header melystrack.h @@ -91,6 +95,8 @@ enum { MUTE_TRACK, UNMUTE_TRACK, + SOLO_TRACK, + UNSOLO_TRACK, LAST_SIGNAL }; @@ -105,6 +111,7 @@ MUTE, RECORD, SOLO, + CHANNEL, LAST_COLUMN_TYPE }; @@ -134,8 +141,9 @@ {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}, + {CHANNEL, COL_TEXT, N_("C"), 14, TRUE}, {MUTE, COL_BUTTON, N_("Mute"), 28, TRUE}, - {SOLO, COL_BUTTON, N_("Solo"), 28, FALSE}, + {SOLO, COL_BUTTON, N_("Solo"), 28, TRUE}, {RECORD, COL_BUTTON, N_("Rec"), 28, FALSE}, }; @@ -246,6 +254,22 @@ gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); + melys_track_info_signals[SOLO_TRACK] = gtk_signal_new("solo_track", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET(MelysTrackInfoClass, solo_track), + gtk_marshal_NONE__POINTER_POINTER, + GTK_TYPE_NONE, 2, + GTK_TYPE_POINTER, + GTK_TYPE_POINTER); + melys_track_info_signals[UNSOLO_TRACK] = gtk_signal_new("unsolo_track", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET(MelysTrackInfoClass, unsolo_track), + gtk_marshal_NONE__POINTER_POINTER, + GTK_TYPE_NONE, 2, + GTK_TYPE_POINTER, + GTK_TYPE_POINTER); gtk_object_class_add_signals @@ -265,6 +289,8 @@ klass->mute_track = real_mute_track; klass->unmute_track = real_unmute_track; + klass->solo_track = real_solo_track; + klass->unsolo_track = real_unsolo_track; >>function melys_track_info_set_height @@ -596,6 +622,7 @@ struct trackElement *track; struct col_info *cip; int xpos; + int wid; int i; widget = (GtkWidget *)minfo; @@ -621,6 +648,11 @@ area.width = cip->width + 2*COL_PADDING; area.height = minfo->vspace; + /* Check not scribbling on our shadow */ + wid = minfo->track_area.width - style->klass->xthickness; + if (area.x + area.width > wid && area.x < wid) + area.width = wid - area.x; + if (cip->kind == COL_TEXT) { gdk_draw_rectangle(widget->window, bg_gc, TRUE, area.x, area.y, area.width, area.height); @@ -635,6 +667,11 @@ area.x = xpos; area.width = cip->width; + /* Check not scribbling on our shadow */ + wid = minfo->track_area.width - style->klass->xthickness; + if (area.x + area.width > wid && area.x < wid) + area.width = wid - area.x; + gdk_gc_set_clip_rectangle(fg_gc, &area); draw_col(minfo, ntrack, track, &area, cip, fg_gc); @@ -722,6 +759,11 @@ g_snprintf(buf, TMP_BUF_SIZE, "%d", track->program & 0x7f); str = buf; break; + case CHANNEL: + if (track) + g_snprintf(buf, TMP_BUF_SIZE, "%2d", + MD_ELEMENT(track)->device_channel & 0xf); + str = buf; default: break; } @@ -986,7 +1028,12 @@ mute_track(minfo, track); break; case SOLO: - track->solo ^= 1; + if (track->solo) + //unsolo_track(minfo, minfo->mdroot, track); + unset_solo(minfo, track); + else + //solo_track(minfo, minfo->mdroot, track); + set_solo(minfo, track); break; case RECORD: track->record ^= 1; @@ -995,6 +1042,72 @@ break; } +>>function set_solo +static void +MelysTrackInfo *minfo; +struct trackElement *track; + +>>description +Solo is a shorthand for setting mute on other tracks. +Therefore we always light up the mute indicators to +show exactly which tracks are being played. +While in solo mode you can unmute certain tracks, these +are remembered so that you can toggle between these tracks and the +full set of tracks by clicking on the solo button. + +>>code + struct trackElement *te; + int i; + + for (i = 0; i < minfo->mdroot->tracks; i++) { + + te = md_track_nth(minfo->mdroot, i); + + /* XXX TEMP */ + if (i != track->number) { + te->solo = 0; + mute_track(minfo, te); + te->mute = 1; + te->solomute = 1; + } else { + track->solo = 1; + track->sololast = 1; + unmute_track(minfo, te); + te->mute = 0; + te->solomute = 0; + } + } + +>>function unset_solo +static void +MelysTrackInfo *minfo; +struct trackElement *track; + +>>description +Solo is a shorthand for setting mute on other tracks. +Therefore we always light up the mute indicators to +show exactly which tracks are being played. +While in solo mode you can unmute certain tracks, these +are remembered so that you can toggle between these tracks and the +full set of tracks by clicking on the solo button. + +>>code + struct trackElement *te; + int i; + + track->solo = 0; + + for (i = 0; i < minfo->mdroot->tracks; i++) { + + te = md_track_nth(minfo->mdroot, i); + + if (te->solomute) { + unmute_track(minfo, te); + te->mute = 0; + } + } + + >># ==== Selection and click actions >>function select_track @@ -1022,6 +1135,7 @@ struct trackElement *track; >>code + gtk_signal_emit(GTK_OBJECT(minfo), melys_track_info_signals[MUTE_TRACK], track); @@ -1053,9 +1167,59 @@ >>code track->mute = 0; + track->solomute = 0; track_redraw(minfo, -1, track); +>>function solo_track +static void +MelysTrackInfo *minfo; +struct rootElement *root; +struct trackElement *track; + +>>code + dprintf(0, "unreal solo track %d", track->number); + gtk_signal_emit(GTK_OBJECT(minfo), + melys_track_info_signals[SOLO_TRACK], root, track); + +>>function real_solo_track +static void +MelysTrackInfo *minfo; +struct rootElement *root; +struct trackElement *track; + +>>code + dprintf(0, "solo track %d", track->number); + set_solo(minfo, track); + gtk_widget_queue_draw_area(GTK_WIDGET(minfo), + minfo->track_area.x, minfo->track_area.y, + minfo->track_area.width, minfo->track_area.height); + +>>function unsolo_track +static void +MelysTrackInfo *minfo; +struct rootElement *root; +struct trackElement *track; + +>>code + dprintf(0, "unreal unsolo track %d", track->number); + + gtk_signal_emit(GTK_OBJECT(minfo), + melys_track_info_signals[UNSOLO_TRACK], root, track); + + +>>function real_unsolo_track +static void +MelysTrackInfo *minfo; +struct rootElement *root; +struct trackElement *track; + +>>code + dprintf(0, "UN-solo track %d", track->number); + unset_solo(minfo, track); + gtk_widget_queue_draw_area(GTK_WIDGET(minfo), + minfo->track_area.x, minfo->track_area.y, + minfo->track_area.width, minfo->track_area.height); >># ==== Utility routines