diff -rNu melys-0.0.5/ChangeLog melys-0.0.6/ChangeLog --- melys-0.0.5/ChangeLog Mon Aug 9 00:31:54 1999 +++ melys-0.0.6/ChangeLog Mon Aug 9 19:27:07 1999 @@ -1,4 +1,34 @@ +1999-08-09 Steve Ratcliffe + + * song/song.m: + Warning about type 0 files (temporary) and now if can't read + file there is no view created for it. (and no crash when it + can't be displayed for that matter) + + * midi/play.m: Reset all controllers before starting a new piece. + + * seq/seqlib.m: Add a function for sending to all opened channels + intended for things like controller reset and the like. + + * po/FILES, po/melys.pot, po/zz.po: updated + + * gui/main.m: Create a warn routine (main) + + * gui/menus.m: If the file fails to load then don't create a view for it. + + * md/elements.m, md/mdutil.m: Track numbers now start internally at 0 + Add var to store program number + + * files/mdmlread.m, files/midiread.m, widgets/melystrack.m, + widgets/melystrackinfo.m: Improvements to the track view. + Can now see the track names and program numbers. + + * util/except.m: removed stack trace debug, which always seemed to hang + anyway. + 1999-08-08 Steve Ratcliffe + + * util/util.m: Changed default debug level down to 0 * files/mdmlread.m, gui/main.m, gui/menus.m, md/mdutil.m, programs/melys.m, song/song.m, util/util.m, widgets/melystrack.m, diff -rNu melys-0.0.5/files/mdmlread.c melys-0.0.6/files/mdmlread.c --- melys-0.0.5/files/mdmlread.c Mon Aug 9 00:51:33 1999 +++ melys-0.0.6/files/mdmlread.c Mon Aug 9 19:46:23 1999 @@ -44,6 +44,9 @@ struct headElement *head; /* Pointer to head element */ GArray *toffsets; /* Time offsets for each container level */ int level; /* Container level */ + + int program; /* Saved program for track */ + int note_seen:1; /* Seen first note on track */ }; static struct element *node_to_md(struct mdmlstate *msp, xmlNodePtr node); static void common_atts(struct mdmlstate *msp, xmlNodePtr node, @@ -122,6 +125,8 @@ if (off > 0) note->offvel = off; + msp->note_seen = 1; + retel = MD_ELEMENT(note); } else if (strcmp(name, "control") == 0) { @@ -130,6 +135,8 @@ } else if (strcmp(name, "program") == 0) { retel = MD_ELEMENT(md_program_new(get_int(node, "program"))); + if (!msp->note_seen) + msp->program = get_int(node, "program"); } else if (strcmp(name, "pitch") == 0) { retel = MD_ELEMENT(md_pitch_new(get_int(node, "p"))); @@ -189,6 +196,9 @@ msp->currtime = 0; msp->maxtime = 0; msp->devchan = 0; + msp->program = 0; + msp->note_seen = 0; + tp = md_track_new(); tp->name = xmlGetProp(node, "name"); retel = MD_ELEMENT(tp); @@ -318,6 +328,10 @@ dur = msp->maxtime - retel->element_time; if (MD_CONTAINER(retel)->duration > dur) dur = MD_CONTAINER(retel)->duration; + + if (retel->type == MD_TYPE_TRACK) { + MD_TRACK(retel)->program = msp->program; + } MD_CONTAINER(retel)->duration = dur; msp->currtime = msp->starttime + dur; diff -rNu melys-0.0.5/files/mdmlread.m melys-0.0.6/files/mdmlread.m --- melys-0.0.5/files/mdmlread.m Mon Aug 9 00:05:59 1999 +++ melys-0.0.6/files/mdmlread.m Mon Aug 9 19:03:09 1999 @@ -32,6 +32,9 @@ struct headElement *head; /* Pointer to head element */ GArray *toffsets; /* Time offsets for each container level */ int level; /* Container level */ + + int program; /* Saved program for track */ + int note_seen:1; /* Seen first note on track */ }; >>headerdef --decl mdrw.h @@ -102,6 +105,8 @@ if (off > 0) note->offvel = off; + msp->note_seen = 1; + retel = MD_ELEMENT(note); } else if (strcmp(name, "control") == 0) { @@ -110,6 +115,8 @@ } else if (strcmp(name, "program") == 0) { retel = MD_ELEMENT(md_program_new(get_int(node, "program"))); + if (!msp->note_seen) + msp->program = get_int(node, "program"); } else if (strcmp(name, "pitch") == 0) { retel = MD_ELEMENT(md_pitch_new(get_int(node, "p"))); @@ -169,6 +176,9 @@ msp->currtime = 0; msp->maxtime = 0; msp->devchan = 0; + msp->program = 0; + msp->note_seen = 0; + tp = md_track_new(); tp->name = xmlGetProp(node, "name"); retel = MD_ELEMENT(tp); @@ -298,6 +308,10 @@ dur = msp->maxtime - retel->element_time; if (MD_CONTAINER(retel)->duration > dur) dur = MD_CONTAINER(retel)->duration; + + if (retel->type == MD_TYPE_TRACK) { + MD_TRACK(retel)->program = msp->program; + } MD_CONTAINER(retel)->duration = dur; msp->currtime = msp->starttime + dur; diff -rNu melys-0.0.5/files/midiread.c melys-0.0.6/files/midiread.c --- melys-0.0.5/files/midiread.c Mon Aug 9 00:51:34 1999 +++ melys-0.0.6/files/midiread.c Mon Aug 9 19:46:24 1999 @@ -46,6 +46,13 @@ struct tempomapElement *tempo_map; /* The tempo map */ struct headElement *head; /* Pointer into head element */ struct rootElement *root; /* Pointer into the root */ + + char *trackname; /* Saved track name */ + char lsb_bank; /* LSB of bank select */ + char msb_bank; /* MSB of bank select */ + int program; /* Track program applying to whole track */ + + int note_seen:1; /* Note has been seen for this track */ }; static struct rootElement *read_head(struct midistate *msp); static struct trackElement *read_track(struct midistate *msp); @@ -124,7 +131,7 @@ fp = fopen(name, "rb"); if (fp == NULL) - ethrow(ioError, _("Could not open file %s"), name); + return NULL; root = midi_read(fp); @@ -206,7 +213,16 @@ length = read_int(msp, 4); msp->chunk_size = length; + + /* + * All track initialisations. + */ msp->chunk_count = 0; /* nothing read yet */ + msp->trackname = NULL; + msp->lsb_bank = 0; + msp->msb_bank = 0; + msp->program = 0; + msp->note_seen = 0; track = md_track_new(); part = md_part_new(); @@ -243,6 +259,8 @@ goto restart; } + track->name = msp->trackname; + track->program = msp->program; MD_CONTAINER(track)->duration = msp->track_duration; msp->track_duration = 0; @@ -292,6 +310,7 @@ break; case MIDI_NOTE_ON: + msp->note_seen = 1; note = read_int(msp, 1); vel = read_int(msp, 1); @@ -317,11 +336,27 @@ val = read_int(msp, 1); el = MD_ELEMENT(md_control_new(control, val)); + /* + * Special actions for various controls. + */ + switch (control) { + case 0: /* MSB Bank */ + msp->msb_bank = val & 0x7f; + break; + case 32: /* LSB Bank */ + msp->lsb_bank = val & 0x7f; + break; + } + break; case MIDI_PATCH: val = read_int(msp, 1); + val += msp->lsb_bank << 7; + val += msp->msb_bank << 14; el = MD_ELEMENT(md_program_new(val)); + if (!msp->note_seen) + msp->program = val; break; case MIDI_CHANNEL_AFTERTOUCH: @@ -421,6 +456,8 @@ case MIDI_META_CUE: /* Text based events */ el = MD_META(md_text_new(type, data)); + if (type == MIDI_META_TRACKNAME && msp->trackname == NULL) + msp->trackname = g_strdup(data); break; case MIDI_META_SMPTE_OFFSET: el = MD_META(md_smpteoffset_new(data[0], data[1], data[2], data[3], diff -rNu melys-0.0.5/files/midiread.m melys-0.0.6/files/midiread.m --- melys-0.0.5/files/midiread.m Mon Aug 2 15:36:09 1999 +++ melys-0.0.6/files/midiread.m Mon Aug 9 19:03:09 1999 @@ -77,6 +77,13 @@ struct tempomapElement *tempo_map; /* The tempo map */ struct headElement *head; /* Pointer into head element */ struct rootElement *root; /* Pointer into the root */ + + char *trackname; /* Saved track name */ + char lsb_bank; /* LSB of bank select */ + char msb_bank; /* MSB of bank select */ + int program; /* Track program applying to whole track */ + + int note_seen:1; /* Note has been seen for this track */ }; >>function midi_read @@ -141,7 +148,7 @@ fp = fopen(name, "rb"); if (fp == NULL) - ethrow(ioError, _("Could not open file %s"), name); + return NULL; root = midi_read(fp); @@ -220,7 +227,16 @@ length = read_int(msp, 4); msp->chunk_size = length; + + /* + * All track initialisations. + */ msp->chunk_count = 0; /* nothing read yet */ + msp->trackname = NULL; + msp->lsb_bank = 0; + msp->msb_bank = 0; + msp->program = 0; + msp->note_seen = 0; track = md_track_new(); part = md_part_new(); @@ -257,6 +273,8 @@ goto restart; } + track->name = msp->trackname; + track->program = msp->program; MD_CONTAINER(track)->duration = msp->track_duration; msp->track_duration = 0; @@ -305,6 +323,7 @@ break; case MIDI_NOTE_ON: + msp->note_seen = 1; note = read_int(msp, 1); vel = read_int(msp, 1); @@ -330,11 +349,27 @@ val = read_int(msp, 1); el = MD_ELEMENT(md_control_new(control, val)); + /* + * Special actions for various controls. + */ + switch (control) { + case 0: /* MSB Bank */ + msp->msb_bank = val & 0x7f; + break; + case 32: /* LSB Bank */ + msp->lsb_bank = val & 0x7f; + break; + } + break; case MIDI_PATCH: val = read_int(msp, 1); + val += msp->lsb_bank << 7; + val += msp->msb_bank << 14; el = MD_ELEMENT(md_program_new(val)); + if (!msp->note_seen) + msp->program = val; break; case MIDI_CHANNEL_AFTERTOUCH: @@ -432,6 +467,8 @@ case MIDI_META_CUE: /* Text based events */ el = MD_META(md_text_new(type, data)); + if (type == MIDI_META_TRACKNAME && msp->trackname == NULL) + msp->trackname = g_strdup(data); break; case MIDI_META_SMPTE_OFFSET: el = MD_META(md_smpteoffset_new(data[0], data[1], data[2], data[3], diff -rNu melys-0.0.5/gui/main.c melys-0.0.6/gui/main.c --- melys-0.0.5/gui/main.c Mon Aug 9 00:51:35 1999 +++ melys-0.0.6/gui/main.c Mon Aug 9 19:46:25 1999 @@ -165,6 +165,36 @@ } /* + * Put up a warning box. There can only be one error box active + * for a file at once although they are not modal. Another + * message will just cause the original to go away. If parent is + * supplied then when that object is destroyed or unmapped the + * dialog will be destroyed to. + * + * Arguments: + * msg - The message to place in the dialog box + * parent - The parent that the dialog 'belongs' to + */ +void +mel_ui_warn(struct song *sd, char *msg, GtkObject *parent) +{ + GtkWidget *dialog; + + /* Destroy any old one */ + reg_destroy(sd->dialog); + + /* Create the gnome dialog */ + dialog = gnome_warning_dialog(msg); + + sd->dialog = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); + + /* Destroy dialog when the parent is hidden as well */ + if (parent) + gtk_signal_connect_object_while_alive(GTK_OBJECT(parent), "hide" + , gtk_widget_destroy, GTK_OBJECT(dialog)); +} + +/* * Add the view to the child. We have to go in a very round about * way of doing this... * @@ -204,7 +234,7 @@ if (toplevel) { gtk_widget_set_usize - (w, 70*gdk_screen_width()/100, 70*gdk_screen_height()/100); + (w, 70*gdk_screen_width()/100, 40*gdk_screen_height()/100); } mel_add_view(mdi, child, w, toplevel); diff -rNu melys-0.0.5/gui/main.m melys-0.0.6/gui/main.m --- melys-0.0.5/gui/main.m Mon Aug 9 00:05:59 1999 +++ melys-0.0.6/gui/main.m Mon Aug 9 19:07:15 1999 @@ -148,6 +148,39 @@ +>>function mel_ui_warn +void +struct song *sd; +char *msg; The message to place in the dialog box +GtkObject *parent; The parent that the dialog 'belongs' to + +>>description +Put up a warning box. +There can only be one error box active for a file at once although they +are not modal. +Another message will just cause the original to go away. +If +.A parent +is supplied then when that object is destroyed or unmapped +the dialog will be destroyed to. + +>>code + GtkWidget *dialog; + + /* Destroy any old one */ + reg_destroy(sd->dialog); + + /* Create the gnome dialog */ + dialog = gnome_warning_dialog(msg); + + sd->dialog = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); + + /* Destroy dialog when the parent is hidden as well */ + if (parent) + gtk_signal_connect_object_while_alive(GTK_OBJECT(parent), "hide" + , gtk_widget_destroy, GTK_OBJECT(dialog)); + + >>function mel_add_view void GtkObject *mdi; @@ -188,7 +221,7 @@ if (toplevel) { gtk_widget_set_usize - (w, 70*gdk_screen_width()/100, 70*gdk_screen_height()/100); + (w, 70*gdk_screen_width()/100, 40*gdk_screen_height()/100); } mel_add_view(mdi, child, w, toplevel); diff -rNu melys-0.0.5/gui/menus.c melys-0.0.6/gui/menus.c --- melys-0.0.5/gui/menus.c Mon Aug 9 00:51:35 1999 +++ melys-0.0.6/gui/menus.c Mon Aug 9 19:46:25 1999 @@ -245,14 +245,16 @@ /* Want to use the same open dialog, but not same save */ sd->open_dialog = open_id; + /* read in the file */ + song_open_file(sd, filename); + if (sd->mdroot == NULL) + return; + /* Add child and increase count */ gnome_mdi_add_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); count = get_child_count(mdi); set_child_count(mdi, ++count); - - /* read in the file */ - song_open_file(sd, filename); /* Create a track view (or users first choice view) of the song */ mel_initial_view(mdi, child, sd->mdroot, FALSE); diff -rNu melys-0.0.5/gui/menus.m melys-0.0.6/gui/menus.m --- melys-0.0.5/gui/menus.m Mon Aug 9 00:05:59 1999 +++ melys-0.0.6/gui/menus.m Mon Aug 9 19:07:15 1999 @@ -226,14 +226,16 @@ /* Want to use the same open dialog, but not same save */ sd->open_dialog = open_id; + /* read in the file */ + song_open_file(sd, filename); + if (sd->mdroot == NULL) + return; + /* Add child and increase count */ gnome_mdi_add_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); count = get_child_count(mdi); set_child_count(mdi, ++count); - - /* read in the file */ - song_open_file(sd, filename); /* Create a track view (or users first choice view) of the song */ mel_initial_view(mdi, child, sd->mdroot, FALSE); diff -rNu melys-0.0.5/include/elements.h melys-0.0.6/include/elements.h --- melys-0.0.5/include/elements.h Mon Aug 9 00:51:30 1999 +++ melys-0.0.6/include/elements.h Mon Aug 9 19:46:20 1999 @@ -76,6 +76,7 @@ struct trackElement { struct containerElement parent; char *name; /* Name of track */ + int program; /* Extended program number */ }; #define MD_TRACK(e) \ ((struct trackElement *)md_check_cast((struct element *)(e), MD_TYPE_TRACK)) diff -rNu melys-0.0.5/include/melgui.h melys-0.0.6/include/melgui.h --- melys-0.0.5/include/melgui.h Mon Aug 9 00:51:30 1999 +++ melys-0.0.6/include/melgui.h Mon Aug 9 19:46:20 1999 @@ -19,6 +19,7 @@ int get_child_count(GtkObject *mdi); void set_child_count(GtkObject *mdi, int count); void mel_ui_error(struct song *sd, char *msg, GtkObject *parent); +void mel_ui_warn(struct song *sd, char *msg, GtkObject *parent); void mel_add_view(GtkObject *mdi, GtkObject *child, GtkWidget *view, gboolean toplevel); void mel_initial_view(GtkObject *mdi, GtkObject *child, diff -rNu melys-0.0.5/include/melystrack.h melys-0.0.6/include/melystrack.h --- melys-0.0.5/include/melystrack.h Mon Aug 9 00:51:31 1999 +++ melys-0.0.6/include/melystrack.h Mon Aug 9 19:46:21 1999 @@ -29,8 +29,8 @@ GtkAdjustment *vadj; GtkAdjustment *hadj; - MelysTrackInfo *info; - MelysTrackDisplay *display; + struct _MelysTrackInfo *info; + struct _MelysTrackDisplay *display; struct rootElement *mdroot; }; diff -rNu melys-0.0.5/include/melystrackinfo.h melys-0.0.6/include/melystrackinfo.h --- melys-0.0.5/include/melystrackinfo.h Mon Aug 9 00:51:31 1999 +++ melys-0.0.6/include/melystrackinfo.h Mon Aug 9 19:46:21 1999 @@ -11,6 +11,10 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * + * This is a widget for the left pane of the track view. + * The columns that can be seen will be configurable and will include + * the usual information and controls such as 'mute'. + * * */ diff -rNu melys-0.0.5/include/seqlib.h melys-0.0.6/include/seqlib.h --- melys-0.0.5/include/seqlib.h Mon Aug 9 00:51:29 1999 +++ melys-0.0.6/include/seqlib.h Mon Aug 9 19:46:19 1999 @@ -53,6 +53,7 @@ int seq_sendto(seq_context_t *ctxp, snd_seq_event_t *ep, int dev, int chan); int seq_sendto_now(seq_context_t *ctxp, snd_seq_event_t *ep, int dev, int chan); +int seq_send_to_all(seq_context_t *ctxp, snd_seq_event_t *ep); void seq_timer_start(seq_context_t *ctxp); void seq_timer_stop(seq_context_t *ctxp); void seq_timer_continue(seq_context_t *ctxp); diff -rNu melys-0.0.5/md/elements.c melys-0.0.6/md/elements.c --- melys-0.0.5/md/elements.c Mon Aug 9 00:51:34 1999 +++ melys-0.0.6/md/elements.c Mon Aug 9 19:46:24 1999 @@ -116,6 +116,7 @@ MD_ELEMENT(new)->type = MD_TYPE_TRACK; md_container_init(MD_CONTAINER(new)); new->name = NULL; + new->program = 0; return new; } diff -rNu melys-0.0.5/md/elements.m melys-0.0.6/md/elements.m --- melys-0.0.5/md/elements.m Fri Aug 6 11:55:29 1999 +++ melys-0.0.6/md/elements.m Mon Aug 9 19:05:57 1999 @@ -78,8 +78,10 @@ >>elementdef track container char *name; /* Name of track */ + int program; /* Extended program number */ new new->name = NULL; + new->program = 0; >>elementdef tempomap container diff -rNu melys-0.0.5/md/mdutil.c melys-0.0.6/md/mdutil.c --- melys-0.0.5/md/mdutil.c Mon Aug 9 00:51:34 1999 +++ melys-0.0.6/md/mdutil.c Mon Aug 9 19:46:25 1999 @@ -285,7 +285,7 @@ /* * Get the nth track of the composition. Track numbers start at - * 1. + * 0. * */ struct trackElement * @@ -297,13 +297,13 @@ if (root == NULL) return NULL; - /* Allow for head and tempomap and starting at 1 */ - n += 1; + /* Allow for head and tempomap */ + n += 2; p = MD_CONTAINER(root)->elements; if (n < p->len) - track = (struct trackElement *)g_ptr_array_index(p, n); + track = MD_TRACK(g_ptr_array_index(p, n)); return track; } diff -rNu melys-0.0.5/md/mdutil.m melys-0.0.6/md/mdutil.m --- melys-0.0.5/md/mdutil.m Mon Aug 9 00:05:59 1999 +++ melys-0.0.6/md/mdutil.m Mon Aug 9 19:05:57 1999 @@ -296,7 +296,7 @@ >>description Get the nth track of the composition. -Track numbers start at 1. +Track numbers start at 0. >>code GPtrArray *p; @@ -305,13 +305,13 @@ if (root == NULL) return NULL; - /* Allow for head and tempomap and starting at 1 */ - n += 1; + /* Allow for head and tempomap */ + n += 2; p = MD_CONTAINER(root)->elements; if (n < p->len) - track = (struct trackElement *)g_ptr_array_index(p, n); + track = MD_TRACK(g_ptr_array_index(p, n)); return track; diff -rNu melys-0.0.5/midi/play.c melys-0.0.6/midi/play.c --- melys-0.0.5/midi/play.c Mon Aug 9 00:51:36 1999 +++ melys-0.0.6/midi/play.c Mon Aug 9 19:46:27 1999 @@ -121,7 +121,7 @@ (void) md_sequence_end(play->seq); if (play->mdroot) - md_free(play->mdroot); + md_free(MD_ELEMENT(play->mdroot)); if (play->ctxp) seq_context_free(play->ctxp); @@ -177,6 +177,7 @@ void play_start(struct play *play) { + snd_seq_event_t ev; if (play->isplaying || play->mdroot == NULL) return; @@ -197,6 +198,14 @@ /* Reset timer */ seq_timer_start(play->ctxp); seq_timer_stop(play->ctxp); + + /* Reset all controllers */ + /* NB: This should very probably be done in another way + * you don't necessarily want to always do this... + */ + seq_midi_event_init(play->ctxp, &ev, 0, 0); + seq_midi_control(play->ctxp, &ev, 121, 127); + seq_send_to_all(play->ctxp, &ev); } /* set playing */ diff -rNu melys-0.0.5/midi/play.m melys-0.0.6/midi/play.m --- melys-0.0.5/midi/play.m Fri Aug 6 11:56:05 1999 +++ melys-0.0.6/midi/play.m Mon Aug 9 19:11:06 1999 @@ -100,7 +100,7 @@ (void) md_sequence_end(play->seq); if (play->mdroot) - md_free(play->mdroot); + md_free(MD_ELEMENT(play->mdroot)); if (play->ctxp) seq_context_free(play->ctxp); @@ -153,6 +153,7 @@ XXX some warning/error? >>code + snd_seq_event_t ev; if (play->isplaying || play->mdroot == NULL) return; @@ -173,6 +174,14 @@ /* Reset timer */ seq_timer_start(play->ctxp); seq_timer_stop(play->ctxp); + + /* Reset all controllers */ + /* NB: This should very probably be done in another way + * you don't necessarily want to always do this... + */ + seq_midi_event_init(play->ctxp, &ev, 0, 0); + seq_midi_control(play->ctxp, &ev, 121, 127); + seq_send_to_all(play->ctxp, &ev); } /* set playing */ Binary files melys-0.0.5/mlib/PROJECT/__init__.pyo and melys-0.0.6/mlib/PROJECT/__init__.pyo differ Binary files melys-0.0.5/mlib/PROJECT/base.pyo and melys-0.0.6/mlib/PROJECT/base.pyo differ Binary files melys-0.0.5/mlib/PROJECT/cmds.pyo and melys-0.0.6/mlib/PROJECT/cmds.pyo differ Binary files melys-0.0.5/mlib/PROJECT/code.pyo and melys-0.0.6/mlib/PROJECT/code.pyo differ Binary files melys-0.0.5/mlib/PROJECT/header.pyo and melys-0.0.6/mlib/PROJECT/header.pyo differ Binary files melys-0.0.5/mlib/PROJECT/make.pyo and melys-0.0.6/mlib/PROJECT/make.pyo differ Binary files melys-0.0.5/mlib/PROJECT/mgtk.pyo and melys-0.0.6/mlib/PROJECT/mgtk.pyo differ diff -rNu melys-0.0.5/po/FILES melys-0.0.6/po/FILES --- melys-0.0.5/po/FILES Fri Jul 16 14:22:51 1999 +++ melys-0.0.6/po/FILES Mon Aug 9 19:07:27 1999 @@ -1,3 +1,4 @@ +config/ports.c files/format.c files/mdmlread.c files/mdmlwrite.c @@ -7,8 +8,20 @@ gui/menus.c md/elements.c md/mdutil.c +midi/play.c +midi/record.c +programs/mdmlconv.c +programs/melys.c +programs/pmidi.c +programs/showseq.c seq/seqlib.c seq/seqmidi.c +seq/sequtil.c +song/song.c util/except.c util/util.c -programs/melys.c +widgets/melystrack.c +widgets/melystrackdisplay.c +widgets/melystrackinfo.c +widgets/melystransport.c +widgets/register.c diff -rNu melys-0.0.5/po/melys.pot melys-0.0.6/po/melys.pot --- melys-0.0.5/po/melys.pot Thu Jul 29 14:21:42 1999 +++ melys-0.0.6/po/melys.pot Mon Aug 9 19:07:27 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-07-28 13:49+0100\n" +"POT-Creation-Date: 1999-08-09 15:17+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,48 +14,48 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: format.m:144 format.m:150 +#: format.m:145 format.m:151 msgid "Unrecognised file type" msgstr "" -#: format.m:157 +#: format.m:158 msgid "Could not read file" msgstr "" -#: mdmlwrite.m:141 +#: mdmlwrite.m:144 msgid "Could not open file" msgstr "" -#: midiread.m:140 +#: midiread.m:151 #, c-format msgid "Could not open file %s" msgstr "" -#: midiread.m:170 +#: midiread.m:182 #, c-format msgid "Bad header (%x), probably not a real midi file" msgstr "" -#: midiread.m:176 +#: midiread.m:188 msgid "Bad header length, probably not a real midi file" msgstr "" -#: midiread.m:213 +#: midiread.m:225 #, c-format msgid "Bad track header (%x), probably not a midi file" msgstr "" -#: midiread.m:376 +#: midiread.m:414 #, c-format msgid "Bad status type 0x%x" msgstr "" -#: midiread.m:443 +#: midiread.m:483 #, c-format msgid "Meta event %d not implemented\n" msgstr "" -#: midiread.m:477 midiread.m:502 midiread.m:524 +#: midiread.m:517 midiread.m:542 midiread.m:564 msgid "Unexpected end of file" msgstr "" @@ -64,73 +64,73 @@ msgid "Can not open file %s" msgstr "" -#: main.m:38 +#: main.m:41 msgid "The Melys sequencer" msgstr "" #. Create the first child -#: main.m:50 +#: main.m:53 msgid "Untitled" msgstr "" -#: menus.m:39 +#: menus.m:42 msgid "_Close all" msgstr "" -#: menus.m:39 +#: menus.m:42 msgid "Close all open windows" msgstr "" -#: menus.m:51 +#: menus.m:54 msgid "_Start" msgstr "" -#: menus.m:51 +#: menus.m:54 msgid "Start playing" msgstr "" -#: menus.m:57 +#: menus.m:60 msgid "_Pause" msgstr "" -#: menus.m:57 +#: menus.m:60 msgid "Pause playing" msgstr "" -#: menus.m:63 +#: menus.m:66 msgid "S_top" msgstr "" -#: menus.m:63 +#: menus.m:66 msgid "Stop and return to beginning" msgstr "" -#: menus.m:69 +#: menus.m:72 msgid "_Record" msgstr "" -#: menus.m:69 +#: menus.m:72 msgid "Start recording" msgstr "" -#: menus.m:75 +#: menus.m:78 msgid "Record stop" msgstr "" -#: menus.m:75 +#: menus.m:78 msgid "Stop recording" msgstr "" -#: menus.m:93 +#: menus.m:97 msgid "_Actions" msgstr "" -#: menus.m:144 +#: menus.m:148 msgid "Select the file to read in..." msgstr "" #. Failed so put up a message for the user -#: menus.m:194 +#: menus.m:199 menus.m:314 #, c-format msgid "" "The file %s\n" @@ -139,12 +139,117 @@ "extension of .mid or .mdml" msgstr "" -#: seqlib.m:73 seqlib.m:139 +#: menus.m:265 +msgid "Select the file name to write to..." +msgstr "" + +#: menus.m:498 +msgid "Copyright Steve Ratcliffe (C) 1999" +msgstr "" + +#: menus.m:500 +msgid "Melys is a sequencer application for ALSA" +msgstr "" + +#: record.m:64 +msgid "Melys sequencer (record)" +msgstr "" + +#: melys.m:123 +msgid "Usage: melys [-x level]" +msgstr "" + +#: melys.m:125 +msgid " -x, --debug=LEVEL Set debuging level" +msgstr "" + +#: pmidi.m:186 +#, c-format +msgid "Could not connect to port %d:%d\n" +msgstr "" + +#: pmidi.m:259 showseq.m:98 +#, c-format +msgid "Could not open sequencer %s" +msgstr "" + +#: pmidi.m:263 showseq.m:102 +#, c-format +msgid "Could not get sequencer information %s" +msgstr "" + +#: pmidi.m:266 +#, c-format +msgid " Port %-30.30s %s\n" +msgstr "" + +#: pmidi.m:266 +msgid "Client name" +msgstr "" + +#: pmidi.m:266 showseq.m:105 +msgid "Port name" +msgstr "" + +#: pmidi.m:295 +msgid "Usage: pmidi [-p client:port ...] [-l] [-d delay] file ..." +msgstr "" + +#: pmidi.m:297 +msgid " -p client:port - A alsa client and port number to send midi to" +msgstr "" + +#: pmidi.m:298 +msgid " -l - List possible output ports that could be used" +msgstr "" + +#: pmidi.m:299 +msgid " -d delay - Delay after song ends (default 2 sec)" +msgstr "" + +#: showseq.m:105 +#, c-format +msgid " %4s %-30.30s\n" +msgstr "" + +#: showseq.m:105 +msgid "Port" +msgstr "" + +#: showseq.m:156 +msgid "Usage: showseq" +msgstr "" + +#: seqlib.m:73 seqlib.m:140 #, c-format msgid "Could not open sequencer: %s" msgstr "" -#: seqlib.m:208 +#: seqlib.m:217 #, c-format msgid "Error (%s) creating sequencer port\n" +msgstr "" + +#: song.m:94 +#, c-format +msgid "" +"Could not read file %s\n" +"%s\n" +msgstr "" + +#: song.m:104 +msgid "" +"You have selected a type 0 midi file\n" +"Unfortunately this will not work very well\n" +"at the current time, but should play.\n" +"It is easy enough to fix given the right encouragement...\n" +msgstr "" + +#. No real need to have this included +#: melystrackinfo.m:100 +msgid "Name" +msgstr "" + +#: melystrackinfo.m:101 +msgid "Prog" msgstr "" diff -rNu melys-0.0.5/po/zz.po melys-0.0.6/po/zz.po --- melys-0.0.5/po/zz.po Thu Jul 29 14:21:42 1999 +++ melys-0.0.6/po/zz.po Mon Aug 9 19:07:27 1999 @@ -6,48 +6,48 @@ msgid "" msgstr "" -#: format.m:144 format.m:150 +#: format.m:145 format.m:151 msgid "Unrecognised file type" msgstr "U.N.R.E.C.O.G.N.I.S.E.D. F.I.L.E. T.Y.P.E." -#: format.m:157 +#: format.m:158 msgid "Could not read file" msgstr "C.O.U.L.D. N.O.T. R.E.A.D. F.I.L.E." -#: mdmlwrite.m:141 +#: mdmlwrite.m:144 msgid "Could not open file" msgstr "C.O.U.L.D. N.O.T. O.P.E.N. F.I.L.E." -#: midiread.m:140 +#: midiread.m:151 #, c-format msgid "Could not open file %s" msgstr "C.O.U.L.D. N.O.T. O.P.E.N. F.I.L.E. %s" -#: midiread.m:170 +#: midiread.m:182 #, c-format msgid "Bad header (%x), probably not a real midi file" msgstr "B.A.D. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. N.O.T. A. R.E.A.L. M.I.D.I. F.I.L.E." -#: midiread.m:176 +#: midiread.m:188 msgid "Bad header length, probably not a real midi file" msgstr "B.A.D. H.E.A.D.E.R. L.E.N.G.T.H., P.R.O.B.A.B.L.Y. N.O.T. A. R.E.A.L. M.I.D.I. F.I.L.E." -#: midiread.m:213 +#: midiread.m:225 #, c-format msgid "Bad track header (%x), probably not a midi file" msgstr "B.A.D. T.R.A.C.K. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. N.O.T. A. M.I.D.I. F.I.L.E." -#: midiread.m:376 +#: midiread.m:414 #, c-format msgid "Bad status type 0x%x" msgstr "B.A.D. S.T.A.T.U.S. T.Y.P.E. 0X.%x" -#: midiread.m:443 +#: midiread.m:483 #, c-format msgid "Meta event %d not implemented\n" msgstr "M.E.T.A. E.V.E.N.T. %d N.O.T. I.M.P.L.E.M.E.N.T.E.D.\n" -#: midiread.m:477 midiread.m:502 midiread.m:524 +#: midiread.m:517 midiread.m:542 midiread.m:564 msgid "Unexpected end of file" msgstr "U.N.E.X.P.E.C.T.E.D. E.N.D. O.F. F.I.L.E." @@ -56,73 +56,73 @@ msgid "Can not open file %s" msgstr "C.A.N. N.O.T. O.P.E.N. F.I.L.E. %s" -#: main.m:38 +#: main.m:41 msgid "The Melys sequencer" msgstr "T.H.E. M.E.L.Y.S. S.E.Q.U.E.N.C.E.R." #. Create the first child -#: main.m:50 +#: main.m:53 msgid "Untitled" msgstr "U.N.T.I.T.L.E.D." -#: menus.m:39 +#: menus.m:42 msgid "_Close all" msgstr "_C.L.O.S.E. A.L.L." -#: menus.m:39 +#: menus.m:42 msgid "Close all open windows" msgstr "C.L.O.S.E. A.L.L. O.P.E.N. W.I.N.D.O.W.S." -#: menus.m:51 +#: menus.m:54 msgid "_Start" msgstr "_S.T.A.R.T." -#: menus.m:51 +#: menus.m:54 msgid "Start playing" msgstr "S.T.A.R.T. P.L.A.Y.I.N.G." -#: menus.m:57 +#: menus.m:60 msgid "_Pause" msgstr "_P.A.U.S.E." -#: menus.m:57 +#: menus.m:60 msgid "Pause playing" msgstr "P.A.U.S.E. P.L.A.Y.I.N.G." -#: menus.m:63 +#: menus.m:66 msgid "S_top" msgstr "S._T.O.P." -#: menus.m:63 +#: menus.m:66 msgid "Stop and return to beginning" msgstr "S.T.O.P. A.N.D. R.E.T.U.R.N. T.O. B.E.G.I.N.N.I.N.G." -#: menus.m:69 +#: menus.m:72 msgid "_Record" msgstr "_R.E.C.O.R.D." -#: menus.m:69 +#: menus.m:72 msgid "Start recording" msgstr "S.T.A.R.T. R.E.C.O.R.D.I.N.G." -#: menus.m:75 +#: menus.m:78 msgid "Record stop" msgstr "R.E.C.O.R.D. S.T.O.P." -#: menus.m:75 +#: menus.m:78 msgid "Stop recording" msgstr "S.T.O.P. R.E.C.O.R.D.I.N.G." -#: menus.m:93 +#: menus.m:97 msgid "_Actions" msgstr "_A.C.T.I.O.N.S." -#: menus.m:144 +#: menus.m:148 msgid "Select the file to read in..." msgstr "S.E.L.E.C.T. T.H.E. F.I.L.E. T.O. R.E.A.D. I.N...." #. Failed so put up a message for the user -#: menus.m:194 +#: menus.m:199 menus.m:314 #, c-format msgid "" "The file %s\n" @@ -135,12 +135,125 @@ "P.L.E.A.S.E. S.E.L.E.C.T. A. F.I.L.E. W.I.T.H. A.N.\n" "E.X.T.E.N.S.I.O.N. O.F. .M.I.D. O.R. .M.D.M.L." -#: seqlib.m:73 seqlib.m:139 +#: menus.m:265 +#, fuzzy +msgid "Select the file name to write to..." +msgstr "S.E.L.E.C.T. T.H.E. F.I.L.E. N.A.M.E. T.O. W.R.I.T.E. T.O...." + +#: menus.m:498 +msgid "Copyright Steve Ratcliffe (C) 1999" +msgstr "C.O.P.Y.R.I.G.H.T. S.T.E.V.E. R.A.T.C.L.I.F.F.E. (C.) 1999" + +#: menus.m:500 +msgid "Melys is a sequencer application for ALSA" +msgstr "M.E.L.Y.S. I.S. A. S.E.Q.U.E.N.C.E.R. A.P.P.L.I.C.A.T.I.O.N. F.O.R. A.L.S.A." + +#: record.m:64 +#, fuzzy +msgid "Melys sequencer (record)" +msgstr "M.E.L.Y.S. S.E.Q.U.E.N.C.E.R. (R.E.C.O.R.D.)" + +#: melys.m:123 +msgid "Usage: melys [-x level]" +msgstr "U.S.A.G.E.: M.E.L.Y.S. [-X. L.E.V.E.L.]" + +#: melys.m:125 +msgid " -x, --debug=LEVEL Set debuging level" +msgstr " -X., --D.E.B.U.G.=L.E.V.E.L. S.E.T. D.E.B.U.G.I.N.G. L.E.V.E.L." + +#: pmidi.m:186 +#, c-format +msgid "Could not connect to port %d:%d\n" +msgstr "C.O.U.L.D. N.O.T. C.O.N.N.E.C.T. T.O. P.O.R.T. %d:%d\n" + +#: pmidi.m:259 showseq.m:98 +#, fuzzy, c-format +msgid "Could not open sequencer %s" +msgstr "C.O.U.L.D. N.O.T. O.P.E.N. S.E.Q.U.E.N.C.E.R. %s" + +#: pmidi.m:263 showseq.m:102 +#, fuzzy, c-format +msgid "Could not get sequencer information %s" +msgstr "C.O.U.L.D. N.O.T. G.E.T. S.E.Q.U.E.N.C.E.R. I.N.F.O.R.M.A.T.I.O.N. %s" + +#: pmidi.m:266 +#, c-format +msgid " Port %-30.30s %s\n" +msgstr " P.O.R.T. %-30.30S. %s\n" + +#: pmidi.m:266 +msgid "Client name" +msgstr "C.L.I.E.N.T. N.A.M.E." + +#: pmidi.m:266 showseq.m:105 +msgid "Port name" +msgstr "P.O.R.T. N.A.M.E." + +#: pmidi.m:295 +msgid "Usage: pmidi [-p client:port ...] [-l] [-d delay] file ..." +msgstr "U.S.A.G.E.: P.M.I.D.I. [-P. C.L.I.E.N.T.:P.O.R.T. ...] [-L.] [-D. D.E.L.A.Y.] F.I.L.E. ..." + +#: pmidi.m:297 +msgid " -p client:port - A alsa client and port number to send midi to" +msgstr " -P. C.L.I.E.N.T.:P.O.R.T. - A. A.L.S.A. C.L.I.E.N.T. A.N.D. P.O.R.T. N.U.M.B.E.R. T.O. S.E.N.D. M.I.D.I. T.O." + +#: pmidi.m:298 +msgid " -l - List possible output ports that could be used" +msgstr " -L. - L.I.S.T. P.O.S.S.I.B.L.E. O.U.T.P.U.T. P.O.R.T.S. T.H.A.T. C.O.U.L.D. B.E. U.S.E.D." + +#: pmidi.m:299 +msgid " -d delay - Delay after song ends (default 2 sec)" +msgstr " -D. D.E.L.A.Y. - D.E.L.A.Y. A.F.T.E.R. S.O.N.G. E.N.D.S. (D.E.F.A.U.L.T. 2 S.E.C.)" + +#: showseq.m:105 +#, c-format +msgid " %4s %-30.30s\n" +msgstr " %4S. %-30.30S.\n" + +#: showseq.m:105 +msgid "Port" +msgstr "P.O.R.T." + +#: showseq.m:156 +msgid "Usage: showseq" +msgstr "U.S.A.G.E.: S.H.O.W.S.E.Q." + +#: seqlib.m:73 seqlib.m:140 #, 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:208 +#: seqlib.m:217 #, c-format msgid "Error (%s) creating sequencer port\n" msgstr "E.R.R.O.R. (%s) C.R.E.A.T.I.N.G. S.E.Q.U.E.N.C.E.R. P.O.R.T.\n" + +#: song.m:94 +#, fuzzy, c-format +msgid "" +"Could not read file %s\n" +"%s\n" +msgstr "" +"C.O.U.L.D. N.O.T. R.E.A.D. F.I.L.E. %s\n" +"%s\n" + +#: song.m:104 +msgid "" +"You have selected a type 0 midi file\n" +"Unfortunately this will not work very well\n" +"at the current time, but should play.\n" +"It is easy enough to fix given the right encouragement...\n" +msgstr "" +"Y.O.U. H.A.V.E. S.E.L.E.C.T.E.D. A. T.Y.P.E. 0 M.I.D.I. F.I.L.E.\n" +"U.N.F.O.R.T.U.N.A.T.E.L.Y. T.H.I.S. W.I.L.L. N.O.T. W.O.R.K. V.E.R.Y. W.E.L.L.\n" +"A.T. T.H.E. C.U.R.R.E.N.T. T.I.M.E., B.U.T. S.H.O.U.L.D. P.L.A.Y..\n" +"I.T. I.S. E.A.S.Y. E.N.O.U.G.H. T.O. F.I.X. G.I.V.E.N. T.H.E. R.I.G.H.T. E.N.C.O.U.R.A.G.E.M.E.N.T....\n" + +#. No real need to have this included +#: melystrackinfo.m:100 +msgid "Name" +msgstr "N.A.M.E." + +#: melystrackinfo.m:101 +msgid "Prog" +msgstr "P.R.O.G." diff -rNu melys-0.0.5/seq/seqlib.c melys-0.0.6/seq/seqlib.c --- melys-0.0.5/seq/seqlib.c Mon Aug 9 00:51:33 1999 +++ melys-0.0.6/seq/seqlib.c Mon Aug 9 19:46:22 1999 @@ -471,16 +471,6 @@ ep->source = ctxp->source; ep->dest = *seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); ep->dest.channel = chan; -#if 0 - printf("send from %s to %s, event type %d time %d", - seq_addr_string(&ep->source), seq_addr_string(&ep->dest), - ep->type, ep->time.tick); - if (ep->flags & SND_SEQ_TIME_STAMP_REAL) - printf(" real"); - if (ep->flags & SND_SEQ_TIME_MODE_REL) - printf(" rel"); - printf("\n"); -#endif return seq_write(ctxp, ep); } @@ -502,6 +492,37 @@ ep->time.tick = 0; (void) seq_sendto(ctxp, ep, dev, chan); return snd_seq_flush_output(ctxp->handle); +} + +/* + * Send the event to all the connected devices across all + * possible channels. This function is intended for + * all-sounds-off type controls etc. + * + * Arguments: + * ctxp - Client context + * ep - Event prototype to be sent + */ +int +seq_send_to_all(seq_context_t *ctxp, snd_seq_event_t *ep) +{ + int dev; + int chan; + snd_seq_addr_t *addr; + + for (dev = 0; ; dev++) { + addr = seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); + if (addr == NULL) + break; /* No more */ + + ep->dest = *addr; + for (chan = 0; chan < 16; chan++) { + ep->dest.channel = chan; + (void)seq_write(ctxp, ep); + } + } + + return 0;/* XXX */ } /* diff -rNu melys-0.0.5/seq/seqlib.m melys-0.0.6/seq/seqlib.m --- melys-0.0.5/seq/seqlib.m Sat Aug 7 11:21:26 1999 +++ melys-0.0.6/seq/seqlib.m Mon Aug 9 19:08:07 1999 @@ -497,16 +497,6 @@ ep->source = ctxp->source; ep->dest = *seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); ep->dest.channel = chan; -#if 0 - printf("send from %s to %s, event type %d time %d", - seq_addr_string(&ep->source), seq_addr_string(&ep->dest), - ep->type, ep->time.tick); - if (ep->flags & SND_SEQ_TIME_STAMP_REAL) - printf(" real"); - if (ep->flags & SND_SEQ_TIME_MODE_REL) - printf(" rel"); - printf("\n"); -#endif return seq_write(ctxp, ep); >>function seq_sendto_now @@ -527,6 +517,35 @@ ep->time.tick = 0; (void) seq_sendto(ctxp, ep, dev, chan); return snd_seq_flush_output(ctxp->handle); + +>>function seq_send_to_all +int +seq_context_t *ctxp; Client context +snd_seq_event_t *ep; Event prototype to be sent + +>>description +Send the event to all the connected devices across +all possible channels. +This function is intended for all-sounds-off type controls etc. + +>>code + int dev; + int chan; + snd_seq_addr_t *addr; + + for (dev = 0; ; dev++) { + addr = seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); + if (addr == NULL) + break; /* No more */ + + ep->dest = *addr; + for (chan = 0; chan < 16; chan++) { + ep->dest.channel = chan; + (void)seq_write(ctxp, ep); + } + } + + return 0;/* XXX */ >># ----- Timer functions >>function seq_timer_start diff -rNu melys-0.0.5/song/song.c melys-0.0.6/song/song.c --- melys-0.0.5/song/song.c Mon Aug 9 00:51:32 1999 +++ melys-0.0.6/song/song.c Mon Aug 9 19:46:22 1999 @@ -51,19 +51,31 @@ filename = ""; } + if (song->mdroot) + md_free(MD_ELEMENT(song->mdroot)); + song->mdroot = root; + if (root == NULL) { char *msg; if (errmsg == NULL) errmsg = ""; - msg = g_strdup_printf(_("Could not read file %s\n" "%s\n"), + msg = g_strdup_printf(_("Open of file %s failed\n" "%s\n"), g_basename(filename), errmsg); mel_ui_error(song, msg, NULL); g_free(msg); return; } + + /* Temporary warning message */ + if (root->head->format == 0) + mel_ui_warn(song, _("You have selected a type 0 midi file\n" + "Unfortunately this will not work very well\n" + "at the current time, but should play.\n" + "It is easy enough to fix given the right encouragement...\n"), + NULL); song->mdroot = root; play_set_mdroot(song->play, root); diff -rNu melys-0.0.5/song/song.m melys-0.0.6/song/song.m --- melys-0.0.5/song/song.m Mon Aug 9 00:05:59 1999 +++ melys-0.0.6/song/song.m Mon Aug 9 19:18:37 1999 @@ -85,19 +85,31 @@ filename = ""; } + if (song->mdroot) + md_free(MD_ELEMENT(song->mdroot)); + song->mdroot = root; + if (root == NULL) { char *msg; if (errmsg == NULL) errmsg = ""; - msg = g_strdup_printf(_("Could not read file %s\n" "%s\n"), + msg = g_strdup_printf(_("Open of file %s failed\n" "%s\n"), g_basename(filename), errmsg); mel_ui_error(song, msg, NULL); g_free(msg); return; } + + /* Temporary warning message */ + if (root->head->format == 0) + mel_ui_warn(song, _("You have selected a type 0 midi file\n" + "Unfortunately this will not work very well\n" + "at the current time, but should play.\n" + "It is easy enough to fix given the right encouragement...\n"), + NULL); song->mdroot = root; play_set_mdroot(song->play, root); diff -rNu melys-0.0.5/util/except.c melys-0.0.6/util/except.c --- melys-0.0.5/util/except.c Mon Aug 9 00:51:35 1999 +++ melys-0.0.6/util/except.c Mon Aug 9 19:46:25 1999 @@ -55,8 +55,5 @@ va_end(ap); putc('\n', stderr); -#ifdef DEBUG - g_on_error_stack_trace("a.out"); -#endif exit(1); } diff -rNu melys-0.0.5/util/except.m melys-0.0.6/util/except.m --- melys-0.0.5/util/except.m Mon Jul 19 22:06:19 1999 +++ melys-0.0.6/util/except.m Mon Aug 9 19:02:02 1999 @@ -60,7 +60,4 @@ va_end(ap); putc('\n', stderr); -#ifdef DEBUG - g_on_error_stack_trace("a.out"); -#endif exit(1); diff -rNu melys-0.0.5/widgets/melystrack.c melys-0.0.6/widgets/melystrack.c --- melys-0.0.5/widgets/melystrack.c Mon Aug 9 00:51:35 1999 +++ melys-0.0.6/widgets/melystrack.c Mon Aug 9 19:46:26 1999 @@ -77,6 +77,8 @@ melys_track_set_md_root((MelysTrack *)mtrack, root); + + return mtrack; } @@ -102,12 +104,12 @@ gtk_container_add(GTK_CONTAINER(mtp), GTK_WIDGET(tab)); hadj = (GtkAdjustment*)gtk_adjustment_new(0.0, - 0.0, 256.0, + 0.0, 0.0, 1.0, 16.0, 32.0 ); vadj = (GtkAdjustment*)gtk_adjustment_new(0.0, - 0.0, 256.0, + 0.0, 0.0, 1.0, 16.0, 32.0 ); @@ -199,6 +201,11 @@ root->refcount++; mtrack->mdroot = root; + + mtrack->vadj->lower = 0.0; + mtrack->vadj->upper = root->tracks; + gtk_adjustment_set_value(mtrack->vadj, 0.0); + gtk_adjustment_changed(mtrack->vadj); melys_track_info_set_md_root(mtrack->info, root); //melys_track_display_set_md_root(mtrack->info, root); diff -rNu melys-0.0.5/widgets/melystrack.m melys-0.0.6/widgets/melystrack.m --- melys-0.0.5/widgets/melystrack.m Mon Aug 9 00:05:59 1999 +++ melys-0.0.6/widgets/melystrack.m Mon Aug 9 19:03:07 1999 @@ -28,8 +28,8 @@ GtkAdjustment *vadj; GtkAdjustment *hadj; - MelysTrackInfo *info; - MelysTrackDisplay *display; + struct _MelysTrackInfo *info; + struct _MelysTrackDisplay *display; struct rootElement *mdroot; }; @@ -64,6 +64,8 @@ melys_track_set_md_root((MelysTrack *)mtrack, root); + + return mtrack; >>function melys_track_init @@ -86,12 +88,12 @@ gtk_container_add(GTK_CONTAINER(mtp), GTK_WIDGET(tab)); hadj = (GtkAdjustment*)gtk_adjustment_new(0.0, - 0.0, 256.0, + 0.0, 0.0, 1.0, 16.0, 32.0 ); vadj = (GtkAdjustment*)gtk_adjustment_new(0.0, - 0.0, 256.0, + 0.0, 0.0, 1.0, 16.0, 32.0 ); @@ -183,6 +185,11 @@ root->refcount++; mtrack->mdroot = root; + + mtrack->vadj->lower = 0.0; + mtrack->vadj->upper = root->tracks; + gtk_adjustment_set_value(mtrack->vadj, 0.0); + gtk_adjustment_changed(mtrack->vadj); melys_track_info_set_md_root(mtrack->info, root); //melys_track_display_set_md_root(mtrack->info, root); diff -rNu melys-0.0.5/widgets/melystrackinfo.c melys-0.0.6/widgets/melystrackinfo.c --- melys-0.0.5/widgets/melystrackinfo.c Mon Aug 9 00:51:36 1999 +++ melys-0.0.6/widgets/melystrackinfo.c Mon Aug 9 19:46:26 1999 @@ -11,6 +11,10 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * + * This is a widget for the left pane of the track view. + * The columns that can be seen will be configurable and will include + * the usual information and controls such as 'mute'. + * * */ @@ -18,11 +22,13 @@ #include "glib.h" #include "except.h" #include "util.h" -#include "gtk/gtk.h" +#include "gtk/gtkwidget.h" +#include "gtk/gtkadjustment.h" +#include "gtk/gtksignal.h" +#include "gtk/gtkvbox.h" #include "elements.h" #include "md.h" #include "melystrackinfo.h" -#include "melystrackdisplay.h" #include "melystrack.h" #include "intl.h" @@ -36,10 +42,6 @@ NUMBER, NAME, PROGRAM, - PATCH, - //MUTE, - //SOLO, - //RECORD, LAST_COLUMN_TYPE }; @@ -49,10 +51,9 @@ int width; gboolean present; } def_col_info[] = { - {NUMBER, "", 20, TRUE}, - {NAME, "Name", 100, TRUE}, - {PROGRAM, "Prog", 60, TRUE}, - {PATCH, "Patch", 200, FALSE}, + {NUMBER, "", 20, TRUE}, /* No real need to have this included */ + {NAME, N_("Name"), 100, TRUE}, + {PROGRAM, N_("Prog"), 27, TRUE}, }; /* A border to the protect the column lines */ @@ -76,6 +77,7 @@ static void track_info_draw(GtkWidget *widget, GdkRectangle *area); static int track_info_expose(GtkWidget *widget, GdkEventExpose *event); static int track_to_y(MelysTrackInfo *minfo, int n); +static void track_info_scroll(GtkAdjustment *adj, gpointer data); static gint melys_track_info_signals[LAST_SIGNAL]; @@ -122,6 +124,9 @@ minfo = (MelysTrackInfo*)w; minfo->vadj = vadj; + gtk_signal_connect((GtkObject *)vadj, "value-changed", + (GtkSignalFunc)track_info_scroll, minfo); + gtk_object_ref((GtkObject*)vadj); // XXX? gtk_object_sink((GtkObject*)vadj); @@ -164,6 +169,8 @@ minfo->htitle = TRACK_TITLE_HEIGHT; minfo->vtitle = TRACK_TITLE_HEIGHT + 2*TRACK_SEPARATION; + minfo->voffset = 0; + minfo->mdroot = NULL; } @@ -252,7 +259,7 @@ root->refcount++; minfo->mdroot = root; - track_info_draw(GTK_WIDGET(minfo), &minfo->track_area); + gtk_widget_queue_draw(GTK_WIDGET(minfo)); } /* @@ -287,12 +294,10 @@ attributes.event_mask |= (GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ///* XXX not sure about keys */GDK_KEY_PRESS_MASK | - //GDK_KEY_RELEASE_MASK ); attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; - /* main window */ + /* Create the main window */ widget->window = gdk_window_new(gtk_widget_get_parent_window(widget), &attributes, attributes_mask); gdk_window_set_user_data(widget->window, minfo); @@ -324,10 +329,8 @@ GTK_WIDGET_UNSET_FLAGS(widget, GTK_MAPPED); - dprintf2("track_info_unrealise: before"); if (GTK_WIDGET_CLASS(parent_class)->unrealize) (GTK_WIDGET_CLASS(parent_class)->unrealize)(widget); - dprintf2("track_info_unrealise: after"); } static void @@ -360,6 +363,14 @@ (GTK_OBJECT_CLASS(parent_class)->destroy)(object); } +/* + * Work out what size we want to be and fill in the details into + * req . We are mostly interested in our width. Its not for us to + * wory about height. + * + * Arguments: + * req - Fill in with the size that we want + */ static void track_info_size_request(GtkWidget *widget, GtkRequisition *req) { @@ -374,13 +385,18 @@ req->width = 0; req->height = 0; + /* + * Add up all the column widths and include the separator + * width. + */ tot = 0; for (i = 0; i < minfo->col_used; i++) { tot += minfo->col_infos[i].width; tot += widget->style->klass->xthickness; + tot += 2*COL_PADDING; } + tot += widget->style->klass->xthickness; - dprintf1("requested width %d", tot); req->width = tot; } @@ -401,10 +417,11 @@ if (GTK_WIDGET_REALIZED (widget)) { + /* Save the track area */ minfo->track_area.x = allocation->x; minfo->track_area.y = allocation->y + minfo->vtitle; minfo->track_area.width = allocation->width - PAN_PADDING; - minfo->track_area.height = allocation->height; + minfo->track_area.height = allocation->height - minfo->vtitle; gdk_window_move_resize(widget->window, allocation->x, allocation->y, @@ -412,6 +429,13 @@ gdk_window_move_resize(minfo->title_window, 0, 0, allocation->width, minfo->vtitle); + + /* Calculate how many tracks are visible on the page */ + minfo->vadj->page_size = + ((gfloat)minfo->track_area.height / minfo->vspace) - 1.5; + minfo->vadj->page_increment = minfo->vadj->page_size; + dprintf1("page_size %f, upper %f lower %f", minfo->vadj->page_size, minfo->vadj->upper, minfo->vadj->lower); + gtk_adjustment_changed(minfo->vadj); } } @@ -434,18 +458,22 @@ if (!GTK_WIDGET_DRAWABLE (widget)) return; + minfo = (MelysTrackInfo*)widget; + style = widget->style; fg_gc = widget->style->fg_gc[GTK_STATE_NORMAL]; - minfo = (MelysTrackInfo*)widget; - dprintf(2, "track_info_draw: (%d, %d) %dx%d", area->x, area->y, area->width, area->height); + /* Needed for scrolling... may be removed in future */ + gdk_window_clear_area(widget->window, area->x, area->y, + area->width, area->height); + gtk_draw_shadow(widget->style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_IN, 0, 0, - minfo->track_area.width, minfo->track_area.height); + minfo->track_area.width, minfo->vtitle + minfo->track_area.height); /* Have to draw in the title box as well, the bottom is not meant to draw*/ gtk_draw_shadow(widget->style, minfo->title_window, @@ -468,7 +496,7 @@ fg_gc, offset, minfo->htitle - widget->style->font->descent - 1, - minfo->col_infos[i].title); + _(minfo->col_infos[i].title)); gdk_gc_set_clip_rectangle(fg_gc, NULL); offset += minfo->col_infos[i].width + COL_PADDING; @@ -477,21 +505,26 @@ /* Do the main window while we are here */ gtk_draw_vline(widget->style, widget->window, GTK_STATE_ACTIVE, - area->y, area->height, offset); + minfo->track_area.y, minfo->track_area.y+minfo->track_area.height, + offset); offset += style->klass->xthickness + COL_PADDING; } gdk_draw_line(minfo->title_window, fg_gc, - 0, minfo->htitle, - area->width, minfo->htitle); + 0, minfo->vtitle-1, minfo->track_area.width, minfo->vtitle-1); + + /* Ideally this should be allowed anyway... */ + if (minfo->mdroot == NULL) + return; /* Nothing more to do */ start = y_to_track(minfo, area->y); end = y_to_track(minfo, area->y + area->height); if (end > minfo->mdroot->tracks) end = minfo->mdroot->tracks; - for (ntrack = start; ntrack < end+1; ntrack++) { + dprintf2("start %d end %d, tracks %d", start, end, minfo->mdroot->tracks); + for (ntrack = start; ntrack < end; ntrack++) { char *str; struct col_info *col; @@ -507,12 +540,12 @@ clip_rectangle.height = minfo->track_area.height; str = get_info_string(minfo, col->type, ntrack); - dprintf(3, "offset %d, string %s", offset, str); + dprintf(4, "offset %d, string %s at %d", offset, str, track_to_y(minfo, ntrack)); /* Now draw it */ gdk_gc_set_clip_rectangle(fg_gc, &clip_rectangle); gdk_draw_string(widget->window, style->font, fg_gc, - offset, track_to_y(minfo, ntrack), str); + offset, track_to_y(minfo, ntrack) + minfo->vtextoffset, str); gdk_gc_set_clip_rectangle(fg_gc, NULL); offset += col->width + COL_PADDING; @@ -538,7 +571,8 @@ minfo = MELYS_TRACK_INFO(widget); - track_info_draw(minfo, &event->area); + gtk_widget_queue_draw_area(widget, event->area.x, event->area.y, + event->area.width, event->area.height); return FALSE; /* XXX what does this mean */ } @@ -546,7 +580,7 @@ /* * Given a y position within the widget window, return the * track number that belongs to that co-ordintate. Track - * numbers start at 1. + * numbers start at 0. * * Arguments: * minfo - The widget @@ -563,15 +597,17 @@ n /= minfo->vspace; - n += 1; + n += minfo->voffset; - dprintf(3, "Y %d, track %d", ypix, n); + dprintf(3, "Y %d, voff %d track %d", ypix, minfo->voffset, n); return n; } /* * Given a track number, return the top y co-ord for that track. + * It could be negative if beyond the top of the current track + * area. * * Arguments: * n - Track number @@ -581,6 +617,7 @@ { int ypix; + n -= minfo->voffset; ypix = (n * minfo->vspace) + minfo->vtitle; return ypix; } @@ -603,7 +640,7 @@ switch (type) { case NUMBER: - g_snprintf(defbuf, TMP_BUF_SIZE, "%2d", ntrack); + g_snprintf(defbuf, TMP_BUF_SIZE, "%2d", ntrack+1); str = defbuf; break; case NAME: @@ -611,17 +648,46 @@ if (track && track->name) { str = track->name; } else { - g_snprintf(defbuf, TMP_BUF_SIZE, "Track %d", ntrack); + g_snprintf(defbuf, TMP_BUF_SIZE, "Track %d", ntrack+1); str = defbuf; } break; case PROGRAM: - //g_snprintf(defbuf, "%d", TMP_BUF_SIZE, track->program); - //str = defbuf; + track = md_track_nth(minfo->mdroot, ntrack); + if (track) + g_snprintf(defbuf, TMP_BUF_SIZE, "%d", track->program & 0x7f); + str = defbuf; break; default: break; } return str; +} + +/* + * The vertical scrollbar has been moved. So we have to set our + * current position and redraw. + * + */ +static void +track_info_scroll(GtkAdjustment *adj, gpointer data) +{ + MelysTrackInfo *minfo; + int val; + + minfo = MELYS_TRACK_INFO(data); + + val = (int)(adj->value); + if (val >= 0 && val != minfo->voffset) { + minfo->voffset = val; + + /* + * I am just redrawing the whole pane here, it would be + * best to do real scrolling, but it looks fast enough + * to me at the moment. Perhaps this will change + */ + gtk_widget_queue_clear((GtkWidget*)minfo); + gtk_widget_queue_draw((GtkWidget*)minfo); + } } diff -rNu melys-0.0.5/widgets/melystrackinfo.m melys-0.0.6/widgets/melystrackinfo.m --- melys-0.0.5/widgets/melystrackinfo.m Mon Aug 9 00:05:59 1999 +++ melys-0.0.6/widgets/melystrackinfo.m Mon Aug 9 19:03:07 1999 @@ -11,7 +11,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ->>header gtk/gtk.h +This is a widget for the left pane of the track view. +The columns that can be seen will be configurable and will include +the usual information and controls such as 'mute'. + +>>header gtk/gtkwidget.h +>>header gtk/gtkadjustment.h +>>header gtk/gtksignal.h +>>header gtk/gtkvbox.h >>header elements.h >>header md.h >>gtkobject melys_track_info gtk_widget @@ -68,7 +75,6 @@ // XXX class definition here }; ->>header melystrackdisplay.h >>header melystrack.h >>extern @@ -81,10 +87,6 @@ NUMBER, NAME, PROGRAM, - PATCH, - //MUTE, - //SOLO, - //RECORD, LAST_COLUMN_TYPE }; @@ -94,10 +96,9 @@ int width; gboolean present; } def_col_info[] = { - {NUMBER, "", 20, TRUE}, - {NAME, "Name", 100, TRUE}, - {PROGRAM, "Prog", 60, TRUE}, - {PATCH, "Patch", 200, FALSE}, + {NUMBER, "", 20, TRUE}, /* No real need to have this included */ + {NAME, N_("Name"), 100, TRUE}, + {PROGRAM, N_("Prog"), 27, TRUE}, }; /* A border to the protect the column lines */ @@ -120,6 +121,9 @@ minfo = (MelysTrackInfo*)w; minfo->vadj = vadj; + gtk_signal_connect((GtkObject *)vadj, "value-changed", + (GtkSignalFunc)track_info_scroll, minfo); + gtk_object_ref((GtkObject*)vadj); // XXX? gtk_object_sink((GtkObject*)vadj); @@ -159,6 +163,8 @@ minfo->htitle = TRACK_TITLE_HEIGHT; minfo->vtitle = TRACK_TITLE_HEIGHT + 2*TRACK_SEPARATION; + minfo->voffset = 0; + minfo->mdroot = NULL; >>function melys_track_info_class_init @@ -245,7 +251,7 @@ root->refcount++; minfo->mdroot = root; - track_info_draw(GTK_WIDGET(minfo), &minfo->track_area); + gtk_widget_queue_draw(GTK_WIDGET(minfo)); >>function track_info_realise @@ -280,12 +286,10 @@ attributes.event_mask |= (GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ///* XXX not sure about keys */GDK_KEY_PRESS_MASK | - //GDK_KEY_RELEASE_MASK ); attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; - /* main window */ + /* Create the main window */ widget->window = gdk_window_new(gtk_widget_get_parent_window(widget), &attributes, attributes_mask); gdk_window_set_user_data(widget->window, minfo); @@ -318,10 +322,8 @@ GTK_WIDGET_UNSET_FLAGS(widget, GTK_MAPPED); - dprintf2("@func_name: before"); if (GTK_WIDGET_CLASS(parent_class)->unrealize) (GTK_WIDGET_CLASS(parent_class)->unrealize)(widget); - dprintf2("@func_name: after"); >>function track_info_destroy @@ -360,6 +362,12 @@ GtkWidget *widget; GtkRequisition *req; Fill in with the size that we want +>>description +Work out what size we want to be and fill in the details into +.A req . +We are mostly interested in our width. +Its not for us to wory about height. + >>code MelysTrackInfo *minfo; int i; @@ -372,13 +380,18 @@ req->width = 0; req->height = 0; + /* + * Add up all the column widths and include the separator + * width. + */ tot = 0; for (i = 0; i < minfo->col_used; i++) { tot += minfo->col_infos[i].width; tot += widget->style->klass->xthickness; + tot += 2*COL_PADDING; } + tot += widget->style->klass->xthickness; - dprintf1("requested width %d", tot); req->width = tot; @@ -402,10 +415,11 @@ if (GTK_WIDGET_REALIZED (widget)) { + /* Save the track area */ minfo->track_area.x = allocation->x; minfo->track_area.y = allocation->y + minfo->vtitle; minfo->track_area.width = allocation->width - PAN_PADDING; - minfo->track_area.height = allocation->height; + minfo->track_area.height = allocation->height - minfo->vtitle; gdk_window_move_resize(widget->window, allocation->x, allocation->y, @@ -413,6 +427,13 @@ gdk_window_move_resize(minfo->title_window, 0, 0, allocation->width, minfo->vtitle); + + /* Calculate how many tracks are visible on the page */ + minfo->vadj->page_size = + ((gfloat)minfo->track_area.height / minfo->vspace) - 1.5; + minfo->vadj->page_increment = minfo->vadj->page_size; + dprintf1("page_size %f, upper %f lower %f", minfo->vadj->page_size, minfo->vadj->upper, minfo->vadj->lower); + gtk_adjustment_changed(minfo->vadj); } @@ -438,18 +459,22 @@ if (!GTK_WIDGET_DRAWABLE (widget)) return; + minfo = (MelysTrackInfo*)widget; + style = widget->style; fg_gc = widget->style->fg_gc[GTK_STATE_NORMAL]; - minfo = (MelysTrackInfo*)widget; - dprintf(2, "@func_name: (%d, %d) %dx%d", area->x, area->y, area->width, area->height); + /* Needed for scrolling... may be removed in future */ + gdk_window_clear_area(widget->window, area->x, area->y, + area->width, area->height); + gtk_draw_shadow(widget->style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_IN, 0, 0, - minfo->track_area.width, minfo->track_area.height); + minfo->track_area.width, minfo->vtitle + minfo->track_area.height); /* Have to draw in the title box as well, the bottom is not meant to draw*/ gtk_draw_shadow(widget->style, minfo->title_window, @@ -472,7 +497,7 @@ fg_gc, offset, minfo->htitle - widget->style->font->descent - 1, - minfo->col_infos[i].title); + _(minfo->col_infos[i].title)); gdk_gc_set_clip_rectangle(fg_gc, NULL); offset += minfo->col_infos[i].width + COL_PADDING; @@ -481,21 +506,26 @@ /* Do the main window while we are here */ gtk_draw_vline(widget->style, widget->window, GTK_STATE_ACTIVE, - area->y, area->height, offset); + minfo->track_area.y, minfo->track_area.y+minfo->track_area.height, + offset); offset += style->klass->xthickness + COL_PADDING; } gdk_draw_line(minfo->title_window, fg_gc, - 0, minfo->htitle, - area->width, minfo->htitle); + 0, minfo->vtitle-1, minfo->track_area.width, minfo->vtitle-1); + + /* Ideally this should be allowed anyway... */ + if (minfo->mdroot == NULL) + return; /* Nothing more to do */ start = y_to_track(minfo, area->y); end = y_to_track(minfo, area->y + area->height); if (end > minfo->mdroot->tracks) end = minfo->mdroot->tracks; - for (ntrack = start; ntrack < end+1; ntrack++) { + dprintf2("start %d end %d, tracks %d", start, end, minfo->mdroot->tracks); + for (ntrack = start; ntrack < end; ntrack++) { char *str; struct col_info *col; @@ -511,12 +541,12 @@ clip_rectangle.height = minfo->track_area.height; str = get_info_string(minfo, col->type, ntrack); - dprintf(3, "offset %d, string %s", offset, str); + dprintf(4, "offset %d, string %s at %d", offset, str, track_to_y(minfo, ntrack)); /* Now draw it */ gdk_gc_set_clip_rectangle(fg_gc, &clip_rectangle); gdk_draw_string(widget->window, style->font, fg_gc, - offset, track_to_y(minfo, ntrack), str); + offset, track_to_y(minfo, ntrack) + minfo->vtextoffset, str); gdk_gc_set_clip_rectangle(fg_gc, NULL); offset += col->width + COL_PADDING; @@ -527,7 +557,6 @@ - >>function track_info_expose static int GtkWidget *widget; @@ -548,7 +577,8 @@ minfo = MELYS_TRACK_INFO(widget); - track_info_draw(minfo, &event->area); + gtk_widget_queue_draw_area(widget, event->area.x, event->area.y, + event->area.width, event->area.height); return FALSE; /* XXX what does this mean */ @@ -560,7 +590,7 @@ >>description Given a y position within the widget window, return the track number that belongs to that co-ordintate. -Track numbers start at 1. +Track numbers start at 0. >>code int n; @@ -571,9 +601,9 @@ n /= minfo->vspace; - n += 1; + n += minfo->voffset; - dprintf(3, "Y %d, track %d", ypix, n); + dprintf(3, "Y %d, voff %d track %d", ypix, minfo->voffset, n); return n; @@ -583,10 +613,13 @@ int n; Track number >>description Given a track number, return the top y co-ord for that track. +It could be negative if beyond the top of the current +track area. >>code int ypix; + n -= minfo->voffset; ypix = (n * minfo->vspace) + minfo->vtitle; return ypix; @@ -616,7 +649,7 @@ switch (type) { case NUMBER: - g_snprintf(defbuf, TMP_BUF_SIZE, "%2d", ntrack); + g_snprintf(defbuf, TMP_BUF_SIZE, "%2d", ntrack+1); str = defbuf; break; case NAME: @@ -624,16 +657,46 @@ if (track && track->name) { str = track->name; } else { - g_snprintf(defbuf, TMP_BUF_SIZE, "Track %d", ntrack); + g_snprintf(defbuf, TMP_BUF_SIZE, "Track %d", ntrack+1); str = defbuf; } break; case PROGRAM: - //g_snprintf(defbuf, "%d", TMP_BUF_SIZE, track->program); - //str = defbuf; + track = md_track_nth(minfo->mdroot, ntrack); + if (track) + g_snprintf(defbuf, TMP_BUF_SIZE, "%d", track->program & 0x7f); + str = defbuf; break; default: break; } return str; + +>>function track_info_scroll +static void +GtkAdjustment *adj; +gpointer data; + +>>description +The vertical scrollbar has been moved. +So we have to set our current position and redraw. + +>>code + MelysTrackInfo *minfo; + int val; + + minfo = MELYS_TRACK_INFO(data); + + val = (int)(adj->value); + if (val >= 0 && val != minfo->voffset) { + minfo->voffset = val; + + /* + * I am just redrawing the whole pane here, it would be + * best to do real scrolling, but it looks fast enough + * to me at the moment. Perhaps this will change + */ + gtk_widget_queue_clear((GtkWidget*)minfo); + gtk_widget_queue_draw((GtkWidget*)minfo); + }