diff -rNu melys-0.1.12/ChangeLog melys-0.1.13/ChangeLog --- melys-0.1.12/ChangeLog Tue Dec 14 18:02:29 1999 +++ melys-0.1.13/ChangeLog Thu Dec 16 21:05:10 1999 @@ -1,4 +1,22 @@ +1999-12-16 Steve Ratcliffe + + * seq/seqlib.m, seq/seqmidi.m, seq/seqplay.m, midi/play.m: + Updates for the new sequencer API. + + * widgets/melysrule.m: + Fix random contents on the ruler after pulling a page from the notebook. + + * programs/melplay.m: + Removed the play() routine as it has now been replaced + with the seq_midi_send_element() routine. + + * midi/play.m: Removed misleading comment, simplified an expression. + 1999-12-14 Steve Ratcliffe + + * version: Version 0.1.12 + + * help/C/piano.sgml: Added paragraph on deletion. * gui/main.m, gui/menus.m, midi/play.m, po/melys.pot, po/zz.po, widgets/melyspiano.m, widgets/melystempo.m, widgets/melystrackdisplay.m: diff -rNu melys-0.1.12/include/seqlib.h melys-0.1.13/include/seqlib.h --- melys-0.1.12/include/seqlib.h Tue Dec 14 18:07:11 1999 +++ melys-0.1.13/include/seqlib.h Thu Dec 16 21:08:01 1999 @@ -25,6 +25,10 @@ */ #include +#if SND_SEQ_VERSION >= SND_PROTOCOL_VERSION(1, 0, 0) +#define SEQ_API_2 +#endif + /* Forward compatibility defines */ #ifndef SND_SEQ_PORT_CAP_OUT @@ -79,7 +83,7 @@ int seq_sendto(seq_context_t *ctxp, snd_seq_event_t *ep, int dev, int chan); int seq_sendto_now(seq_context_t *ctxp, snd_seq_event_t *ep, int dev, int chan); -int seq_send_to_all(seq_context_t *ctxp, snd_seq_event_t *ep); +int seq_send_to_all_now(seq_context_t *ctxp, snd_seq_event_t *ep); void seq_timer_start(seq_context_t *ctxp); void seq_timer_stop(seq_context_t *ctxp); void seq_timer_continue(seq_context_t *ctxp); @@ -98,20 +102,22 @@ void seq_midi_event_init(seq_context_t *ctxp, snd_seq_event_t *ep, gboolean real, union un_time time, int devchan); -void seq_midi_note(seq_context_t *ctxp, snd_seq_event_t *ep, int note, - int vel, int length); -void seq_midi_note_on(seq_context_t *ctxp, snd_seq_event_t *ep, int note, - int vel); -void seq_midi_note_off(seq_context_t *ctxp, snd_seq_event_t *ep, int note, - int vel); -void seq_midi_keypress(seq_context_t *ctxp, snd_seq_event_t *ep, int note, - int value); -void seq_midi_control(seq_context_t *ctxp, snd_seq_event_t *ep, int control, - int value); -void seq_midi_program(seq_context_t *ctxp, snd_seq_event_t *ep, int program); -void seq_midi_chanpress(seq_context_t *ctxp, snd_seq_event_t *ep, +void seq_midi_note(seq_context_t *ctxp, snd_seq_event_t *ep, int chan, + int note, int vel, int offvel, int length); +void seq_midi_note_on(seq_context_t *ctxp, snd_seq_event_t *ep, int chan, + int note, int vel); +void seq_midi_note_off(seq_context_t *ctxp, snd_seq_event_t *ep, int chan, + int note, int vel); +void seq_midi_keypress(seq_context_t *ctxp, snd_seq_event_t *ep, int chan, + int note, int value); +void seq_midi_control(seq_context_t *ctxp, snd_seq_event_t *ep, int chan, + int control, int value); +void seq_midi_program(seq_context_t *ctxp, snd_seq_event_t *ep, int chan, + int program); +void seq_midi_chanpress(seq_context_t *ctxp, snd_seq_event_t *ep, int chan, int pressure); -void seq_midi_pitchbend(seq_context_t *ctxp, snd_seq_event_t *ep, int bend); +void seq_midi_pitchbend(seq_context_t *ctxp, snd_seq_event_t *ep, int chan, + int bend); void seq_midi_tempo(seq_context_t *ctxp, snd_seq_event_t *ep, int tempo); void seq_midi_sysex(seq_context_t *ctxp, snd_seq_event_t *ep, int status, unsigned char *data, int length); diff -rNu melys-0.1.12/midi/play.c melys-0.1.13/midi/play.c --- melys-0.1.12/midi/play.c Tue Dec 14 18:07:39 1999 +++ melys-0.1.13/midi/play.c Thu Dec 16 21:08:29 1999 @@ -231,7 +231,7 @@ { seq_context_t *ctxp; snd_seq_event_t ev; - int i; + union un_time t; if (play->isplaying == FALSE || play->mdroot == NULL) return; @@ -248,13 +248,10 @@ ctxp = play->ctxp; - for (i = 0; i < 16; i++) { - union un_time t; - t.tick = 0; - seq_midi_event_init(ctxp, &ev, FALSE, t, i); - seq_midi_control(ctxp, &ev, SND_MCTL_ALL_SOUNDS_OFF, 0); - seq_control_write(ctxp, &ev); - } + t.tick = 0; + seq_midi_event_init(ctxp, &ev, FALSE, t, 0); + seq_midi_control(ctxp, &ev, 0, SND_MCTL_ALL_SOUNDS_OFF, 0); + seq_send_to_all_now(ctxp, &ev); seq_timer_stop(ctxp); } @@ -325,7 +322,6 @@ int dev; int chan; - /* Send an all sounds off message to the affected channel */ dev = ((struct element *)track)->device_channel >> 4; chan = ((struct element *)track)->device_channel & 0x0f; @@ -344,7 +340,11 @@ memset(&fqueue, 0, sizeof(fqueue)); fqueue.output = 1; fqueue.dest = *addr; - fqueue.dest.channel = MD_ELEMENT(track)->device_channel & 0xf; +#ifndef SEQ_API_2 + fqueue.dest.channel = chan; +#else /* SEQ_API_2 */ + fqueue.channel = chan; +#endif /* SEQ_API_2 */ fqueue.type = SND_SEQ_EVENT_NOTE; fqueue.tag = MD_TRACKLIKE(track)->number; /* XXX TEMP */ fqueue.remove_mode = @@ -437,7 +437,11 @@ SND_SEQ_REMOVE_TAG_MATCH | SND_SEQ_REMOVE_TIME_AFTER; fqueue.dest = *seq_dev_addr(play->ctxp, dev, SEQ_ADDR_OUTPUT);/*XXX*/ +#ifndef SEQ_API_2 fqueue.dest.channel = chan; +#else /* SEQ_API_2 */ + fqueue.channel = chan; +#endif /* SEQ_API_2 */ fqueue.tag = MD_TRACKLIKE(track)->number; fqueue.tick = 1; fqueue.time.tick = now; diff -rNu melys-0.1.12/midi/play.m melys-0.1.13/midi/play.m --- melys-0.1.12/midi/play.m Tue Dec 14 17:49:32 1999 +++ melys-0.1.13/midi/play.m Thu Dec 16 21:04:00 1999 @@ -225,7 +225,7 @@ >>code seq_context_t *ctxp; snd_seq_event_t ev; - int i; + union un_time t; if (play->isplaying == FALSE || play->mdroot == NULL) return; @@ -242,13 +242,10 @@ ctxp = play->ctxp; - for (i = 0; i < 16; i++) { - union un_time t; - t.tick = 0; - seq_midi_event_init(ctxp, &ev, FALSE, t, i); - seq_midi_control(ctxp, &ev, SND_MCTL_ALL_SOUNDS_OFF, 0); - seq_control_write(ctxp, &ev); - } + t.tick = 0; + seq_midi_event_init(ctxp, &ev, FALSE, t, 0); + seq_midi_control(ctxp, &ev, 0, SND_MCTL_ALL_SOUNDS_OFF, 0); + seq_send_to_all_now(ctxp, &ev); seq_timer_stop(ctxp); >>function play_stop @@ -318,7 +315,6 @@ int dev; int chan; - /* Send an all sounds off message to the affected channel */ dev = ((struct element *)track)->device_channel >> 4; chan = ((struct element *)track)->device_channel & 0x0f; @@ -337,7 +333,11 @@ memset(&fqueue, 0, sizeof(fqueue)); fqueue.output = 1; fqueue.dest = *addr; - fqueue.dest.channel = MD_ELEMENT(track)->device_channel & 0xf; +#ifndef SEQ_API_2 + fqueue.dest.channel = chan; +#else /* SEQ_API_2 */ + fqueue.channel = chan; +#endif /* SEQ_API_2 */ fqueue.type = SND_SEQ_EVENT_NOTE; fqueue.tag = MD_TRACKLIKE(track)->number; /* XXX TEMP */ fqueue.remove_mode = @@ -433,7 +433,11 @@ SND_SEQ_REMOVE_TAG_MATCH | SND_SEQ_REMOVE_TIME_AFTER; fqueue.dest = *seq_dev_addr(play->ctxp, dev, SEQ_ADDR_OUTPUT);/*XXX*/ +#ifndef SEQ_API_2 fqueue.dest.channel = chan; +#else /* SEQ_API_2 */ + fqueue.channel = chan; +#endif /* SEQ_API_2 */ fqueue.tag = MD_TRACKLIKE(track)->number; fqueue.tick = 1; fqueue.time.tick = now; diff -rNu melys-0.1.12/programs/melplay.c melys-0.1.13/programs/melplay.c --- melys-0.1.12/programs/melplay.c Tue Dec 14 18:07:41 1999 +++ melys-0.1.13/programs/melplay.c Thu Dec 16 21:08:31 1999 @@ -67,7 +67,6 @@ static void playfile(seq_context_t *ctxp, char *filename); static void showlist(void); static void showusage(void); -static void play(void *arg, struct element *el); /* @@ -268,7 +267,7 @@ #endif while ((el = md_seq_next(seq)) != NULL) { - play(ctxp, el); + seq_midi_send_element(ctxp, el); } /* Get the end time for the tracks and echo an event to @@ -362,63 +361,4 @@ for (cpp = msg; cpp < msg+NELEM(msg); cpp++) { fprintf(stderr, "%s\n", _(*cpp)); } -} - -static void -play(void *arg, struct element *el) -{ - struct tempomapElement *tmap; - seq_context_t *ctxp = arg; - snd_seq_event_t ev; - - seq_midi_event_init(ctxp, &ev, FALSE, el->time, el->device_channel); - switch (el->type) { - case MD_TYPE_ROOT: - tmap = md_get_tempomap(MD_ROOT(el)); - seq_init_tempo(ctxp, tmap->timebase, 120, 1); - seq_timer_start(ctxp); - return; - case MD_TYPE_NOTE: - seq_midi_note(ctxp, &ev, MD_NOTE(el)->note, MD_NOTE(el)->vel, - MD_NOTE(el)->length); - break; - case MD_TYPE_CONTROL: - seq_midi_control(ctxp, &ev, MD_CONTROL(el)->control, - MD_CONTROL(el)->value); - break; - case MD_TYPE_PROGRAM: - seq_midi_program(ctxp, &ev, MD_PROGRAM(el)->program); - break; - case MD_TYPE_TEMPO: - seq_midi_tempo(ctxp, &ev, MD_TEMPO(el)->micro_tempo); - break; - case MD_TYPE_PITCH: - seq_midi_pitchbend(ctxp, &ev, MD_PITCH(el)->pitch); - break; - case MD_TYPE_PRESSURE: - seq_midi_chanpress(ctxp, &ev, MD_PRESSURE(el)->velocity); - break; - case MD_TYPE_KEYTOUCH: - seq_midi_keypress(ctxp, &ev, MD_KEYTOUCH(el)->note, - MD_KEYTOUCH(el)->velocity); - break; - case MD_TYPE_SYSEX: - seq_midi_sysex(ctxp, &ev, MD_SYSEX(el)->status, MD_SYSEX(el)->data, - MD_SYSEX(el)->length); - break; - - case MD_TYPE_HEAD: - case MD_TYPE_TEXT: - case MD_TYPE_KEYSIG: - case MD_TYPE_TIMESIG: - case MD_TYPE_SMPTEOFFSET: - case MD_TYPE_PART: - /* Ones that have no sequencer action */ - return; - default: - printf("WARNING: play: not implemented yet %d\n", el->type); - return; - } - - seq_write(ctxp, &ev); } diff -rNu melys-0.1.12/programs/melplay.m melys-0.1.13/programs/melplay.m --- melys-0.1.12/programs/melplay.m Sat Nov 27 11:43:23 1999 +++ melys-0.1.13/programs/melplay.m Thu Dec 16 13:27:21 1999 @@ -263,7 +263,7 @@ #endif while ((el = md_seq_next(seq)) != NULL) { - play(ctxp, el); + seq_midi_send_element(ctxp, el); } /* Get the end time for the tracks and echo an event to @@ -359,64 +359,3 @@ fprintf(stderr, "%s\n", _(*cpp)); } - ->>function play -static void -void *arg; -struct element *el; - ->>code - struct tempomapElement *tmap; - seq_context_t *ctxp = arg; - snd_seq_event_t ev; - - seq_midi_event_init(ctxp, &ev, FALSE, el->time, el->device_channel); - switch (el->type) { - case MD_TYPE_ROOT: - tmap = md_get_tempomap(MD_ROOT(el)); - seq_init_tempo(ctxp, tmap->timebase, 120, 1); - seq_timer_start(ctxp); - return; - case MD_TYPE_NOTE: - seq_midi_note(ctxp, &ev, MD_NOTE(el)->note, MD_NOTE(el)->vel, - MD_NOTE(el)->length); - break; - case MD_TYPE_CONTROL: - seq_midi_control(ctxp, &ev, MD_CONTROL(el)->control, - MD_CONTROL(el)->value); - break; - case MD_TYPE_PROGRAM: - seq_midi_program(ctxp, &ev, MD_PROGRAM(el)->program); - break; - case MD_TYPE_TEMPO: - seq_midi_tempo(ctxp, &ev, MD_TEMPO(el)->micro_tempo); - break; - case MD_TYPE_PITCH: - seq_midi_pitchbend(ctxp, &ev, MD_PITCH(el)->pitch); - break; - case MD_TYPE_PRESSURE: - seq_midi_chanpress(ctxp, &ev, MD_PRESSURE(el)->velocity); - break; - case MD_TYPE_KEYTOUCH: - seq_midi_keypress(ctxp, &ev, MD_KEYTOUCH(el)->note, - MD_KEYTOUCH(el)->velocity); - break; - case MD_TYPE_SYSEX: - seq_midi_sysex(ctxp, &ev, MD_SYSEX(el)->status, MD_SYSEX(el)->data, - MD_SYSEX(el)->length); - break; - - case MD_TYPE_HEAD: - case MD_TYPE_TEXT: - case MD_TYPE_KEYSIG: - case MD_TYPE_TIMESIG: - case MD_TYPE_SMPTEOFFSET: - case MD_TYPE_PART: - /* Ones that have no sequencer action */ - return; - default: - printf("WARNING: play: not implemented yet %d\n", el->type); - return; - } - - seq_write(ctxp, &ev); diff -rNu melys-0.1.12/seq/seqlib.c melys-0.1.13/seq/seqlib.c --- melys-0.1.12/seq/seqlib.c Tue Dec 14 18:07:26 1999 +++ melys-0.1.13/seq/seqlib.c Thu Dec 16 21:08:16 1999 @@ -81,7 +81,9 @@ /* Fill in source address */ ctxp->source.client = ctxp->client; ctxp->source.port = 0; +#ifndef SEQ_API_2 ctxp->source.channel = 0; +#endif /* not SEQ_API_2 */ /* Create a control client for important messages */ ctxp->control = seq_add_subcontext(ctxp); @@ -95,10 +97,14 @@ */ q = snd_seq_alloc_queue(ctxp->control->handle); ctxp->queue = q; +#ifndef SEQ_API_2 ctxp->source.queue = q; +#endif /* not SEQ_API_2 */ ctxp->control->queue = q; +#ifndef SEQ_API_2 ctxp->control->source.queue = q; +#endif /* not SEQ_API_2 */ snd_seq_get_queue_client(ctxp->control->handle, q, &qclient); snd_seq_set_queue_client(ctxp->handle, q, &qclient); @@ -282,16 +288,20 @@ snd_seq_addr_t *addrlist, int n) { GArray *list; +#ifndef SEQ_API_2 int i; +#endif /* not SEQ_API_2 */ list = get_addr_list(ctxp, inout); if (!list) return; +#ifndef SEQ_API_2 for (i = 0; i < n; i++) { addrlist[i].queue = ctxp->queue; } +#endif /* not SEQ_API_2 */ g_array_set_size(list, 0); g_array_append_vals(list, addrlist, n); } @@ -327,8 +337,10 @@ addr = g_array_index(list, snd_seq_addr_t, i); +#ifndef SEQ_API_2 addr.queue = ctxp->queue; +#endif /* not SEQ_API_2 */ if (inout == SEQ_ADDR_INPUT) { ctxp->inconnected = 1; subs.dest = ctxp->source; @@ -384,8 +396,10 @@ addr = g_array_index(list, snd_seq_addr_t, i); +#ifndef SEQ_API_2 addr.queue = ctxp->queue; +#endif /* not SEQ_API_2 */ if (inout == SEQ_ADDR_INPUT) { ctxp->inconnected = 0; subs.dest = ctxp->source; @@ -500,7 +514,9 @@ return -EINVAL; ep->dest = *addr; +#ifndef SEQ_API_2 ep->dest.channel = chan; +#endif /* not SEQ_API_2 */ return seq_write(ctxp, ep); } @@ -527,15 +543,17 @@ /* * Send the event to all the connected devices across all - * possible channels. This function is intended for - * all-sounds-off type controls etc. + * possible channels. The messages are sent to the blocking + * control port and so should not have timestamps in the + * future. This function is intended for all-sounds-off type + * controls etc. * * Arguments: * ctxp - Client context * ep - Event prototype to be sent */ int -seq_send_to_all(seq_context_t *ctxp, snd_seq_event_t *ep) +seq_send_to_all_now(seq_context_t *ctxp, snd_seq_event_t *ep) { int dev; int chan; @@ -546,10 +564,26 @@ if (addr == NULL) break; /* No more */ +#ifdef SEQ_API_2 + ep->queue = ctxp->queue; +#endif /* SEQ_API_2 */ ep->dest = *addr; for (chan = 0; chan < 16; chan++) { +#ifndef SEQ_API_2 ep->dest.channel = chan; (void)seq_write(ctxp, ep); +#else /* SEQ_API_2 */ + switch (ep->type) { + case SND_SEQ_EVENT_CONTROLLER: + ep->data.control.channel = chan; + break; + default: + /* Only use controls but catch if we start using others */ + g_warning("type %d not implemented in seq_send_to_all_now", ep->type); + break; + } + (void)seq_control_write(ctxp, ep); +#endif /* SEQ_API_2 */ } } @@ -595,13 +629,23 @@ ev.source = ctxp->source; +#ifndef SEQ_API_2 ev.dest.queue = ctxp->queue; +#else /* SEQ_API_2 */ + ev.queue = ctxp->queue; +#endif /* SEQ_API_2 */ ev.dest.client = SND_SEQ_CLIENT_SYSTEM; /* system */ ev.dest.port = SND_SEQ_PORT_SYSTEM_TIMER; /* timer */ +#ifndef SEQ_API_2 ev.dest.channel = 0; /* don't care */ +#endif /* not SEQ_API_2 */ +#ifndef SEQ_API_2 /* Will be: ev.data.queue.addr.queue = ctxp->queue; */ ((snd_seq_addr_t *)&ev.data.control)->queue = ctxp->queue; +#else /* SEQ_API_2 */ + ev.data.queue.queue = ctxp->queue; +#endif /* SEQ_API_2 */ ev.flags = SND_SEQ_TIME_STAMP_REAL | SND_SEQ_TIME_MODE_REL; ev.time.real.tv_sec = 0; @@ -804,8 +848,12 @@ { char *str; +#ifndef SEQ_API_2 str = g_strdup_printf("%d:%d:%d:%d", addr->queue, addr->client, addr->port, addr->channel); +#else /* SEQ_API_2 */ + str = g_strdup_printf("%d:%d", addr->client, addr->port); +#endif /* SEQ_API_2 */ return str; } diff -rNu melys-0.1.12/seq/seqlib.m melys-0.1.13/seq/seqlib.m --- melys-0.1.12/seq/seqlib.m Wed Dec 1 13:08:59 1999 +++ melys-0.1.13/seq/seqlib.m Thu Dec 16 21:04:03 1999 @@ -28,6 +28,10 @@ >>headerdef --decl seqlib.h #include +#if SND_SEQ_VERSION >= SND_PROTOCOL_VERSION(1, 0, 0) +#define SEQ_API_2 +#endif + /* Forward compatibility defines */ #ifndef SND_SEQ_PORT_CAP_OUT @@ -118,7 +122,9 @@ /* Fill in source address */ ctxp->source.client = ctxp->client; ctxp->source.port = 0; +#ifndef SEQ_API_2 ctxp->source.channel = 0; +#endif /* not SEQ_API_2 */ /* Create a control client for important messages */ ctxp->control = seq_add_subcontext(ctxp); @@ -132,10 +138,14 @@ */ q = snd_seq_alloc_queue(ctxp->control->handle); ctxp->queue = q; +#ifndef SEQ_API_2 ctxp->source.queue = q; +#endif /* not SEQ_API_2 */ ctxp->control->queue = q; +#ifndef SEQ_API_2 ctxp->control->source.queue = q; +#endif /* not SEQ_API_2 */ snd_seq_get_queue_client(ctxp->control->handle, q, &qclient); snd_seq_set_queue_client(ctxp->handle, q, &qclient); @@ -330,16 +340,20 @@ >>code GArray *list; +#ifndef SEQ_API_2 int i; +#endif /* not SEQ_API_2 */ list = get_addr_list(ctxp, inout); if (!list) return; +#ifndef SEQ_API_2 for (i = 0; i < n; i++) { addrlist[i].queue = ctxp->queue; } +#endif /* not SEQ_API_2 */ g_array_set_size(list, 0); g_array_append_vals(list, addrlist, n); @@ -375,8 +389,10 @@ addr = g_array_index(list, snd_seq_addr_t, i); +#ifndef SEQ_API_2 addr.queue = ctxp->queue; +#endif /* not SEQ_API_2 */ if (inout == SEQ_ADDR_INPUT) { ctxp->inconnected = 1; subs.dest = ctxp->source; @@ -433,8 +449,10 @@ addr = g_array_index(list, snd_seq_addr_t, i); +#ifndef SEQ_API_2 addr.queue = ctxp->queue; +#endif /* not SEQ_API_2 */ if (inout == SEQ_ADDR_INPUT) { ctxp->inconnected = 0; subs.dest = ctxp->source; @@ -549,7 +567,9 @@ return -EINVAL; ep->dest = *addr; +#ifndef SEQ_API_2 ep->dest.channel = chan; +#endif /* not SEQ_API_2 */ return seq_write(ctxp, ep); >>function seq_sendto_now @@ -571,7 +591,7 @@ (void) seq_sendto(ctxp, ep, dev, chan); return snd_seq_flush_output(ctxp->handle); ->>function seq_send_to_all +>>function seq_send_to_all_now int seq_context_t *ctxp; Client context snd_seq_event_t *ep; Event prototype to be sent @@ -579,6 +599,8 @@ >>description Send the event to all the connected devices across all possible channels. +The messages are sent to the blocking control port and +so should not have timestamps in the future. This function is intended for all-sounds-off type controls etc. >>code @@ -591,10 +613,26 @@ if (addr == NULL) break; /* No more */ +#ifdef SEQ_API_2 + ep->queue = ctxp->queue; +#endif /* SEQ_API_2 */ ep->dest = *addr; for (chan = 0; chan < 16; chan++) { +#ifndef SEQ_API_2 ep->dest.channel = chan; (void)seq_write(ctxp, ep); +#else /* SEQ_API_2 */ + switch (ep->type) { + case SND_SEQ_EVENT_CONTROLLER: + ep->data.control.channel = chan; + break; + default: + /* Only use controls but catch if we start using others */ + g_warning("type %d not implemented in @func_name", ep->type); + break; + } + (void)seq_control_write(ctxp, ep); +#endif /* SEQ_API_2 */ } } @@ -640,13 +678,23 @@ ev.source = ctxp->source; +#ifndef SEQ_API_2 ev.dest.queue = ctxp->queue; +#else /* SEQ_API_2 */ + ev.queue = ctxp->queue; +#endif /* SEQ_API_2 */ ev.dest.client = SND_SEQ_CLIENT_SYSTEM; /* system */ ev.dest.port = SND_SEQ_PORT_SYSTEM_TIMER; /* timer */ +#ifndef SEQ_API_2 ev.dest.channel = 0; /* don't care */ +#endif /* not SEQ_API_2 */ +#ifndef SEQ_API_2 /* Will be: ev.data.queue.addr.queue = ctxp->queue; */ ((snd_seq_addr_t *)&ev.data.control)->queue = ctxp->queue; +#else /* SEQ_API_2 */ + ev.data.queue.queue = ctxp->queue; +#endif /* SEQ_API_2 */ ev.flags = SND_SEQ_TIME_STAMP_REAL | SND_SEQ_TIME_MODE_REL; ev.time.real.tv_sec = 0; @@ -849,8 +897,12 @@ >>code char *str; +#ifndef SEQ_API_2 str = g_strdup_printf("%d:%d:%d:%d", addr->queue, addr->client, addr->port, addr->channel); +#else /* SEQ_API_2 */ + str = g_strdup_printf("%d:%d", addr->client, addr->port); +#endif /* SEQ_API_2 */ return str; diff -rNu melys-0.1.12/seq/seqmidi.c melys-0.1.13/seq/seqmidi.c --- melys-0.1.12/seq/seqmidi.c Tue Dec 14 18:07:26 1999 +++ melys-0.1.13/seq/seqmidi.c Thu Dec 16 21:08:16 1999 @@ -1,5 +1,4 @@ /* - * File: seqmidi.m - XXX * * Copyright (C) 1999 Steve Ratcliffe * @@ -63,7 +62,11 @@ /* Other ideas welcome... */ if (!addr) { addr = &zeroaddr; +#ifndef SEQ_API_2 addr->queue = ctxp->queue; +#else /* SEQ_API_2 */ + ep->queue = ctxp->queue; +#endif /* SEQ_API_2 */ } memset(ep, '\0', sizeof(*ep)); @@ -77,10 +80,15 @@ ep->flags |= SND_SEQ_TIME_STAMP_TICK; ep->time.tick = time.tick; } +#ifdef SEQ_API_2 + ep->queue = ctxp->queue; +#endif /* SEQ_API_2 */ ep->source = ctxp->source; if (addr) ep->dest = *addr; +#ifndef SEQ_API_2 ep->dest.channel = channel; +#endif /* not SEQ_API_2 */ } /* @@ -91,14 +99,20 @@ * ep - Event template */ void -seq_midi_note(seq_context_t *ctxp, snd_seq_event_t *ep, int note, int vel, - int length) +seq_midi_note(seq_context_t *ctxp, snd_seq_event_t *ep, int chan, int note, + int vel, int offvel, int length) { ep->type = SND_SEQ_EVENT_NOTE; +#ifdef SEQ_API_2 + ep->data.note.channel = chan; +#endif /* SEQ_API_2 */ ep->data.note.note = note; ep->data.note.velocity = vel; +#ifdef SEQ_API_2 + ep->data.note.off_velocity = offvel; +#endif /* SEQ_API_2 */ ep->data.note.duration = length; } @@ -110,11 +124,15 @@ * ep - Event template */ void -seq_midi_note_on(seq_context_t *ctxp, snd_seq_event_t *ep, int note, int vel) +seq_midi_note_on(seq_context_t *ctxp, snd_seq_event_t *ep, int chan, int note, + int vel) { ep->type = SND_SEQ_EVENT_NOTEON; +#ifdef SEQ_API_2 + ep->data.note.channel = chan; +#endif /* SEQ_API_2 */ ep->data.note.note = note; ep->data.note.velocity = vel; } @@ -127,10 +145,14 @@ * ep - Event template */ void -seq_midi_note_off(seq_context_t *ctxp, snd_seq_event_t *ep, int note, int vel) +seq_midi_note_off(seq_context_t *ctxp, snd_seq_event_t *ep, int chan, + int note, int vel) { ep->type = SND_SEQ_EVENT_NOTEOFF; +#ifdef SEQ_API_2 + ep->data.note.channel = chan; +#endif /* SEQ_API_2 */ ep->data.note.note = note; ep->data.note.velocity = vel; } @@ -141,16 +163,20 @@ * Arguments: * ctxp - Application context * ep - Event template + * chan - Channel to send on * note - Note to be altered * value - Pressure value */ void -seq_midi_keypress(seq_context_t *ctxp, snd_seq_event_t *ep, int note, - int value) +seq_midi_keypress(seq_context_t *ctxp, snd_seq_event_t *ep, int chan, + int note, int value) { ep->type = SND_SEQ_EVENT_KEYPRESS; +#ifdef SEQ_API_2 + ep->data.control.channel = chan; +#endif /* SEQ_API_2 */ ep->data.control.param = note; ep->data.control.value = value; } @@ -161,16 +187,20 @@ * Arguments: * ctxp - Application context * ep - Event template + * chan - Channel to send on * control - Controller to change * value - Value to set it to */ void -seq_midi_control(seq_context_t *ctxp, snd_seq_event_t *ep, int control, - int value) +seq_midi_control(seq_context_t *ctxp, snd_seq_event_t *ep, int chan, + int control, int value) { ep->type = SND_SEQ_EVENT_CONTROLLER; +#ifdef SEQ_API_2 + ep->data.control.channel = chan; +#endif /* SEQ_API_2 */ ep->data.control.param = control; ep->data.control.value = value; } @@ -181,21 +211,22 @@ * Arguments: * ctxp - Application context * ep - Event template + * chan - Channel to send on * program - Program to set */ void -seq_midi_program(seq_context_t *ctxp, snd_seq_event_t *ep, int program) +seq_midi_program(seq_context_t *ctxp, snd_seq_event_t *ep, int chan, + int program) { ep->type = SND_SEQ_EVENT_PGMCHANGE; -#if notyet /* Wait to 0.5.0 to be released */ - ep->data.queue.addr.queue = ctxp->queue; - ep->data.queue.value = program; -#else +#ifndef SEQ_API_2 ((snd_seq_addr_t *)&ep->data.control)->queue = ctxp->queue; +#else /* SEQ_API_2 */ + ep->data.control.channel = chan; +#endif /* SEQ_API_2 */ ep->data.control.value = program; -#endif } /* @@ -204,14 +235,19 @@ * Arguments: * ctxp - Application context * ep - Event template + * chan - Midi channel * pressure - Pressure value */ void -seq_midi_chanpress(seq_context_t *ctxp, snd_seq_event_t *ep, int pressure) +seq_midi_chanpress(seq_context_t *ctxp, snd_seq_event_t *ep, int chan, + int pressure) { ep->type = SND_SEQ_EVENT_CHANPRESS; +#ifdef SEQ_API_2 + ep->data.control.channel = chan; +#endif /* SEQ_API_2 */ ep->data.control.value = pressure; } @@ -222,14 +258,19 @@ * Arguments: * ctxp - Application context * ep - Event template + * chan - Midi channel * bend - Bend value, centered on zero. */ void -seq_midi_pitchbend(seq_context_t *ctxp, snd_seq_event_t *ep, int bend) +seq_midi_pitchbend(seq_context_t *ctxp, snd_seq_event_t *ep, int chan, + int bend) { ep->type = SND_SEQ_EVENT_PITCHBEND; +#ifdef SEQ_API_2 + ep->data.control.channel = chan; +#endif /* SEQ_API_2 */ ep->data.control.value = bend; } @@ -248,13 +289,13 @@ ep->type = SND_SEQ_EVENT_TEMPO; -#if notyet /* Wait to 0.5.0 to be released */ - ep->data.queue.addr.queue = ctxp->queue; - ep->data.queue.value = tempo; -#else +#ifndef SEQ_API_2 ((snd_seq_addr_t *)&ep->data.control)->queue = ctxp->queue; ep->data.control.value = tempo; -#endif +#else /* SEQ_API_2 */ + ep->data.queue.queue = ctxp->queue; + ep->data.queue.param.value = tempo; +#endif /* SEQ_API_2 */ ep->dest.client = SND_SEQ_PORT_SYSTEM_TIMER; } diff -rNu melys-0.1.12/seq/seqmidi.m melys-0.1.13/seq/seqmidi.m --- melys-0.1.12/seq/seqmidi.m Sat Nov 27 11:43:23 1999 +++ melys-0.1.13/seq/seqmidi.m Thu Dec 16 21:04:03 1999 @@ -1,5 +1,4 @@ ->>name seqmidi.m Routines to write midi events. -File: seqmidi.m - XXX +>>name seqmidi.m - Routines to write midi events. Copyright (C) 1999 Steve Ratcliffe @@ -52,7 +51,11 @@ /* Other ideas welcome... */ if (!addr) { addr = &zeroaddr; +#ifndef SEQ_API_2 addr->queue = ctxp->queue; +#else /* SEQ_API_2 */ + ep->queue = ctxp->queue; +#endif /* SEQ_API_2 */ } memset(ep, '\0', sizeof(*ep)); @@ -66,17 +69,24 @@ ep->flags |= SND_SEQ_TIME_STAMP_TICK; ep->time.tick = time.tick; } +#ifdef SEQ_API_2 + ep->queue = ctxp->queue; +#endif /* SEQ_API_2 */ ep->source = ctxp->source; if (addr) ep->dest = *addr; +#ifndef SEQ_API_2 ep->dest.channel = channel; +#endif /* not SEQ_API_2 */ >>function seq_midi_note void seq_context_t *ctxp; Client context snd_seq_event_t *ep; Event template +int chan; int note; int vel; +int offvel; int length; >>description Initialize a note event. @@ -84,8 +94,14 @@ ep->type = SND_SEQ_EVENT_NOTE; +#ifdef SEQ_API_2 + ep->data.note.channel = chan; +#endif /* SEQ_API_2 */ ep->data.note.note = note; ep->data.note.velocity = vel; +#ifdef SEQ_API_2 + ep->data.note.off_velocity = offvel; +#endif /* SEQ_API_2 */ ep->data.note.duration = length; @@ -93,6 +109,7 @@ void seq_context_t *ctxp; Client context snd_seq_event_t *ep; Event template +int chan; int note; int vel; @@ -102,6 +119,9 @@ ep->type = SND_SEQ_EVENT_NOTEON; +#ifdef SEQ_API_2 + ep->data.note.channel = chan; +#endif /* SEQ_API_2 */ ep->data.note.note = note; ep->data.note.velocity = vel; @@ -110,6 +130,7 @@ void seq_context_t *ctxp; Client context snd_seq_event_t *ep; Event template +int chan; int note; int vel; @@ -118,6 +139,9 @@ >>code ep->type = SND_SEQ_EVENT_NOTEOFF; +#ifdef SEQ_API_2 + ep->data.note.channel = chan; +#endif /* SEQ_API_2 */ ep->data.note.note = note; ep->data.note.velocity = vel; @@ -126,6 +150,7 @@ void seq_context_t *ctxp; Application context snd_seq_event_t *ep; Event template +int chan; Channel to send on int note; Note to be altered int value; Pressure value >>description @@ -134,6 +159,9 @@ ep->type = SND_SEQ_EVENT_KEYPRESS; +#ifdef SEQ_API_2 + ep->data.control.channel = chan; +#endif /* SEQ_API_2 */ ep->data.control.param = note; ep->data.control.value = value; @@ -142,6 +170,7 @@ void seq_context_t *ctxp; Application context snd_seq_event_t *ep; Event template +int chan; Channel to send on int control; Controller to change int value; Value to set it to >>description @@ -150,6 +179,9 @@ ep->type = SND_SEQ_EVENT_CONTROLLER; +#ifdef SEQ_API_2 + ep->data.control.channel = chan; +#endif /* SEQ_API_2 */ ep->data.control.param = control; ep->data.control.value = value; @@ -158,6 +190,7 @@ void seq_context_t *ctxp; Application context snd_seq_event_t *ep; Event template +int chan; Channel to send on int program; Program to set >>description Initialize a program change event. @@ -165,19 +198,19 @@ ep->type = SND_SEQ_EVENT_PGMCHANGE; -#if notyet /* Wait to 0.5.0 to be released */ - ep->data.queue.addr.queue = ctxp->queue; - ep->data.queue.value = program; -#else +#ifndef SEQ_API_2 ((snd_seq_addr_t *)&ep->data.control)->queue = ctxp->queue; +#else /* SEQ_API_2 */ + ep->data.control.channel = chan; +#endif /* SEQ_API_2 */ ep->data.control.value = program; -#endif >>function seq_midi_chanpress void seq_context_t *ctxp; Application context snd_seq_event_t *ep; Event template +int chan; Midi channel int pressure; Pressure value >>description Initialize a channel pressure event. @@ -185,6 +218,9 @@ ep->type = SND_SEQ_EVENT_CHANPRESS; +#ifdef SEQ_API_2 + ep->data.control.channel = chan; +#endif /* SEQ_API_2 */ ep->data.control.value = pressure; @@ -192,6 +228,7 @@ void seq_context_t *ctxp; Application context snd_seq_event_t *ep; Event template +int chan; Midi channel int bend; Bend value, centered on zero. >>description Initialize a pitchbend message. The @@ -201,6 +238,9 @@ ep->type = SND_SEQ_EVENT_PITCHBEND; +#ifdef SEQ_API_2 + ep->data.control.channel = chan; +#endif /* SEQ_API_2 */ ep->data.control.value = bend; @@ -216,13 +256,13 @@ ep->type = SND_SEQ_EVENT_TEMPO; -#if notyet /* Wait to 0.5.0 to be released */ - ep->data.queue.addr.queue = ctxp->queue; - ep->data.queue.value = tempo; -#else +#ifndef SEQ_API_2 ((snd_seq_addr_t *)&ep->data.control)->queue = ctxp->queue; ep->data.control.value = tempo; -#endif +#else /* SEQ_API_2 */ + ep->data.queue.queue = ctxp->queue; + ep->data.queue.param.value = tempo; +#endif /* SEQ_API_2 */ ep->dest.client = SND_SEQ_PORT_SYSTEM_TIMER; diff -rNu melys-0.1.12/seq/seqplay.c melys-0.1.13/seq/seqplay.c --- melys-0.1.12/seq/seqplay.c Tue Dec 14 18:07:26 1999 +++ melys-0.1.13/seq/seqplay.c Thu Dec 16 21:08:17 1999 @@ -33,7 +33,7 @@ static void conv_event(struct seq_context *ctxp, struct element *el, snd_seq_event_t *ep); static void send_program(struct seq_context *ctxp, struct programElement *prg, - snd_seq_event_t *ep); + int chan, snd_seq_event_t *ep); static union un_time set_time(snd_seq_event_t *ep, union un_time time); @@ -75,8 +75,10 @@ conv_event(struct seq_context *ctxp, struct element *el, snd_seq_event_t *ep) { struct tempomapElement *tmap; + int chan; seq_midi_event_init(ctxp, ep, el->realtime, el->time, el->device_channel); + chan = CHAN(el->device_channel); switch (el->type) { case MD_TYPE_ROOT: @@ -87,27 +89,27 @@ case MD_TYPE_HEAD: break; case MD_TYPE_NOTE: - seq_midi_note(ctxp, ep, MD_NOTE(el)->note, MD_NOTE(el)->vel, - MD_NOTE(el)->length); + seq_midi_note(ctxp, ep, chan, MD_NOTE(el)->note, MD_NOTE(el)->vel, + MD_NOTE(el)->offvel, MD_NOTE(el)->length); break; case MD_TYPE_CONTROL: - seq_midi_control(ctxp, ep, MD_CONTROL(el)->control, + seq_midi_control(ctxp, ep, chan, MD_CONTROL(el)->control, MD_CONTROL(el)->value); break; case MD_TYPE_PROGRAM: - send_program(ctxp, MD_PROGRAM(el), ep); + send_program(ctxp, MD_PROGRAM(el), CHAN(MD_DEVCHAN(el)), ep); break; case MD_TYPE_TEMPO: seq_midi_tempo(ctxp, ep, MD_TEMPO(el)->micro_tempo); break; case MD_TYPE_PITCH: - seq_midi_pitchbend(ctxp, ep, MD_PITCH(el)->pitch); + seq_midi_pitchbend(ctxp, ep, chan, MD_PITCH(el)->pitch); break; case MD_TYPE_PRESSURE: - seq_midi_chanpress(ctxp, ep, MD_PRESSURE(el)->velocity); + seq_midi_chanpress(ctxp, ep, chan, MD_PRESSURE(el)->velocity); break; case MD_TYPE_KEYTOUCH: - seq_midi_keypress(ctxp, ep, MD_KEYTOUCH(el)->note, + seq_midi_keypress(ctxp, ep, chan, MD_KEYTOUCH(el)->note, MD_KEYTOUCH(el)->velocity); break; case MD_TYPE_SYSEX: @@ -130,7 +132,7 @@ } static void -send_program(struct seq_context *ctxp, struct programElement *prg, +send_program(struct seq_context *ctxp, struct programElement *prg, int chan, snd_seq_event_t *ep) { struct controlElement *ctl; @@ -163,7 +165,7 @@ break; } - seq_midi_program(ctxp, ep, prg->program); + seq_midi_program(ctxp, ep, chan, prg->program); seq_write(ctxp, ep); MD_FREE(ctl); @@ -190,6 +192,7 @@ struct trackElement *track; union un_time time; snd_seq_event_t ev; + int chan; int n; time.real.tv_sec = 0; @@ -213,30 +216,31 @@ for (n = 0; n < root->tracks; n++) { track = md_track_nth(root, n); + chan = CHAN(MD_DEVCHAN(track)); /* Reset all controllers */ seq_midi_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); - seq_midi_control(ctxp, &ev, SND_MCTL_RESET_CONTROLLERS, 0); + seq_midi_control(ctxp, &ev, chan, SND_MCTL_RESET_CONTROLLERS, 0); time = set_time(&ev, time); seq_write(ctxp, &ev); /* Set to initial volume */ seq_midi_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); - seq_midi_control(ctxp, &ev, + seq_midi_control(ctxp, &ev, chan, SND_MCTL_MSB_MAIN_VOLUME, MD_VOL_TO_MIDI(track->volume)); time = set_time(&ev, time); seq_write(ctxp, &ev); /* Set initial pan position */ seq_midi_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); - seq_midi_control(ctxp, &ev, + seq_midi_control(ctxp, &ev, chan, SND_MCTL_MSB_PAN, MD_PAN_TO_MIDI(track->pan)); time = set_time(&ev, time); seq_write(ctxp, &ev); /* Send the patch */ time = set_time(&ev, time); - send_program(ctxp, track->program, &ev); + send_program(ctxp, track->program, chan, &ev); } seq_midi_event_init(ctxp, &ev, TRUE, time, 0); diff -rNu melys-0.1.12/seq/seqplay.m melys-0.1.13/seq/seqplay.m --- melys-0.1.12/seq/seqplay.m Wed Dec 1 13:08:59 1999 +++ melys-0.1.13/seq/seqplay.m Thu Dec 16 21:04:03 1999 @@ -58,8 +58,10 @@ >>code struct tempomapElement *tmap; + int chan; seq_midi_event_init(ctxp, ep, el->realtime, el->time, el->device_channel); + chan = CHAN(el->device_channel); switch (el->type) { case MD_TYPE_ROOT: @@ -70,27 +72,27 @@ case MD_TYPE_HEAD: break; case MD_TYPE_NOTE: - seq_midi_note(ctxp, ep, MD_NOTE(el)->note, MD_NOTE(el)->vel, - MD_NOTE(el)->length); + seq_midi_note(ctxp, ep, chan, MD_NOTE(el)->note, MD_NOTE(el)->vel, + MD_NOTE(el)->offvel, MD_NOTE(el)->length); break; case MD_TYPE_CONTROL: - seq_midi_control(ctxp, ep, MD_CONTROL(el)->control, + seq_midi_control(ctxp, ep, chan, MD_CONTROL(el)->control, MD_CONTROL(el)->value); break; case MD_TYPE_PROGRAM: - send_program(ctxp, MD_PROGRAM(el), ep); + send_program(ctxp, MD_PROGRAM(el), CHAN(MD_DEVCHAN(el)), ep); break; case MD_TYPE_TEMPO: seq_midi_tempo(ctxp, ep, MD_TEMPO(el)->micro_tempo); break; case MD_TYPE_PITCH: - seq_midi_pitchbend(ctxp, ep, MD_PITCH(el)->pitch); + seq_midi_pitchbend(ctxp, ep, chan, MD_PITCH(el)->pitch); break; case MD_TYPE_PRESSURE: - seq_midi_chanpress(ctxp, ep, MD_PRESSURE(el)->velocity); + seq_midi_chanpress(ctxp, ep, chan, MD_PRESSURE(el)->velocity); break; case MD_TYPE_KEYTOUCH: - seq_midi_keypress(ctxp, ep, MD_KEYTOUCH(el)->note, + seq_midi_keypress(ctxp, ep, chan, MD_KEYTOUCH(el)->note, MD_KEYTOUCH(el)->velocity); break; case MD_TYPE_SYSEX: @@ -116,6 +118,7 @@ static void struct seq_context *ctxp; Sequence state struct programElement *prg; Element to send to sequencer +int chan; Midi channel snd_seq_event_t *ep; Event is written here >>code @@ -149,7 +152,7 @@ break; } - seq_midi_program(ctxp, ep, prg->program); + seq_midi_program(ctxp, ep, chan, prg->program); seq_write(ctxp, ep); MD_FREE(ctl); @@ -180,6 +183,7 @@ struct trackElement *track; union un_time time; snd_seq_event_t ev; + int chan; int n; time.real.tv_sec = 0; @@ -203,30 +207,31 @@ for (n = 0; n < root->tracks; n++) { track = md_track_nth(root, n); + chan = CHAN(MD_DEVCHAN(track)); /* Reset all controllers */ seq_midi_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); - seq_midi_control(ctxp, &ev, SND_MCTL_RESET_CONTROLLERS, 0); + seq_midi_control(ctxp, &ev, chan, SND_MCTL_RESET_CONTROLLERS, 0); time = set_time(&ev, time); seq_write(ctxp, &ev); /* Set to initial volume */ seq_midi_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); - seq_midi_control(ctxp, &ev, + seq_midi_control(ctxp, &ev, chan, SND_MCTL_MSB_MAIN_VOLUME, MD_VOL_TO_MIDI(track->volume)); time = set_time(&ev, time); seq_write(ctxp, &ev); /* Set initial pan position */ seq_midi_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); - seq_midi_control(ctxp, &ev, + seq_midi_control(ctxp, &ev, chan, SND_MCTL_MSB_PAN, MD_PAN_TO_MIDI(track->pan)); time = set_time(&ev, time); seq_write(ctxp, &ev); /* Send the patch */ time = set_time(&ev, time); - send_program(ctxp, track->program, &ev); + send_program(ctxp, track->program, chan, &ev); } seq_midi_event_init(ctxp, &ev, TRUE, time, 0); diff -rNu melys-0.1.12/version melys-0.1.13/version --- melys-0.1.12/version Tue Dec 14 18:03:04 1999 +++ melys-0.1.13/version Thu Dec 16 21:05:20 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.1.12" +#define MELYS_VERSION_STRING "0.1.13" diff -rNu melys-0.1.12/widgets/melysrule.c melys-0.1.13/widgets/melysrule.c --- melys-0.1.12/widgets/melysrule.c Tue Dec 14 18:07:35 1999 +++ melys-0.1.13/widgets/melysrule.c Thu Dec 16 21:08:25 1999 @@ -190,6 +190,7 @@ rule_configure(GtkWidget *widget, GdkEventConfigure *event) { MelysRule *mrule = MELYS_RULE(widget); + GdkRectangle area; if (mrule->pixmap) gdk_pixmap_unref(mrule->pixmap); @@ -197,6 +198,18 @@ mrule->pixmap = gdk_pixmap_new(widget->window, widget->allocation.width, widget->allocation.height, -1); + gdk_draw_rectangle(mrule->pixmap, + widget->style->bg_gc[widget->state], + TRUE, + 0, 0, + widget->allocation.width, widget->allocation.height); + + area.x = 0; + area.y = 0; + area.width = widget->allocation.width; + area.height = widget->allocation.height; + rule_draw(widget, &area); + return TRUE; } @@ -215,7 +228,7 @@ int yoff; mrule = MELYS_RULE(widget); - if (!GTK_WIDGET_DRAWABLE(widget) || !mrule->tempomap) + if (!mrule->tempomap) return; tempomap = mrule->tempomap; @@ -264,6 +277,9 @@ gdk_draw_line(mrule->pixmap, widget->style->fg_gc[widget->state], 0, mrule->vcp->vtitle - VIEW_TITLE_RULE, widget->allocation.width, mrule->vcp->vtitle - VIEW_TITLE_RULE); + + if (!GTK_WIDGET_DRAWABLE(widget)) + return; gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], ap); gdk_draw_pixmap(widget->window, diff -rNu melys-0.1.12/widgets/melysrule.m melys-0.1.13/widgets/melysrule.m --- melys-0.1.12/widgets/melysrule.m Fri Dec 3 17:22:43 1999 +++ melys-0.1.13/widgets/melysrule.m Thu Dec 16 18:45:15 1999 @@ -166,6 +166,7 @@ >>code MelysRule *mrule = MELYS_RULE(widget); + GdkRectangle area; if (mrule->pixmap) gdk_pixmap_unref(mrule->pixmap); @@ -173,6 +174,18 @@ mrule->pixmap = gdk_pixmap_new(widget->window, widget->allocation.width, widget->allocation.height, -1); + gdk_draw_rectangle(mrule->pixmap, + widget->style->bg_gc[widget->state], + TRUE, + 0, 0, + widget->allocation.width, widget->allocation.height); + + area.x = 0; + area.y = 0; + area.width = widget->allocation.width; + area.height = widget->allocation.height; + rule_draw(widget, &area); + return TRUE; @@ -194,7 +207,7 @@ int yoff; mrule = MELYS_RULE(widget); - if (!GTK_WIDGET_DRAWABLE(widget) || !mrule->tempomap) + if (!mrule->tempomap) return; tempomap = mrule->tempomap; @@ -243,6 +256,9 @@ gdk_draw_line(mrule->pixmap, widget->style->fg_gc[widget->state], 0, mrule->vcp->vtitle - VIEW_TITLE_RULE, widget->allocation.width, mrule->vcp->vtitle - VIEW_TITLE_RULE); + + if (!GTK_WIDGET_DRAWABLE(widget)) + return; gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], ap); gdk_draw_pixmap(widget->window,