diff -rNu melys-0.1.13/ChangeLog melys-0.1.14/ChangeLog --- melys-0.1.13/ChangeLog Thu Dec 16 21:05:10 1999 +++ melys-0.1.14/ChangeLog Mon Dec 20 23:30:11 1999 @@ -1,3 +1,62 @@ +1999-12-20 Steve Ratcliffe + + * programs/melplay.m, md/mdseq.m, md/mdutil.m, md/elements.m: + new macro istracklike() which we need now that the TEMPOMAP + is not the same as a track. Perhaps it was a mistake to split them in + that way. + + * widgets/melysrule.m: Motion events on ruler are 'notyet' + + * seq/seqlib.m: Temporary routine to get the queue. Really all + the flush/remove routines should be moved out of midi/play.m + to here. + + * midi/play.m: Fix for new api, you need to specify a queue on the + remove_events call. + +1999-12-19 Steve Ratcliffe + + * util/util.m: Moved the snap_type enum into here. + + * md/mdutil.m: Moved the snap_types enum out of here. + + * md/mdseq.m: Fixed major bug that only seem to show up when compiled + with optimisation. + If you have seen flakiness when using the mute and solo buttons + this is probably it. + + * files/mdmlread.m: + On some systems, it would appear that error.h gets included + for some reason. Changed a name from error to sax_error to + get around this. + + * examples/screenshot.mdml: + Fixed duration so it didn't play beyond end of tracks. + + * midi/play.m, seq/seqlib.m, seq/seqplay.m, widgets/melyspiano.m, + widgets/melysrule.m, widgets/melystrackdisplay.m, + widgets/melysview.m, widgets/viewcontrol.m, md/mdadd.m, md/mdseq.m: + Added the initial implementation of the set position + support. At present you can just shift click on the ruler + to set the current time. There is no scan back for controller + values or current tempo. + +1999-12-16 Steve Ratcliffe + + * version: Version 0.1.13 + + * seq/seqlib.m, seq/seqmidi.m, seq/seqplay.m, midi/play.m: + Updates for the new sequencer API. + + * widgets/melysrule.m: + Fix random contents 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-16 Steve Ratcliffe * seq/seqlib.m, seq/seqmidi.m, seq/seqplay.m, midi/play.m: diff -rNu melys-0.1.13/INSTALL melys-0.1.14/INSTALL --- melys-0.1.13/INSTALL Fri Dec 3 17:24:08 1999 +++ melys-0.1.14/INSTALL Mon Dec 20 13:38:02 1999 @@ -11,7 +11,8 @@ make -This should build everything. +This should build everything. If you see lots of errors, check the +requirements section. Probably cause is an old version of lixml. Install ------- @@ -44,5 +45,11 @@ You can also supply Midi or MDML filenames on the command line which will be read in. + +Test it out +----------- + +You can try reading in some of the files in the examples +directory. ..Steve diff -rNu melys-0.1.13/README melys-0.1.14/README --- melys-0.1.13/README Tue Dec 7 14:17:00 1999 +++ melys-0.1.14/README Mon Dec 20 13:38:03 1999 @@ -53,8 +53,7 @@ Requirements. ------------- - - You will need the gnome libraries. - You need gnome-libs version 1.0.40 or above, I am using 1.0.53. + - You need gnome-libs version 1.0.40 or above, I am using 1.0.53. Version 1.0.10, which I believe is supplied with RedHat 6.0 works very badly with Melys, version 1.0.15 just about works but there are problems. diff -rNu melys-0.1.13/examples/screenshot.mdml melys-0.1.14/examples/screenshot.mdml --- melys-0.1.13/examples/screenshot.mdml Thu Dec 2 23:18:12 1999 +++ melys-0.1.14/examples/screenshot.mdml Sun Dec 19 16:59:33 1999 @@ -1,7 +1,7 @@ - Steve Ratcliffe, 1999 + Steve Ratcliffe, 1999 @@ -33,23 +33,23 @@ - + - + - + - + @@ -151,7 +151,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -169,26 +169,26 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff -rNu melys-0.1.13/files/mdmlread.c melys-0.1.14/files/mdmlread.c --- melys-0.1.13/files/mdmlread.c Thu Dec 16 21:08:17 1999 +++ melys-0.1.14/files/mdmlread.c Mon Dec 20 23:40:52 1999 @@ -83,8 +83,8 @@ static void characters(void *data, const xmlChar *ch, int len); static int ourParseFile(xmlSAXHandlerPtr sax, const char *filename, void *data); -static void warning(void *data, const char *msg, ...); -static void error(void *data, const char *msg, ...); +static void sax_warning(void *data, const char *msg, ...); +static void sax_error(void *data, const char *msg, ...); static void fatalError(void *data, const char *msg, ...); @@ -626,8 +626,8 @@ SAXhandler.endElement = endElement; SAXhandler.getEntity = getEntity; - SAXhandler.warning = warning; - SAXhandler.error = error; + SAXhandler.warning = sax_warning; + SAXhandler.error = sax_error; SAXhandler.fatalError = fatalError; SAXhandler.characters = characters; } @@ -846,7 +846,7 @@ } static void -warning(void *data, const char *msg, ...) +sax_warning(void *data, const char *msg, ...) { va_list args; char *str; @@ -863,7 +863,7 @@ } static void -error(void *data, const char *msg, ...) +sax_error(void *data, const char *msg, ...) { va_list args; char *str; diff -rNu melys-0.1.13/files/mdmlread.m melys-0.1.14/files/mdmlread.m --- melys-0.1.13/files/mdmlread.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.14/files/mdmlread.m Sun Dec 19 22:18:51 1999 @@ -597,8 +597,8 @@ SAXhandler.endElement = endElement; SAXhandler.getEntity = getEntity; - SAXhandler.warning = warning; - SAXhandler.error = error; + SAXhandler.warning = sax_warning; + SAXhandler.error = sax_error; SAXhandler.fatalError = fatalError; SAXhandler.characters = characters; @@ -829,7 +829,7 @@ return ret; ->>function warning +>>function sax_warning static void void *data; const char *msg; @@ -849,7 +849,7 @@ if (!msp->errmsg) msp->errmsg = str; ->>function error +>>function sax_error static void void *data; const char *msg; diff -rNu melys-0.1.13/include/md.h melys-0.1.14/include/md.h --- melys-0.1.13/include/md.h Thu Dec 16 21:08:03 1999 +++ melys-0.1.14/include/md.h Mon Dec 20 23:40:38 1999 @@ -74,6 +74,7 @@ ticktime_t time); void md_elem_seek_back(struct sequenceState *seq, struct tracklikeElement *ltrack, ticktime_t time); +void md_elem_all_seek(struct sequenceState *seq, ticktime_t tick); struct element *md_copy(struct element *e); @@ -132,6 +133,7 @@ #define MD_WUNREF(el) ( md_wfree((struct element *)el)) #define MD_IS_DESTROYED(el) ( ((struct element *)el)->destroyed) #define iscontainer(el) ( (MD_TYPE(el) >= MD_CONTAINER_BEGIN)? TRUE: FALSE) +#define istracklike(el) ( MD_TYPE(el)==MD_TYPE_TRACK || MD_TYPE(el)==MD_TYPE_TEMPOMAP ) #define MD_UNDO(el) NULL /* XXX */ #define MD_TEMPO_TO_BPM(ut) ((double)60000000 / (ut)) #define MD_BPM_TO_TEMPO(bpm) ((double) 60000000 / (bpm)) @@ -206,27 +208,6 @@ short bottom; }; -/* - * Snap to grid types. - */ -enum snap_type { - SNAP_NONE, - SNAP_BAR, - SNAP_1, - SNAP_1_2, - SNAP_1_4, - SNAP_1_8, - SNAP_1_16, - SNAP_1_32, - SNAP_1_64, - SNAP_1_3, - SNAP_1_6, - SNAP_1_24, - SNAP_1_48, - SNAP_1_96, - SNAP_1_192, - /* ETC */ -}; void md_walk(struct containerElement *c, walkFunc fn, void *arg, int flags); struct rootElement *md_empty(void); diff -rNu melys-0.1.13/include/melysrule.h melys-0.1.14/include/melysrule.h --- melys-0.1.13/include/melysrule.h Thu Dec 16 21:08:05 1999 +++ melys-0.1.14/include/melysrule.h Mon Dec 20 23:40:40 1999 @@ -14,6 +14,7 @@ * * * + * */ #define MELYS_RULE(obj) GTK_CHECK_CAST(obj, melys_rule_get_type(), MelysRule) diff -rNu melys-0.1.13/include/melysview.h melys-0.1.14/include/melysview.h --- melys-0.1.13/include/melysview.h Thu Dec 16 21:08:07 1999 +++ melys-0.1.14/include/melysview.h Mon Dec 20 23:40:41 1999 @@ -34,16 +34,11 @@ ViewControl *vcp; - GtkAdjustment *posadj; /* Song position adjustment */ - /* Play position offset, in ticks */ int poffset; /* The number of things in the vertical direction */ int vthings; /* Number of notes, tracks whatever */ - - /* From aligning to a grid */ - enum snap_type snap; struct containerElement *viewcon; struct song *song; diff -rNu melys-0.1.13/include/seqlib.h melys-0.1.14/include/seqlib.h --- melys-0.1.13/include/seqlib.h Thu Dec 16 21:08:01 1999 +++ melys-0.1.14/include/seqlib.h Mon Dec 20 23:40:36 1999 @@ -87,7 +87,8 @@ void seq_timer_start(seq_context_t *ctxp); void seq_timer_stop(seq_context_t *ctxp); void seq_timer_continue(seq_context_t *ctxp); -void seq_control_timer(seq_context_t *ctxp, int onoff); +void seq_timer_seek(seq_context_t *ctxp, ticktime_t tick); +void seq_control_timer(seq_context_t *ctxp, int cmd, ticktime_t tick); ticktime_t seq_get_time(seq_context_t *ctxp); int seq_write(seq_context_t *ctxp, snd_seq_event_t *ep); int seq_control_write(seq_context_t *ctxp, snd_seq_event_t *ep); @@ -97,6 +98,7 @@ void *seq_handle(seq_context_t *ctxp); int seq_descriptor(seq_context_t *ctxp); char *seq_addr_string(snd_seq_addr_t *addr); +int seq_xxx_get_queue(seq_context_t *ctxp); struct programElement; diff -rNu melys-0.1.13/include/seqplay.h melys-0.1.14/include/seqplay.h --- melys-0.1.13/include/seqplay.h Thu Dec 16 21:08:01 1999 +++ melys-0.1.14/include/seqplay.h Mon Dec 20 23:40:36 1999 @@ -17,3 +17,5 @@ int seq_midi_send_element(struct seq_context *ctxp, struct element *el); void midi_play_prologue(struct seq_context *ctxp, struct rootElement *root); +void seq_midi_seek(seq_context_t *ctxp, struct sequenceState *seq, + ticktime_t tick); diff -rNu melys-0.1.13/include/util.h melys-0.1.14/include/util.h --- melys-0.1.13/include/util.h Thu Dec 16 21:08:03 1999 +++ melys-0.1.14/include/util.h Mon Dec 20 23:40:38 1999 @@ -53,6 +53,29 @@ /* Typedef for times */ typedef long ticktime_t; +/* + * Snap to grid types. + */ +enum snap_type { + SNAP_NONE, + SNAP_BAR, + SNAP_1, + SNAP_1_2, + SNAP_1_4, + SNAP_1_8, + SNAP_1_16, + SNAP_1_32, + SNAP_1_64, + SNAP_1_3, + SNAP_1_6, + SNAP_1_24, + SNAP_1_48, + SNAP_1_96, + SNAP_1_192, + /* ETC */ +}; + + #ifdef DEBUG /* * Debugging stuff. diff -rNu melys-0.1.13/include/viewcontrol.h melys-0.1.14/include/viewcontrol.h --- melys-0.1.13/include/viewcontrol.h Thu Dec 16 21:08:07 1999 +++ melys-0.1.14/include/viewcontrol.h Mon Dec 20 23:40:41 1999 @@ -39,6 +39,7 @@ /* Adjustments */ GtkAdjustment *hadj; /* Horizontal adjustment position */ GtkAdjustment *vadj; /* Vertical adjustment position */ + GtkAdjustment *posadj; /* The current song position */ /* Scrollbar groups */ GtkWidget *hsb; /* The horizontal scrollbar group */ @@ -60,6 +61,9 @@ int hmaxscale; int vminscale; int vmaxscale; + + /* For aligning to a grid */ + enum snap_type snap; }; struct _ViewControlClass { @@ -76,6 +80,7 @@ guint view_control_get_type(void); ViewControl *view_control_new(void); +void view_control_set_posadj(ViewControl *vcp, GtkAdjustment *posadj); void view_control_set_vertical(ViewControl *vcp, int vscale); void view_control_set_horizontal(ViewControl *vcp, int hscale); void view_control_set_range(ViewControl *vcp, int which, gfloat lower, @@ -86,3 +91,4 @@ int view_control_tick_to_x(ViewControl *vcp, int tick); int view_control_y_to_thing(ViewControl *vcp, int ypix); int view_control_thing_to_y(ViewControl *vcp, int n); +void view_control_set_snap(ViewControl *vcp, enum snap_type snap); diff -rNu melys-0.1.13/md/elements.c melys-0.1.14/md/elements.c --- melys-0.1.13/md/elements.c Thu Dec 16 21:08:19 1999 +++ melys-0.1.14/md/elements.c Mon Dec 20 23:40:54 1999 @@ -1133,7 +1133,7 @@ if (el->type == MD_TYPE_PARTREF) return el; case MD_TYPE_TRACKLIKE: - if (el->type == MD_TYPE_TEMPOMAP || el->type == MD_TYPE_TRACK) + if (istracklike(el)) return el; break; } diff -rNu melys-0.1.13/md/elements.m melys-0.1.14/md/elements.m --- melys-0.1.13/md/elements.m Wed Dec 1 10:58:11 1999 +++ melys-0.1.14/md/elements.m Mon Dec 20 13:39:49 1999 @@ -408,7 +408,7 @@ if (el->type == MD_TYPE_PARTREF) return el; case MD_TYPE_TRACKLIKE: - if (el->type == MD_TYPE_TEMPOMAP || el->type == MD_TYPE_TRACK) + if (istracklike(el)) return el; break; } diff -rNu melys-0.1.13/md/mdadd.c melys-0.1.14/md/mdadd.c --- melys-0.1.13/md/mdadd.c Thu Dec 16 21:08:19 1999 +++ melys-0.1.14/md/mdadd.c Mon Dec 20 23:40:54 1999 @@ -211,6 +211,11 @@ if (MD_PART(el)->name) g_free(MD_PART(el)->name); break; + case MD_TYPE_HEAD: + if (MD_HEAD(el)->copyright) + g_free(MD_HEAD(el)->copyright); + MD_HEAD(el)->copyright = NULL; + break; default: break; } diff -rNu melys-0.1.13/md/mdadd.m melys-0.1.14/md/mdadd.m --- melys-0.1.13/md/mdadd.m Sat Nov 27 11:43:22 1999 +++ melys-0.1.14/md/mdadd.m Sun Dec 19 16:36:24 1999 @@ -218,6 +218,11 @@ if (MD_PART(el)->name) g_free(MD_PART(el)->name); break; + case MD_TYPE_HEAD: + if (MD_HEAD(el)->copyright) + g_free(MD_HEAD(el)->copyright); + MD_HEAD(el)->copyright = NULL; + break; default: break; } diff -rNu melys-0.1.13/md/mdseq.c melys-0.1.14/md/mdseq.c --- melys-0.1.13/md/mdseq.c Thu Dec 16 21:08:20 1999 +++ melys-0.1.14/md/mdseq.c Mon Dec 20 23:40:55 1999 @@ -41,8 +41,6 @@ int usedroot:1; /* Root has been returned */ int usedhead:1; /* Head has been returned */ - struct rootElement *root; /* Root being sequenced over */ - struct trackinfo *trackinfos; /* List of track info structures */ int ntinfo; /* Number of elements in trackinfos */ @@ -335,7 +333,7 @@ next = 1; } else if (pos->pos >= MD_CONTAINER_LEN(pos->con)) { /* Do not pop the initial track element */ - if (MD_TYPE(pos->con) == MD_TYPE_TRACK) + if (istracklike(pos->con)) return NULL; gx_stack_pop(pstack, &npos); MD_UNREF(npos.con); @@ -409,7 +407,7 @@ ti->need_next = 1; } while (el && MD_TIME(el) < time); - ti->time = MD_TIME(el); + ti->time = el? MD_TIME(el): 0; ti->need_next = 0; ti->lastelem = NULL; } @@ -451,4 +449,26 @@ return; /* Nothing to do */ md_elem_seek(seq, ltrack, time); +} + +/* + * Seek all tracks to the same time. XXX may Need a seek back + * version. + */ +void +md_elem_all_seek(struct sequenceState *seq, ticktime_t tick) +{ + struct tempomapElement *tmap; + struct trackElement *trk; + int n; + + g_return_if_fail(MD_TYPE(seq->retroot) == MD_TYPE_ROOT); + + tmap = md_get_tempomap(seq->retroot); + md_elem_seek(seq, MD_TRACKLIKE(tmap), tick); + + for (n = 0; n < seq->retroot->tracks; n++) { + trk = md_track_nth(seq->retroot, n); + md_elem_seek(seq, MD_TRACKLIKE(trk), tick); + } } diff -rNu melys-0.1.13/md/mdseq.m melys-0.1.14/md/mdseq.m --- melys-0.1.13/md/mdseq.m Sat Nov 27 11:50:52 1999 +++ melys-0.1.14/md/mdseq.m Mon Dec 20 13:39:50 1999 @@ -34,8 +34,6 @@ int usedroot:1; /* Root has been returned */ int usedhead:1; /* Head has been returned */ - struct rootElement *root; /* Root being sequenced over */ - struct trackinfo *trackinfos; /* List of track info structures */ int ntinfo; /* Number of elements in trackinfos */ @@ -337,7 +335,7 @@ next = 1; } else if (pos->pos >= MD_CONTAINER_LEN(pos->con)) { /* Do not pop the initial track element */ - if (MD_TYPE(pos->con) == MD_TYPE_TRACK) + if (istracklike(pos->con)) return NULL; gx_stack_pop(pstack, &npos); MD_UNREF(npos.con); @@ -415,7 +413,7 @@ ti->need_next = 1; } while (el && MD_TIME(el) < time); - ti->time = MD_TIME(el); + ti->time = el? MD_TIME(el): 0; ti->need_next = 0; ti->lastelem = NULL; @@ -461,3 +459,29 @@ return; /* Nothing to do */ md_elem_seek(seq, ltrack, time); + + +>>function md_elem_all_seek +void +struct sequenceState *seq; +ticktime_t tick; + +>>description +Seek all tracks to the same time. +XXX may Need a seek back version. + +>>code + struct tempomapElement *tmap; + struct trackElement *trk; + int n; + + g_return_if_fail(MD_TYPE(seq->retroot) == MD_TYPE_ROOT); + + tmap = md_get_tempomap(seq->retroot); + md_elem_seek(seq, MD_TRACKLIKE(tmap), tick); + + for (n = 0; n < seq->retroot->tracks; n++) { + trk = md_track_nth(seq->retroot, n); + md_elem_seek(seq, MD_TRACKLIKE(trk), tick); + } + diff -rNu melys-0.1.13/md/mdutil.m melys-0.1.14/md/mdutil.m --- melys-0.1.13/md/mdutil.m Tue Dec 14 15:02:25 1999 +++ melys-0.1.14/md/mdutil.m Mon Dec 20 13:39:50 1999 @@ -41,6 +41,7 @@ #define MD_WUNREF(el) ( md_wfree((struct element *)el)) #define MD_IS_DESTROYED(el) ( ((struct element *)el)->destroyed) #define iscontainer(el) ( (MD_TYPE(el) >= MD_CONTAINER_BEGIN)? TRUE: FALSE) +#define istracklike(el) ( MD_TYPE(el)==MD_TYPE_TRACK || MD_TYPE(el)==MD_TYPE_TEMPOMAP ) #define MD_UNDO(el) NULL /* XXX */ #define MD_TEMPO_TO_BPM(ut) ((double)60000000 / (ut)) #define MD_BPM_TO_TEMPO(bpm) ((double) 60000000 / (bpm)) @@ -115,27 +116,6 @@ short bottom; }; -/* - * Snap to grid types. - */ -enum snap_type { - SNAP_NONE, - SNAP_BAR, - SNAP_1, - SNAP_1_2, - SNAP_1_4, - SNAP_1_8, - SNAP_1_16, - SNAP_1_32, - SNAP_1_64, - SNAP_1_3, - SNAP_1_6, - SNAP_1_24, - SNAP_1_48, - SNAP_1_96, - SNAP_1_192, - /* ETC */ -}; >>function md_walk void diff -rNu melys-0.1.13/midi/play.c melys-0.1.14/midi/play.c --- melys-0.1.13/midi/play.c Thu Dec 16 21:08:29 1999 +++ melys-0.1.14/midi/play.c Mon Dec 20 23:41:04 1999 @@ -27,6 +27,7 @@ #include "gdk/gdk.h" #include "gtk/gtkmain.h" #include "gtk/gtkadjustment.h" +#include "gtk/gtksignal.h" #include "elements.h" #include "seqlib.h" #include "md.h" @@ -57,6 +58,9 @@ struct _GtkAdjustment *posadj; /* Play position adjustment */ + ticktime_t lastpos; /* Last time position we set */ + + int pos_sig; /* Signal for position */ int to_id; /* Timeout id */ }; @@ -69,7 +73,8 @@ 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 gint play_pos_cb(gpointer data); +static gint play_to_cb(gpointer data); +static void pos_changed_cb(GtkAdjustment *adj, gpointer data); 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); @@ -96,6 +101,7 @@ play->seq = NULL; play->write_id = 0; play->read_id = 0; + play->pos_sig = 0; return play; } @@ -112,6 +118,9 @@ remove_io_cb(play, INPUT_ALL); + if (play->pos_sig) + gtk_signal_disconnect(GTK_OBJECT(play->posadj), play->pos_sig); + if (play->to_id) gtk_timeout_remove(play->to_id); @@ -124,6 +133,9 @@ if (play->ctxp) seq_context_free(play->ctxp); + if (play->posadj) + gtk_object_unref(GTK_OBJECT(play->posadj)); + g_free(play); } @@ -146,8 +158,17 @@ play_set_pos_adj(struct play *play, struct _GtkAdjustment *adj) { - if (play) + if (play) { + if (play->pos_sig) { + gtk_signal_disconnect(GTK_OBJECT(play->posadj), play->pos_sig); + gtk_object_unref(GTK_OBJECT(play->posadj)); + } + play->posadj = adj; + gtk_object_ref(GTK_OBJECT(adj)); + play->pos_sig = gtk_signal_connect(GTK_OBJECT(adj), + "value-changed", pos_changed_cb, play); + } } /* @@ -215,7 +236,7 @@ /* Timeout is in ms */ if (play->to_id == 0) - play->to_id = gtk_timeout_add(40, play_pos_cb, play); + play->to_id = gtk_timeout_add(40, play_to_cb, play); } /* @@ -344,6 +365,7 @@ fqueue.dest.channel = chan; #else /* SEQ_API_2 */ fqueue.channel = chan; + fqueue.queue = seq_xxx_get_queue(play->ctxp); /*FIXME*/ #endif /* SEQ_API_2 */ fqueue.type = SND_SEQ_EVENT_NOTE; fqueue.tag = MD_TRACKLIKE(track)->number; /* XXX TEMP */ @@ -544,7 +566,6 @@ /* Try and push out next items in the sequence */ while ((el = md_seq_next(play->seq)) != NULL) { - dprintf2("Sending type %d for %d at %ld", el->type, el->device_channel, el->element_time); status = seq_midi_send_element(play->ctxp, el); if (status < 0) { @@ -558,8 +579,8 @@ } } - status = snd_seq_flush_output(seq_handle(play->ctxp)); + /* * There could be an empty queue here because all * channels have been muted. This means that we @@ -655,21 +676,40 @@ * Called while playing to update the play position pointer. */ static gint -play_pos_cb(gpointer data) +play_to_cb(gpointer data) { struct play *play = data; ticktime_t t; t = seq_get_time(play->ctxp); - gtk_adjustment_set_value(play->posadj, t); - if (t > play->posadj->upper) { play->posadj->upper = t; gtk_adjustment_changed(play->posadj); } + play->lastpos = t; + gtk_adjustment_set_value(play->posadj, t); + return TRUE; +} + +static void +pos_changed_cb(GtkAdjustment *adj, gpointer data) +{ + struct play *play = data; + gboolean wasplaying; + + if (adj->value != play->lastpos) { + /* Somebody else changed it */ + wasplaying = play->isplaying; + + play->lastpos = adj->value; + play_pause(play); + seq_midi_seek(play->ctxp, play->seq, (ticktime_t)adj->value); + if (wasplaying) + play_start(play); + } } /* diff -rNu melys-0.1.13/midi/play.m melys-0.1.14/midi/play.m --- melys-0.1.13/midi/play.m Thu Dec 16 21:04:00 1999 +++ melys-0.1.14/midi/play.m Mon Dec 20 13:31:01 1999 @@ -18,6 +18,7 @@ >>header gdk/gdk.h >>header gtk/gtkmain.h >>header gtk/gtkadjustment.h +>>header gtk/gtksignal.h >>header elements.h >>header seqlib.h @@ -59,6 +60,9 @@ struct _GtkAdjustment *posadj; /* Play position adjustment */ + ticktime_t lastpos; /* Last time position we set */ + + int pos_sig; /* Signal for position */ int to_id; /* Timeout id */ }; @@ -87,6 +91,7 @@ play->seq = NULL; play->write_id = 0; play->read_id = 0; + play->pos_sig = 0; return play; @@ -102,6 +107,9 @@ remove_io_cb(play, INPUT_ALL); + if (play->pos_sig) + gtk_signal_disconnect(GTK_OBJECT(play->posadj), play->pos_sig); + if (play->to_id) gtk_timeout_remove(play->to_id); @@ -114,8 +122,12 @@ if (play->ctxp) seq_context_free(play->ctxp); + if (play->posadj) + gtk_object_unref(GTK_OBJECT(play->posadj)); + g_free(play); + >>function play_set_mdroot void struct play *play; The play object @@ -137,8 +149,17 @@ >>code - if (play) + if (play) { + if (play->pos_sig) { + gtk_signal_disconnect(GTK_OBJECT(play->posadj), play->pos_sig); + gtk_object_unref(GTK_OBJECT(play->posadj)); + } + play->posadj = adj; + gtk_object_ref(GTK_OBJECT(adj)); + play->pos_sig = gtk_signal_connect(GTK_OBJECT(adj), + "value-changed", pos_changed_cb, play); + } >>function play_set_ports @@ -206,7 +227,7 @@ /* Timeout is in ms */ if (play->to_id == 0) - play->to_id = gtk_timeout_add(40, play_pos_cb, play); + play->to_id = gtk_timeout_add(40, play_to_cb, play); @@ -248,6 +269,7 @@ seq_send_to_all_now(ctxp, &ev); seq_timer_stop(ctxp); + >>function play_stop void struct play *play; The play object to stop and rewind @@ -337,6 +359,7 @@ fqueue.dest.channel = chan; #else /* SEQ_API_2 */ fqueue.channel = chan; + fqueue.queue = seq_xxx_get_queue(play->ctxp); /*FIXME*/ #endif /* SEQ_API_2 */ fqueue.type = SND_SEQ_EVENT_NOTE; fqueue.tag = MD_TRACKLIKE(track)->number; /* XXX TEMP */ @@ -545,7 +568,6 @@ /* Try and push out next items in the sequence */ while ((el = md_seq_next(play->seq)) != NULL) { - dprintf2("Sending type %d for %d at %ld", el->type, el->device_channel, el->element_time); status = seq_midi_send_element(play->ctxp, el); if (status < 0) { @@ -559,8 +581,8 @@ } } - status = snd_seq_flush_output(seq_handle(play->ctxp)); + /* * There could be an empty queue here because all * channels have been muted. This means that we @@ -649,7 +671,7 @@ } ->>function play_pos_cb +>>function play_to_cb static gint gpointer data; @@ -662,14 +684,36 @@ t = seq_get_time(play->ctxp); - gtk_adjustment_set_value(play->posadj, t); - if (t > play->posadj->upper) { play->posadj->upper = t; gtk_adjustment_changed(play->posadj); } + play->lastpos = t; + gtk_adjustment_set_value(play->posadj, t); + return TRUE; + + +>>function pos_changed_cb +static void +GtkAdjustment *adj; +gpointer data; The play object + +>>code + struct play *play = data; + gboolean wasplaying; + + if (adj->value != play->lastpos) { + /* Somebody else changed it */ + wasplaying = play->isplaying; + + play->lastpos = adj->value; + play_pause(play); + seq_midi_seek(play->ctxp, play->seq, (ticktime_t)adj->value); + if (wasplaying) + play_start(play); + } >>function add_io_cb diff -rNu melys-0.1.13/programs/Makefile melys-0.1.14/programs/Makefile --- melys-0.1.13/programs/Makefile Thu Dec 16 21:08:15 1999 +++ melys-0.1.14/programs/Makefile Mon Dec 20 23:40:50 1999 @@ -119,12 +119,12 @@ mdmlconv.o: ../include/melfile.h mdmlconv.o: ../include/md.h melplay.o: ../include/elements.h +melplay.o: ../include/md.h melplay.o: ../include/seqlib.h melplay.o: ../include/seqplay.h melplay.o: ../include/melfile.h melplay.o: ../include/melmidi.h melplay.o: ../include/midi.h -melplay.o: ../include/md.h showseq.o: ../include/elements.h showseq.o: ../include/seqlib.h melys.o: ../include/melmsg.h diff -rNu melys-0.1.13/programs/melplay.c melys-0.1.14/programs/melplay.c --- melys-0.1.13/programs/melplay.c Thu Dec 16 21:08:31 1999 +++ melys-0.1.14/programs/melplay.c Mon Dec 20 23:41:05 1999 @@ -24,12 +24,12 @@ #include #include #include "elements.h" +#include "md.h" #include "seqlib.h" #include "seqplay.h" #include "melfile.h" #include "melmidi.h" #include "midi.h" -#include "md.h" #include #include #include "intl.h" diff -rNu melys-0.1.13/programs/melplay.m melys-0.1.14/programs/melplay.m --- melys-0.1.13/programs/melplay.m Thu Dec 16 13:27:21 1999 +++ melys-0.1.14/programs/melplay.m Mon Dec 20 13:39:54 1999 @@ -27,12 +27,12 @@ >>header >>header >>header elements.h +>>header md.h >>header seqlib.h >>header seqplay.h >>header melfile.h >>header melmidi.h >>header midi.h ->>header md.h >>target melplay >>make --objects melplay.o diff -rNu melys-0.1.13/seq/seqlib.c melys-0.1.14/seq/seqlib.c --- melys-0.1.13/seq/seqlib.c Thu Dec 16 21:08:16 1999 +++ melys-0.1.14/seq/seqlib.c Mon Dec 20 23:40:51 1999 @@ -339,8 +339,8 @@ #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; @@ -598,7 +598,7 @@ seq_timer_start(seq_context_t *ctxp) { - seq_control_timer(ctxp, SND_SEQ_EVENT_START); + seq_control_timer(ctxp, SND_SEQ_EVENT_START, 0); } /* @@ -609,7 +609,7 @@ seq_timer_stop(seq_context_t *ctxp) { - seq_control_timer(ctxp, SND_SEQ_EVENT_STOP); + seq_control_timer(ctxp, SND_SEQ_EVENT_STOP, 0); } /* @@ -619,11 +619,22 @@ seq_timer_continue(seq_context_t *ctxp) { - seq_control_timer(ctxp, SND_SEQ_EVENT_CONTINUE); + seq_control_timer(ctxp, SND_SEQ_EVENT_CONTINUE, 0); +} + +void +seq_timer_seek(seq_context_t *ctxp, ticktime_t tick) +{ +#ifdef SND_SEQ_EVENT_SETPOS_TICK + seq_control_timer(ctxp, SND_SEQ_EVENT_SETPOS_TICK, tick); +#else + /* We should not be called if this not set */ + g_warning("SND_SEQ_EVENT_SETPOS_TICK is not defined"); +#endif } void -seq_control_timer(seq_context_t *ctxp, int onoff) +seq_control_timer(seq_context_t *ctxp, int cmd, ticktime_t tick) { snd_seq_event_t ev; @@ -651,7 +662,10 @@ ev.time.real.tv_sec = 0; ev.time.real.tv_nsec = 0; - ev.type = onoff; + ev.type = cmd; + + if (cmd == SND_SEQ_EVENT_SETPOS_TICK) + ev.data.queue.param.time.tick = tick; snd_seq_event_output(ctxp->control->handle, &ev); snd_seq_flush_output(ctxp->control->handle); @@ -663,8 +677,8 @@ ticktime_t seq_get_time(seq_context_t *ctxp) { - snd_seq_queue_status_t qstatus; + snd_seq_get_queue_status(ctxp->handle, ctxp->queue, &qstatus); return qstatus.tick; @@ -902,4 +916,10 @@ pool.output_room = n; snd_seq_set_client_pool(seq, &pool); +} + +int +seq_xxx_get_queue(seq_context_t *ctxp) +{ + return ctxp->queue; } diff -rNu melys-0.1.13/seq/seqlib.m melys-0.1.14/seq/seqlib.m --- melys-0.1.13/seq/seqlib.m Thu Dec 16 21:04:03 1999 +++ melys-0.1.14/seq/seqlib.m Mon Dec 20 13:36:53 1999 @@ -391,8 +391,8 @@ #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; @@ -647,7 +647,7 @@ (What about timers other than the system one?) >>code - seq_control_timer(ctxp, SND_SEQ_EVENT_START); + seq_control_timer(ctxp, SND_SEQ_EVENT_START, 0); >>function seq_timer_stop void @@ -657,7 +657,7 @@ (What about timers other than the system one?) >>code - seq_control_timer(ctxp, SND_SEQ_EVENT_STOP); + seq_control_timer(ctxp, SND_SEQ_EVENT_STOP, 0); >>function seq_timer_continue void @@ -666,13 +666,29 @@ Continue the timer after pausing. >>code - seq_control_timer(ctxp, SND_SEQ_EVENT_CONTINUE); + seq_control_timer(ctxp, SND_SEQ_EVENT_CONTINUE, 0); + + +>>function seq_timer_seek +void +seq_context_t *ctxp; +ticktime_t tick; + +>>code +#ifdef SND_SEQ_EVENT_SETPOS_TICK + seq_control_timer(ctxp, SND_SEQ_EVENT_SETPOS_TICK, tick); +#else + /* We should not be called if this not set */ + g_warning("SND_SEQ_EVENT_SETPOS_TICK is not defined"); +#endif >>function seq_control_timer void seq_context_t *ctxp; // The seq context -int onoff; // SND_SEQ_EVENT_START or ...STOP +int cmd; // SND_SEQ_EVENT_START or ...STOP +ticktime_t tick; + >>code snd_seq_event_t ev; @@ -700,7 +716,10 @@ ev.time.real.tv_sec = 0; ev.time.real.tv_nsec = 0; - ev.type = onoff; + ev.type = cmd; + + if (cmd == SND_SEQ_EVENT_SETPOS_TICK) + ev.data.queue.param.time.tick = tick; snd_seq_event_output(ctxp->control->handle, &ev); snd_seq_flush_output(ctxp->control->handle); @@ -712,8 +731,8 @@ >>description Get the current song time in ticks. >>code - snd_seq_queue_status_t qstatus; + snd_seq_get_queue_status(ctxp->handle, ctxp->queue, &qstatus); return qstatus.tick; @@ -949,3 +968,9 @@ pool.output_room = n; snd_seq_set_client_pool(seq, &pool); + +>>function seq_xxx_get_queue +int +seq_context_t *ctxp; +>>code + return ctxp->queue; diff -rNu melys-0.1.13/seq/seqplay.c melys-0.1.14/seq/seqplay.c --- melys-0.1.13/seq/seqplay.c Thu Dec 16 21:08:17 1999 +++ melys-0.1.14/seq/seqplay.c Mon Dec 20 23:40:51 1999 @@ -287,3 +287,49 @@ return time; } + +/* + * Seek to another place in the song. This involves changing + * our place in the md tree and also setting the queue timer in + * the sequencer. + * + * Arguments: + * ctxp - The sequencer context. + * seq - The sequence to be seeked + * tick - The tick to seek to + */ +void +seq_midi_seek(seq_context_t *ctxp, struct sequenceState *seq, ticktime_t tick) +{ +#ifdef SND_SEQ_EVENT_SETPOS_TICK +#if 0 + int curtick; + gboolean forward; + + curtick = seq_get_time(ctxp); + if (tick == curtick) + return; + else if (tick > curtick) + forward = TRUE; + else + forward = FALSE; + + if (forward) { + snd_seq_remove_events_t fqueue; + + fqueue.output = 1; + fqueue.remove_mode = SND_SEQ_REMOVE_TIME_BEFORE; + fqueue.tick = 1; + fqueue.time.tick = tick; + + snd_seq_remove_events(seq_handle(ctxp), &fqueue); + } else { +#endif + + seq_drain_output(ctxp); + + if (seq) + md_elem_all_seek(seq, tick); + seq_timer_seek(ctxp, tick); +#endif +} diff -rNu melys-0.1.13/seq/seqplay.m melys-0.1.14/seq/seqplay.m --- melys-0.1.13/seq/seqplay.m Thu Dec 16 21:04:03 1999 +++ melys-0.1.14/seq/seqplay.m Mon Dec 20 23:33:37 1999 @@ -277,3 +277,48 @@ } return time; + + +>>function seq_midi_seek +void +seq_context_t *ctxp; The sequencer context. +struct sequenceState *seq; The sequence to be seeked +ticktime_t tick; The tick to seek to + +>>description +Seek to another place in the song. +This involves changing our place in the md tree and also setting +the queue timer in the sequencer. + +>>code +#ifdef SND_SEQ_EVENT_SETPOS_TICK +#if 0 + int curtick; + gboolean forward; + + curtick = seq_get_time(ctxp); + if (tick == curtick) + return; + else if (tick > curtick) + forward = TRUE; + else + forward = FALSE; + + if (forward) { + snd_seq_remove_events_t fqueue; + + fqueue.output = 1; + fqueue.remove_mode = SND_SEQ_REMOVE_TIME_BEFORE; + fqueue.tick = 1; + fqueue.time.tick = tick; + + snd_seq_remove_events(seq_handle(ctxp), &fqueue); + } else { +#endif + + seq_drain_output(ctxp); + + if (seq) + md_elem_all_seek(seq, tick); + seq_timer_seek(ctxp, tick); +#endif diff -rNu melys-0.1.13/util/util.m melys-0.1.14/util/util.m --- melys-0.1.13/util/util.m Tue Dec 14 16:49:04 1999 +++ melys-0.1.14/util/util.m Sun Dec 19 22:20:32 1999 @@ -30,6 +30,29 @@ /* Typedef for times */ typedef long ticktime_t; +/* + * Snap to grid types. + */ +enum snap_type { + SNAP_NONE, + SNAP_BAR, + SNAP_1, + SNAP_1_2, + SNAP_1_4, + SNAP_1_8, + SNAP_1_16, + SNAP_1_32, + SNAP_1_64, + SNAP_1_3, + SNAP_1_6, + SNAP_1_24, + SNAP_1_48, + SNAP_1_96, + SNAP_1_192, + /* ETC */ +}; + + #ifdef DEBUG /* * Debugging stuff. diff -rNu melys-0.1.13/version melys-0.1.14/version --- melys-0.1.13/version Thu Dec 16 21:05:20 1999 +++ melys-0.1.14/version Mon Dec 20 23:40:22 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.1.13" +#define MELYS_VERSION_STRING "0.1.14" diff -rNu melys-0.1.13/widgets/Makefile melys-0.1.14/widgets/Makefile --- melys-0.1.13/widgets/Makefile Thu Dec 16 21:08:14 1999 +++ melys-0.1.14/widgets/Makefile Mon Dec 20 23:40:48 1999 @@ -93,6 +93,8 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< +viewcontrol.o: ../include/elements.h +viewcontrol.o: ../include/md.h viewcontrol.o: ../include/pixmaps.h viewcontrol.o: ../include/melgui.h viewcontrol.o: ../include/viewcontrol.h @@ -136,9 +138,9 @@ melystransport.o: ../include/melystransport.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/md.h melysrule.o: ../include/melysrule.h melysscroll.o: ../include/viewcontrol.h melysscroll.o: ../include/melysscroll.h diff -rNu melys-0.1.13/widgets/melyspiano.c melys-0.1.14/widgets/melyspiano.c --- melys-0.1.13/widgets/melyspiano.c Thu Dec 16 21:08:24 1999 +++ melys-0.1.14/widgets/melyspiano.c Mon Dec 20 23:40:59 1999 @@ -138,9 +138,9 @@ GtkWidget *invis; mview->type = MD_TYPE_NOTE; - mview->snap = SNAP_1_16; + view_control_set_snap(mview->vcp, SNAP_1_16); view_control_set_vertical(mview->vcp, 8); - 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, 4, 0); tab = (GtkTable *)gtk_table_new(2, 2, 0); diff -rNu melys-0.1.13/widgets/melyspiano.m melys-0.1.14/widgets/melyspiano.m --- melys-0.1.13/widgets/melyspiano.m Tue Dec 14 17:49:32 1999 +++ melys-0.1.14/widgets/melyspiano.m Sun Dec 19 16:36:26 1999 @@ -103,9 +103,9 @@ GtkWidget *invis; mview->type = MD_TYPE_NOTE; - mview->snap = SNAP_1_16; + view_control_set_snap(mview->vcp, SNAP_1_16); view_control_set_vertical(mview->vcp, 8); - 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, 4, 0); tab = (GtkTable *)gtk_table_new(2, 2, 0); diff -rNu melys-0.1.13/widgets/melysrule.c melys-0.1.14/widgets/melysrule.c --- melys-0.1.13/widgets/melysrule.c Thu Dec 16 21:08:25 1999 +++ melys-0.1.14/widgets/melysrule.c Mon Dec 20 23:41:00 1999 @@ -14,6 +14,7 @@ * * * + * */ @@ -24,9 +25,9 @@ #include "gtk/gtkvbox.h" #include "gtk/gtksignal.h" #include "elements.h" +#include "md.h" #include "viewcontrol.h" #include "melystrack.h" -#include "md.h" #include "melysrule.h" #include "intl.h" @@ -51,6 +52,8 @@ static void rule_draw(GtkWidget *widget, GdkRectangle *ap); static int rule_expose(GtkWidget *widget, GdkEventExpose *event); static void rule_scroll(GtkAdjustment *adj, gpointer data); +static int rule_button_press(GtkWidget *widget, GdkEventButton *event); +static int rule_motion(GtkWidget *widget, GdkEventMotion *event); static void rule_destroy(GtkObject *obj); @@ -136,6 +139,8 @@ widget_class->draw = rule_draw; widget_class->expose_event = rule_expose; + widget_class->button_press_event = rule_button_press; + widget_class->motion_notify_event = rule_motion; widget_class->configure_event = rule_configure; object_class->destroy = rule_destroy; } @@ -198,6 +203,9 @@ mrule->pixmap = gdk_pixmap_new(widget->window, widget->allocation.width, widget->allocation.height, -1); + gtk_widget_add_events(widget, + GDK_BUTTON_PRESS_MASK|GDK_BUTTON_MOTION_MASK); + gdk_draw_rectangle(mrule->pixmap, widget->style->bg_gc[widget->state], TRUE, @@ -341,6 +349,43 @@ if (xchanged) gtk_widget_queue_draw(widget); +} + +static int +rule_button_press(GtkWidget *widget, GdkEventButton *event) +{ + MelysRule *mrule = MELYS_RULE(widget); + ticktime_t tick; + + switch (event->button) { + case 1: + if (event->state & GDK_SHIFT_MASK) { + tick = mrule->hoffset + x_to_tick(mrule, (int) event->x); + gtk_adjustment_set_value(mrule->vcp->posadj, tick); + } + break; + } + + return FALSE; +} + +static int +rule_motion(GtkWidget *widget, GdkEventMotion *event) +{ + MelysRule *mrule = MELYS_RULE(widget); + ticktime_t tick; + + if ((event->state & (GDK_BUTTON1_MASK|GDK_SHIFT_MASK)) + == (GDK_BUTTON1_MASK|GDK_SHIFT_MASK)) { + + tick = mrule->hoffset + x_to_tick(mrule, (int) event->x); +#ifdef notyet + gtk_adjustment_set_value(mrule->vcp->posadj, tick); +#endif + return TRUE; + } + + return FALSE; } static void diff -rNu melys-0.1.13/widgets/melysrule.m melys-0.1.14/widgets/melysrule.m --- melys-0.1.13/widgets/melysrule.m Thu Dec 16 18:45:15 1999 +++ melys-0.1.14/widgets/melysrule.m Mon Dec 20 13:37:49 1999 @@ -16,9 +16,10 @@ >>header gtk/gtksignal.h >>header elements.h +>>header md.h + >>header viewcontrol.h >>header melystrack.h ->>header md.h >>gtkobject melys_rule gtk_drawing_area @@ -104,6 +105,8 @@ widget_class->draw = rule_draw; widget_class->expose_event = rule_expose; + widget_class->button_press_event = rule_button_press; + widget_class->motion_notify_event = rule_motion; widget_class->configure_event = rule_configure; object_class->destroy = rule_destroy; @@ -174,6 +177,9 @@ mrule->pixmap = gdk_pixmap_new(widget->window, widget->allocation.width, widget->allocation.height, -1); + gtk_widget_add_events(widget, + GDK_BUTTON_PRESS_MASK|GDK_BUTTON_MOTION_MASK); + gdk_draw_rectangle(mrule->pixmap, widget->style->bg_gc[widget->state], TRUE, @@ -325,6 +331,48 @@ if (xchanged) gtk_widget_queue_draw(widget); + +>>function rule_button_press +static int +GtkWidget *widget; +GdkEventButton *event; + +>>code + MelysRule *mrule = MELYS_RULE(widget); + ticktime_t tick; + + switch (event->button) { + case 1: + if (event->state & GDK_SHIFT_MASK) { + tick = mrule->hoffset + x_to_tick(mrule, (int) event->x); + gtk_adjustment_set_value(mrule->vcp->posadj, tick); + } + break; + } + + return FALSE; + + +>>function rule_motion +static int +GtkWidget *widget; +GdkEventMotion *event; + +>>code + MelysRule *mrule = MELYS_RULE(widget); + ticktime_t tick; + + if ((event->state & (GDK_BUTTON1_MASK|GDK_SHIFT_MASK)) + == (GDK_BUTTON1_MASK|GDK_SHIFT_MASK)) { + + tick = mrule->hoffset + x_to_tick(mrule, (int) event->x); +#ifdef notyet + gtk_adjustment_set_value(mrule->vcp->posadj, tick); +#endif + return TRUE; + } + + return FALSE; >>function rule_destroy static void diff -rNu melys-0.1.13/widgets/melystrackdisplay.c melys-0.1.14/widgets/melystrackdisplay.c --- melys-0.1.13/widgets/melystrackdisplay.c Thu Dec 16 21:08:27 1999 +++ melys-0.1.14/widgets/melystrackdisplay.c Mon Dec 20 23:41:02 1999 @@ -222,7 +222,7 @@ box = gtk_vbox_new(0, 0); mview->type = MD_TYPE_PART; - mview->snap = SNAP_1_4; + view_control_set_snap(mview->vcp, SNAP_1_4); /* Create the pop up menu */ mview->menu = gnome_popup_menu_new(displaymenu); @@ -556,7 +556,7 @@ ticktime_t t; t = mview->click_tick; - t = md_snap_tick(mview->tempomap, mview->snap, t); + t = md_snap_tick(mview->tempomap, mview->vcp->snap, t); part = MD_PART(mview->click_elem); track = MD_TRACK(mview->click_base); diff -rNu melys-0.1.13/widgets/melystrackdisplay.m melys-0.1.14/widgets/melystrackdisplay.m --- melys-0.1.13/widgets/melystrackdisplay.m Tue Dec 14 17:49:32 1999 +++ melys-0.1.14/widgets/melystrackdisplay.m Sun Dec 19 16:36:26 1999 @@ -190,7 +190,7 @@ box = gtk_vbox_new(0, 0); mview->type = MD_TYPE_PART; - mview->snap = SNAP_1_4; + view_control_set_snap(mview->vcp, SNAP_1_4); /* Create the pop up menu */ mview->menu = gnome_popup_menu_new(displaymenu); @@ -541,7 +541,7 @@ ticktime_t t; t = mview->click_tick; - t = md_snap_tick(mview->tempomap, mview->snap, t); + t = md_snap_tick(mview->tempomap, mview->vcp->snap, t); part = MD_PART(mview->click_elem); track = MD_TRACK(mview->click_base); diff -rNu melys-0.1.13/widgets/melysview.c melys-0.1.14/widgets/melysview.c --- melys-0.1.13/widgets/melysview.c Thu Dec 16 21:08:28 1999 +++ melys-0.1.14/widgets/melysview.c Mon Dec 20 23:41:03 1999 @@ -104,11 +104,11 @@ static void view_pos_change(MelysScroll *mscroll, int tick, int thing, gpointer data); static int canvas_event(GtkWidget *w, GdkEvent *event, gpointer data); -static void button_press(MelysView *mview, struct element *elem, +static int button_press(MelysView *mview, struct element *elem, GdkEventButton *event); -static void button_release(MelysView *mview, struct element *elem, +static int button_release(MelysView *mview, struct element *elem, GdkEventButton *event); -static void button_motion(MelysView *mview, struct element *elem, +static int button_motion(MelysView *mview, struct element *elem, GdkEventMotion *event); static int key_press(MelysView *mview, struct element *el, GdkEventKey *kevent); @@ -320,10 +320,6 @@ gtk_object_unref(GTK_OBJECT(mview->vcp)); mview->vcp = NULL; } - if (mview->posadj) { - gtk_object_unref(GTK_OBJECT(mview->posadj)); - mview->posadj = NULL; - } if (mview->ruler) { gtk_widget_unref(mview->ruler); mview->ruler = NULL; @@ -391,9 +387,8 @@ melys_rule_set_tempomap(MELYS_RULE(mview->ruler), mview->tempomap); if (song->posadj) { - mview->posadj = song->posadj; - gtk_object_ref((GtkObject *)mview->posadj); - gtk_signal_connect_while_alive((GtkObject *)mview->posadj, + view_control_set_posadj(mview->vcp, song->posadj); + gtk_signal_connect_while_alive((GtkObject *)mview->vcp->posadj, "value-changed", (GtkSignalFunc)song_pos_cb, mview, GTK_OBJECT(mview)); } @@ -475,6 +470,7 @@ MelysView *mview = data; struct element *elem; struct display_info *dinfo; + int res = FALSE; /* Get the display data from the group */ dinfo = gtk_object_get_data(item, mview->infostr); @@ -493,42 +489,41 @@ mview->click_base = VIEW_CLASS(mview)->get_base_from_pos( mview, mview->click_nthing); - button_press(mview, elem, &event->button); + res = button_press(mview, elem, &event->button); break; case GDK_2BUTTON_PRESS: - if (VIEW_CLASS(mview)->button1_double) + if (event->button.button == 1 && VIEW_CLASS(mview)->button1_double) VIEW_CLASS(mview)->button1_double(mview, elem); break; case GDK_BUTTON_RELEASE: - button_release(mview, elem, &event->button); + res = button_release(mview, elem, &event->button); break; case GDK_MOTION_NOTIFY: if (event->motion.state & ALL_BUTTON_MASK) - button_motion(mview, elem, &event->motion); + res = button_motion(mview, elem, &event->motion); break; - case GDK_KEY_PRESS: - return key_press(mview, elem, &event->key); - default: break; } - return TRUE; + return res; } /* * Action to take when button 1 is pressed. */ -static void +static int button_press(MelysView *mview, struct element *elem, GdkEventButton *event) { + int res = TRUE; + if (mview->click_state != CLICK_INACTIVE) { mview->click_state = CLICK_ERROR; - return; + return TRUE; } switch (event->button) { @@ -548,17 +543,25 @@ */ if (mview->menu) gnome_popup_menu_do_popup(mview->menu, NULL, NULL, event, mview); + else + res = FALSE; + break; + default: + res = FALSE; break; } + + return res; } /* * Button 1 has been pressed on a part item. This selects the * item. */ -static void +static int button_release(MelysView *mview, struct element *elem, GdkEventButton *event) { + int res = TRUE; int mask; struct display_info *dinfo; @@ -580,7 +583,7 @@ */ if (mask == 0) mview->click_state = CLICK_INACTIVE; - return; + return TRUE; } switch (event->button) { @@ -610,25 +613,34 @@ mview->click_state = CLICK_INACTIVE; break; #endif + default: + res = FALSE; + break; } + + return res; } /* * Motion when a button is pressed down. Drag and drop on button * 1, gesture based editing on button 2. */ -static void +static int button_motion(MelysView *mview, struct element *elem, GdkEventMotion *event) { + int res = FALSE; switch (mview->click_state) { case CLICK_BUTTON1_DOWN: drag_setup(mview, event); mview->click_state = CLICK_INACTIVE; + res = TRUE; break; default: break; } + + return res; } static int @@ -743,7 +755,7 @@ hadj = mview->vcp->hadj; - t = (ticktime_t)mview->posadj->value; + t = (ticktime_t)mview->vcp->posadj->value; x = tick_to_x(mview, t); if (x != tick_to_x(mview, mview->poffset)) { @@ -767,7 +779,7 @@ if (MD_TYPE(mview->viewcon) == MD_TYPE_TRACK && t > MD_ENDTIME(mview->viewcon)) { MD_SET_DURATION(mview->viewcon, t + hadj->page_size); - mview->posadj->upper = MD_ENDTIME(mview->viewcon); + mview->vcp->posadj->upper = MD_ENDTIME(mview->viewcon); set_scrolls(mview); } @@ -979,7 +991,7 @@ if (wy < 0) wy = 0; - tick = md_snap_tick(mview->tempomap, mview->snap, tick); + tick = md_snap_tick(mview->tempomap, mview->vcp->snap, tick); wx = tick_to_x(mview, tick); canvas_item_move_abs(GNOME_CANVAS_ITEM(oldata->group), wx, wy); @@ -1186,6 +1198,9 @@ x = (int)dx; y = (int)dy; + dprintf(2, "data received len %d %p, at %d,%d", + data->length, *(char **)data->data,x, y); + dprintf(2, "data received len %d %p, at %g,%g %d,%d", data->length, *(char **)data->data, dx, dy, x, y); @@ -1201,7 +1216,6 @@ x = -tick_to_x(mview, dragdata->min_tick_offset); if (y + thing_to_y(mview, dragdata->min_thing_offset) < 0) y = -thing_to_y(mview, dragdata->min_thing_offset); - squeeze = get_squeeze_factor(mview->type, dragdata->a[0].element->type); if (squeeze == 0) goto error; @@ -1239,7 +1253,7 @@ t = dp->tick_offset + x_to_tick(mview, x); if (t < 0) t = 0; - t = md_snap_tick(mview->tempomap, mview->snap, t); + t = md_snap_tick(mview->tempomap, mview->vcp->snap, t); tn = dp->thing_offset + y_to_thing(mview, y); if (tn < 0) diff -rNu melys-0.1.13/widgets/melysview.m melys-0.1.14/widgets/melysview.m --- melys-0.1.13/widgets/melysview.m Tue Dec 14 17:31:24 1999 +++ melys-0.1.14/widgets/melysview.m Sun Dec 19 16:36:26 1999 @@ -50,17 +50,12 @@ ViewControl *vcp; - GtkAdjustment *posadj; /* Song position adjustment */ - /* Play position offset, in ticks */ int poffset; /* The number of things in the vertical direction */ int vthings; /* Number of notes, tracks whatever */ - /* From aligning to a grid */ - enum snap_type snap; - struct containerElement *viewcon; struct song *song; struct tempomapElement *tempomap; @@ -354,10 +349,6 @@ gtk_object_unref(GTK_OBJECT(mview->vcp)); mview->vcp = NULL; } - if (mview->posadj) { - gtk_object_unref(GTK_OBJECT(mview->posadj)); - mview->posadj = NULL; - } if (mview->ruler) { gtk_widget_unref(mview->ruler); mview->ruler = NULL; @@ -425,9 +416,8 @@ melys_rule_set_tempomap(MELYS_RULE(mview->ruler), mview->tempomap); if (song->posadj) { - mview->posadj = song->posadj; - gtk_object_ref((GtkObject *)mview->posadj); - gtk_signal_connect_while_alive((GtkObject *)mview->posadj, + view_control_set_posadj(mview->vcp, song->posadj); + gtk_signal_connect_while_alive((GtkObject *)mview->vcp->posadj, "value-changed", (GtkSignalFunc)song_pos_cb, mview, GTK_OBJECT(mview)); } @@ -521,6 +511,7 @@ MelysView *mview = data; struct element *elem; struct display_info *dinfo; + int res = FALSE; /* Get the display data from the group */ dinfo = gtk_object_get_data(item, mview->infostr); @@ -539,35 +530,32 @@ mview->click_base = VIEW_CLASS(mview)->get_base_from_pos( mview, mview->click_nthing); - button_press(mview, elem, &event->button); + res = button_press(mview, elem, &event->button); break; case GDK_2BUTTON_PRESS: - if (VIEW_CLASS(mview)->button1_double) + if (event->button.button == 1 && VIEW_CLASS(mview)->button1_double) VIEW_CLASS(mview)->button1_double(mview, elem); break; case GDK_BUTTON_RELEASE: - button_release(mview, elem, &event->button); + res = button_release(mview, elem, &event->button); break; case GDK_MOTION_NOTIFY: if (event->motion.state & ALL_BUTTON_MASK) - button_motion(mview, elem, &event->motion); + res = button_motion(mview, elem, &event->motion); break; - case GDK_KEY_PRESS: - return key_press(mview, elem, &event->key); - default: break; } - return TRUE; + return res; >>function button_press -static void +static int MelysView *mview; struct element *elem; GdkEventButton *event; @@ -576,9 +564,11 @@ Action to take when button 1 is pressed. >>code + int res = TRUE; + if (mview->click_state != CLICK_INACTIVE) { mview->click_state = CLICK_ERROR; - return; + return TRUE; } switch (event->button) { @@ -598,12 +588,19 @@ */ if (mview->menu) gnome_popup_menu_do_popup(mview->menu, NULL, NULL, event, mview); + else + res = FALSE; + break; + default: + res = FALSE; break; } + return res; + >>function button_release -static void +static int MelysView *mview; struct element *elem; GdkEventButton *event; @@ -613,6 +610,7 @@ This selects the item. >>code + int res = TRUE; int mask; struct display_info *dinfo; @@ -634,7 +632,7 @@ */ if (mask == 0) mview->click_state = CLICK_INACTIVE; - return; + return TRUE; } switch (event->button) { @@ -664,11 +662,15 @@ mview->click_state = CLICK_INACTIVE; break; #endif + default: + res = FALSE; + break; } + return res; >>function button_motion -static void +static int MelysView *mview; struct element *elem; GdkEventMotion *event; @@ -678,16 +680,19 @@ Drag and drop on button 1, gesture based editing on button 2. >>code + int res = FALSE; switch (mview->click_state) { case CLICK_BUTTON1_DOWN: drag_setup(mview, event); mview->click_state = CLICK_INACTIVE; + res = TRUE; break; default: break; } + return res; >>function key_press static int @@ -810,7 +815,7 @@ hadj = mview->vcp->hadj; - t = (ticktime_t)mview->posadj->value; + t = (ticktime_t)mview->vcp->posadj->value; x = tick_to_x(mview, t); if (x != tick_to_x(mview, mview->poffset)) { @@ -834,7 +839,7 @@ if (MD_TYPE(mview->viewcon) == MD_TYPE_TRACK && t > MD_ENDTIME(mview->viewcon)) { MD_SET_DURATION(mview->viewcon, t + hadj->page_size); - mview->posadj->upper = MD_ENDTIME(mview->viewcon); + mview->vcp->posadj->upper = MD_ENDTIME(mview->viewcon); set_scrolls(mview); } @@ -1063,7 +1068,7 @@ if (wy < 0) wy = 0; - tick = md_snap_tick(mview->tempomap, mview->snap, tick); + tick = md_snap_tick(mview->tempomap, mview->vcp->snap, tick); wx = tick_to_x(mview, tick); canvas_item_move_abs(GNOME_CANVAS_ITEM(oldata->group), wx, wy); @@ -1278,6 +1283,9 @@ x = (int)dx; y = (int)dy; + dprintf(2, "data received len %d %p, at %d,%d", + data->length, *(char **)data->data,x, y); + dprintf(2, "data received len %d %p, at %g,%g %d,%d", data->length, *(char **)data->data, dx, dy, x, y); @@ -1293,7 +1301,6 @@ x = -tick_to_x(mview, dragdata->min_tick_offset); if (y + thing_to_y(mview, dragdata->min_thing_offset) < 0) y = -thing_to_y(mview, dragdata->min_thing_offset); - squeeze = get_squeeze_factor(mview->type, dragdata->a[0].element->type); if (squeeze == 0) goto error; @@ -1331,7 +1338,7 @@ t = dp->tick_offset + x_to_tick(mview, x); if (t < 0) t = 0; - t = md_snap_tick(mview->tempomap, mview->snap, t); + t = md_snap_tick(mview->tempomap, mview->vcp->snap, t); tn = dp->thing_offset + y_to_thing(mview, y); if (tn < 0) diff -rNu melys-0.1.13/widgets/viewcontrol.c melys-0.1.14/widgets/viewcontrol.c --- melys-0.1.13/widgets/viewcontrol.c Thu Dec 16 21:08:29 1999 +++ melys-0.1.14/widgets/viewcontrol.c Mon Dec 20 23:41:04 1999 @@ -33,6 +33,8 @@ #include "gtk/gtkvscrollbar.h" #include "gtk/gtkmain.h" #include "libgnomeui/gnome-pixmap.h" +#include "elements.h" +#include "md.h" #include "pixmaps.h" #include "melgui.h" #include "viewcontrol.h" @@ -195,6 +197,13 @@ klass->scale_changed = NULL; } +void +view_control_set_posadj(ViewControl *vcp, GtkAdjustment *posadj) +{ + vcp->posadj = posadj; + gtk_object_ref(GTK_OBJECT(vcp->posadj)); +} + static void view_control_destroy(GtkObject *obj) { @@ -202,6 +211,8 @@ gtk_object_unref(GTK_OBJECT(vcp->hadj)); gtk_object_unref(GTK_OBJECT(vcp->vadj)); + if (vcp->posadj) + gtk_object_unref(GTK_OBJECT(vcp->posadj)); gtk_widget_unref(vcp->hsb); gtk_widget_unref(vcp->vsb); @@ -497,4 +508,10 @@ view_control_thing_to_y(ViewControl *vcp, int n) { return n * vcp->vscale; +} + +void +view_control_set_snap(ViewControl *vcp, enum snap_type snap) +{ + vcp->snap = snap; } diff -rNu melys-0.1.13/widgets/viewcontrol.m melys-0.1.14/widgets/viewcontrol.m --- melys-0.1.13/widgets/viewcontrol.m Tue Dec 7 14:12:40 1999 +++ melys-0.1.14/widgets/viewcontrol.m Sun Dec 19 16:36:26 1999 @@ -30,6 +30,8 @@ >>header libgnomeui/gnome-pixmap.h +>>header elements.h +>>header md.h >>header pixmaps.h >>header melgui.h @@ -50,6 +52,7 @@ /* Adjustments */ GtkAdjustment *hadj; /* Horizontal adjustment position */ GtkAdjustment *vadj; /* Vertical adjustment position */ + GtkAdjustment *posadj; /* The current song position */ /* Scrollbar groups */ GtkWidget *hsb; /* The horizontal scrollbar group */ @@ -71,6 +74,9 @@ int hmaxscale; int vminscale; int vmaxscale; + + /* For aligning to a grid */ + enum snap_type snap; }; struct _ViewControlClass { @@ -191,6 +197,16 @@ klass->scale_changed = NULL; +>>function view_control_set_posadj +void +ViewControl *vcp; +GtkAdjustment *posadj; + +>>code + vcp->posadj = posadj; + gtk_object_ref(GTK_OBJECT(vcp->posadj)); + + >>function view_control_destroy static void GtkObject *obj; The view control @@ -199,6 +215,8 @@ gtk_object_unref(GTK_OBJECT(vcp->hadj)); gtk_object_unref(GTK_OBJECT(vcp->vadj)); + if (vcp->posadj) + gtk_object_unref(GTK_OBJECT(vcp->posadj)); gtk_widget_unref(vcp->hsb); gtk_widget_unref(vcp->vsb); @@ -521,4 +539,12 @@ >>code return n * vcp->vscale; + +>>function view_control_set_snap +void +ViewControl *vcp; +enum snap_type snap; + +>>code + vcp->snap = snap;