diff -rNu melys-0.1.14/ChangeLog melys-0.1.15/ChangeLog --- melys-0.1.14/ChangeLog Mon Dec 20 23:30:11 1999 +++ melys-0.1.15/ChangeLog Thu Jan 6 19:03:31 2000 @@ -1,4 +1,44 @@ +2000-01-06 Steve Ratcliffe + + * widgets/melysgrid.m: + Make the grid extend beneath the existing tracks. + + * po/melys.pot, po/zz.po: Updated language files. + + * seq/seqplay.m: Only send pan command if it is not default. + + * seq/seqlib.m: Hopefully the final changes for the new API + + * midi/record.m: + Use correct define instead of (now out of date) magic number + in debugging statement. + + * md/mdutil.m: Fixed snap to bar. + + * widgets/melysgrid.m: + First checkin of the grid canvas item. This will be a flexible + grid where each view can specify the frequency of the horizontal + and vertical rulings. + At present it just draws vertical lines at each bar. + + * widgets/melysview.m: A melys_grid is now added to each view. + + * widgets/melystempo.m: Change the default horizontal scale. + + * widgets/melysrule.m: + Account for hbase offset when setting position by + clicking on the ruler. + +2000-01-04 Steve Ratcliffe + + * widgets/melysrule.m, widgets/melysscroll.m, widgets/melystempo.m, + widgets/viewcontrol.m: + Moved the hbase into the viewcontrol, instead of having + duplicates everywhere. + 1999-12-20 Steve Ratcliffe + + * version: Version 0.1.14 * programs/melplay.m, md/mdseq.m, md/mdutil.m, md/elements.m: new macro istracklike() which we need now that the TEMPOMAP diff -rNu melys-0.1.14/INSTALL melys-0.1.15/INSTALL --- melys-0.1.14/INSTALL Mon Dec 20 13:38:02 1999 +++ melys-0.1.15/INSTALL Thu Jan 6 19:03:31 2000 @@ -12,7 +12,7 @@ make This should build everything. If you see lots of errors, check the -requirements section. Probably cause is an old version of lixml. +requirements section. Probably the cause is an old version of libxml. Install ------- diff -rNu melys-0.1.14/README melys-0.1.15/README --- melys-0.1.14/README Mon Dec 20 13:38:03 1999 +++ melys-0.1.15/README Thu Jan 6 19:03:31 2000 @@ -2,8 +2,11 @@ This is Melys, a MIDI sequencer for ALSA. Written by Steve Ratcliffe: - Project home page: http://www.parabola.demon.co.uk/melys/ - Project mailing list: melys@parabola.demon.co.uk + Project home page: + http://www.parabola.demon.co.uk/melys/ + http://melys.sourceforge.net/ + Project mailing list: + http://lists.sourceforge.net/mailman/listinfo/melys-devel See the file COPYING for licence details. @@ -13,17 +16,6 @@ Melys is a Midi sequencer for ALSA written in C and using the GNOME/gtk+ libraries. -It is at an early stage of development, although you can already do -a few useful things with it. - -The latest features are in the track parts display. You can now split -part, join them, delete them and drag and drop them, both at a different -time and also onto a different track. Parts can also be dragged to -another window in the same application. - -There is now a piano roll view. You can move notes around in it and -copy them. No deletion or changing the length yet. - At present you can: - Read in files in either midi format or the Melys native format MDML. @@ -38,14 +30,15 @@ - Modify a few properties of the track such as instrument and channel number. -- Save the file. - - Edit tracks by cutting them up and rearranging by dragging. Parts can be dragged between different tracks and songs as well as adjusting their time position in the track. - Open up a piano roll view of a track. Select, drag, move or copy sets of notes within a part or to another part. + +- Open a graphical view of the tempo changes. Also displayed (read-only at + present) are the key and time signatures. - Files can be opened by dragging from a file manager. diff -rNu melys-0.1.14/examples/screenshot.mdml melys-0.1.15/examples/screenshot.mdml --- melys-0.1.14/examples/screenshot.mdml Sun Dec 19 16:59:33 1999 +++ melys-0.1.15/examples/screenshot.mdml Thu Jan 6 16:52:14 2000 @@ -102,7 +102,8 @@ - + + @@ -130,7 +131,6 @@ - diff -rNu melys-0.1.14/include/melysgrid.h melys-0.1.15/include/melysgrid.h --- melys-0.1.14/include/melysgrid.h Thu Jan 1 01:00:00 1970 +++ melys-0.1.15/include/melysgrid.h Thu Jan 6 19:05:52 2000 @@ -0,0 +1,65 @@ +/* + * + * Copyright (C) 1999 Steve Ratcliffe + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * A grid widget. You can specify major and minor rulings, the frequency + * of the rulings etc. + * + * + * + * + */ + +#define MELYS_GRID(obj) GTK_CHECK_CAST(obj, melys_grid_get_type(), MelysGrid) +#define MELYS_GRID_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, melys_grid_get_type(), MelysGridClass) +#define IS_MELYS_GRID(obj) GTK_CHECK_TYPE(obj, melys_grid_get_type()) + +typedef struct _MelysGrid MelysGrid; +typedef struct _MelysGridClass MelysGridClass; + + +/* + * The MelysGrid structure. Each instance of the class is + * allocated one of these structures. + */ +struct _MelysGrid { + GnomeCanvasItem gnome_canvas_item; + + ViewControl *vcp; + struct tempomapElement *tempomap; + + /* Grid spacings in tick and thing directions */ + int tick_major; + int tick_minor; + int thing_major; + int thing_minor; + + /* GC for drawing */ + GdkGC *majgc; /* Darker for major ruling */ + GdkGC *mingc; /* lighter for minor ruling */ + + int maj_dash_offset; + int min_dash_offset; +}; + +/* + * The MelysGridClass structure. There is only one of these + * allocated for the class. + */ +struct _MelysGridClass { + GnomeCanvasItemClass parent_class; +}; + +guint melys_grid_get_type(void); +GtkWidget *melys_grid_new(ViewControl *vcp); +void melys_grid_set_adj(MelysGrid *mgrid, ViewControl *vcp); +void melys_grid_set_tempomap(MelysGrid *mgrid, struct tempomapElement *tmap); diff -rNu melys-0.1.14/include/melysrule.h melys-0.1.15/include/melysrule.h --- melys-0.1.14/include/melysrule.h Mon Dec 20 23:40:40 1999 +++ melys-0.1.15/include/melysrule.h Thu Jan 6 19:05:53 2000 @@ -33,7 +33,6 @@ ViewControl *vcp; /* Horizontal adj for this rule */ int hoffset; /* Previous horizontal adjustment */ - int hbase; /* Zero point base TEMP XXX */ struct tempomapElement *tempomap; diff -rNu melys-0.1.14/include/melysscroll.h melys-0.1.15/include/melysscroll.h --- melys-0.1.14/include/melysscroll.h Mon Dec 20 23:40:40 1999 +++ melys-0.1.15/include/melysscroll.h Thu Jan 6 19:05:53 2000 @@ -42,9 +42,6 @@ int mouse_thing; int mouse_tick; - /* Base offset of zero point */ - int hbase; - int which; /* Whether vertical or horizontal (or both) */ }; diff -rNu melys-0.1.14/include/melysview.h melys-0.1.15/include/melysview.h --- melys-0.1.14/include/melysview.h Mon Dec 20 23:40:41 1999 +++ melys-0.1.15/include/melysview.h Thu Jan 6 19:05:54 2000 @@ -47,8 +47,9 @@ /* Widgets that are controlled by this widget */ GtkWidget *canvas; /* The canvas that the subclass will place items on */ GtkWidget *ruler; /* A ruler that can be used */ - GtkWidget *posline; /* Song position pointer */ + GtkObject *posline; /* Song position pointer */ GtkWidget *menu; /* The item context menu */ + GtkObject *grid; /* The background grid */ /* For the posline */ void *points; diff -rNu melys-0.1.14/include/viewcontrol.h melys-0.1.15/include/viewcontrol.h --- melys-0.1.14/include/viewcontrol.h Mon Dec 20 23:40:41 1999 +++ melys-0.1.15/include/viewcontrol.h Thu Jan 6 19:05:54 2000 @@ -55,6 +55,7 @@ /* Horizontal measurements */ int hscale; + int hbase; /* A controlling widget can set these to limit zooming */ int hminscale; diff -rNu melys-0.1.14/md/mdutil.c melys-0.1.15/md/mdutil.c --- melys-0.1.14/md/mdutil.c Mon Dec 20 23:40:56 1999 +++ melys-0.1.15/md/mdutil.c Thu Jan 6 19:06:08 2000 @@ -600,6 +600,7 @@ try2 = md_mbt_to_tick(tmap, &mbt); if (tick - try1 < try2 - tick) mbt.bars--; + tick = md_mbt_to_tick(tmap, &mbt); break; case SNAP_1: tick = tickround(tmap, tick, 1); break; diff -rNu melys-0.1.14/md/mdutil.m melys-0.1.15/md/mdutil.m --- melys-0.1.14/md/mdutil.m Mon Dec 20 13:39:50 1999 +++ melys-0.1.15/md/mdutil.m Thu Jan 6 16:52:34 2000 @@ -715,6 +715,7 @@ try2 = md_mbt_to_tick(tmap, &mbt); if (tick - try1 < try2 - tick) mbt.bars--; + tick = md_mbt_to_tick(tmap, &mbt); break; case SNAP_1: tick = tickround(tmap, tick, 1); break; diff -rNu melys-0.1.14/midi/record.c melys-0.1.15/midi/record.c --- melys-0.1.14/midi/record.c Mon Dec 20 23:41:04 1999 +++ melys-0.1.15/midi/record.c Thu Jan 6 19:06:18 2000 @@ -265,7 +265,7 @@ int n; int tn; - if (ep->type != 50) + if (ep->type != SND_SEQ_EVENT_SENSING) dprintf2("Got event %d time %ld", ep->type, ep->time.tick); /* This is an ALSA bug (reported) keyboard events have the REL bit diff -rNu melys-0.1.14/midi/record.m melys-0.1.15/midi/record.m --- melys-0.1.14/midi/record.m Mon Nov 29 23:46:34 1999 +++ melys-0.1.15/midi/record.m Thu Jan 6 16:54:33 2000 @@ -241,7 +241,7 @@ int n; int tn; - if (ep->type != 50) + if (ep->type != SND_SEQ_EVENT_SENSING) dprintf2("Got event %d time %ld", ep->type, ep->time.tick); /* This is an ALSA bug (reported) keyboard events have the REL bit diff -rNu melys-0.1.14/po/melys.pot melys-0.1.15/po/melys.pot --- melys-0.1.14/po/melys.pot Tue Dec 14 17:49:32 1999 +++ melys-0.1.15/po/melys.pot Thu Jan 6 16:57:44 2000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-12-14 17:48+0000\n" +"POT-Creation-Date: 2000-01-06 16:57+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -325,24 +325,24 @@ msgid "Freed an element %d with bad reference count %d" msgstr "" -#: play.m:85 +#: play.m:89 msgid "Melys sequencer" msgstr "" -#: play.m:360 +#: play.m:383 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 "" -#: play.m:389 +#: play.m:412 msgid "" "Melys should be built with ALSA version of\n" "at least 0.4.1. The muting function will hardly work at all" msgstr "" -#: play.m:473 +#: play.m:500 #, c-format msgid "BUG: play_unmute: t2=%ld, ahead time=%ld\n" msgstr "" @@ -443,12 +443,12 @@ msgid "Usage: showseq" msgstr "" -#: seqlib.m:107 seqlib.m:172 +#: seqlib.m:111 seqlib.m:182 #, c-format msgid "Could not open sequencer: %s" msgstr "" -#: seqlib.m:259 +#: seqlib.m:269 #, c-format msgid "Error (%s) creating sequencer port\n" msgstr "" @@ -472,7 +472,7 @@ msgid "Note: %3s Time: %3d:%02d:%03d" msgstr "" -#: melystempo.m:519 +#: melystempo.m:515 #, c-format msgid "Tempo: %3d Time: %3d:%02d:%03d" msgstr "" @@ -595,18 +595,18 @@ "Value was %d\n" msgstr "" -#: viewcontrol.m:256 +#: viewcontrol.m:276 msgid "Increase vertical scale" msgstr "" -#: viewcontrol.m:257 +#: viewcontrol.m:277 msgid "Decrease vertical scale" msgstr "" -#: viewcontrol.m:267 +#: viewcontrol.m:287 msgid "Increase horizontal scale" msgstr "" -#: viewcontrol.m:268 +#: viewcontrol.m:288 msgid "Decrease horizontail scale" msgstr "" diff -rNu melys-0.1.14/po/zz.po melys-0.1.15/po/zz.po --- melys-0.1.14/po/zz.po Tue Dec 14 17:49:32 1999 +++ melys-0.1.15/po/zz.po Thu Jan 6 16:57:44 2000 @@ -333,11 +333,11 @@ msgid "Freed an element %d with bad reference count %d" msgstr "F.R.E.E.D. A.N. E.L.E.M.E.N.T. %d W.I.T.H. B.A.D. R.E.F.E.R.E.N.C.E. C.O.U.N.T. %d" -#: play.m:85 +#: play.m:89 msgid "Melys sequencer" msgstr "M.E.L.Y.S. S.E.Q.U.E.N.C.E.R." -#: play.m:360 +#: play.m:383 msgid "" "Melys was not built with the ALSA remove_events\n" "patch. The muting function will not work very well\n" @@ -347,7 +347,7 @@ "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:389 +#: play.m:412 msgid "" "Melys should be built with ALSA version of\n" "at least 0.4.1. The muting function will hardly work at all" @@ -355,7 +355,7 @@ "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. O.F.\n" "A.T. L.E.A.S.T. 0.4.1. 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:473 +#: play.m:500 #, 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" @@ -463,12 +463,12 @@ msgid "Usage: showseq" msgstr "U.S.A.G.E.: S.H.O.W.S.E.Q." -#: seqlib.m:107 seqlib.m:172 +#: seqlib.m:111 seqlib.m:182 #, 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:259 +#: seqlib.m:269 #, 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" @@ -494,7 +494,7 @@ msgid "Note: %3s Time: %3d:%02d:%03d" msgstr "N.O.T.E.: %3S. T.I.M.E.: %3D.:%02D.:%03D." -#: melystempo.m:519 +#: melystempo.m:515 #, c-format msgid "Tempo: %3d Time: %3d:%02d:%03d" msgstr "T.E.M.P.O.: %3D. T.I.M.E.: %3D.:%02D.:%03D." @@ -620,19 +620,19 @@ "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" -#: viewcontrol.m:256 +#: viewcontrol.m:276 msgid "Increase vertical scale" msgstr "I.N.C.R.E.A.S.E. V.E.R.T.I.C.A.L. S.C.A.L.E." -#: viewcontrol.m:257 +#: viewcontrol.m:277 msgid "Decrease vertical scale" msgstr "D.E.C.R.E.A.S.E. V.E.R.T.I.C.A.L. S.C.A.L.E." -#: viewcontrol.m:267 +#: viewcontrol.m:287 msgid "Increase horizontal scale" msgstr "I.N.C.R.E.A.S.E. H.O.R.I.Z.O.N.T.A.L. S.C.A.L.E." -#: viewcontrol.m:268 +#: viewcontrol.m:288 msgid "Decrease horizontail scale" msgstr "D.E.C.R.E.A.S.E. H.O.R.I.Z.O.N.T.A.I.L. S.C.A.L.E." diff -rNu melys-0.1.14/programs/Makefile melys-0.1.15/programs/Makefile --- melys-0.1.14/programs/Makefile Mon Dec 20 23:40:50 1999 +++ melys-0.1.15/programs/Makefile Thu Jan 6 19:06:02 2000 @@ -59,7 +59,7 @@ ../widgets/viewcontrol.o ../widgets/melysview.o \ ../widgets/melyspiano.o ../widgets/melyskeys.o \ ../widgets/melystempo.o ../widgets/melysscale.o \ - ../widgets/melysscroll.o \ + ../widgets/melysscroll.o ../widgets/melysgrid.o \ ../widgets/melyssig.o ../widgets/melystimesig.o \ ../widgets/melyskeysig.o \ ../pixmaps/balls.o ../pixmaps/menu_icons.o ../pixmaps/mag.o diff -rNu melys-0.1.14/programs/melys.m melys-0.1.15/programs/melys.m --- melys-0.1.14/programs/melys.m Wed Dec 1 13:11:12 1999 +++ melys-0.1.15/programs/melys.m Thu Jan 6 16:54:56 2000 @@ -33,7 +33,7 @@ >>make --objects ../widgets/viewcontrol.o ../widgets/melysview.o >>make --objects ../widgets/melyspiano.o ../widgets/melyskeys.o >>make --objects ../widgets/melystempo.o ../widgets/melysscale.o ->>make --objects ../widgets/melysscroll.o +>>make --objects ../widgets/melysscroll.o ../widgets/melysgrid.o >>make --objects ../widgets/melyssig.o ../widgets/melystimesig.o >>make --objects ../widgets/melyskeysig.o >>make --objects ../pixmaps/balls.o ../pixmaps/menu_icons.o ../pixmaps/mag.o diff -rNu melys-0.1.14/seq/seqlib.c melys-0.1.15/seq/seqlib.c --- melys-0.1.14/seq/seqlib.c Mon Dec 20 23:40:51 1999 +++ melys-0.1.15/seq/seqlib.c Thu Jan 6 19:06:03 2000 @@ -43,6 +43,7 @@ #define POOL_SMALL 80 /* This does need to be fairly large */ /* Static functions */ +static void set_channel(snd_seq_event_t *ep, int chan); static GArray *get_addr_list(seq_context_t *ctxp, int inout); static void fix_output_pool(snd_seq_t *seq, int client, int size); @@ -337,7 +338,9 @@ addr = g_array_index(list, snd_seq_addr_t, i); -#ifndef SEQ_API_2 +#ifdef SEQ_API_2 + subs.queue = ctxp->queue; +#else addr.queue = ctxp->queue; #endif /* not SEQ_API_2 */ @@ -357,7 +360,7 @@ seq_addr_string(&subs.dest)); #endif - subs.realtime = 0; /* XXX */ + subs.realtime = 0; subs.exclusive = 0; #ifdef SND_SEQ_CLIENT_DUMMY /* TEMP this about identifies when this thing was added @@ -494,6 +497,37 @@ ctxp->queue = q; } +static void +set_channel(snd_seq_event_t *ep, int chan) +{ + +#ifdef SEQ_API_2 + switch (ep->type) { + case SND_SEQ_EVENT_NOTE: + case SND_SEQ_EVENT_NOTEON: + case SND_SEQ_EVENT_NOTEOFF: + ep->data.note.channel = chan; + break; + case SND_SEQ_EVENT_KEYPRESS: + case SND_SEQ_EVENT_PGMCHANGE: + case SND_SEQ_EVENT_CHANPRESS: + case SND_SEQ_EVENT_PITCHBEND: + case SND_SEQ_EVENT_CONTROL14: + case SND_SEQ_EVENT_NONREGPARAM: + case SND_SEQ_EVENT_REGPARAM: + case SND_SEQ_EVENT_CONTROLLER: + ep->data.control.channel = chan; + break; + default: + if (snd_seq_ev_is_channel_type(ep)) + g_warning("Missed a case in set_channel"); + break; + } +#else + ep->dest.channel = chan; +#endif +} + /* * Send the event to the specified client and port. * @@ -509,14 +543,13 @@ snd_seq_addr_t *addr; ep->source = ctxp->source; + ep->queue = ctxp->queue; addr = seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); if (!addr) return -EINVAL; ep->dest = *addr; -#ifndef SEQ_API_2 - ep->dest.channel = chan; -#endif /* not SEQ_API_2 */ + set_channel(ep, chan); return seq_write(ctxp, ep); } @@ -569,21 +602,8 @@ #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; - } + set_channel(ep, chan); (void)seq_control_write(ctxp, ep); -#endif /* SEQ_API_2 */ } } diff -rNu melys-0.1.14/seq/seqlib.m melys-0.1.15/seq/seqlib.m --- melys-0.1.14/seq/seqlib.m Mon Dec 20 13:36:53 1999 +++ melys-0.1.15/seq/seqlib.m Thu Jan 6 16:55:47 2000 @@ -389,7 +389,9 @@ addr = g_array_index(list, snd_seq_addr_t, i); -#ifndef SEQ_API_2 +#ifdef SEQ_API_2 + subs.queue = ctxp->queue; +#else addr.queue = ctxp->queue; #endif /* not SEQ_API_2 */ @@ -409,7 +411,7 @@ seq_addr_string(&subs.dest)); #endif - subs.realtime = 0; /* XXX */ + subs.realtime = 0; subs.exclusive = 0; #ifdef SND_SEQ_CLIENT_DUMMY /* TEMP this about identifies when this thing was added @@ -548,6 +550,39 @@ ctxp->queue = q; +>>function set_channel +static void +snd_seq_event_t *ep; +int chan; +>>code + +#ifdef SEQ_API_2 + switch (ep->type) { + case SND_SEQ_EVENT_NOTE: + case SND_SEQ_EVENT_NOTEON: + case SND_SEQ_EVENT_NOTEOFF: + ep->data.note.channel = chan; + break; + case SND_SEQ_EVENT_KEYPRESS: + case SND_SEQ_EVENT_PGMCHANGE: + case SND_SEQ_EVENT_CHANPRESS: + case SND_SEQ_EVENT_PITCHBEND: + case SND_SEQ_EVENT_CONTROL14: + case SND_SEQ_EVENT_NONREGPARAM: + case SND_SEQ_EVENT_REGPARAM: + case SND_SEQ_EVENT_CONTROLLER: + ep->data.control.channel = chan; + break; + default: + if (snd_seq_ev_is_channel_type(ep)) + g_warning("Missed a case in @func_name"); + break; + } +#else + ep->dest.channel = chan; +#endif + + >>function seq_sendto int seq_context_t *ctxp; Client context @@ -562,14 +597,13 @@ snd_seq_addr_t *addr; ep->source = ctxp->source; + ep->queue = ctxp->queue; addr = seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); if (!addr) return -EINVAL; ep->dest = *addr; -#ifndef SEQ_API_2 - ep->dest.channel = chan; -#endif /* not SEQ_API_2 */ + set_channel(ep, chan); return seq_write(ctxp, ep); >>function seq_sendto_now @@ -618,21 +652,8 @@ #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; - } + set_channel(ep, chan); (void)seq_control_write(ctxp, ep); -#endif /* SEQ_API_2 */ } } diff -rNu melys-0.1.14/seq/seqplay.c melys-0.1.15/seq/seqplay.c --- melys-0.1.14/seq/seqplay.c Mon Dec 20 23:40:51 1999 +++ melys-0.1.15/seq/seqplay.c Thu Jan 6 19:06:04 2000 @@ -232,11 +232,13 @@ seq_write(ctxp, &ev); /* Set initial pan position */ - seq_midi_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); - 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); + if (track->pan != 0) { + seq_midi_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); + 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); diff -rNu melys-0.1.14/seq/seqplay.m melys-0.1.15/seq/seqplay.m --- melys-0.1.14/seq/seqplay.m Mon Dec 20 23:33:37 1999 +++ melys-0.1.15/seq/seqplay.m Thu Jan 6 16:56:13 2000 @@ -223,11 +223,13 @@ seq_write(ctxp, &ev); /* Set initial pan position */ - seq_midi_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); - 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); + if (track->pan != 0) { + seq_midi_event_init(ctxp, &ev, TRUE, time, MD_DEVCHAN(track)); + 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); diff -rNu melys-0.1.14/version melys-0.1.15/version --- melys-0.1.14/version Mon Dec 20 23:40:22 1999 +++ melys-0.1.15/version Thu Jan 6 19:05:33 2000 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.1.14" +#define MELYS_VERSION_STRING "0.1.15" diff -rNu melys-0.1.14/widgets/.cvsignore melys-0.1.15/widgets/.cvsignore --- melys-0.1.14/widgets/.cvsignore Mon Dec 20 23:40:48 1999 +++ melys-0.1.15/widgets/.cvsignore Thu Jan 6 19:06:01 2000 @@ -1,3 +1,4 @@ +melysgrid.c melyskeys.c melyskeysig.c melyspartitem.c diff -rNu melys-0.1.14/widgets/Makefile melys-0.1.15/widgets/Makefile --- melys-0.1.14/widgets/Makefile Mon Dec 20 23:40:48 1999 +++ melys-0.1.15/widgets/Makefile Thu Jan 6 19:06:01 2000 @@ -4,7 +4,8 @@ include $(TOP)/make.conf TARGETS = -OBJS = melyskeys.o \ +OBJS = melysgrid.o \ + melyskeys.o \ melyskeysig.o \ melyspartitem.o \ melyspiano.o \ @@ -23,7 +24,8 @@ misc.o \ register.o \ viewcontrol.o -GENCFILES = melyskeys.c \ +GENCFILES = melysgrid.c \ + melyskeys.c \ melyskeysig.c \ melyspartitem.c \ melyspiano.c \ @@ -42,7 +44,8 @@ misc.c \ register.c \ viewcontrol.c -GENHFILES = ../include/melyskeys.h \ +GENHFILES = ../include/melysgrid.h \ + ../include/melyskeys.h \ ../include/melyskeysig.h \ ../include/melyspartitem.h \ ../include/melyspiano.h \ @@ -114,6 +117,7 @@ melysview.o: ../include/md.h melysview.o: ../include/viewcontrol.h melysview.o: ../include/melysrule.h +melysview.o: ../include/melysgrid.h melysview.o: ../include/melwidgets.h melysview.o: ../include/melysscroll.h melysview.o: ../include/song.h @@ -136,12 +140,15 @@ melyspiano.o: ../include/melyskeys.h melyspiano.o: ../include/melyspiano.h melystransport.o: ../include/melystransport.h +melyssig.o: ../include/elements.h +melyssig.o: ../include/md.h +melyssig.o: ../include/viewcontrol.h +melyssig.o: ../include/melysscroll.h +melyssig.o: ../include/melwidgets.h +melyssig.o: ../include/melyssig.h register.o: ../include/melreg.h -melysrule.o: ../include/elements.h -melysrule.o: ../include/md.h -melysrule.o: ../include/viewcontrol.h -melysrule.o: ../include/melystrack.h -melysrule.o: ../include/melysrule.h +melysscroll.o: ../include/elements.h +melysscroll.o: ../include/md.h melysscroll.o: ../include/viewcontrol.h melysscroll.o: ../include/melysscroll.h melystimesig.o: ../include/elements.h @@ -168,17 +175,20 @@ melystrackdisplay.o: ../include/melmsg.h melystrackdisplay.o: ../include/meldnd.h melystrackdisplay.o: ../include/melystrackdisplay.h +melysgrid.o: ../include/elements.h +melysgrid.o: ../include/md.h +melysgrid.o: ../include/viewcontrol.h +melysgrid.o: ../include/melysgrid.h misc.o: ../include/pixmaps.h misc.o: ../include/melgui.h misc.o: ../include/elements.h misc.o: ../include/md.h misc.o: ../include/melwidgets.h -melyssig.o: ../include/elements.h -melyssig.o: ../include/md.h -melyssig.o: ../include/viewcontrol.h -melyssig.o: ../include/melysscroll.h -melyssig.o: ../include/melwidgets.h -melyssig.o: ../include/melyssig.h +melysrule.o: ../include/elements.h +melysrule.o: ../include/md.h +melysrule.o: ../include/viewcontrol.h +melysrule.o: ../include/melystrack.h +melysrule.o: ../include/melysrule.h melystrackinfo.o: ../include/melmsg.h melystrackinfo.o: ../include/melgui.h melystrackinfo.o: ../include/pixmaps.h diff -rNu melys-0.1.14/widgets/melysgrid.c melys-0.1.15/widgets/melysgrid.c --- melys-0.1.14/widgets/melysgrid.c Thu Jan 1 01:00:00 1970 +++ melys-0.1.15/widgets/melysgrid.c Thu Jan 6 19:06:11 2000 @@ -0,0 +1,359 @@ +/* + * + * Copyright (C) 1999 Steve Ratcliffe + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * A grid widget. You can specify major and minor rulings, the frequency + * of the rulings etc. + * + * + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "gtk/gtksignal.h" +#include "gtk/gtkwidget.h" +#include "libgnomeui/gnome-canvas.h" +#include "libgnomeui/gnome-canvas-util.h" +#include "elements.h" +#include "md.h" +#include "viewcontrol.h" +#include "melysgrid.h" +#include "intl.h" + + +/* The list of signal id's that are being added for MelysGrid. */ +enum { + LAST_SIGNAL +}; + +/* Argument numbers */ +enum { + ARG_0, +}; + + +#define x_to_tick(g, x) view_control_x_to_tick(MELYS_GRID(g)->vcp, (x)) +#define tick_to_x(g, t) view_control_tick_to_x(MELYS_GRID(g)->vcp, (t)) + +static gchar maj_dash[] = { 1, 1 }; +static gchar min_dash[] = { 1, 3 }; +static const int max_dash_offset = 4; + +/* Static functions */ +static void melys_grid_init(MelysGrid *mgrid); +static void melys_grid_class_init(MelysGridClass *klass); +static void grid_realize(GnomeCanvasItem *item); +static void grid_unrealize(GnomeCanvasItem *item); +static void grid_destroy(GtkObject *obj); +static double grid_point(GnomeCanvasItem *item, double x, double y, int cx, + int cy, GnomeCanvasItem **actual); +static void grid_update(GnomeCanvasItem *item, double *affine, ArtSVP *clip, + int flags); +static void grid_draw(GnomeCanvasItem *item, GdkDrawable *drawable, int x, + int y, int width, int height); +static void scale_changed(GtkObject *obj, gpointer data); + + +static GnomeCanvasItemClass *parent_class = NULL; + +static gint melys_grid_signals[LAST_SIGNAL]; + +/* + * Return a unique integer that represents the object type. + */ +guint +melys_grid_get_type(void) +{ + static guint mtype = 0; + + if (!mtype) { + GtkTypeInfo minfo = { + "MelysGrid", + sizeof(MelysGrid), + sizeof(MelysGridClass), + (GtkClassInitFunc) melys_grid_class_init, + (GtkObjectInitFunc) melys_grid_init, + (GtkArgSetFunc) NULL, + (GtkArgGetFunc) NULL, + (GtkClassInitFunc) NULL, + }; + + mtype = gtk_type_unique(gnome_canvas_item_get_type(), &minfo); + } + + return mtype; +} + +/* + * Create a new MelysGrid object. + */ +GtkWidget * +melys_grid_new(ViewControl *vcp) +{ + GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_grid_get_type())); + MelysGrid *mgrid = MELYS_GRID(w); + + if (vcp) + melys_grid_set_adj(mgrid, vcp); + + return w; +} + +/* + * Initialise the MelysGrid. + * + * Arguments: + * mgrid - The MelysGrid to init + */ +static void +melys_grid_init(MelysGrid *mgrid) +{ + + mgrid->vcp = NULL; + mgrid->tick_major = SNAP_BAR; + mgrid->tick_minor = 0; + mgrid->thing_major = 1; + mgrid->thing_minor = 0; +} + +/* + * Initialize the class. + * + * Arguments: + * klass - The class to initialise + */ +static void +melys_grid_class_init(MelysGridClass *klass) +{ + GtkObjectClass *object_class; + GnomeCanvasItemClass *gnome_canvas_item_class; + + object_class = (GtkObjectClass *)klass; + gnome_canvas_item_class = (GnomeCanvasItemClass *)klass; + + parent_class = gtk_type_class(gnome_canvas_item_get_type()); + + gtk_object_class_add_signals(object_class, melys_grid_signals, LAST_SIGNAL); + + object_class->destroy = grid_destroy; + + gnome_canvas_item_class->realize = grid_realize; + gnome_canvas_item_class->unrealize = grid_unrealize; + gnome_canvas_item_class->point = grid_point; + gnome_canvas_item_class->update = grid_update; + gnome_canvas_item_class->draw = grid_draw; +} + +void +melys_grid_set_adj(MelysGrid *mgrid, ViewControl *vcp) +{ + + if (vcp) { + if (mgrid->vcp) + gtk_object_unref((GtkObject *) mgrid->vcp); + mgrid->vcp = vcp; + gtk_object_ref((GtkObject *) vcp); + +#if 0 + gnome_canvas_update_bbox(GNOME_CANVAS_ITEM(mgrid), + 0, 0, + view_control_tick_to_x(vcp, vcp->hadj->upper), + view_control_thing_to_y(vcp, vcp->vadj->upper) + ); +#endif + + gtk_signal_connect(GTK_OBJECT(vcp), "scale-changed", + scale_changed, mgrid); + } +} + +void +melys_grid_set_tempomap(MelysGrid *mgrid, struct tempomapElement *tmap) +{ + + if (mgrid->tempomap) + md_free(MD_ELEMENT(mgrid->tempomap)); + + MD_REF(tmap); + mgrid->tempomap = tmap; + gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(mgrid)); +} + +static void +grid_realize(GnomeCanvasItem *item) +{ + MelysGrid *mgrid = MELYS_GRID(item); + + if (parent_class->realize) + (*parent_class->realize)(item); + + mgrid->majgc = gdk_gc_new(item->canvas->layout.bin_window); + mgrid->mingc = gdk_gc_new(item->canvas->layout.bin_window); + + gdk_gc_set_line_attributes(mgrid->majgc, 1, GDK_LINE_ON_OFF_DASH, + GDK_CAP_BUTT, GDK_JOIN_MITER); + gdk_gc_set_dashes(mgrid->majgc, 0, maj_dash, NELEM(maj_dash)); + + gdk_gc_set_line_attributes(mgrid->mingc, 1, GDK_LINE_ON_OFF_DASH, + GDK_CAP_BUTT, GDK_JOIN_MITER); + gdk_gc_set_dashes(mgrid->mingc, 0, min_dash, NELEM(min_dash)); +} + +static void +grid_unrealize(GnomeCanvasItem *item) +{ + MelysGrid *mgrid = MELYS_GRID(item); + + gdk_gc_unref(mgrid->majgc); + gdk_gc_unref(mgrid->mingc); + mgrid->majgc = NULL; + mgrid->mingc = NULL; + + if (parent_class->unrealize) + (*parent_class->unrealize)(item); +} + +static void +grid_destroy(GtkObject *obj) +{ + MelysGrid *mgrid = MELYS_GRID(obj); + + g_assert(mgrid->majgc == 0); + + if (mgrid->vcp) + gtk_object_unref((GtkObject *) mgrid->vcp); + + if (mgrid->tempomap) + MD_UNREF(mgrid->tempomap); +} + +/* + * As this item covers the whole of the canvas all points are + * "inside" so this routine always returns 0. + * + * Arguments: + * item - The mgrid + * x - Point to test + * y - Point to test + * cx - Point to test in canvas co-ords + * cy - Point to test in canvas co-ords + * actual - Return of top most item in group + */ +static double +grid_point(GnomeCanvasItem *item, double x, double y, int cx, int cy, + GnomeCanvasItem **actual) +{ + + *actual = item; + return 0.0; +} + +static void +grid_update(GnomeCanvasItem *item, double *affine, ArtSVP *clip, int flags) +{ + ViewControl *vcp; + int width; + int height; + + if (parent_class->update) + (*parent_class->update)(item, affine, clip, flags); + + vcp = MELYS_GRID(item)->vcp; + + width = view_control_tick_to_x(vcp, vcp->hadj->upper); + if (width < GTK_WIDGET(item->canvas)->allocation.width) + width = GTK_WIDGET(item->canvas)->allocation.width; + height = view_control_thing_to_y(vcp, vcp->vadj->upper); + if (height < GTK_WIDGET(item->canvas)->allocation.height) + height = GTK_WIDGET(item->canvas)->allocation.height; + gnome_canvas_update_bbox(item, + 0, 0, + width, + height + ); +#if 0 + gnome_canvas_request_redraw(item->canvas, + 0, 0, + 1000000, 100000 + ); +#endif +} + +static void +grid_draw(GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, + int width, int height) +{ + MelysGrid *mgrid = MELYS_GRID(item); + struct mbt mbt; + ticktime_t tick; + int xoff; + + if (parent_class->draw) + (*parent_class->draw)(item, drawable, x, y, width, height); + + if (x < mgrid->vcp->hbase) + tick = 0; + else + tick = x_to_tick(item, x - mgrid->vcp->hbase); + md_tick_to_mbt(mgrid->tempomap, tick, &mbt); + tick = md_snap_tick(mgrid->tempomap, mgrid->tick_major, tick); + + xoff = mgrid->vcp->hbase + tick_to_x(item, tick) - x; + + /* + * Do the vertical rulings. First the major ruling. + * First need to set the dash offset (perhaps dashes are not a good + * idea?) + */ + if (mgrid->maj_dash_offset != y % max_dash_offset) { + mgrid->maj_dash_offset = y % max_dash_offset; + gdk_gc_set_dashes(mgrid->majgc, y % max_dash_offset, + maj_dash, NELEM(maj_dash)); + } + + while (xoff < width) { + + if (xoff >= 0) + gdk_draw_line(drawable, mgrid->majgc, + xoff, 0, + xoff, height); + + /* TEMP */ + mbt.bars++; + mbt.beats = 0; + mbt.ticks = 0; + tick = md_mbt_to_tick(mgrid->tempomap, &mbt); + + xoff = mgrid->vcp->hbase + tick_to_x(mgrid, tick) - x; + } +} + +static void +scale_changed(GtkObject *obj, gpointer data) +{ + MelysGrid *mgrid = data; + ViewControl *vcp = VIEW_CONTROL(obj); + + if (!GTK_WIDGET_REALIZED(mgrid)) + return; + + gnome_canvas_update_bbox(data, + 0, 0, + view_control_tick_to_x(vcp, vcp->hadj->upper), + view_control_thing_to_y(vcp, vcp->vadj->upper) + ); + gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(mgrid)); +} diff -rNu melys-0.1.14/widgets/melysgrid.m melys-0.1.15/widgets/melysgrid.m --- melys-0.1.14/widgets/melysgrid.m Thu Jan 1 01:00:00 1970 +++ melys-0.1.15/widgets/melysgrid.m Thu Jan 6 18:50:05 2000 @@ -0,0 +1,362 @@ +>>name melysgrid.m - A grid widget for Melys. + +Copyright (C) 1999 Steve Ratcliffe + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +A grid widget. You can specify major and minor rulings, the frequency +of the rulings etc. + +>>header gtk/gtksignal.h +>>header gtk/gtkwidget.h + +>>header libgnomeui/gnome-canvas.h +>>header libgnomeui/gnome-canvas-util.h + +>>header elements.h +>>header md.h +>>header viewcontrol.h +>>gtkobject melys_grid gnome_canvas_item + +>>headerdef @header + +/* + * The MelysGrid structure. Each instance of the class is + * allocated one of these structures. + */ +struct _MelysGrid { + GnomeCanvasItem gnome_canvas_item; + + ViewControl *vcp; + struct tempomapElement *tempomap; + + /* Grid spacings in tick and thing directions */ + int tick_major; + int tick_minor; + int thing_major; + int thing_minor; + + /* GC for drawing */ + GdkGC *majgc; /* Darker for major ruling */ + GdkGC *mingc; /* lighter for minor ruling */ + + int maj_dash_offset; + int min_dash_offset; +}; + +/* + * The MelysGridClass structure. There is only one of these + * allocated for the class. + */ +struct _MelysGridClass { + GnomeCanvasItemClass parent_class; +}; + +>>extern + +/* The list of signal id's that are being added for MelysGrid. */ +enum { + LAST_SIGNAL +}; + +/* Argument numbers */ +enum { + ARG_0, +}; + + +#define x_to_tick(g, x) view_control_x_to_tick(MELYS_GRID(g)->vcp, (x)) +#define tick_to_x(g, t) view_control_tick_to_x(MELYS_GRID(g)->vcp, (t)) + +static gchar maj_dash[] = { 1, 1 }; +static gchar min_dash[] = { 1, 3 }; +static const int max_dash_offset = 4; + + +>>function melys_grid_new +GtkWidget * +ViewControl *vcp; + +>>description +Create a new MelysGrid object. +>>code + GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_grid_get_type())); + MelysGrid *mgrid = MELYS_GRID(w); + + if (vcp) + melys_grid_set_adj(mgrid, vcp); + + return w; + + +>>function melys_grid_init +static void +MelysGrid *mgrid; The MelysGrid to init +>>description +Initialise the MelysGrid. +>>code + + mgrid->vcp = NULL; + mgrid->tick_major = SNAP_BAR; + mgrid->tick_minor = 0; + mgrid->thing_major = 1; + mgrid->thing_minor = 0; + + + +>>function melys_grid_class_init +static void +MelysGridClass *klass; The class to initialise + +>>description +Initialize the class. + +>>code + GtkObjectClass *object_class; + GnomeCanvasItemClass *gnome_canvas_item_class; + + object_class = (GtkObjectClass *)klass; + gnome_canvas_item_class = (GnomeCanvasItemClass *)klass; + + parent_class = gtk_type_class(gnome_canvas_item_get_type()); + + gtk_object_class_add_signals(object_class, melys_grid_signals, LAST_SIGNAL); + + object_class->destroy = grid_destroy; + + gnome_canvas_item_class->realize = grid_realize; + gnome_canvas_item_class->unrealize = grid_unrealize; + gnome_canvas_item_class->point = grid_point; + gnome_canvas_item_class->update = grid_update; + gnome_canvas_item_class->draw = grid_draw; + + + +>>function melys_grid_set_adj +void +MelysGrid *mgrid; +ViewControl *vcp; + +>>code + + if (vcp) { + if (mgrid->vcp) + gtk_object_unref((GtkObject *) mgrid->vcp); + mgrid->vcp = vcp; + gtk_object_ref((GtkObject *) vcp); + +#if 0 + gnome_canvas_update_bbox(GNOME_CANVAS_ITEM(mgrid), + 0, 0, + view_control_tick_to_x(vcp, vcp->hadj->upper), + view_control_thing_to_y(vcp, vcp->vadj->upper) + ); +#endif + + gtk_signal_connect(GTK_OBJECT(vcp), "scale-changed", + scale_changed, mgrid); + } + + +>>function melys_grid_set_tempomap +void +MelysGrid *mgrid; +struct tempomapElement *tmap; + +>>code + + if (mgrid->tempomap) + md_free(MD_ELEMENT(mgrid->tempomap)); + + MD_REF(tmap); + mgrid->tempomap = tmap; + gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(mgrid)); + + +>>function grid_realize +static void +GnomeCanvasItem *item; + +>>code + MelysGrid *mgrid = MELYS_GRID(item); + + if (parent_class->realize) + (*parent_class->realize)(item); + + mgrid->majgc = gdk_gc_new(item->canvas->layout.bin_window); + mgrid->mingc = gdk_gc_new(item->canvas->layout.bin_window); + + gdk_gc_set_line_attributes(mgrid->majgc, 1, GDK_LINE_ON_OFF_DASH, + GDK_CAP_BUTT, GDK_JOIN_MITER); + gdk_gc_set_dashes(mgrid->majgc, 0, maj_dash, NELEM(maj_dash)); + + gdk_gc_set_line_attributes(mgrid->mingc, 1, GDK_LINE_ON_OFF_DASH, + GDK_CAP_BUTT, GDK_JOIN_MITER); + gdk_gc_set_dashes(mgrid->mingc, 0, min_dash, NELEM(min_dash)); + + +>>function grid_unrealize +static void +GnomeCanvasItem *item; + +>>code + MelysGrid *mgrid = MELYS_GRID(item); + + gdk_gc_unref(mgrid->majgc); + gdk_gc_unref(mgrid->mingc); + mgrid->majgc = NULL; + mgrid->mingc = NULL; + + if (parent_class->unrealize) + (*parent_class->unrealize)(item); + + +>>function grid_destroy +static void +GtkObject *obj; +>>code + MelysGrid *mgrid = MELYS_GRID(obj); + + g_assert(mgrid->majgc == 0); + + if (mgrid->vcp) + gtk_object_unref((GtkObject *) mgrid->vcp); + + if (mgrid->tempomap) + MD_UNREF(mgrid->tempomap); + + +>>function grid_point +static double +GnomeCanvasItem *item; The mgrid +double x; Point to test +double y; Point to test +int cx; Point to test in canvas co-ords +int cy; Point to test in canvas co-ords +GnomeCanvasItem **actual; Return of top most item in group + +>>description +As this item covers the whole of the canvas all points are "inside" +so this routine always returns 0. + +>>code + + *actual = item; + return 0.0; + +>>function grid_update +static void +GnomeCanvasItem *item; +double *affine; +ArtSVP *clip; +int flags; + +>>code + ViewControl *vcp; + int width; + int height; + + if (parent_class->update) + (*parent_class->update)(item, affine, clip, flags); + + vcp = MELYS_GRID(item)->vcp; + + width = view_control_tick_to_x(vcp, vcp->hadj->upper); + if (width < GTK_WIDGET(item->canvas)->allocation.width) + width = GTK_WIDGET(item->canvas)->allocation.width; + height = view_control_thing_to_y(vcp, vcp->vadj->upper); + if (height < GTK_WIDGET(item->canvas)->allocation.height) + height = GTK_WIDGET(item->canvas)->allocation.height; + gnome_canvas_update_bbox(item, + 0, 0, + width, + height + ); +#if 0 + gnome_canvas_request_redraw(item->canvas, + 0, 0, + 1000000, 100000 + ); +#endif + + +>>function grid_draw +static void +GnomeCanvasItem *item; The mgrid +GdkDrawable *drawable; Something to draw upon +int x; The buffer x offset +int y; The buffer y offset +int width; The buffer width +int height; The buffer height + +>>code + MelysGrid *mgrid = MELYS_GRID(item); + struct mbt mbt; + ticktime_t tick; + int xoff; + + if (parent_class->draw) + (*parent_class->draw)(item, drawable, x, y, width, height); + + if (x < mgrid->vcp->hbase) + tick = 0; + else + tick = x_to_tick(item, x - mgrid->vcp->hbase); + md_tick_to_mbt(mgrid->tempomap, tick, &mbt); + tick = md_snap_tick(mgrid->tempomap, mgrid->tick_major, tick); + + xoff = mgrid->vcp->hbase + tick_to_x(item, tick) - x; + + /* + * Do the vertical rulings. First the major ruling. + * First need to set the dash offset (perhaps dashes are not a good + * idea?) + */ + if (mgrid->maj_dash_offset != y % max_dash_offset) { + mgrid->maj_dash_offset = y % max_dash_offset; + gdk_gc_set_dashes(mgrid->majgc, y % max_dash_offset, + maj_dash, NELEM(maj_dash)); + } + + while (xoff < width) { + + if (xoff >= 0) + gdk_draw_line(drawable, mgrid->majgc, + xoff, 0, + xoff, height); + + /* TEMP */ + mbt.bars++; + mbt.beats = 0; + mbt.ticks = 0; + tick = md_mbt_to_tick(mgrid->tempomap, &mbt); + + xoff = mgrid->vcp->hbase + tick_to_x(mgrid, tick) - x; + } + + +>>function scale_changed +static void +GtkObject *obj; The view control +gpointer data; Our mgrid info + +>>code + MelysGrid *mgrid = data; + ViewControl *vcp = VIEW_CONTROL(obj); + + if (!GTK_WIDGET_REALIZED(mgrid)) + return; + + gnome_canvas_update_bbox(data, + 0, 0, + view_control_tick_to_x(vcp, vcp->hadj->upper), + view_control_thing_to_y(vcp, vcp->vadj->upper) + ); + gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(mgrid)); diff -rNu melys-0.1.14/widgets/melysrule.c melys-0.1.15/widgets/melysrule.c --- melys-0.1.14/widgets/melysrule.c Mon Dec 20 23:41:00 1999 +++ melys-0.1.15/widgets/melysrule.c Thu Jan 6 19:06:13 2000 @@ -262,7 +262,7 @@ widget->allocation.width, widget->allocation.height); for (; x < ap->x + ap->width; ) { - x += mrule->hbase; + x += mrule->vcp->hbase; if ((mbt.bars % 4) == 0) { yoff = 10; g_snprintf(numbuf, 20, "%d", mbt.bars+1); @@ -360,7 +360,8 @@ switch (event->button) { case 1: if (event->state & GDK_SHIFT_MASK) { - tick = mrule->hoffset + x_to_tick(mrule, (int) event->x); + tick = mrule->hoffset + + x_to_tick(mrule, (int) event->x - mrule->vcp->hbase); gtk_adjustment_set_value(mrule->vcp->posadj, tick); } break; diff -rNu melys-0.1.14/widgets/melysrule.m melys-0.1.15/widgets/melysrule.m --- melys-0.1.14/widgets/melysrule.m Mon Dec 20 13:37:49 1999 +++ melys-0.1.15/widgets/melysrule.m Thu Jan 6 16:43:14 2000 @@ -33,7 +33,6 @@ ViewControl *vcp; /* Horizontal adj for this rule */ int hoffset; /* Previous horizontal adjustment */ - int hbase; /* Zero point base TEMP XXX */ struct tempomapElement *tempomap; @@ -239,7 +238,7 @@ widget->allocation.width, widget->allocation.height); for (; x < ap->x + ap->width; ) { - x += mrule->hbase; + x += mrule->vcp->hbase; if ((mbt.bars % 4) == 0) { yoff = 10; g_snprintf(numbuf, 20, "%d", mbt.bars+1); @@ -344,7 +343,8 @@ switch (event->button) { case 1: if (event->state & GDK_SHIFT_MASK) { - tick = mrule->hoffset + x_to_tick(mrule, (int) event->x); + tick = mrule->hoffset + + x_to_tick(mrule, (int) event->x - mrule->vcp->hbase); gtk_adjustment_set_value(mrule->vcp->posadj, tick); } break; diff -rNu melys-0.1.14/widgets/melysscroll.c melys-0.1.15/widgets/melysscroll.c --- melys-0.1.14/widgets/melysscroll.c Mon Dec 20 23:41:00 1999 +++ melys-0.1.15/widgets/melysscroll.c Thu Jan 6 19:06:13 2000 @@ -19,6 +19,8 @@ #include "util.h" #include "gtk/gtksignal.h" #include "libgnomeui/gnome-canvas.h" +#include "elements.h" +#include "md.h" #include "viewcontrol.h" #include "melysscroll.h" #include "intl.h" @@ -298,7 +300,7 @@ height = GTK_WIDGET(mscroll)->allocation.height; gnome_canvas_set_scroll_region(GNOME_CANVAS(mscroll), - -mscroll->hbase, 0.0, + -mscroll->vcp->hbase, 0.0, width, height); mscroll->voffset = -1; diff -rNu melys-0.1.14/widgets/melysscroll.m melys-0.1.15/widgets/melysscroll.m --- melys-0.1.14/widgets/melysscroll.m Tue Dec 14 16:52:18 1999 +++ melys-0.1.15/widgets/melysscroll.m Tue Jan 4 10:45:13 2000 @@ -16,6 +16,8 @@ >>header libgnomeui/gnome-canvas.h +>>header elements.h +>>header md.h >>header viewcontrol.h >>gtkobject melys_scroll gnome_canvas @@ -43,9 +45,6 @@ int mouse_thing; int mouse_tick; - /* Base offset of zero point */ - int hbase; - int which; /* Whether vertical or horizontal (or both) */ }; @@ -299,7 +298,7 @@ height = GTK_WIDGET(mscroll)->allocation.height; gnome_canvas_set_scroll_region(GNOME_CANVAS(mscroll), - -mscroll->hbase, 0.0, + -mscroll->vcp->hbase, 0.0, width, height); mscroll->voffset = -1; diff -rNu melys-0.1.14/widgets/melyssig.c melys-0.1.15/widgets/melyssig.c --- melys-0.1.14/widgets/melyssig.c Mon Dec 20 23:41:00 1999 +++ melys-0.1.15/widgets/melyssig.c Thu Jan 6 19:06:13 2000 @@ -109,11 +109,6 @@ parent_class = gtk_type_class(melys_scroll_get_type()); - // XXX Add args - - // XXX Create signals - - object_class->destroy = sig_destroy; widget_class->draw = sig_draw; diff -rNu melys-0.1.14/widgets/melyssig.m melys-0.1.15/widgets/melyssig.m --- melys-0.1.14/widgets/melyssig.m Thu Dec 2 17:19:52 1999 +++ melys-0.1.15/widgets/melyssig.m Thu Jan 6 16:43:33 2000 @@ -100,11 +100,6 @@ parent_class = gtk_type_class(melys_scroll_get_type()); - // XXX Add args - - // XXX Create signals - - object_class->destroy = sig_destroy; widget_class->draw = sig_draw; diff -rNu melys-0.1.14/widgets/melystempo.c melys-0.1.15/widgets/melystempo.c --- melys-0.1.14/widgets/melystempo.c Mon Dec 20 23:41:01 1999 +++ melys-0.1.15/widgets/melystempo.c Thu Jan 6 19:06:14 2000 @@ -167,14 +167,10 @@ mtempo->ksig = ksig; mview->vcp->vspace = 0; /* No separation between items on scale */ - - MELYS_SCROLL(mview->canvas)->hbase = 5; - MELYS_RULE(mview->ruler)->hbase = 5; /* TEMP */ - MELYS_SCROLL(tsig)->hbase = 5; - MELYS_SCROLL(ksig)->hbase = 5; + mview->vcp->hbase = 5; view_control_set_vertical(mview->vcp, 1); - view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE * 4); + view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE * 2); view_control_set_limits(mview->vcp, 1, 0, 1, 0); tab = (GtkTable *)gtk_table_new(2, 2, FALSE); diff -rNu melys-0.1.14/widgets/melystempo.m melys-0.1.15/widgets/melystempo.m --- melys-0.1.14/widgets/melystempo.m Tue Dec 14 17:49:32 1999 +++ melys-0.1.15/widgets/melystempo.m Thu Jan 6 16:45:04 2000 @@ -139,14 +139,10 @@ mtempo->ksig = ksig; mview->vcp->vspace = 0; /* No separation between items on scale */ - - MELYS_SCROLL(mview->canvas)->hbase = 5; - MELYS_RULE(mview->ruler)->hbase = 5; /* TEMP */ - MELYS_SCROLL(tsig)->hbase = 5; - MELYS_SCROLL(ksig)->hbase = 5; + mview->vcp->hbase = 5; view_control_set_vertical(mview->vcp, 1); - view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE * 4); + view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE * 2); view_control_set_limits(mview->vcp, 1, 0, 1, 0); tab = (GtkTable *)gtk_table_new(2, 2, FALSE); diff -rNu melys-0.1.14/widgets/melysview.c melys-0.1.15/widgets/melysview.c --- melys-0.1.14/widgets/melysview.c Mon Dec 20 23:41:03 1999 +++ melys-0.1.15/widgets/melysview.c Thu Jan 6 19:06:16 2000 @@ -36,6 +36,7 @@ #include "md.h" #include "viewcontrol.h" #include "melysrule.h" +#include "melysgrid.h" #include "melwidgets.h" #include "melysscroll.h" #include "song.h" @@ -224,7 +225,14 @@ gtk_widget_ref(mview->canvas); melys_view_add_scroll(mview, MELYS_SCROLL(mview->canvas)); - mview->posline = (GtkWidget *)gnome_canvas_item_new( + mview->grid = (GtkObject *)gnome_canvas_item_new( + gnome_canvas_root(canvas), + melys_grid_get_type(), + NULL); + + melys_grid_set_adj(MELYS_GRID(mview->grid), mview->vcp); + + mview->posline = (GtkObject *)gnome_canvas_item_new( gnome_canvas_root(canvas), GNOME_TYPE_CANVAS_LINE, "points", mview->points, @@ -357,6 +365,8 @@ set_scrolls(mview); + if (mview->grid) + gnome_canvas_item_request_update((GnomeCanvasItem *)mview->grid); if (mview->posline) gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mview->posline); @@ -385,6 +395,7 @@ MD_REF(mview->tempomap); } melys_rule_set_tempomap(MELYS_RULE(mview->ruler), mview->tempomap); + melys_grid_set_tempomap(MELYS_GRID(mview->grid), mview->tempomap); if (song->posadj) { view_control_set_posadj(mview->vcp, song->posadj); diff -rNu melys-0.1.14/widgets/melysview.m melys-0.1.15/widgets/melysview.m --- melys-0.1.14/widgets/melysview.m Sun Dec 19 16:36:26 1999 +++ melys-0.1.15/widgets/melysview.m Thu Jan 6 16:46:20 2000 @@ -33,6 +33,7 @@ >>header md.h >>header viewcontrol.h >>header melysrule.h +>>header melysgrid.h >>header melwidgets.h >>header melysscroll.h >>header song.h @@ -63,8 +64,9 @@ /* Widgets that are controlled by this widget */ GtkWidget *canvas; /* The canvas that the subclass will place items on */ GtkWidget *ruler; /* A ruler that can be used */ - GtkWidget *posline; /* Song position pointer */ + GtkObject *posline; /* Song position pointer */ GtkWidget *menu; /* The item context menu */ + GtkObject *grid; /* The background grid */ /* For the posline */ void *points; @@ -251,7 +253,14 @@ gtk_widget_ref(mview->canvas); melys_view_add_scroll(mview, MELYS_SCROLL(mview->canvas)); - mview->posline = (GtkWidget *)gnome_canvas_item_new( + mview->grid = (GtkObject *)gnome_canvas_item_new( + gnome_canvas_root(canvas), + melys_grid_get_type(), + NULL); + + melys_grid_set_adj(MELYS_GRID(mview->grid), mview->vcp); + + mview->posline = (GtkObject *)gnome_canvas_item_new( gnome_canvas_root(canvas), GNOME_TYPE_CANVAS_LINE, "points", mview->points, @@ -389,6 +398,8 @@ set_scrolls(mview); + if (mview->grid) + gnome_canvas_item_request_update((GnomeCanvasItem *)mview->grid); if (mview->posline) gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mview->posline); @@ -414,6 +425,7 @@ MD_REF(mview->tempomap); } melys_rule_set_tempomap(MELYS_RULE(mview->ruler), mview->tempomap); + melys_grid_set_tempomap(MELYS_GRID(mview->grid), mview->tempomap); if (song->posadj) { view_control_set_posadj(mview->vcp, song->posadj); diff -rNu melys-0.1.14/widgets/viewcontrol.c melys-0.1.15/widgets/viewcontrol.c --- melys-0.1.14/widgets/viewcontrol.c Mon Dec 20 23:41:04 1999 +++ melys-0.1.15/widgets/viewcontrol.c Thu Jan 6 19:06:17 2000 @@ -158,6 +158,7 @@ vcp->vheight = VIEW_DEF_HEIGHT; vcp->vtitle = VIEW_TITLE_HEIGHT + 2*VIEW_SEPARATION; vcp->hscale = VIEW_DEF_HSCALE; + vcp->hbase = 0; /* Some defaults - but you are supposed to set them */ vcp->hminscale = 1; diff -rNu melys-0.1.14/widgets/viewcontrol.m melys-0.1.15/widgets/viewcontrol.m --- melys-0.1.14/widgets/viewcontrol.m Sun Dec 19 16:36:26 1999 +++ melys-0.1.15/widgets/viewcontrol.m Tue Jan 4 10:45:13 2000 @@ -68,6 +68,7 @@ /* Horizontal measurements */ int hscale; + int hbase; /* A controlling widget can set these to limit zooming */ int hminscale; @@ -159,6 +160,7 @@ vcp->vheight = VIEW_DEF_HEIGHT; vcp->vtitle = VIEW_TITLE_HEIGHT + 2*VIEW_SEPARATION; vcp->hscale = VIEW_DEF_HSCALE; + vcp->hbase = 0; /* Some defaults - but you are supposed to set them */ vcp->hminscale = 1;