diff -rNu melys-0.0.19/ChangeLog melys-0.0.20/ChangeLog --- melys-0.0.19/ChangeLog Sat Oct 16 15:03:09 1999 +++ melys-0.0.20/ChangeLog Mon Oct 25 20:46:41 1999 @@ -1,4 +1,175 @@ +1999-10-25 Steve Ratcliffe + + * widgets/melyspos.m: Now save the signal id so it can be + disconnected. I had previously convinced myself that this was + not needed. + + * gui/main.m, gui/menus.m: Masses of hacks to get the correct song + position pointer showing at all times. And to make sure that it + doesn't ever reference a tempomap when all windows are closed. + * gui/main.m: Fixed warnings that got checked in. + + * gui/main.m: + Fixed bugs in allocating of the status line indicators to current view. + + * po/melys.pot, po/zz.po: updated + + * gui/main.m: Improved the file to window issue. + Now if the current window is empty or contains an unused + new song, it will be replaced when a file is read in. + Other files will have their own top level window. + + * gui/main.m: If you gave a command line arg and the file could + not be opened, then all you saw was an error message. Now you + see a default new file as if you had not supplied a filename + and the error message. + + * gui/trackprop.m: New locations for the properties help. + + * help/C/menus.sgml, help/C/track.sgml: Brought the doc up to date. + +1999-10-24 Steve Ratcliffe + + * widgets/melystrackdisplay.m: + When zooming, reset the canvas scroll position. This appears + to cause some completely un-needed re-drawing. + + * md/mdtools.m: + Modification to last patch -- we take the greatest endtime + of either of the parts. (The parts may be overlapping) + + * md/mdtools.m: + When joining we now make the endpoint of the combined part the exact + same endpoint that the second part had. + + * widgets/melystrackdisplay.m: When snapping a number of parts, + some of which are not aligned to a snap boundry we have to make + a decision as to what happens. If you draw a box around all the + parts to be placed then we snap the leftmost edge of the box. + All parts keep the exact same relative positioning. + + * files/midiread.m: Some of the track level information is now + dealt with by the routine md_extract_track_info(). This allows + use on type 0 and 1 files without changing the existing code + here in horrible ways. + + * md/mdconv.m: Added routine to extract the track level info + from a track that has been read in from a midi file. + + * widgets/melystrackinfo.m: Modify some of the column widths a little. + + * song/song.m: Now that we deal better with type 0 midi, remove the + warning. + + * gui/main.m: Split up type 0 midi files into separate tracks. + +1999-10-23 Steve Ratcliffe + + * md/.cvsignore, md/mdadd.m, md/mdconv.m: Midi type 0 files are + now split into tracks so that they can be edited properly. + + * widgets/melyspos.m: Can now clear the resources it is holding. + Various minor improvements. + + * gui/main.m: Use view and child removal callbacks to ensure + that the statusline song position does not hang on to resources. + + * gui/menus.m: No longer refuse to close the last song, now that it is + not a problem. + + * gui/main.m: Increased the default size a little. + +1999-10-22 Steve Ratcliffe + + * mlib/PROJECT/mgtk.py, widgets/melyspos.m: Really fixed being + able to omit the signals, though it is perhaps not worth it. + + * widgets/melyspos.m: A position indicator. This will be used for + a number of things. First use is for a song position indicator. + + * widgets/melystrack.m: Add tooltips to zoom buttons. + + * seq/seqplay.m: Send out the initial volume and pan positions. + + * mlib/PROJECT/mgtk.py: Put the signal array in an ifdef in the + skel code so that it can be removed. + + * files/file.m, files/mdmlread.m, files/mdmlwrite.m: Some error + tidy ups. + + * files/midiwrite.m: Implement the track volume and pan controls + in the midi output file. + + * gui/main.m, gui/menus.m: Tooltip routine. Status bar with + current song position. The current position indicator will + probably be removed from the status bar when there is a transport + widget. + + * gui/trackprop.m: Re-structure the code to create the basic + props page. Add the pan and volume settings. + + * gui/menus.m: Fix so that you never get multiple About boxes. + + * md/elements.m, md/mdutil.m: Add track level pan and volume + +1999-10-20 Steve Ratcliffe + + * files/mdmlread.m, files/mdmlwrite.m: Save and read volume and + pan positions. + +1999-10-19 Steve Ratcliffe + + * md/elements.m, md/mdadd.m: Added a hard endtime. Now if a note + lasts beyond the soft end of the part this will be reflected in + the max_duration field. Tracks take notice of the max_duration, + but parts don't care. This clears up anomolous behaviour when + copying and over-recording parts. + + * md/mdutil.m: Sorted out setting the program somewhat. + + * gui/trackprop.m: Now when you change the track instrument + it will override any program changes that were read in from a + Midi file. + + * gui/menus.m: Implement the Save menu item. Yes, we've had + save-as for ever, but only now have save... + + * gui/main.m: A better message for files that can't be read. + Now includes the filename! + + * doc/mdml.dtd: Added some track attributes. + Comments added to explain some of the attributes and elements + better. + +1999-10-18 Steve Ratcliffe + + * md/mdutil.m: Modify the shrink fit routine to deal with parts + within a track and make it work both ways to expand as + well as shrink. Routine is now more like md_shrink_fit rather than + md_shrink. May rename at a later date. + + * widgets/melystrackdisplay.m: + Ensure that the play position pointer is moved above all parts + when a part is moved or copied. + + * files/mdmlread.m, files/mdmlwrite.m: + Save and restore mute/solo/record settings. + 1999-10-16 Steve Ratcliffe + + * help/C/Makefile, help/C/topic.dat: + Changed the help index file name back to melys.html from + index.html because the href's all point there... + + * version: Version 0.0.19 + + * ChangeLog, README: Updated for release. + + * make.conf: Add defines for disabling glib and gtk checking. + + * md/mdutil.m: Add the snap-to-beat code to md_snap_tick. + + * md/mdadd.m: Fix the generation of default track names. * widgets/melystrackdisplay.m: Snap slices and drags to the nearest beat. This will be changable diff -rNu melys-0.0.19/INSTALL melys-0.0.20/INSTALL --- melys-0.0.19/INSTALL Sun Oct 3 11:52:07 1999 +++ melys-0.0.20/INSTALL Mon Oct 25 20:37:38 1999 @@ -39,3 +39,7 @@ melys +You can also supply Midi or MDML filenames on the command line +which will be read in. + +..Steve diff -rNu melys-0.0.19/README melys-0.0.20/README --- melys-0.0.19/README Sat Oct 16 15:03:09 1999 +++ melys-0.0.20/README Mon Oct 25 20:37:39 1999 @@ -10,7 +10,10 @@ Features -------- -This is very early stage of development, although you can already do +Melys is a Midi sequencer for ALSA written in C and using the GNOME/gtk+ +libraries. + +It is at an early stage of development, although you can already do a few useful things with it. The latest features are in the track parts display. You can now split @@ -57,6 +60,7 @@ development to get mcode. http://www.parabola.demon.co.uk/mcode/ This will deal with the files ending in .m + Other utilities --------------- @@ -73,6 +77,7 @@ Melplay is a command line player. It reads all formats that Melys can read, which at present is midi, mdml and compressed mdml. + Bug reporting ------------- @@ -83,6 +88,7 @@ There should be no compile warnings, crashes or GTK messages. If compiled with debug, then after closing all windows the debug menu item should report 0 allocated elements. + Authors ------- diff -rNu melys-0.0.19/doc/mdml.dtd melys-0.0.20/doc/mdml.dtd --- melys-0.0.19/doc/mdml.dtd Mon Oct 11 19:50:30 1999 +++ melys-0.0.20/doc/mdml.dtd Tue Oct 19 21:35:26 1999 @@ -1,5 +1,5 @@ @@ -77,17 +82,46 @@ ppq CDATA #REQUIRED > + @@ -140,7 +174,11 @@ minor CDATA #REQUIRED > - + + @@ -163,6 +201,9 @@ bpm CDATA #REQUIRED > + + - + @@ -203,7 +249,7 @@ +--> +--> - diff -rNu melys-0.0.19/files/file.c melys-0.0.20/files/file.c --- melys-0.0.19/files/file.c Sat Oct 16 15:08:35 1999 +++ melys-0.0.20/files/file.c Mon Oct 25 20:56:31 1999 @@ -352,6 +352,8 @@ int i; tempomap = md_get_tempomap(root); + if (!tempomap) + return; /* Default timebase in case it is not set */ if (tempomap->timebase == 0) diff -rNu melys-0.0.19/files/file.m melys-0.0.20/files/file.m --- melys-0.0.19/files/file.m Fri Oct 8 22:15:19 1999 +++ melys-0.0.20/files/file.m Fri Oct 22 23:36:55 1999 @@ -64,13 +64,14 @@ * gives a more useful indication to the user. */ enum fileErrors { - FILE_SUCCESS, /* Successful status */ FILE_STATUS_NONE,/* This just means that no status has been set yet */ + FILE_SUCCESS, /* Successful status */ FILE_STATUS_CONFIRM, /* Do you really want to... kind of messages */ FILE_STATUS_OPEN_FAIL, /* Could not open */ FILE_STATUS_BAD_FORMAT, /* File had a format problem */ FILE_STATUS_UNKNOWN, /* Could not recognise file type */ FILE_STATUS_INTERNAL,/* Probably a Melys bug, rather than user error */ + FILE_STATUS_NO_ROOT, /* Missing the root element, partial file */ FILE_STATUS_LAST }; @@ -401,6 +402,8 @@ int i; tempomap = md_get_tempomap(root); + if (!tempomap) + return; /* Default timebase in case it is not set */ if (tempomap->timebase == 0) diff -rNu melys-0.0.19/files/mdmlread.c melys-0.0.20/files/mdmlread.c --- melys-0.0.19/files/mdmlread.c Sat Oct 16 15:08:35 1999 +++ melys-0.0.20/files/mdmlread.c Mon Oct 25 20:56:31 1999 @@ -118,12 +118,17 @@ if (root) md_free(MD_ELEMENT(root)); return NULL; + } else if (!root) { + /* No error, but there isn't a root */ + file_set_error(file, FILE_STATUS_NO_ROOT, + _("Incomplete or partial file")); } - if (root) + if (root) { file_set_success(file); + file_check_root(root); + } - file_check_root(root); return root; } @@ -214,6 +219,7 @@ } else if (strcmp(name, "track") == 0) { struct trackElement *tp; + char *str; int res; msp->currtime = 0; @@ -225,9 +231,39 @@ tp = md_track_new(); tp->name = g_strdup(get_str(attrs, "name")); + res = get_int(attrs, "program"); if (res >= 0) msp->program = res; + + res = get_int(attrs, "volume"); + if (res >= 0) + tp->volume = res; + + res = get_int(attrs, "pan"); + if (res != -1) + tp->pan = res; + + str = get_str(attrs, "mute"); + if (str && strcmp(str, "yes") == 0) + tp->mute = TRUE; + + str = get_str(attrs, "solo"); + if (str && strcmp(str, "yes") == 0) + tp->solo = TRUE; + + str = get_str(attrs, "solomute"); + if (str && strcmp(str, "yes") == 0) + tp->solomute = TRUE; + + str = get_str(attrs, "sololast"); + if (str && strcmp(str, "yes") == 0) + tp->sololast = TRUE; + + str = get_str(attrs, "record"); + if (str && strcmp(str, "yes") == 0) + tp->record = TRUE; + retel = MD_ELEMENT(tp); } else if (strcmp(name, "tempomap") == 0) { diff -rNu melys-0.0.19/files/mdmlread.m melys-0.0.20/files/mdmlread.m --- melys-0.0.19/files/mdmlread.m Sun Oct 10 16:27:18 1999 +++ melys-0.0.20/files/mdmlread.m Fri Oct 22 23:36:55 1999 @@ -85,12 +85,17 @@ if (root) md_free(MD_ELEMENT(root)); return NULL; + } else if (!root) { + /* No error, but there isn't a root */ + file_set_error(file, FILE_STATUS_NO_ROOT, + _("Incomplete or partial file")); } - if (root) + if (root) { file_set_success(file); + file_check_root(root); + } - file_check_root(root); return root; >>header @@ -183,6 +188,7 @@ } else if (strcmp(name, "track") == 0) { struct trackElement *tp; + char *str; int res; msp->currtime = 0; @@ -194,9 +200,39 @@ tp = md_track_new(); tp->name = g_strdup(get_str(attrs, "name")); + res = get_int(attrs, "program"); if (res >= 0) msp->program = res; + + res = get_int(attrs, "volume"); + if (res >= 0) + tp->volume = res; + + res = get_int(attrs, "pan"); + if (res != -1) + tp->pan = res; + + str = get_str(attrs, "mute"); + if (str && strcmp(str, "yes") == 0) + tp->mute = TRUE; + + str = get_str(attrs, "solo"); + if (str && strcmp(str, "yes") == 0) + tp->solo = TRUE; + + str = get_str(attrs, "solomute"); + if (str && strcmp(str, "yes") == 0) + tp->solomute = TRUE; + + str = get_str(attrs, "sololast"); + if (str && strcmp(str, "yes") == 0) + tp->sololast = TRUE; + + str = get_str(attrs, "record"); + if (str && strcmp(str, "yes") == 0) + tp->record = TRUE; + retel = MD_ELEMENT(tp); } else if (strcmp(name, "tempomap") == 0) { diff -rNu melys-0.0.19/files/mdmlwrite.c melys-0.0.20/files/mdmlwrite.c --- melys-0.0.19/files/mdmlwrite.c Sat Oct 16 15:08:35 1999 +++ melys-0.0.20/files/mdmlwrite.c Mon Oct 25 20:56:32 1999 @@ -90,6 +90,8 @@ struct containerElement *c; int i; + g_return_if_fail(root != NULL); + mstate.lasttime = 0; mstate.devchan = 0; @@ -145,8 +147,22 @@ xtrack = xmlNewChild(doc->root, 0, "track", 0); set_prop_int(xtrack, "duration", MD_CONTAINER(el)->duration); set_prop_int(xtrack, "program", MD_TRACK(el)->program); + if (MD_TRACK(el)->mute) + xmlSetProp(xtrack, "mute", "yes"); + if (MD_TRACK(el)->solo) + xmlSetProp(xtrack, "solo", "yes"); + if (MD_TRACK(el)->solomute) + xmlSetProp(xtrack, "solomute", "yes"); + if (MD_TRACK(el)->sololast) + xmlSetProp(xtrack, "sololast", "yes"); + if (MD_TRACK(el)->record) + xmlSetProp(xtrack, "record", "yes"); if (MD_TRACK(el)->name) xmlSetProp(xtrack, "name", MD_TRACK(el)->name); + if (MD_TRACK(el)->volume != 127) + set_prop_int(xtrack, "volume", MD_TRACK(el)->volume); + if (MD_TRACK(el)->pan != 64) + set_prop_int(xtrack, "pan", MD_TRACK(el)->pan); mstate.starttime = 0; set_common_atts(&mstate, xtrack, el); build_section(&mstate, xtrack, MD_CONTAINER(el)); diff -rNu melys-0.0.19/files/mdmlwrite.m melys-0.0.20/files/mdmlwrite.m --- melys-0.0.19/files/mdmlwrite.m Sat Oct 2 20:17:45 1999 +++ melys-0.0.20/files/mdmlwrite.m Fri Oct 22 23:36:55 1999 @@ -69,6 +69,8 @@ struct containerElement *c; int i; + g_return_if_fail(root != NULL); + mstate.lasttime = 0; mstate.devchan = 0; @@ -124,8 +126,22 @@ xtrack = xmlNewChild(doc->root, 0, "track", 0); set_prop_int(xtrack, "duration", MD_CONTAINER(el)->duration); set_prop_int(xtrack, "program", MD_TRACK(el)->program); + if (MD_TRACK(el)->mute) + xmlSetProp(xtrack, "mute", "yes"); + if (MD_TRACK(el)->solo) + xmlSetProp(xtrack, "solo", "yes"); + if (MD_TRACK(el)->solomute) + xmlSetProp(xtrack, "solomute", "yes"); + if (MD_TRACK(el)->sololast) + xmlSetProp(xtrack, "sololast", "yes"); + if (MD_TRACK(el)->record) + xmlSetProp(xtrack, "record", "yes"); if (MD_TRACK(el)->name) xmlSetProp(xtrack, "name", MD_TRACK(el)->name); + if (MD_TRACK(el)->volume != 127) + set_prop_int(xtrack, "volume", MD_TRACK(el)->volume); + if (MD_TRACK(el)->pan != 64) + set_prop_int(xtrack, "pan", MD_TRACK(el)->pan); mstate.starttime = 0; set_common_atts(&mstate, xtrack, el); build_section(&mstate, xtrack, MD_CONTAINER(el)); diff -rNu melys-0.0.19/files/midiread.c melys-0.0.20/files/midiread.c --- melys-0.0.19/files/midiread.c Sat Oct 16 15:08:36 1999 +++ melys-0.0.20/files/midiread.c Mon Oct 25 20:56:32 1999 @@ -55,12 +55,8 @@ char *trackname; /* Saved track name */ guchar lsb_bank; /* LSB of bank select */ guchar msb_bank; /* MSB of bank select */ - int program; /* Track program applying to whole track */ - int hasprogram; /* Has a program change on the track */ int track_devchan; /* Track device channel */ - int note_seen:1; /* Note has been seen for this track */ - struct except error; /* For exceptional errors */ }; @@ -277,11 +273,8 @@ */ msp->chunk_count = 0; /* nothing read yet */ msp->trackname = NULL; - msp->lsb_bank = 0; msp->msb_bank = 0; - msp->program = 0; - msp->hasprogram = 0; - msp->note_seen = 0; + msp->lsb_bank = 0; msp->track_devchan = -1; msp->port = 0; @@ -324,14 +317,12 @@ MD_ELEMENT(part)->device_channel = msp->track_devchan; track->name = msp->trackname; - if (msp->hasprogram) { - track->program = msp->program; - track->hasprogram = TRUE; - } MD_CONTAINER(track)->duration = msp->track_duration; msp->track_duration = 0; + md_extract_track_info(track, part); + return track; } @@ -383,7 +374,6 @@ break; case MIDI_NOTE_ON: - msp->note_seen = 1; note = read_int(msp, 1); vel = read_int(msp, 1); @@ -433,9 +423,6 @@ val |= msp->lsb_bank << 7; val |= msp->msb_bank << 14; el = MD_ELEMENT(md_program_new(val)); - if (!msp->note_seen) - msp->program = val; - msp->hasprogram = TRUE; break; case MIDI_CHANNEL_AFTERTOUCH: diff -rNu melys-0.0.19/files/midiread.m melys-0.0.20/files/midiread.m --- melys-0.0.19/files/midiread.m Fri Oct 8 22:15:19 1999 +++ melys-0.0.20/files/midiread.m Sun Oct 24 19:22:12 1999 @@ -86,12 +86,8 @@ char *trackname; /* Saved track name */ guchar lsb_bank; /* LSB of bank select */ guchar msb_bank; /* MSB of bank select */ - int program; /* Track program applying to whole track */ - int hasprogram; /* Has a program change on the track */ int track_devchan; /* Track device channel */ - int note_seen:1; /* Note has been seen for this track */ - struct except error; /* For exceptional errors */ }; @@ -291,11 +287,8 @@ */ msp->chunk_count = 0; /* nothing read yet */ msp->trackname = NULL; - msp->lsb_bank = 0; msp->msb_bank = 0; - msp->program = 0; - msp->hasprogram = 0; - msp->note_seen = 0; + msp->lsb_bank = 0; msp->track_devchan = -1; msp->port = 0; @@ -338,14 +331,12 @@ MD_ELEMENT(part)->device_channel = msp->track_devchan; track->name = msp->trackname; - if (msp->hasprogram) { - track->program = msp->program; - track->hasprogram = TRUE; - } MD_CONTAINER(track)->duration = msp->track_duration; msp->track_duration = 0; + md_extract_track_info(track, part); + return track; >>function handle_status @@ -396,7 +387,6 @@ break; case MIDI_NOTE_ON: - msp->note_seen = 1; note = read_int(msp, 1); vel = read_int(msp, 1); @@ -446,9 +436,6 @@ val |= msp->lsb_bank << 7; val |= msp->msb_bank << 14; el = MD_ELEMENT(md_program_new(val)); - if (!msp->note_seen) - msp->program = val; - msp->hasprogram = TRUE; break; case MIDI_CHANNEL_AFTERTOUCH: diff -rNu melys-0.0.19/files/midiwrite.c melys-0.0.20/files/midiwrite.c --- melys-0.0.19/files/midiwrite.c Sat Oct 16 15:08:36 1999 +++ melys-0.0.20/files/midiwrite.c Mon Oct 25 20:56:32 1999 @@ -625,8 +625,8 @@ * When the track has been created from within the sequencer * there will be no program changes at the beginning. Nor will * there be any track names etc. - * Everything is put out at a time of zero. I realise that may not - * work for everyone. + * Currently everything is put out at a time of zero. I realise + * that may not work for everyone. * * Arguments: * msp - Midi write state @@ -667,4 +667,16 @@ /* If there are no embeded program events */ if (!track->hasprogram) put_program(msp, MD_DEVCHAN(track), 0, track->program); + + /* The initial volume */ + put_time(msp, 0); + put_status(msp, MIDI_CONTROLLER, MD_DEVCHAN(track)); + put_int(msp, 1, SND_MCTL_MSB_MAIN_VOLUME); + put_int(msp, 1, MD_VOL_TO_MIDI(track->volume)); + + /* The initial pan position */ + put_time(msp, 0); + put_status(msp, MIDI_CONTROLLER, MD_DEVCHAN(track)); + put_int(msp, 1, SND_MCTL_MSB_PAN); + put_int(msp, 1, MD_PAN_TO_MIDI(track->pan)); } diff -rNu melys-0.0.19/files/midiwrite.m melys-0.0.20/files/midiwrite.m --- melys-0.0.19/files/midiwrite.m Sat Oct 2 20:17:45 1999 +++ melys-0.0.20/files/midiwrite.m Fri Oct 22 23:36:37 1999 @@ -586,7 +586,7 @@ will be no program changes at the beginning. Nor will there be any track names etc. -Everything is put out at a time of zero. +Currently everything is put out at a time of zero. I realise that may not work for everyone. >>code @@ -622,3 +622,15 @@ /* If there are no embeded program events */ if (!track->hasprogram) put_program(msp, MD_DEVCHAN(track), 0, track->program); + + /* The initial volume */ + put_time(msp, 0); + put_status(msp, MIDI_CONTROLLER, MD_DEVCHAN(track)); + put_int(msp, 1, SND_MCTL_MSB_MAIN_VOLUME); + put_int(msp, 1, MD_VOL_TO_MIDI(track->volume)); + + /* The initial pan position */ + put_time(msp, 0); + put_status(msp, MIDI_CONTROLLER, MD_DEVCHAN(track)); + put_int(msp, 1, SND_MCTL_MSB_PAN); + put_int(msp, 1, MD_PAN_TO_MIDI(track->pan)); diff -rNu melys-0.0.19/gui/Makefile melys-0.0.20/gui/Makefile --- melys-0.0.19/gui/Makefile Sat Oct 16 15:08:31 1999 +++ melys-0.0.20/gui/Makefile Mon Oct 25 20:56:27 1999 @@ -80,6 +80,7 @@ menus.o: ../include/pixmaps.h menus.o: ../include/md.h menus.o: ../include/melystrack.h +menus.o: ../include/melyspos.h menus.o: ../include/menus.h help.o: ../include/melgui.h main.o: ../include/menus.h @@ -93,6 +94,7 @@ main.o: ../include/melystrackinfo.h main.o: ../include/melystrackdisplay.h main.o: ../include/melystrack.h +main.o: ../include/melyspos.h main.o: ../include/md.h main.o: ../include/melgui.h main.o: ../include/melmsg.h diff -rNu melys-0.0.19/gui/main.c melys-0.0.20/gui/main.c --- melys-0.0.19/gui/main.c Sat Oct 16 15:08:39 1999 +++ melys-0.0.20/gui/main.c Mon Oct 25 20:56:36 1999 @@ -41,6 +41,7 @@ #include "melystrackinfo.h" #include "melystrackdisplay.h" #include "melystrack.h" +#include "melyspos.h" #include "md.h" #include "melgui.h" #include "melmsg.h" @@ -50,6 +51,8 @@ /* Atoms */ GdkAtom MelysElemAtom; +/* For dialogs that do not belong to a particular song */ +static regid_t UnattachedDialog; /* * Help text for the context menu on the info pane @@ -65,13 +68,21 @@ struct except *noActiveChildError = &childError; /* Static functions */ +static void app_created_cb(GnomeMDI *mdi, GnomeApp *app, gpointer data); static GtkWidget *create_view(GnomeMDIChild *child, gpointer data); static int drag_files_received(GtkWidget *w, GdkDragContext *context, gint x, gint y, GtkSelectionData *data, guint info, guint time); static gboolean create_files(gpointer data); -static int add_view_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data); static void view_changed_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data); +static int add_view_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data); +static gboolean remove_view_cb(GtkObject *mdi, GtkWidget *view, + gpointer user_data); +static gboolean add_child_cb(GtkObject *mdi, GtkObject *child, + gpointer user_data); +static gboolean remove_child_cb(GtkObject *mdi, GtkObject *child, + gpointer user_data); +static void app_destroy_cb(GtkWidget *app, gpointer data); /* @@ -86,7 +97,9 @@ melys_app(int argc, char **argv, int optind) { GnomeMDI *mdi; + GtkWidget *dw; struct song *song; + int nopen; int oldargc = argc; /* @@ -99,6 +112,8 @@ mdi = GNOME_MDI(gnome_mdi_new("melys", _("The Melys sequencer"))); MainMDI = mdi; + gtk_signal_connect(GTK_OBJECT(mdi), "app_created", app_created_cb, NULL); + mel_init_menus(mdi); /* Set to notebook mode */ @@ -107,17 +122,29 @@ gtk_signal_connect(GTK_OBJECT(mdi), "add-view" , GTK_SIGNAL_FUNC(add_view_cb), NULL); - gtk_signal_connect(GTK_OBJECT(mdi), "view-changed" + gtk_signal_connect_after(GTK_OBJECT(mdi), "view-changed" , GTK_SIGNAL_FUNC(view_changed_cb), NULL); + gtk_signal_connect_after(GTK_OBJECT(mdi), "remove-view" + , GTK_SIGNAL_FUNC(remove_view_cb), NULL); + gtk_signal_connect_after(GTK_OBJECT(mdi), "add-child" + , GTK_SIGNAL_FUNC(add_child_cb), NULL); + gtk_signal_connect_after(GTK_OBJECT(mdi), "remove-child" + , GTK_SIGNAL_FUNC(remove_child_cb), NULL); argc = oldargc; - if (argc == optind) { + nopen = 0; + while (optind++ < argc) { + song = mel_create_song(GTK_OBJECT(mdi), argv[optind-1], NULL); + if (song) + nopen++; + } + if (nopen == 0) { song = mel_create_song(GTK_OBJECT(mdi), NULL, NULL); song->unused = 1; - } else { - while (optind++ < argc) - mel_create_song(GTK_OBJECT(mdi), argv[optind-1], NULL); } + dw = reg_get_widget(UnattachedDialog); + if (dw && dw->window) + gdk_window_raise(dw->window); MelysElemAtom = gdk_atom_intern(MELYS_ELEM_ATOM_NAME, FALSE); @@ -125,6 +152,51 @@ } /* + * This is called whenever a new app window is created. We need + * to catch it so that we can add the status bar which otherwise + * would not be added. + * + * Arguments: + * app - The newly created app window + */ +static void +app_created_cb(GnomeMDI *mdi, GnomeApp *app, gpointer data) +{ + GtkWidget *hbox; + GtkWidget *status; + GtkWidget *pos; + GtkWidget *frame; + GtkWidget *posbox; + GtkWidget *poslab; + + hbox = gtk_hbox_new(0, 0); + + status = gtk_statusbar_new(); + + pos = melys_pos_new(); + gtk_object_set_data(GTK_OBJECT(app), "song-position", pos); + + frame = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN); + + posbox = gtk_hbox_new(0, 4); + poslab = gtk_label_new(_("Song position")); + gtk_box_pack_start(GTK_BOX(posbox), poslab, 0, 0, 0); + gtk_box_pack_start(GTK_BOX(posbox), pos, 0, 0, 0); + + gtk_container_add(GTK_CONTAINER(frame), posbox); + + gtk_box_pack_start(GTK_BOX(hbox), status, 1, 1, 0); + gtk_box_pack_start(GTK_BOX(hbox), frame, 0, 1, 0); + + gtk_widget_show_all(hbox); + gnome_app_set_statusbar_custom(app, hbox, status); + gnome_app_install_menu_hints(app, gnome_mdi_get_menubar_info(app)); + + gtk_signal_connect(GTK_OBJECT(app), "destroy", app_destroy_cb, mdi); +} + +/* * Get the child info data from the specified MDI. The active * child is found. If the data does not exist on the child then it * is created. @@ -220,6 +292,9 @@ if (mel_file_error(psong, file, parent)) return NULL; + if (root->head->format == 0) + md_split_midi0(root); + /* Hide the parent dialogue box */ if (parent && GTK_IS_WIDGET(parent)) gtk_widget_hide((GtkWidget *)parent); @@ -244,8 +319,7 @@ gnome_mdi_add_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); mel_initial_view((GtkObject *)mdi, (GtkObject *)child, song->mdroot, - (ga)? FALSE: TRUE); - + ((psong && psong->unused) || (!psong && ga))? FALSE: TRUE); if (psong && psong->unused) { count--; @@ -305,17 +379,9 @@ if (toplevel) { gtk_widget_set_usize - (w, 70*gdk_screen_width()/100, 40*gdk_screen_height()/100); + (w, 80*gdk_screen_width()/100, 50*gdk_screen_height()/100); } - mel_add_view(mdi, child, w, toplevel); - - /* Notebook bug? Need this to get it drawn properly */ - while (gtk_events_pending()) - gtk_main_iteration(); - - gnome_mdi_set_active_view(GNOME_MDI(mdi), w); - /* * Set the button three context menu. */ @@ -327,6 +393,14 @@ melys_track_set_song(MELYS_TRACK(w), song); play_set_pos_adj(song->play, MELYS_TRACK(song->trackview)->posadj); + + mel_add_view(mdi, child, w, toplevel); + + /* Notebook bug? Need this to get it drawn properly */ + while (gtk_events_pending()) + gtk_main_iteration(); + + gnome_mdi_set_active_view(GNOME_MDI(mdi), w); } /* @@ -420,6 +494,8 @@ d_id = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); if (sd) sd->dialog = d_id; + else + UnattachedDialog = d_id; /* Destroy dialog when the parent is hidden as well */ if (parent) @@ -483,8 +559,14 @@ } switch (code) { + char *msg; + default: - mel_song_error(song, parent, file_get_message(file)); + msg = g_strdup_printf( + _("There was a problem opening the file %s\n%s"), + file->name, file_get_message(file) + ); + mel_song_error(song, parent, msg); break; } @@ -571,47 +653,140 @@ } /* - * Called when a view is added to a child of the mdi. + * Called when the view is changed. This function and the + * {child|view}{add|remove} functions all work together to + * keep the song position counter in the status line up to date + * with what is being shown in the window. This is a mess but + * ultimately the position counter is going to be removed from + * the status bar. * * Arguments: * mdi - The mdi object * widget - The newly added view * user_data - User data */ -static int -add_view_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data) +static void +view_changed_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data) { + GtkWidget *actview; + GnomeApp *app; + struct song *song; + MelysPos *pos; + GtkAdjustment *adj; - dprintf1("add_view_cb: View Added"); + dprintf1("view_changed_cb"); - return TRUE; + if (widget) + gtk_widget_grab_focus(widget); + + actview = gnome_mdi_get_active_view(GNOME_MDI(mdi)); + + if (actview) { + mel_accept_files(GTK_OBJECT(MainMDI), GTK_WIDGET(actview)); + + app = gnome_mdi_get_app_from_view(actview); + pos = gtk_object_get_data(GTK_OBJECT(app), "song-position"); + song = get_song_from_mdi((GtkObject *)mdi); + + adj = NULL; + if (song->trackview) + adj = ((MelysTrack *)song->trackview)->posadj; + if (adj) + melys_pos_set_controls(pos, md_get_tempomap(song->mdroot), adj); + } } /* - * Called when the view is changed. + * Called when a view is added to a child of the mdi. * * Arguments: * mdi - The mdi object * widget - The newly added view * user_data - User data */ -static void -view_changed_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data) +static int +add_view_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data) { - GtkWidget *actview; - if (widget == NULL) - return; + dprintf1("add_view_cb: View Added"); + view_changed_cb(mdi, NULL, user_data); - dprintf1("view_changed_cb"); + return TRUE; +} - actview = gnome_mdi_get_active_view(GNOME_MDI(mdi)); - if (actview) - mel_accept_files(GTK_OBJECT(MainMDI), GTK_WIDGET(actview)); +static gboolean +remove_view_cb(GtkObject *mdi, GtkWidget *view, gpointer user_data) +{ + GnomeApp *app; + MelysPos *pos; + + dprintf1("remove_view_cb"); + + if (view) { + + app = gnome_mdi_get_app_from_view(view); + pos = gtk_object_get_data(GTK_OBJECT(app), "song-position"); + if (pos) + melys_pos_clear(pos); + } + + return TRUE; +} + +static gboolean +add_child_cb(GtkObject *mdi, GtkObject *child, gpointer user_data) +{ + dprintf1("add_child_cb"); + + /* Call this in case the view hasn't actually changed */ + view_changed_cb(mdi, NULL, user_data); + return TRUE; +} + +static gboolean +remove_child_cb(GtkObject *mdi, GtkObject *child, gpointer user_data) +{ + GnomeApp *app; + GtkWidget *view; + MelysPos *pos; + + dprintf1("remove_child_cb"); + + view = gnome_mdi_get_active_view(GNOME_MDI(mdi)); + if (view) { + app = gnome_mdi_get_app_from_view(view); + pos = gtk_object_get_data(GTK_OBJECT(app), "song-position"); + if (pos) + melys_pos_clear(pos); + } + view_changed_cb(mdi, NULL, NULL); + + return TRUE; +} + +static void +app_destroy_cb(GtkWidget *app, gpointer data) +{ + dprintf1("app_destroy_cb"); + view_changed_cb(GTK_OBJECT(MainMDI), NULL, NULL); +} + +/* + * Add a tool tip to a widget. + * + * Arguments: + * w - Widget that tool tip is for + * tip - The text of the tool tip + */ +void +set_tip(GtkWidget *w, char *tip) +{ + static GtkTooltips *tips; - gtk_widget_grab_focus(widget); + if (!tips) + tips = gtk_tooltips_new(); - return; + gtk_tooltips_set_tip(tips, w, tip, NULL); } /* diff -rNu melys-0.0.19/gui/main.m melys-0.0.20/gui/main.m --- melys-0.0.19/gui/main.m Mon Oct 11 19:51:06 1999 +++ melys-0.0.20/gui/main.m Mon Oct 25 20:32:43 1999 @@ -33,6 +33,7 @@ >>header melystrackinfo.h >>header melystrackdisplay.h >>header melystrack.h +>>header melyspos.h >>header md.h >>headerdef --decl melgui.h @@ -79,6 +80,8 @@ /* Atoms */ GdkAtom MelysElemAtom; +/* For dialogs that do not belong to a particular song */ +static regid_t UnattachedDialog; /* * Help text for the context menu on the info pane @@ -104,7 +107,9 @@ >>code GnomeMDI *mdi; + GtkWidget *dw; struct song *song; + int nopen; int oldargc = argc; /* @@ -117,6 +122,8 @@ mdi = GNOME_MDI(gnome_mdi_new("melys", _("The Melys sequencer"))); MainMDI = mdi; + gtk_signal_connect(GTK_OBJECT(mdi), "app_created", app_created_cb, NULL); + mel_init_menus(mdi); /* Set to notebook mode */ @@ -125,22 +132,80 @@ gtk_signal_connect(GTK_OBJECT(mdi), "add-view" , GTK_SIGNAL_FUNC(add_view_cb), NULL); - gtk_signal_connect(GTK_OBJECT(mdi), "view-changed" + gtk_signal_connect_after(GTK_OBJECT(mdi), "view-changed" , GTK_SIGNAL_FUNC(view_changed_cb), NULL); + gtk_signal_connect_after(GTK_OBJECT(mdi), "remove-view" + , GTK_SIGNAL_FUNC(remove_view_cb), NULL); + gtk_signal_connect_after(GTK_OBJECT(mdi), "add-child" + , GTK_SIGNAL_FUNC(add_child_cb), NULL); + gtk_signal_connect_after(GTK_OBJECT(mdi), "remove-child" + , GTK_SIGNAL_FUNC(remove_child_cb), NULL); argc = oldargc; - if (argc == optind) { + nopen = 0; + while (optind++ < argc) { + song = mel_create_song(GTK_OBJECT(mdi), argv[optind-1], NULL); + if (song) + nopen++; + } + if (nopen == 0) { song = mel_create_song(GTK_OBJECT(mdi), NULL, NULL); song->unused = 1; - } else { - while (optind++ < argc) - mel_create_song(GTK_OBJECT(mdi), argv[optind-1], NULL); } + dw = reg_get_widget(UnattachedDialog); + if (dw && dw->window) + gdk_window_raise(dw->window); MelysElemAtom = gdk_atom_intern(MELYS_ELEM_ATOM_NAME, FALSE); return 0; +>>function app_created_cb +static void +GnomeMDI *mdi; +GnomeApp *app; The newly created app window +gpointer data; + +>>description +This is called whenever a new app window is created. +We need to catch it so that we can add the status bar +which otherwise would not be added. + +>>code + GtkWidget *hbox; + GtkWidget *status; + GtkWidget *pos; + GtkWidget *frame; + GtkWidget *posbox; + GtkWidget *poslab; + + hbox = gtk_hbox_new(0, 0); + + status = gtk_statusbar_new(); + + pos = melys_pos_new(); + gtk_object_set_data(GTK_OBJECT(app), "song-position", pos); + + frame = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN); + + posbox = gtk_hbox_new(0, 4); + poslab = gtk_label_new(_("Song position")); + gtk_box_pack_start(GTK_BOX(posbox), poslab, 0, 0, 0); + gtk_box_pack_start(GTK_BOX(posbox), pos, 0, 0, 0); + + gtk_container_add(GTK_CONTAINER(frame), posbox); + + gtk_box_pack_start(GTK_BOX(hbox), status, 1, 1, 0); + gtk_box_pack_start(GTK_BOX(hbox), frame, 0, 1, 0); + + gtk_widget_show_all(hbox); + gnome_app_set_statusbar_custom(app, hbox, status); + gnome_app_install_menu_hints(app, gnome_mdi_get_menubar_info(app)); + + gtk_signal_connect(GTK_OBJECT(app), "destroy", app_destroy_cb, mdi); + + >>function get_song_from_mdi struct song * GtkObject *mdi; The MDI to find the active child @@ -234,6 +299,9 @@ if (mel_file_error(psong, file, parent)) return NULL; + if (root->head->format == 0) + md_split_midi0(root); + /* Hide the parent dialogue box */ if (parent && GTK_IS_WIDGET(parent)) gtk_widget_hide((GtkWidget *)parent); @@ -258,8 +326,7 @@ gnome_mdi_add_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); mel_initial_view((GtkObject *)mdi, (GtkObject *)child, song->mdroot, - (ga)? FALSE: TRUE); - + ((psong && psong->unused) || (!psong && ga))? FALSE: TRUE); if (psong && psong->unused) { count--; @@ -319,17 +386,9 @@ if (toplevel) { gtk_widget_set_usize - (w, 70*gdk_screen_width()/100, 40*gdk_screen_height()/100); + (w, 80*gdk_screen_width()/100, 50*gdk_screen_height()/100); } - mel_add_view(mdi, child, w, toplevel); - - /* Notebook bug? Need this to get it drawn properly */ - while (gtk_events_pending()) - gtk_main_iteration(); - - gnome_mdi_set_active_view(GNOME_MDI(mdi), w); - /* * Set the button three context menu. */ @@ -342,6 +401,14 @@ melys_track_set_song(MELYS_TRACK(w), song); play_set_pos_adj(song->play, MELYS_TRACK(song->trackview)->posadj); + mel_add_view(mdi, child, w, toplevel); + + /* Notebook bug? Need this to get it drawn properly */ + while (gtk_events_pending()) + gtk_main_iteration(); + + gnome_mdi_set_active_view(GNOME_MDI(mdi), w); + >>function mel_view_update @@ -444,6 +511,8 @@ d_id = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); if (sd) sd->dialog = d_id; + else + UnattachedDialog = d_id; /* Destroy dialog when the parent is hidden as well */ if (parent) @@ -513,8 +582,14 @@ } switch (code) { + char *msg; + default: - mel_song_error(song, parent, file_get_message(file)); + msg = g_strdup_printf( + _("There was a problem opening the file %s\n%s"), + file->name, file_get_message(file) + ); + mel_song_error(song, parent, msg); break; } @@ -607,6 +682,50 @@ return FALSE; +>>function view_changed_cb +static void +GtkObject *mdi; The mdi object +GtkWidget *widget; The newly added view +gpointer user_data; User data + +>>description +Called when the view is changed. +This function and the {child|view}{add|remove} functions +all work together to keep the song position counter in the +status line up to date with what is being shown in the window. +This is a mess but ultimately the position counter is going +to be removed from the status bar. + +>>code + GtkWidget *actview; + GnomeApp *app; + struct song *song; + MelysPos *pos; + GtkAdjustment *adj; + + dprintf1("@func_name"); + + if (widget) + gtk_widget_grab_focus(widget); + + actview = gnome_mdi_get_active_view(GNOME_MDI(mdi)); + + if (actview) { + mel_accept_files(GTK_OBJECT(MainMDI), GTK_WIDGET(actview)); + + app = gnome_mdi_get_app_from_view(actview); + pos = gtk_object_get_data(GTK_OBJECT(app), "song-position"); + song = get_song_from_mdi((GtkObject *)mdi); + + adj = NULL; + if (song->trackview) + adj = ((MelysTrack *)song->trackview)->posadj; + if (adj) + melys_pos_set_controls(pos, md_get_tempomap(song->mdroot), adj); + } + + + >>function add_view_cb static int GtkObject *mdi; The mdi object @@ -619,33 +738,95 @@ >>code dprintf1("@func_name: View Added"); + view_changed_cb(mdi, NULL, user_data); return TRUE; ->>function view_changed_cb -static void +>>function remove_view_cb +static gboolean GtkObject *mdi; The mdi object -GtkWidget *widget; The newly added view +GtkWidget *view; The view being removed gpointer user_data; User data ->>description -Called when the view is changed. +>>code + GnomeApp *app; + MelysPos *pos; + + dprintf1("@func_name"); + + if (view) { + + app = gnome_mdi_get_app_from_view(view); + pos = gtk_object_get_data(GTK_OBJECT(app), "song-position"); + if (pos) + melys_pos_clear(pos); + } + + return TRUE; + + +>>function add_child_cb +static gboolean +GtkObject *mdi; The mdi object +GtkObject *child; The child being added +gpointer user_data; User data >>code - GtkWidget *actview; + dprintf1("@func_name"); + + /* Call this in case the view hasn't actually changed */ + view_changed_cb(mdi, NULL, user_data); + return TRUE; + +>>function remove_child_cb +static gboolean +GtkObject *mdi; The mdi object +GtkObject *child; The child being removed +gpointer user_data; User data - if (widget == NULL) - return; +>>code + GnomeApp *app; + GtkWidget *view; + MelysPos *pos; dprintf1("@func_name"); - actview = gnome_mdi_get_active_view(GNOME_MDI(mdi)); - if (actview) - mel_accept_files(GTK_OBJECT(MainMDI), GTK_WIDGET(actview)); + view = gnome_mdi_get_active_view(GNOME_MDI(mdi)); + if (view) { + app = gnome_mdi_get_app_from_view(view); + pos = gtk_object_get_data(GTK_OBJECT(app), "song-position"); + if (pos) + melys_pos_clear(pos); + } + view_changed_cb(mdi, NULL, NULL); + + return TRUE; + +>>function app_destroy_cb +static void +GtkWidget *app; +gpointer data; + +>>code + dprintf1("@func_name"); + view_changed_cb(GTK_OBJECT(MainMDI), NULL, NULL); + +>>function set_tip +void +GtkWidget *w; Widget that tool tip is for +char *tip; The text of the tool tip + +>>description +Add a tool tip to a widget. + +>>code + static GtkTooltips *tips; + + if (!tips) + tips = gtk_tooltips_new(); - gtk_widget_grab_focus(widget); + gtk_tooltips_set_tip(tips, w, tip, NULL); - return; >>function mel_debug_print_type void diff -rNu melys-0.0.19/gui/menus.c melys-0.0.20/gui/menus.c --- melys-0.0.19/gui/menus.c Sat Oct 16 15:08:40 1999 +++ melys-0.0.20/gui/menus.c Mon Oct 25 20:56:36 1999 @@ -38,6 +38,7 @@ #include "pixmaps.h" #include "md.h" #include "melystrack.h" +#include "melyspos.h" #include "menus.h" #include "intl.h" @@ -46,6 +47,7 @@ static void new_cb(GtkWidget *wid, gpointer data); static void open_cb(GtkWidget *wid, gpointer data); static void open_ok_cb(GtkWidget *button, gpointer data); +static void save_cb(GtkWidget *mi, gpointer data); static void save_as_cb(GtkWidget *mi, gpointer data); static void save_ok_cb(GtkWidget *button, gpointer data); static void file_cancel_cb(GtkWidget *button, gpointer data); @@ -70,10 +72,11 @@ /* The file menu */ GnomeUIInfo filemenu[] = { GNOMEUIINFO_MENU_NEW_ITEM(N_("New"), - "Start a new arrangement", new_cb, NULL), + "Start a new piece of music", new_cb, NULL), GNOMEUIINFO_MENU_OPEN_ITEM(open_cb, NULL), - GNOMEUIINFO_MENU_CLOSE_ITEM(close_cb, NULL), + GNOMEUIINFO_MENU_SAVE_ITEM(save_cb, NULL), GNOMEUIINFO_MENU_SAVE_AS_ITEM(save_as_cb, NULL), + GNOMEUIINFO_MENU_CLOSE_ITEM(close_cb, NULL), GNOMEUIINFO_SEPARATOR, GNOMEUIINFO_MENU_EXIT_ITEM(exit_cb, NULL), GNOMEUIINFO_END @@ -130,7 +133,7 @@ /* The play menu */ /* NOTE add accelerators later */ GnomeUIInfo actionmenu[] = { - {GNOME_APP_UI_ITEM, N_("_Start"), N_("Start playing"), + {GNOME_APP_UI_ITEM, N_("_Start"), N_("Start or continue playing"), start_cb, (gpointer)0, (gpointer)0, /* Callback and data */ GNOME_APP_PIXMAP_DATA, mplay_xpm, /* Pixmap */ GDK_Return, (GdkModifierType)0, /* Accel */ @@ -301,6 +304,39 @@ } /* + * Save the file. If there is no stored filename then it behaves + * like save_as. + * + * Arguments: + * mi - The menu item selected + * data - The mdi object + */ +static void +save_cb(GtkWidget *mi, gpointer data) +{ + GtkObject *mdi = data; + GtkObject *child; + struct song *sd; + struct File *file; + + sd = get_song_from_mdi(mdi); + + if (sd->filename == NULL) { + save_as_cb(mi, data); + return; + } + + child = sd->child; + + file = file_new(sd->filename); + file_write(file, sd->mdroot); + if (mel_file_error(sd, file, NULL)); + return; + + gnome_mdi_child_set_name(GNOME_MDI_CHILD(child), g_basename(sd->filename)); +} + +/* * Bring up a save-as dialog and write the song to the selected * file. * @@ -372,6 +408,9 @@ if (mel_file_error(sd, file, (GtkObject*)sel)) return; + sd->filename = filename; + gnome_mdi_child_set_name(GNOME_MDI_CHILD(child), g_basename(filename)); + gtk_widget_hide(GTK_WIDGET(sel)); } @@ -403,7 +442,7 @@ int count; count = get_child_count(mdi); - if (count > 1 && sd->child) { + if (sd->child) { gnome_mdi_remove_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(sd->child), 0); set_child_count(mdi, --count); } @@ -419,9 +458,15 @@ static void close_all_cb(GtkWidget *w, gpointer data) { + MelysPos *pos; GtkObject *mdi = GTK_OBJECT(data); + GnomeApp *gapp; gnome_mdi_remove_all(GNOME_MDI(mdi), 0); + + gapp = gnome_mdi_get_active_window(GNOME_MDI(mdi)); + pos = gtk_object_get_data(GTK_OBJECT(gapp), "song-position"); + melys_pos_clear(pos); dprintf1("Nfree is %d", md_get_nfree()); } @@ -527,20 +572,30 @@ about_cb(GtkWidget *w, gpointer data) { GtkWidget *about; + static regid_t aid; const gchar *authors[] = { "Steve Ratcliffe ", NULL, }; - about = gnome_about_new("Melys", - MELYS_VERSION_STRING, - _("Copyright Steve Ratcliffe (C) 1999"), - authors, - _("Melys is a sequencer application for ALSA"), - NULL /* Logo */ - ); + about = reg_get_widget(aid); + if (!about) { + about = gnome_about_new("Melys", + MELYS_VERSION_STRING, + _("Copyright Steve Ratcliffe (C) 1999"), + authors, + _("Melys is a Midi sequencer for ALSA"), + NULL /* Logo */ + ); + aid = reg_object(GTK_OBJECT(about), NULL); + } gtk_widget_show(about); + + if (about->window) { + gdk_window_raise(about->window); + gdk_window_show(about->window); + } } /* diff -rNu melys-0.0.19/gui/menus.m melys-0.0.20/gui/menus.m --- melys-0.0.19/gui/menus.m Tue Oct 12 14:52:25 1999 +++ melys-0.0.20/gui/menus.m Mon Oct 25 20:29:30 1999 @@ -30,6 +30,7 @@ >>header pixmaps.h >>header md.h >>header melystrack.h +>>header melyspos.h >>headerdef --decl menus.h @@ -38,10 +39,11 @@ /* The file menu */ GnomeUIInfo filemenu[] = { GNOMEUIINFO_MENU_NEW_ITEM(N_("New"), - "Start a new arrangement", new_cb, NULL), + "Start a new piece of music", new_cb, NULL), GNOMEUIINFO_MENU_OPEN_ITEM(open_cb, NULL), - GNOMEUIINFO_MENU_CLOSE_ITEM(close_cb, NULL), + GNOMEUIINFO_MENU_SAVE_ITEM(save_cb, NULL), GNOMEUIINFO_MENU_SAVE_AS_ITEM(save_as_cb, NULL), + GNOMEUIINFO_MENU_CLOSE_ITEM(close_cb, NULL), GNOMEUIINFO_SEPARATOR, GNOMEUIINFO_MENU_EXIT_ITEM(exit_cb, NULL), GNOMEUIINFO_END @@ -98,7 +100,7 @@ /* The play menu */ /* NOTE add accelerators later */ GnomeUIInfo actionmenu[] = { - {GNOME_APP_UI_ITEM, N_("_Start"), N_("Start playing"), + {GNOME_APP_UI_ITEM, N_("_Start"), N_("Start or continue playing"), start_cb, (gpointer)0, (gpointer)0, /* Callback and data */ GNOME_APP_PIXMAP_DATA, mplay_xpm, /* Pixmap */ GDK_Return, (GdkModifierType)0, /* Accel */ @@ -270,6 +272,37 @@ mel_create_song(GTK_OBJECT(mdi), filename, GTK_OBJECT(sel)); +>>function save_cb +static void +GtkWidget *mi; The menu item selected +gpointer data; The mdi object +>>description +Save the file. If there is no stored filename +then it behaves like save_as. +>>code + GtkObject *mdi = data; + GtkObject *child; + struct song *sd; + struct File *file; + + sd = get_song_from_mdi(mdi); + + if (sd->filename == NULL) { + save_as_cb(mi, data); + return; + } + + child = sd->child; + + file = file_new(sd->filename); + file_write(file, sd->mdroot); + if (mel_file_error(sd, file, NULL)); + return; + + gnome_mdi_child_set_name(GNOME_MDI_CHILD(child), g_basename(sd->filename)); + + + >>function save_as_cb static void GtkWidget *mi; The menu item selected @@ -343,6 +376,9 @@ if (mel_file_error(sd, file, (GtkObject*)sel)) return; + sd->filename = filename; + gnome_mdi_child_set_name(GNOME_MDI_CHILD(child), g_basename(filename)); + gtk_widget_hide(GTK_WIDGET(sel)); @@ -375,7 +411,7 @@ int count; count = get_child_count(mdi); - if (count > 1 && sd->child) { + if (sd->child) { gnome_mdi_remove_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(sd->child), 0); set_child_count(mdi, --count); } @@ -388,9 +424,15 @@ Close all the open windows. >>code + MelysPos *pos; GtkObject *mdi = GTK_OBJECT(data); + GnomeApp *gapp; gnome_mdi_remove_all(GNOME_MDI(mdi), 0); + + gapp = gnome_mdi_get_active_window(GNOME_MDI(mdi)); + pos = gtk_object_get_data(GTK_OBJECT(gapp), "song-position"); + melys_pos_clear(pos); dprintf1("Nfree is %d", md_get_nfree()); @@ -503,20 +545,31 @@ >>code GtkWidget *about; + static regid_t aid; const gchar *authors[] = { "Steve Ratcliffe ", NULL, }; - about = gnome_about_new("Melys", - MELYS_VERSION_STRING, - _("Copyright Steve Ratcliffe (C) 1999"), - authors, - _("Melys is a sequencer application for ALSA"), - NULL /* Logo */ - ); + about = reg_get_widget(aid); + if (!about) { + about = gnome_about_new("Melys", + MELYS_VERSION_STRING, + _("Copyright Steve Ratcliffe (C) 1999"), + authors, + _("Melys is a Midi sequencer for ALSA"), + NULL /* Logo */ + ); + aid = reg_object(GTK_OBJECT(about), NULL); + } gtk_widget_show(about); + + if (about->window) { + gdk_window_raise(about->window); + gdk_window_show(about->window); + } + >>function add_track_cb static void diff -rNu melys-0.0.19/gui/trackprop.c melys-0.0.20/gui/trackprop.c --- melys-0.0.19/gui/trackprop.c Sat Oct 16 15:08:40 1999 +++ melys-0.0.20/gui/trackprop.c Mon Oct 25 20:56:37 1999 @@ -48,6 +48,9 @@ GtkEntry *trackname; /* The track name */ GtkSpinButton *devname; /* Device name will probably change */ GtkSpinButton *channel; /* The channel number */ + GtkAdjustment *volume; /* The initial volume */ + GtkAdjustment *pan; /* Initial pan position */ + GtkSpinButton *instr; /* The instrument number (TEMP) */ GtkSpinButton *bankmsb; /* The instrument number high bank */ GtkSpinButton *banklsb; /* The instrument number low bank */ @@ -55,13 +58,18 @@ /* Help locations */ static struct help_page_entry pages[] = { - {"melys", "track.html", "track-prop-info"}, - {"melys", "track.html", "track-prop-instruments"}, + {"melys", "info-pane.html", "track-prop-info"}, + {"melys", "info-pane.html", "track-prop-instruments"}, }; static struct help_entry help_entry = { NELEM(pages), pages }; +#define PAN_TO_ADJ(pan) ( (MD_PAN_TO_MIDI(pan) - 64.0) * 50.0 / 64.0) +#define ADJ_TO_PAN(val) ( MD_MIDI_TO_PAN((val * 64.0 / 50.0)+64.0) ) +#define VOL_TO_ADJ(vol) ( MD_VOL_TO_MIDI(vol) * 100.0 / 127.0) +#define ADJ_TO_VOL(val) ( MD_MIDI_TO_VOL(val * 127.0 / 100.0)) + /* Static functions */ static GtkWidget *prop_track_info(struct track_prop *prop); static GtkWidget *prop_track_instruments(struct track_prop *prop); @@ -130,18 +138,6 @@ GtkFrame *frame; GtkBox *mainbox; GtkWidget *tab; - /* Track name */ - GtkWidget *namelab; - GtkEntry *trackname; - GtkWidget *tnbox; - /* Device name */ - GtkWidget *devlab; - GtkWidget *devlist; - GtkWidget *devbox; - /* Channel number */ - GtkWidget *chanbox; - GtkWidget *chanlab; - GtkWidget *chan; track = MD_TRACK(PROP_ELEM(prop)); @@ -149,69 +145,123 @@ /* * Create the boxes that some of the widgets are packed into. - * The mainbox may not be needed. */ tab = gtk_table_new(3, 3, 0); mainbox = (GtkBox *)gtk_vbox_new(0, 0/*spacing*/); - devbox = gtk_hbox_new(0, 0); - chanbox = gtk_hbox_new(0, 0); - tnbox = gtk_hbox_new(0, 0); - - /* Create the labels */ - namelab = new_lab_align(_("Track name")); - devlab = new_lab_align(_("Output device")); - chanlab = new_lab_align(_("Channel")); - - /* Entry box for the track name */ - trackname = (GtkEntry *)gtk_entry_new(); - if (track->name) - gtk_entry_set_text(trackname, track->name); - gtk_box_pack_start((GtkBox *)tnbox, (GtkWidget *)trackname, 0, 0, 0); - - /* Channel spinner */ - chan = mel_int_spinner(1, 16, MD_CHAN(track)+1); - gtk_box_pack_start((GtkBox *)chanbox, chan, 0, 0, 0); - - - /* The combo box for devices */ -#if 0 - devnames = g_list_append(devnames, "A: not operational"); - devnames = g_list_append(devnames, "B: another test"); - devnames = g_list_append(devnames, "C: yet another test"); - devlist = gtk_combo_new(); - gtk_combo_set_popdown_strings((GtkCombo *)devlist, devnames); - gtk_entry_set_editable((GtkEntry*)GTK_COMBO(devlist)->entry, 0); -#endif - devlist = mel_int_spinner(1, 4, MD_DEV(track)+1); /* Very temporary */ - gtk_box_pack_start((GtkBox *)devbox, (GtkWidget *)devlist, 0, 0, 0); - gtk_container_add((GtkContainer *)frame, (GtkWidget*)mainbox); gtk_box_pack_start(mainbox, (GtkWidget *)tab, 0, 0, 0); /* ..., expand, fill, padding */ - /* Attach all the labels */ - attach_at(tab, namelab, 0, 0, GTK_FILL, 0); - attach_at(tab, devlab, 1, 0, GTK_FILL, 0); - attach_at(tab, chanlab, 2, 0, GTK_FILL, 0); - - /* Now attach the form boxes */ - attach_at(tab, tnbox, 0, 1, GTK_FILL, 0); - attach_at(tab, devbox, 1, 1, GTK_FILL, 0); - attach_at(tab, chanbox, 2, 1, GTK_FILL, 0); + { + /* Track name */ + GtkWidget *namelab; + GtkEntry *trackname; + GtkWidget *tnbox; - /* - * Connect to all the changed signals. All this does is allow - * us to get the apply and OK button activated. Nothing is - * changed in the real track until the apply signal is received. - */ - gtk_signal_connect((GtkObject *)trackname, "changed", prop_change, prop); - gtk_signal_connect((GtkObject *)devlist, "changed", prop_change, prop); - gtk_signal_connect((GtkObject *)chan, "changed", prop_change, prop); - - prop->trackname = trackname; - prop->channel = GTK_SPIN_BUTTON(chan); - prop->devname = GTK_SPIN_BUTTON(devlist); + tnbox = gtk_hbox_new(0, 0); + namelab = new_lab_align(_("Track name")); + + /* Entry box for the track name */ + trackname = (GtkEntry *)gtk_entry_new(); + if (track->name) + gtk_entry_set_text(trackname, track->name); + gtk_box_pack_start((GtkBox *)tnbox, (GtkWidget *)trackname, 0, 0, 0); + attach_at(tab, namelab, 0, 0, GTK_FILL, 0); + attach_at(tab, tnbox, 0, 1, GTK_FILL, 0); + gtk_signal_connect((GtkObject *)trackname, "changed", + prop_change, prop); + prop->trackname = trackname; + } + + { + /* Device name */ + GtkWidget *devlab; + GtkWidget *devlist; + GtkWidget *devbox; + + devbox = gtk_hbox_new(0, 0); + devlab = new_lab_align(_("Output device")); + devlist = mel_int_spinner(1, 4, MD_DEV(track)+1); /* Very temporary */ + + gtk_box_pack_start((GtkBox *)devbox, (GtkWidget *)devlist, 0, 0, 0); + attach_at(tab, devlab, 1, 0, GTK_FILL, 0); + attach_at(tab, devbox, 1, 1, GTK_FILL, 0); + + gtk_signal_connect((GtkObject *)devlist, "changed", prop_change, prop); + prop->devname = GTK_SPIN_BUTTON(devlist); + } + + { + /* Channel number */ + GtkWidget *chanbox; + GtkWidget *chanlab; + GtkWidget *chan; + + chanbox = gtk_hbox_new(0, 0); + chanlab = new_lab_align(_("Channel")); + + /* Channel spinner */ + chan = mel_int_spinner(1, 16, MD_CHAN(track)+1); + + gtk_box_pack_start((GtkBox *)chanbox, chan, 0, 0, 0); + attach_at(tab, chanlab, 2, 0, GTK_FILL, 0); + attach_at(tab, chanbox, 2, 1, GTK_FILL, 0); + + gtk_signal_connect((GtkObject *)chan, "changed", prop_change, prop); + prop->channel = GTK_SPIN_BUTTON(chan); + } + + { + /* Initial volume */ + GtkAdjustment *voladj; + GtkWidget *volbox; + GtkWidget *vollab; + GtkWidget *vol; + + volbox = gtk_hbox_new(0, 0); + vollab = new_lab_align(_("Initial volume")); + voladj = (GtkAdjustment *)gtk_adjustment_new( + MD_VOL_TO_MIDI(track->volume), 0.0, 100.0, 1.0, 1.0, 0.0); + vol = gtk_hscale_new(voladj); + gtk_scale_set_draw_value((GtkScale *)vol, TRUE); + gtk_scale_set_value_pos((GtkScale *)vol, GTK_POS_RIGHT); + gtk_scale_set_digits((GtkScale *)vol, 0); + + gtk_box_pack_start((GtkBox *)volbox, vol, 1, 1, 0); + attach_at(tab, vollab, 3, 0, GTK_FILL, 0); + attach_at(tab, volbox, 3, 1, GTK_FILL, 0); + + gtk_signal_connect((GtkObject *)voladj, "value_changed", + prop_change, prop); + prop->volume = voladj; + } + + + { + /* Pan position */ + GtkAdjustment *panadj; + GtkWidget *panbox; + GtkWidget *panlab; + GtkWidget *pan; + + panbox = gtk_hbox_new(0, 0); + panlab = new_lab_align(_("Pan position")); + panadj = (GtkAdjustment *)gtk_adjustment_new(PAN_TO_ADJ(track->pan), + -50.0, 50.0, 1.0, 1.0, 0.0); + pan = gtk_hscale_new(panadj); + gtk_scale_set_draw_value((GtkScale *)pan, TRUE); + gtk_scale_set_value_pos((GtkScale *)pan, GTK_POS_RIGHT); + gtk_scale_set_digits((GtkScale *)pan, 0); + + gtk_box_pack_start((GtkBox *)panbox, pan, 1, 1, 0); + attach_at(tab, panlab, 4, 0, GTK_FILL, 0); + attach_at(tab, panbox, 4, 1, GTK_FILL, 0); + + gtk_signal_connect((GtkObject *)panadj, "value_changed", + prop_change, prop); + prop->pan = panadj; + } gtk_widget_show_all((GtkWidget*)frame); return (GtkWidget *)frame; @@ -322,10 +372,14 @@ program |= num << 7; num = gtk_spin_button_get_value_as_int(prop->bankmsb); program |= num << 14; - if (program != track->program) { - track->program = program; - md_set_program(track, program, FALSE); - } + if (program != track->program) + md_set_program(MD_CONTAINER(track), program, TRUE); + + num = prop->volume->value; + track->volume = MD_MIDI_TO_VOL(num); + + num = prop->pan->value; + track->pan = MD_MIDI_TO_PAN(num + 64); MD_SET_MODIFIED(track, TRUE); song_view_update(PROP_SONG(prop)); diff -rNu melys-0.0.19/gui/trackprop.m melys-0.0.20/gui/trackprop.m --- melys-0.0.19/gui/trackprop.m Wed Oct 13 13:26:30 1999 +++ melys-0.0.20/gui/trackprop.m Mon Oct 25 13:48:09 1999 @@ -47,6 +47,9 @@ GtkEntry *trackname; /* The track name */ GtkSpinButton *devname; /* Device name will probably change */ GtkSpinButton *channel; /* The channel number */ + GtkAdjustment *volume; /* The initial volume */ + GtkAdjustment *pan; /* Initial pan position */ + GtkSpinButton *instr; /* The instrument number (TEMP) */ GtkSpinButton *bankmsb; /* The instrument number high bank */ GtkSpinButton *banklsb; /* The instrument number low bank */ @@ -54,13 +57,19 @@ /* Help locations */ static struct help_page_entry pages[] = { - {"melys", "track.html", "track-prop-info"}, - {"melys", "track.html", "track-prop-instruments"}, + {"melys", "info-pane.html", "track-prop-info"}, + {"melys", "info-pane.html", "track-prop-instruments"}, }; static struct help_entry help_entry = { NELEM(pages), pages }; +>>extern +#define PAN_TO_ADJ(pan) ( (MD_PAN_TO_MIDI(pan) - 64.0) * 50.0 / 64.0) +#define ADJ_TO_PAN(val) ( MD_MIDI_TO_PAN((val * 64.0 / 50.0)+64.0) ) +#define VOL_TO_ADJ(vol) ( MD_VOL_TO_MIDI(vol) * 100.0 / 127.0) +#define ADJ_TO_VOL(val) ( MD_MIDI_TO_VOL(val * 127.0 / 100.0)) + >>function track_prop_box void struct trackElement *track; The track to set the properties for @@ -125,18 +134,6 @@ GtkFrame *frame; GtkBox *mainbox; GtkWidget *tab; - /* Track name */ - GtkWidget *namelab; - GtkEntry *trackname; - GtkWidget *tnbox; - /* Device name */ - GtkWidget *devlab; - GtkWidget *devlist; - GtkWidget *devbox; - /* Channel number */ - GtkWidget *chanbox; - GtkWidget *chanlab; - GtkWidget *chan; track = MD_TRACK(PROP_ELEM(prop)); @@ -144,69 +141,123 @@ /* * Create the boxes that some of the widgets are packed into. - * The mainbox may not be needed. */ tab = gtk_table_new(3, 3, 0); mainbox = (GtkBox *)gtk_vbox_new(0, 0/*spacing*/); - devbox = gtk_hbox_new(0, 0); - chanbox = gtk_hbox_new(0, 0); - tnbox = gtk_hbox_new(0, 0); - - /* Create the labels */ - namelab = new_lab_align(_("Track name")); - devlab = new_lab_align(_("Output device")); - chanlab = new_lab_align(_("Channel")); - - /* Entry box for the track name */ - trackname = (GtkEntry *)gtk_entry_new(); - if (track->name) - gtk_entry_set_text(trackname, track->name); - gtk_box_pack_start((GtkBox *)tnbox, (GtkWidget *)trackname, 0, 0, 0); - - /* Channel spinner */ - chan = mel_int_spinner(1, 16, MD_CHAN(track)+1); - gtk_box_pack_start((GtkBox *)chanbox, chan, 0, 0, 0); - - - /* The combo box for devices */ -#if 0 - devnames = g_list_append(devnames, "A: not operational"); - devnames = g_list_append(devnames, "B: another test"); - devnames = g_list_append(devnames, "C: yet another test"); - devlist = gtk_combo_new(); - gtk_combo_set_popdown_strings((GtkCombo *)devlist, devnames); - gtk_entry_set_editable((GtkEntry*)GTK_COMBO(devlist)->entry, 0); -#endif - devlist = mel_int_spinner(1, 4, MD_DEV(track)+1); /* Very temporary */ - gtk_box_pack_start((GtkBox *)devbox, (GtkWidget *)devlist, 0, 0, 0); - gtk_container_add((GtkContainer *)frame, (GtkWidget*)mainbox); gtk_box_pack_start(mainbox, (GtkWidget *)tab, 0, 0, 0); /* ..., expand, fill, padding */ - /* Attach all the labels */ - attach_at(tab, namelab, 0, 0, GTK_FILL, 0); - attach_at(tab, devlab, 1, 0, GTK_FILL, 0); - attach_at(tab, chanlab, 2, 0, GTK_FILL, 0); - - /* Now attach the form boxes */ - attach_at(tab, tnbox, 0, 1, GTK_FILL, 0); - attach_at(tab, devbox, 1, 1, GTK_FILL, 0); - attach_at(tab, chanbox, 2, 1, GTK_FILL, 0); + { + /* Track name */ + GtkWidget *namelab; + GtkEntry *trackname; + GtkWidget *tnbox; - /* - * Connect to all the changed signals. All this does is allow - * us to get the apply and OK button activated. Nothing is - * changed in the real track until the apply signal is received. - */ - gtk_signal_connect((GtkObject *)trackname, "changed", prop_change, prop); - gtk_signal_connect((GtkObject *)devlist, "changed", prop_change, prop); - gtk_signal_connect((GtkObject *)chan, "changed", prop_change, prop); - - prop->trackname = trackname; - prop->channel = GTK_SPIN_BUTTON(chan); - prop->devname = GTK_SPIN_BUTTON(devlist); + tnbox = gtk_hbox_new(0, 0); + namelab = new_lab_align(_("Track name")); + + /* Entry box for the track name */ + trackname = (GtkEntry *)gtk_entry_new(); + if (track->name) + gtk_entry_set_text(trackname, track->name); + gtk_box_pack_start((GtkBox *)tnbox, (GtkWidget *)trackname, 0, 0, 0); + attach_at(tab, namelab, 0, 0, GTK_FILL, 0); + attach_at(tab, tnbox, 0, 1, GTK_FILL, 0); + gtk_signal_connect((GtkObject *)trackname, "changed", + prop_change, prop); + prop->trackname = trackname; + } + + { + /* Device name */ + GtkWidget *devlab; + GtkWidget *devlist; + GtkWidget *devbox; + + devbox = gtk_hbox_new(0, 0); + devlab = new_lab_align(_("Output device")); + devlist = mel_int_spinner(1, 4, MD_DEV(track)+1); /* Very temporary */ + + gtk_box_pack_start((GtkBox *)devbox, (GtkWidget *)devlist, 0, 0, 0); + attach_at(tab, devlab, 1, 0, GTK_FILL, 0); + attach_at(tab, devbox, 1, 1, GTK_FILL, 0); + + gtk_signal_connect((GtkObject *)devlist, "changed", prop_change, prop); + prop->devname = GTK_SPIN_BUTTON(devlist); + } + + { + /* Channel number */ + GtkWidget *chanbox; + GtkWidget *chanlab; + GtkWidget *chan; + + chanbox = gtk_hbox_new(0, 0); + chanlab = new_lab_align(_("Channel")); + + /* Channel spinner */ + chan = mel_int_spinner(1, 16, MD_CHAN(track)+1); + + gtk_box_pack_start((GtkBox *)chanbox, chan, 0, 0, 0); + attach_at(tab, chanlab, 2, 0, GTK_FILL, 0); + attach_at(tab, chanbox, 2, 1, GTK_FILL, 0); + + gtk_signal_connect((GtkObject *)chan, "changed", prop_change, prop); + prop->channel = GTK_SPIN_BUTTON(chan); + } + + { + /* Initial volume */ + GtkAdjustment *voladj; + GtkWidget *volbox; + GtkWidget *vollab; + GtkWidget *vol; + + volbox = gtk_hbox_new(0, 0); + vollab = new_lab_align(_("Initial volume")); + voladj = (GtkAdjustment *)gtk_adjustment_new( + MD_VOL_TO_MIDI(track->volume), 0.0, 100.0, 1.0, 1.0, 0.0); + vol = gtk_hscale_new(voladj); + gtk_scale_set_draw_value((GtkScale *)vol, TRUE); + gtk_scale_set_value_pos((GtkScale *)vol, GTK_POS_RIGHT); + gtk_scale_set_digits((GtkScale *)vol, 0); + + gtk_box_pack_start((GtkBox *)volbox, vol, 1, 1, 0); + attach_at(tab, vollab, 3, 0, GTK_FILL, 0); + attach_at(tab, volbox, 3, 1, GTK_FILL, 0); + + gtk_signal_connect((GtkObject *)voladj, "value_changed", + prop_change, prop); + prop->volume = voladj; + } + + + { + /* Pan position */ + GtkAdjustment *panadj; + GtkWidget *panbox; + GtkWidget *panlab; + GtkWidget *pan; + + panbox = gtk_hbox_new(0, 0); + panlab = new_lab_align(_("Pan position")); + panadj = (GtkAdjustment *)gtk_adjustment_new(PAN_TO_ADJ(track->pan), + -50.0, 50.0, 1.0, 1.0, 0.0); + pan = gtk_hscale_new(panadj); + gtk_scale_set_draw_value((GtkScale *)pan, TRUE); + gtk_scale_set_value_pos((GtkScale *)pan, GTK_POS_RIGHT); + gtk_scale_set_digits((GtkScale *)pan, 0); + + gtk_box_pack_start((GtkBox *)panbox, pan, 1, 1, 0); + attach_at(tab, panlab, 4, 0, GTK_FILL, 0); + attach_at(tab, panbox, 4, 1, GTK_FILL, 0); + + gtk_signal_connect((GtkObject *)panadj, "value_changed", + prop_change, prop); + prop->pan = panadj; + } gtk_widget_show_all((GtkWidget*)frame); return (GtkWidget *)frame; @@ -322,10 +373,14 @@ program |= num << 7; num = gtk_spin_button_get_value_as_int(prop->bankmsb); program |= num << 14; - if (program != track->program) { - track->program = program; - md_set_program(track, program, FALSE); - } + if (program != track->program) + md_set_program(MD_CONTAINER(track), program, TRUE); + + num = prop->volume->value; + track->volume = MD_MIDI_TO_VOL(num); + + num = prop->pan->value; + track->pan = MD_MIDI_TO_PAN(num + 64); MD_SET_MODIFIED(track, TRUE); song_view_update(PROP_SONG(prop)); diff -rNu melys-0.0.19/help/C/Makefile melys-0.0.20/help/C/Makefile --- melys-0.0.19/help/C/Makefile Sun Oct 3 19:16:08 1999 +++ melys-0.0.20/help/C/Makefile Sat Oct 16 17:24:06 1999 @@ -25,7 +25,7 @@ rm -rf html mv melys html rm -rf html/stylesheet-images - cd html; mv melys.html index.html + # cd html; mv melys.html index.html ps: $(SGMLFILES) db2ps melys.sgml diff -rNu melys-0.0.19/help/C/html/display-pane.html melys-0.0.20/help/C/html/display-pane.html --- melys-0.0.19/help/C/html/display-pane.html Sat Oct 16 15:08:52 1999 +++ melys-0.0.20/help/C/html/display-pane.html Mon Oct 25 20:56:49 1999 @@ -12,8 +12,8 @@ TITLE="Track view" HREF="track.html">
Prev

This pane shows the recorded parts. + A part is a set of notes and control information that exists + in a track. + Each part is represented by a rectangle in the display. A scale at the top displays the bar numbers. As the piece plays or during recording a pointer moves @@ -87,12 +90,13 @@ >

Right click menu

Clicking on a part with the right menu button brings up a context menu of operations that can be performed on that part. +

The part is cut into two at the point where the mouse was clicked. - - It will be possible to snap to the beginning of a bar - or some other point in the future.

The part is joined to the next one in the track. - If there is no next part then nothing happens.

The part that you clicked on is deleted.

The part that you clicked on is deleted. + If the part that was clicked is selected, then in addition + all currently selected parts will be deleted.

Part drag and drop

Move a single part

Hold the shift button down while releasing the mouse button. You can drag the part anywhere in the song or to another song altogether, as long as it is another window of the same application. @@ -195,7 +206,7 @@ >

Move a set of parts

Once all the parts are selected that are to be moved, click with the left button one of the selected parts. Keep the button down and drag it to desired location. + Make sure that the Shift key is held down when releasing + the mouse button. All the selected parts will move as a unit and keep the same positions relative to each other. Outlines of all the parts will be displayed as the move is @@ -231,14 +244,14 @@ >

Copying parts

The way to copy a single or several parts is very similar to the way that parts are moved. - Instead of holding down the shift key, you should hold - down the control key. The symbol on the drag icon + Instead of holding down the Shift key, you should hold + down the Control key. The symbol on the drag icon will change to a plus sign to show that a copy will be performed. In fact the default action is to copy so no keys need to @@ -250,7 +263,7 @@ >

Caveats

Name

The name of the part.

The name of the part. + Part names default to the name of the track when they are first + added to it.

PrevThe track menuThe information paneMelys User's Guide
  Next
  Menus
\ No newline at end of file diff -rNu melys-0.0.19/help/C/html/info-pane.html melys-0.0.20/help/C/html/info-pane.html --- melys-0.0.19/help/C/html/info-pane.html Thu Jan 1 00:00:00 1970 +++ melys-0.0.20/help/C/html/info-pane.html Mon Oct 25 20:56:48 1999 @@ -0,0 +1,373 @@ +The information pane
Melys User's Guide
PrevChapter 2. Track viewNext

The information pane

Each track of the song is represented by a line in the information + pane showing details of the track. + The items that are visible will be configurable, what follows + is all the possible columns, but they may not all be visible.

Columns

Track

This is the track number. The track number always starts + at one and carries on in increasing order down the page.

Name

This is the name of the track. + If the track has not been given a name then it will be given + the name of ``Track N'', + where N is the track number.

Prog

The program number for the track. + Only a number between 0 and 255 is shown here. + If the program is using Midi bank select messages or + some other means of providing more than 255 instruments, then + this can be seen on the track properties page. +

C

The channel number for the track. + A number from 0 to 15 that is the midi channel number. + It is possible to have more than one midi device to obtain + more than 16 channels of Midi. + The device is not currently an option for the information + pane, but can be seen in track properties.

Mute

Clicking on a button for a particular track mutes that track. + If playing, then activating this button for a track will + prevent any more notes from playing on this track until + it is de-selected again. + Notes that are already playing will continue to play though. + + It should light up yellow when active. + Clicking again will un-mute the track.

Solo

Clicking on this button for a track will mute all other + tracks, leaving the one track playing. +

Further tracks can be unmuted by clicking on the relevant + mute button. + In this way you can have a selection of tracks playing. + These unmuted tracks are remembered so that if you toggle + the solo button the same set of tracks will be toggled. + This allows you to switch rapidly between playing all tracks + and a limited selection of tracks.

Rec

Clicking the record button enables recording for this track. + When recording is active, then all Midi events arriving on the + input channel that has been selected for this track will be + recorded and saved in this track. +

Normally only one track is active for recording at a time, but + by control-clicking on the button, more than one track can be + selected for record. + Clicking on an active button will deactivate it. +

When more than one track is selected for record and two or + more of these tracks are connected to the same input device, + then the same midi events will be recorded on each. +

Track properties

The track properties dialog allows you to change + information associated with a particular + track of the composition. + For example each track has a name, a recording source, output device + and channel.

To access the track property dialogue, double click on a track. + You can also use the track information context menu, right click + in the track information pane, or the item from the tracks menu.

The properties box has several pages and the appropriate + page will be displayed for the column you clicked in. + Of course you can always select another page by clicking + on the tabs at the top.

There are several things that can be modified. + +

Track name

You can type in any name for the track. + There is no limit on the length of the name. + (Yes, there probably is a practical limit, but not one that + is built into Melys)

Output device

Sets the you to set the destination MIDI device for this track. + Currently there is no way to set up devices from within + Melys, this will be implemented in a later version. + The device list is taken from the ALSA_OUTPUT_PORTS + environment variable. + This is a comma separated list of ALSA sequencer ports. + You can use the utility showseq to display + a list of available sequencer ports on your system. + All ports labeled write are possible candidates + for inclusion in ALSA_OUTPUT_PORTS.

Channel

This sets the channel number that the MIDI events are sent + to. + You can type in the number directly or use the spin control + arrows on the right to adjust the value.

Initial volume

This sets the initial volume for this track. + It can be set between 0 and 100%. + If the file was read in from a Midi file or + other file with embedded volume changes then they + will override this setting when they occur. + When a midi file is read, then an attempt is made to work out the + initial volume, from volume control events that occur before + the first note of a track.

Pan position

This sets the initial pan position for this track. + The position can be set between -50 and 50. + If the file was read in from a Midi file or + other file with embedded pan position changes then they + will override this setting when they occur. + When a midi file is read, then an attempt is made to work out the + initial pan position, from pan control events that occur before + the first note of a track.

Instrument selection

Currently the only method of selecting instruments is + numerically. + +

You can type in a number between 0 and 127 or use the spin control + arrows on the right to adjust the value. + There are also bank MSB and LSB controls. +

PrevHomeNext
Track viewUpThe part display pane
\ No newline at end of file diff -rNu melys-0.0.19/help/C/html/melys.html melys-0.0.20/help/C/html/melys.html --- melys-0.0.19/help/C/html/melys.html Thu Jan 1 00:00:00 1970 +++ melys-0.0.20/help/C/html/melys.html Mon Oct 25 20:56:49 1999 @@ -0,0 +1,215 @@ +Melys User's Guide
  Next
  Menus
\ No newline at end of file diff -rNu melys-0.0.19/help/C/html/menus.html melys-0.0.20/help/C/html/menus.html --- melys-0.0.19/help/C/html/menus.html Sat Oct 16 15:08:51 1999 +++ melys-0.0.20/help/C/html/menus.html Mon Oct 25 20:56:48 1999 @@ -68,7 +68,13 @@ Many of the features can also be driven by the keyboard and in most cases this is the best way to work. Keyboard short-cuts are shown to the right on each - menu entry.

This is the standard file menu that allows you to open and save files and exit the application. + You can also open files by dragging them from a graphical + file manager.

MDML, files that are compressed - with gzip and have a . + Compressed files can have the same .mdml ending or + a .mdml.gz ending. +> ending which they would have if compressed + with gzip.

You can have several files open at once. The limit is the number of queues that the sequencer is configured with (currently 8). - They appear in a notebook format and you can select the current - file by clicking on the notebook tabs. - It is also possible to drag the notebook tabs off the - the application window, this will create a new top level - window containing that file.

There are currently no warnings if it has not been saved.

There are currently no warnings if it has not been saved. + I do not intend to add any warnings as they slow down work, instead + all operations will be undo-able.

New

A new song is created. + It will have a number of tracks pre-allocated setup with + default channel and device numbers. + However there are no limits to the number of tracks and you can add + more, or delete all the unused ones.

Save

The current file is saved to the file it was read in from or last + written to. + If there is no remembered filename (for example if it is new) + then you will be prompted, just as with the Save as... + menu item.

Save as...

There is currently no warning if files are not saved. +> There is currently no warning if files are not saved and + all unsaved changes will be lost.

Actions

The playing file is stopped. - If the file is re started it will begin playing from the beginning.

Note: In the future there will be other modes for storing - new events such as replace. + new events such as replacing the events that currently + exist.

Recording is stopped. The song will continue playing if it has not already - finished and recording will be restarted by selecting + finished and recording can be restarted by selecting Record

Windows

This will close all open windows.

Debug

This menu item will only appear if Melys is built for debugging. + It will show some information that may be useful in debugging Melys.

Help

This menu contains the usual useless information.

This menu contains the usual useless information. + The about item shows the version of Melys and + who to complain to when something doesn't work. +

The manual item brings up the manual that + you are reading now.

The track menu
Melys User's Guide
PrevChapter 2. Track viewNext

The track menu

There is a menu that applies only to the track view and - will only be available when the track view is visible. - The following operations can be performed from this menu. - -

Add

This adds a new track. - The track is currently added at the end of the listing.

Delete

Delete all currently selected tracks.

Delete empty

Delete all the empty tracks. - Tracks are only considered empty if they have never been used - since they were created.

Properties

This brings up the track properties box for the first - selected track. - It is an alternative to simply clicking on the selected - track. - See the track properties - section for more details.

PrevHomeNext
Track viewUpThe part display pane
\ No newline at end of file diff -rNu melys-0.0.19/help/C/html/track.html melys-0.0.20/help/C/html/track.html --- melys-0.0.19/help/C/html/track.html Sat Oct 16 15:08:52 1999 +++ melys-0.0.20/help/C/html/track.html Mon Oct 25 20:56:49 1999 @@ -12,8 +12,8 @@ TITLE="Menus" HREF="menus.html">
Next
The information paneThe track menu
The track menuThe information pane

Around the track panes you have the scroll bars that allow you to + move around in the song. + In the corner where the two scroll bars meet there are little + magnifying glass icons, these allow you to zoom in and out of + the track view.

The information paneThe track menu

Each track of the song is represented by a line in the information - pane showing details of the track. - The items that are visible will be configurable, what follows - is all the possible columns, but they may not all be visible.

Columns

There is a menu that applies only to the track view and + will only be available when the track view is visible. + The following operations can be performed from this menu. + +

Track

This is the track number. The track number always starts - at one and carries on in increasing order down the page.

Name

This is the name of the track. - If the track has not been given a name then it will be given - the name of ``Track N'', - where N is the track number.

Prog

The program number for the track.

C

The channel number for the track. - A number from 0 to 15 that is the midi channel number. - It is possible to have more than one midi device to obtain - more than 16 channels of Midi.

Mute

Clicking on a button for a particular track mutes that track. - It should light up yellow when active. - Clicking again will un-mute the track.

Solo
Add

Clicking on this button for a track will mute all other - tracks, leaving the one track playing. -

Further tracks can be unmuted by clicking on the relevant - mute button. - In this way you can have a selection of tracks playing. - These unmuted tracks are remembered so that if you toggle - the solo button that set of tracks will be toggled.

This adds a new track. + The new track is added at the end of the listing.

Rec
Delete

Clicking this enables record for this track. - When recording is active, then all Midi events arriving on the - input channel that has been selected for this track will be - recorded and saved in this track. -

Normally only one track is active for recording at a time, but - by control-clicking on the button, more than one track can be - selected for record. - Clicking on an active button will deactivate it.

Delete all currently selected tracks.

Track properties

Track properties means information associated with a particular - track of the composition. - For example each track has a name, a recording source, output device - and channel.

To access the track property dialogue, click on a track name or - number that is already selected. - (Or double click, this is still being decided) - You can also use the track information context menu, right click - in the track information pane, or the item from the tracks menu.

The properties box has several pages and the appropriate - page will be displayed for the column you clicked in. - Of course you can always select another page by clicking - on the tabs at the top.

There are several things that can be modified. - -

Track name
Delete empty

You can type in any name for the track. - There is no limit on the length of the name.

Delete all the empty tracks. + Tracks are only considered empty if they have never been used + since they were created or if all parts that they contained + have been deleted.

Output device
Properties

Sets the you to set the destination MIDI device for this track. - Currently there is no way to set up devices from within - Melys, this will be implemented in a later version. - The device list is taken from the ALSA_OUTPUT_PORTS This brings up the track properties box for the first + selected track. + It is an alternative to simply clicking on the selected + track. + See the track properties - environment variable. - This is a comma separated list of ALSA sequencer ports. - You can use the utility showseq to display - a list of available sequencer ports on your system. - All ports labeled write are possible candidates - for inclusion in ALSA_OUTPUT_PORTS.

Channel

This sets the channel number that the MIDI events are sent - to. - You can type in the number directly or use the spin control - arrows on the right to adjust the value. -

Instrument selection

This is a temporary way of setting the program number. - There will be a much better interface in a later version. -

You can type in a number between 0 and 127 or use the spin control - arrows on the right to adjust the value. - There are also bank MSB and LSB controls. - -

NextThe track menuThe information pane
+ (they should be, its just not implemented yet). Title bar menus <sect2><title><GUImenu/File/ <para> This is the standard file menu that allows you to open and save files and exit the application. + You can also open files by dragging them from a graphical + file manager. <variablelist> @@ -27,19 +35,19 @@ At the current time this includes MIDI files ending in <filename/.mid/ or <filename/.smf/ and &mdml; files ending in <filename/.mdml/. - It will also read compressed &mdml;, files that are compressed - with gzip and have a <filename/.mdml.gz/ ending. + It will also read compressed &mdml;. + Compressed files can have the same <filename/.mdml/ ending or + a <filename/.mdml.gz/ ending which they would have if compressed + with <command/gzip/. <para> You can have several files open at once. The limit is the number of queues that the sequencer is configured with (currently 8). - They appear in a notebook format and you can select the current - file by clicking on the notebook tabs. - It is also possible to drag the notebook tabs off the - the application window, this will create a new top level - window containing that file. + Each file appears in its own top level window. + If you click and drag the notebook tab below the main area + you can place several files into the same notebook window. <varlistentry> <term><GUImenuitem/Close/ @@ -50,13 +58,27 @@ <warning> <para> There are currently no warnings if it has not been saved. + I do not intend to add any warnings as they slow down work, instead + all operations will be undo-able. </warning> -<!-- <varlistentry> <term><GUImenuitem/New/ <listitem><para> ---> + A new song is created. + It will have a number of tracks pre-allocated setup with + default channel and device numbers. + However there are no limits to the number of tracks and you can add + more, or delete all the unused ones. + +<varlistentry> +<term><GUImenuitem/Save/ +<listitem><para> + The current file is saved to the file it was read in from or last + written to. + If there is no remembered filename (for example if it is new) + then you will be prompted, just as with the <GUImenuitem/Save as.../ + menu item. <varlistentry> <term><GUImenuitem/Save as.../ @@ -70,7 +92,8 @@ Exits &mel;. <warning> <para> - There is currently no warning if files are not saved. + There is currently no warning if files are not saved and + all unsaved changes will be lost. </warning> </variablelist> @@ -98,7 +121,7 @@ <term><GUImenuitem/Stop/ <listitem><para> The playing file is stopped. - If the file is re started it will begin playing from the beginning. + If the file is re-started it will begin playing from the beginning. <varlistentry> <term><GUImenuitem/Record/ @@ -119,7 +142,8 @@ <note> <para> In the future there will be other modes for storing - new events such as replace. + new events such as replacing the events that currently + exist. </note> <varlistentry> @@ -127,7 +151,7 @@ <listitem><para> Recording is stopped. The song will continue playing if it has not already - finished and recording will be restarted by selecting + finished and recording can be restarted by selecting <GUImenuitem/Record/ again. </variablelist> @@ -149,10 +173,21 @@ <listitem><para> This will close all open windows. +<varlistentry> +<term><GUImenuitem/Debug/ +<listitem><para> + This menu item will only appear if &mel; is built for debugging. + It will show some information that may be useful in debugging &mel;. + </variablelist> <sect2><title><GUImenu/Help/ <para> -This menu contains the usual useless information. + This menu contains the usual useless information. + The <GUImenuitem/about/ item shows the version of &mel; and + who to complain to when something doesn't work. + <para> + The <GUImenuitem/manual/ item brings up the manual that + you are reading now. </chapter> diff -rNu melys-0.0.19/help/C/topic.dat melys-0.0.20/help/C/topic.dat --- melys-0.0.19/help/C/topic.dat Wed Sep 15 17:01:39 1999 +++ melys-0.0.20/help/C/topic.dat Sat Oct 16 17:24:06 1999 @@ -1 +1 @@ -index.html Manual +melys.html Manual diff -rNu melys-0.0.19/help/C/track.sgml melys-0.0.20/help/C/track.sgml --- melys-0.0.19/help/C/track.sgml Thu Oct 14 17:40:38 1999 +++ melys-0.0.20/help/C/track.sgml Mon Oct 25 13:34:02 1999 @@ -7,7 +7,63 @@ a pane showing the existing parts and current play position. It is possible to drag the divider between these panes with the button to display more or less of each pane. +<para> + Around the track panes you have the scroll bars that allow you to + move around in the song. + In the corner where the two scroll bars meet there are little + magnifying glass icons, these allow you to zoom in and out of + the track view. + +<!-- + The track menu is associated with the track infomation pane +--> +<sect1 id="track-menu"><title>The track menu + + There is a menu that applies only to the track view and + will only be available when the track view is visible. + The following operations can be performed from this menu. + + + + + + This adds a new track. + The new track is added at the end of the listing. + + + + + + Delete all currently selected tracks. + + + + + + Delete all the empty tracks. + Tracks are only considered empty if they have never been used + since they were created or if all parts that they contained + have been deleted. + + + + + + This brings up the track properties box for the first + selected track. + It is an alternative to simply clicking on the selected + track. + See the track properties + section for more details. + + + + The information pane Each track of the song is represented by a line in the information @@ -33,8 +89,8 @@ This is the name of the track. If the track has not been given a name then it will be given - the name of ``Track N'', - where N is the track number. + the name of ``Track '', + where @@ -42,6 +98,11 @@ The program number for the track. + Only a number between 0 and 255 is shown here. + If the program is using Midi bank select messages or + some other means of providing more than 255 instruments, then + this can be seen on the track properties page. + @@ -52,6 +113,8 @@ A number from 0 to 15 that is the midi channel number. It is possible to have more than one midi device to obtain more than 16 channels of Midi. + The device is not currently an option for the information + pane, but can be seen in track properties. @@ -59,6 +122,11 @@ Clicking on a button for a particular track mutes that track. + If playing, then activating this button for a track will + prevent any more notes from playing on this track until + it is de-selected again. + Notes that are already playing will continue to play though. + It should light up yellow when active. Clicking again will un-mute the track. @@ -74,13 +142,16 @@ mute button. In this way you can have a selection of tracks playing. These unmuted tracks are remembered so that if you toggle - the solo button that set of tracks will be toggled. + the solo button the same set of tracks will be toggled. + This allows you to switch rapidly between playing all tracks + and a limited selection of tracks. Rec - Clicking this enables record for this track. + + Clicking the record button enables recording for this track. When recording is active, then all Midi events arriving on the input channel that has been selected for this track will be recorded and saved in this track. @@ -89,19 +160,23 @@ by control-clicking on the button, more than one track can be selected for record. Clicking on an active button will deactivate it. + + When more than one track is selected for record and two or + more of these tracks are connected to the same input device, + then the same midi events will be recorded on each. + Track properties <para> - Track properties means information associated with a particular + The track properties dialog allows you to change + information associated with a particular track of the composition. For example each track has a name, a recording source, output device and channel. <para> - To access the track property dialogue, click on a track name or - number that is already selected. - (Or double click, this is still being decided) + To access the track property dialogue, double click on a track. You can also use the track information context menu, right click in the track information pane, or the item from the tracks menu. <para> @@ -120,6 +195,8 @@ <para> You can type in any name for the track. There is no limit on the length of the name. + (Yes, there probably is a practical limit, but not one that + is built into &mel;) <varlistentry> <term> @@ -147,67 +224,48 @@ You can type in the number directly or use the spin control arrows on the right to adjust the value. - -</variablelist> - -<sect2 id="track-prop-instruments"> - <title>Instrument selection - - This is a temporary way of setting the program number. - There will be a much better interface in a later version. - - You can type in a number between 0 and 127 or use the spin control - arrows on the right to adjust the value. - There are also bank MSB and LSB controls. - - - - -The track menu - - There is a menu that applies only to the track view and - will only be available when the track view is visible. - The following operations can be performed from this menu. - - - - This adds a new track. - The track is currently added at the end of the listing. + This sets the initial volume for this track. + It can be set between 0 and 100%. + If the file was read in from a Midi file or + other file with embedded volume changes then they + will override this setting when they occur. + When a midi file is read, then an attempt is made to work out the + initial volume, from volume control events that occur before + the first note of a track. - - Delete all currently selected tracks. + This sets the initial pan position for this track. + The position can be set between -50 and 50. + If the file was read in from a Midi file or + other file with embedded pan position changes then they + will override this setting when they occur. + When a midi file is read, then an attempt is made to work out the + initial pan position, from pan control events that occur before + the first note of a track. - - - + + + + Instrument selection - Delete all the empty tracks. - Tracks are only considered empty if they have never been used - since they were created. - - - + + Currently the only method of selecting instruments is + numerically. + - This brings up the track properties box for the first - selected track. - It is an alternative to simply clicking on the selected - track. - See the track properties - section for more details. + You can type in a number between 0 and 127 or use the spin control + arrows on the right to adjust the value. + There are also bank MSB and LSB controls. - - It will be possible to snap to the beginning of a bar - or some other point in the future. + The point where the part is cut is currently forced to the + nearest beat boundary. It is not yet possible to + configure this. The part is joined to the next one in the track. If there is no next part then nothing happens. + If you have moved a short part so that it is entirely sitting + on top of a larger part, then the effect of this command + will be to merge the two parts together into one. The part that you clicked on is deleted. + If the part that was clicked is selected, then in addition + all currently selected parts will be deleted. @@ -299,6 +366,7 @@ to go. An outline of the part will be displayed at the current mouse position to help you position it. + Hold the shift button down while releasing the mouse button. You can drag the part anywhere in the song or to another song altogether, as long as it is another window of the same @@ -316,6 +384,8 @@ Once all the parts are selected that are to be moved, click with the left button one of the selected parts. Keep the button down and drag it to desired location. + Make sure that the Shift key is held down when releasing + the mouse button. All the selected parts will move as a unit and keep the same positions relative to each other. Outlines of all the parts will be displayed as the move is @@ -333,8 +403,8 @@ The way to copy a single or several parts is very similar to the way that parts are moved. - Instead of holding down the shift key, you should hold - down the control key. The symbol on the drag icon + Instead of holding down the Shift key, you should hold + down the Control key. The symbol on the drag icon will change to a plus sign to show that a copy will be performed. In fact the default action is to copy so no keys need to @@ -347,11 +417,10 @@ Do not allow parts to overlap, although nothing bad will happen the behaviour is currently difficult to predict and will be changed. - If parts overlap then saving in midi format will not + If parts overlap then saving in midi format may not be successful. - Slicing or draging does not snap to bar or beat boundries - so it is not possible to position things very well. - This will be fixed in the next release. + Slicing or dragging snaps to the nearest beat boundary. + This is not yet configurable. + Name The name of the part. + Part names default to the name of the track when they are first + added to it. diff -rNu melys-0.0.19/include/elements.h melys-0.0.20/include/elements.h --- melys-0.0.19/include/elements.h Sat Oct 16 15:08:24 1999 +++ melys-0.0.20/include/elements.h Mon Oct 25 20:56:20 1999 @@ -45,6 +45,7 @@ struct element parent; GPtrArray *elements; /* List of elements */ guint32 duration; /* duration time for this container */ + guint32 max_duration; /* duration including note lengths */ }; #define MD_CONTAINER(e) \ ((struct containerElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_CONTAINER)) @@ -85,7 +86,9 @@ struct trackElement { struct tracklikeElement parent; char *name; /* Name of track */ - int program; /* Extended program number */ + int program; /* Extended program number */ + int pan; /* Pan position -32768:32767 */ + int volume; /* Initial volume 0:65535 */ int inputdev; /* Input device for this track */ /* Flags (Maybe should go on container) */ int record:1; /* Set for record */ diff -rNu melys-0.0.19/include/md.h melys-0.0.20/include/md.h --- melys-0.0.19/include/md.h Sat Oct 16 15:08:24 1999 +++ melys-0.0.20/include/md.h Mon Oct 25 20:56:20 1999 @@ -41,6 +41,11 @@ int md_get_nfree(void); struct element *md_copy(struct element *e); +void md_split_midi0(struct rootElement *root); +gboolean md_extract_track_info(struct trackElement *track, + struct partElement *part); +struct element *md_copy(struct element *e); + void md_list_append(struct containerElement *c, struct element *el); void md_list_prepend(struct containerElement *c, struct element *el); int md_list_add_sort(struct containerElement *c, struct element *el); @@ -153,6 +158,15 @@ MD_SET_MODIFIED(el, 1); \ } while (0) +/* Some MD to Midi macros */ +#define MD_MIDI_VOL_SHIFT 9 +#define MD_VOL_TO_MIDI(vol) (((vol) >> MD_MIDI_VOL_SHIFT) & 0x7f) +#define MD_MIDI_TO_VOL(v) (((v)&0x7f) << MD_MIDI_VOL_SHIFT) +#define MD_MIDI_PAN_SHIFT 9 +#define MD_PAN_TO_MIDI(pan) (((((pan)+(int)0x8000) & 0xffff) >> MD_MIDI_PAN_SHIFT) & 0x7f) +#define MD_MIDI_TO_PAN(v) ((((v)&0x7f) << MD_MIDI_PAN_SHIFT) - (int)0x7fff) + + /* Defines for md_walk() */ #define MD_WALK_NODES 0x01 /* Just callback on nodes */ #define MD_WALK_LEAF 0x02 /* Callback on leaves */ @@ -188,7 +202,8 @@ void md_ensure_track(struct rootElement *root, int n); struct tempomapElement *md_get_tempomap(struct rootElement *root); void md_set_devchan(struct element *base, int devchan); -void md_set_program(struct trackElement *track, int program, gboolean clear); +void md_set_program(struct containerElement *base, int program, + gboolean clear); void md_change_time(struct element *el, unsigned long t); void md_clear_all_mod(struct element *base); void md_shrink(struct rootElement *root); diff -rNu melys-0.0.19/include/melfile.h melys-0.0.20/include/melfile.h --- melys-0.0.19/include/melfile.h Sat Oct 16 15:08:23 1999 +++ melys-0.0.20/include/melfile.h Mon Oct 25 20:56:18 1999 @@ -63,13 +63,14 @@ * gives a more useful indication to the user. */ enum fileErrors { - FILE_SUCCESS, /* Successful status */ FILE_STATUS_NONE,/* This just means that no status has been set yet */ + FILE_SUCCESS, /* Successful status */ FILE_STATUS_CONFIRM, /* Do you really want to... kind of messages */ FILE_STATUS_OPEN_FAIL, /* Could not open */ FILE_STATUS_BAD_FORMAT, /* File had a format problem */ FILE_STATUS_UNKNOWN, /* Could not recognise file type */ FILE_STATUS_INTERNAL,/* Probably a Melys bug, rather than user error */ + FILE_STATUS_NO_ROOT, /* Missing the root element, partial file */ FILE_STATUS_LAST }; diff -rNu melys-0.0.19/include/melgui.h melys-0.0.20/include/melgui.h --- melys-0.0.19/include/melgui.h Sat Oct 16 15:08:25 1999 +++ melys-0.0.20/include/melgui.h Mon Oct 25 20:56:21 1999 @@ -53,6 +53,7 @@ gboolean mel_file_error(struct song *song, struct File *file, GtkObject *parent); void mel_accept_files(GtkObject *mdi, GtkWidget *w); +void set_tip(GtkWidget *w, char *tip); void mel_debug_print_type(char *msg, GtkObject *o); /* diff -rNu melys-0.0.19/include/melyspos.h melys-0.0.20/include/melyspos.h --- melys-0.0.19/include/melyspos.h Thu Jan 1 00:00:00 1970 +++ melys-0.0.20/include/melyspos.h Mon Oct 25 20:56:21 1999 @@ -0,0 +1,50 @@ +/* + * + * Copyright (C) 1999 Steve Ratcliffe + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * A meters, beats and ticks indicator. + * It is currently essentially a label that updates itself based on + * the supplied adjustment. + * + * + * + * + */ + +#define MELYS_POS(obj) GTK_CHECK_CAST(obj, melys_pos_get_type(), MelysPos) +#define MELYS_POS_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, melys_pos_get_type(), MelysPosClass) +#define IS_MELYS_POS(obj) GTK_CHECK_TYPE(obj, melys_pos_get_type()) + +typedef struct _MelysPos MelysPos; +typedef struct _MelysPosClass MelysPosClass; + + +struct _MelysPos { + GtkLabel label; + + GtkAdjustment *posadj; + struct tempomapElement *tempomap; + + int sig_id; /* Connection to posadj */ + + unsigned long lasttime; +}; + +struct _MelysPosClass { + GtkLabelClass parent_class; +}; + +guint melys_pos_get_type(void); +GtkWidget *melys_pos_new(void); +void melys_pos_set_controls(MelysPos *mpos, struct tempomapElement *tmap, + GtkAdjustment *posadj); +void melys_pos_clear(MelysPos *mpos); diff -rNu melys-0.0.19/make.conf melys-0.0.20/make.conf --- melys-0.0.19/make.conf Sat Oct 16 15:02:41 1999 +++ melys-0.0.20/make.conf Tue Oct 19 00:10:56 1999 @@ -3,7 +3,7 @@ VERSION = 0.0.10 # Options required by the C compiler -COPTS = -O2 -Wall +COPTS = -g -O2 -Wall # Comment out for debugging defines. DEBUG_DEFINES = -DDEBUG -DDEBUG_CASTS diff -rNu melys-0.0.19/md/.cvsignore melys-0.0.20/md/.cvsignore --- melys-0.0.19/md/.cvsignore Sat Oct 16 15:08:30 1999 +++ melys-0.0.20/md/.cvsignore Mon Oct 25 20:56:26 1999 @@ -1,5 +1,6 @@ elements.c mdadd.c +mdconv.c mdlist.c mdseq.c mdtools.c diff -rNu melys-0.0.19/md/Makefile melys-0.0.20/md/Makefile --- melys-0.0.19/md/Makefile Sat Oct 16 15:08:30 1999 +++ melys-0.0.20/md/Makefile Mon Oct 25 20:56:26 1999 @@ -6,6 +6,7 @@ TARGETS = OBJS = elements.o \ mdadd.o \ + mdconv.o \ mdlist.o \ mdseq.o \ mdtools.o \ @@ -13,6 +14,7 @@ mdutil.o GENCFILES = elements.c \ mdadd.c \ + mdconv.c \ mdlist.c \ mdseq.c \ mdtools.c \ @@ -51,6 +53,7 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< +mdundo.o: ../include/md.h elements.o: ../include/md.h elements.o: ../include/except.h elements.o: ../include/elements.h @@ -62,6 +65,7 @@ mdadd.o: ../include/md.h mdlist.o: ../include/melmsg.h mdlist.o: ../include/md.h -mdundo.o: ../include/md.h +mdconv.o: ../include/elements.h +mdconv.o: ../include/md.h mdseq.o: ../include/elements.h mdseq.o: ../include/md.h diff -rNu melys-0.0.19/md/elements.c melys-0.0.20/md/elements.c --- melys-0.0.19/md/elements.c Sat Oct 16 15:08:37 1999 +++ melys-0.0.20/md/elements.c Mon Oct 25 20:56:33 1999 @@ -359,6 +359,7 @@ e->name = NULL; e->program = 0; e->notes = NULL; + e->volume = MD_MIDI_TO_VOL(127); } /* diff -rNu melys-0.0.19/md/elements.m melys-0.0.20/md/elements.m --- melys-0.0.19/md/elements.m Fri Oct 15 12:25:42 1999 +++ melys-0.0.20/md/elements.m Fri Oct 22 11:03:30 1999 @@ -71,6 +71,7 @@ >>elementdef container element GPtrArray *elements; /* List of elements */ guint32 duration; /* duration time for this container */ + guint32 max_duration; /* duration including note lengths */ init e->elements = g_ptr_array_new(); @@ -133,7 +134,9 @@ >>elementdef track tracklike char *name; /* Name of track */ - int program; /* Extended program number */ + int program; /* Extended program number */ + int pan; /* Pan position -32768:32767 */ + int volume; /* Initial volume 0:65535 */ int inputdev; /* Input device for this track */ @@ -153,6 +156,7 @@ e->name = NULL; e->program = 0; e->notes = NULL; + e->volume = MD_MIDI_TO_VOL(127); copy if (e->name) new->name = g_strdup(e->name); diff -rNu melys-0.0.19/md/mdadd.c melys-0.0.20/md/mdadd.c --- melys-0.0.19/md/mdadd.c Sat Oct 16 15:08:37 1999 +++ melys-0.0.20/md/mdadd.c Mon Oct 25 20:56:33 1999 @@ -50,6 +50,7 @@ md_add_elem(struct containerElement *c, struct element *el, int sort) { unsigned long endtime; + unsigned long max_time; unsigned long t; if (el->floating) @@ -58,14 +59,14 @@ el->refcount++; endtime = el->element_time; - if (iscontainer(el)) { + if (iscontainer(el)) endtime += ((struct containerElement *)el)->duration; - } + max_time = endtime; switch (el->type) { case MD_TYPE_NOTE: - endtime += ((struct noteElement *)el)->length; + max_time += ((struct noteElement *)el)->length; break; case MD_TYPE_TRACK: @@ -99,6 +100,12 @@ t = endtime - MD_TIME(c); if (t > c->duration) c->duration = t; + t = max_time - MD_TIME(c); + if (t > c->max_duration) + c->max_duration = t; + + if (MD_TYPE(c) == MD_TYPE_TRACK) + c->duration = c->max_duration; g_assert(c->duration >= 0); if (sort) @@ -317,7 +324,7 @@ md_undo_begin_set(MD_UNDO(track)); /* Make sure that part elements cover all the duration of the list */ - ensure_part_filled(ctrk, MD_TIME(list), MD_ENDTIME(list)); + ensure_part_filled(ctrk, MD_TIME(list), MD_ENDTIME(list)+1); for (n = 0; n < md_list_size(list); n++) { el = md_list_nth_elem(list, n); diff -rNu melys-0.0.19/md/mdadd.m melys-0.0.20/md/mdadd.m --- melys-0.0.19/md/mdadd.m Sat Oct 16 15:00:55 1999 +++ melys-0.0.20/md/mdadd.m Sun Oct 24 00:32:51 1999 @@ -52,6 +52,7 @@ >>code unsigned long endtime; + unsigned long max_time; unsigned long t; if (el->floating) @@ -60,14 +61,14 @@ el->refcount++; endtime = el->element_time; - if (iscontainer(el)) { + if (iscontainer(el)) endtime += ((struct containerElement *)el)->duration; - } + max_time = endtime; switch (el->type) { case MD_TYPE_NOTE: - endtime += ((struct noteElement *)el)->length; + max_time += ((struct noteElement *)el)->length; break; case MD_TYPE_TRACK: @@ -101,6 +102,12 @@ t = endtime - MD_TIME(c); if (t > c->duration) c->duration = t; + t = max_time - MD_TIME(c); + if (t > c->max_duration) + c->max_duration = t; + + if (MD_TYPE(c) == MD_TYPE_TRACK) + c->duration = c->max_duration; g_assert(c->duration >= 0); if (sort) @@ -329,7 +336,7 @@ md_undo_begin_set(MD_UNDO(track)); /* Make sure that part elements cover all the duration of the list */ - ensure_part_filled(ctrk, MD_TIME(list), MD_ENDTIME(list)); + ensure_part_filled(ctrk, MD_TIME(list), MD_ENDTIME(list)+1); for (n = 0; n < md_list_size(list); n++) { el = md_list_nth_elem(list, n); diff -rNu melys-0.0.19/md/mdconv.c melys-0.0.20/md/mdconv.c --- melys-0.0.19/md/mdconv.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.20/md/mdconv.c Mon Oct 25 20:56:34 1999 @@ -0,0 +1,135 @@ +/* + * + * Copyright (C) 1999 Steve Ratcliffe + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "elements.h" +#include +#include "md.h" +#include "intl.h" + + +/* Static functions */ + + +/* + * Split a file that is in midi type 0 form into a track based + * form. We split so that each device channel goes into a + * different track. + */ +void +md_split_midi0(struct rootElement *root) +{ + struct trackElement *track; + struct trackElement *trk; + struct containerElement *con; +#define MAX_0_TRACKS 16 + struct partElement *parts[MAX_0_TRACKS]; + struct element *el; + int maxtnum; + int tnum; + int i; + + if (root->head->format != 0) + return; + + /* + * There should be one track. We remove it and then allocate + * all its events to the correct track. + */ + track = md_track_nth(root, 0); + MD_REF(track); + md_remove(MD_CONTAINER(root), MD_ELEMENT(track)); + + root->trackid = 0; + + /* There will be only one part --> con */ + con = (struct containerElement *)MD_GET_INDEX(track, 0); + + for (i = 0; i < MAX_0_TRACKS; i++) + parts[i] = md_part_new(); + + maxtnum = 0; + for (i = 0; i < MD_CONTAINER_LEN(con); i++) { + el = MD_GET_INDEX(con, i); + + tnum = el->device_channel % MAX_0_TRACKS; + maxtnum = MAX(tnum, maxtnum); + md_add(MD_CONTAINER(parts[tnum]), el); + } + + md_ensure_track(root, maxtnum - 1); + for (i = 0; i < maxtnum; i++) { + trk = md_track_nth(root, i); + md_extract_track_info(trk, parts[i]); + md_add(MD_CONTAINER(trk), MD_ELEMENT(parts[i])); + } + /* Free remaining */ + for (; i < MAX_0_TRACKS; i++) + MD_FREE(parts[i]); + + MD_FREE(track); + + /* + * This converts the format to type 1 and so if the file is saved + * it will be saved as type 1. This will be changed once + * there is a routine to convert back to type 0. + */ + root->head->format = 1; +} + +/* + * Extract track level information from the existing md tree. + * This is used when reading in from a non-native format such as + * a midi file. Of course it is not possible to do this + * meaningfully in all cases and because of this music events + * are not removed from the track. So tracks will continue to + * play correctly even if they do contain a hodge-podge of + * program and channel information etc. + */ +gboolean +md_extract_track_info(struct trackElement *track, struct partElement *part) +{ + int i; + struct element *el; + + for (i = 0; i < MD_CONTAINER_LEN(part); i++) { + el = MD_GET_INDEX(part, i); + + switch (el->type) { + case MD_TYPE_NOTE: + return TRUE; + + case MD_TYPE_CONTROL: + switch (MD_CONTROL(el)->control) { + case SND_MCTL_MSB_MAIN_VOLUME: + track->volume = MD_MIDI_TO_VOL(MD_CONTROL(el)->value); + break; + case SND_MCTL_MSB_PAN: + track->pan = MD_MIDI_TO_PAN(MD_CONTROL(el)->value); + break; + } + break; + case MD_TYPE_PROGRAM: + track->program = MD_PROGRAM(el)->program; + break; + } + } + + return FALSE; +} diff -rNu melys-0.0.19/md/mdconv.m melys-0.0.20/md/mdconv.m --- melys-0.0.19/md/mdconv.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.20/md/mdconv.m Sun Oct 24 19:20:00 1999 @@ -0,0 +1,127 @@ +>>name mdconv.m - Conversions from one form to another. + +Copyright (C) 1999 Steve Ratcliffe + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +>>header +>>header elements.h +>>headerdef --decl md.h + +>>function md_split_midi0 +void +struct rootElement *root; + +>>description +Split a file that is in midi type 0 +form into a track based form. +We split so that each device channel goes into a different track. + +>>code + struct trackElement *track; + struct trackElement *trk; + struct containerElement *con; +#define MAX_0_TRACKS 16 + struct partElement *parts[MAX_0_TRACKS]; + struct element *el; + int maxtnum; + int tnum; + int i; + + if (root->head->format != 0) + return; + + /* + * There should be one track. We remove it and then allocate + * all its events to the correct track. + */ + track = md_track_nth(root, 0); + MD_REF(track); + md_remove(MD_CONTAINER(root), MD_ELEMENT(track)); + + root->trackid = 0; + + /* There will be only one part --> con */ + con = (struct containerElement *)MD_GET_INDEX(track, 0); + + for (i = 0; i < MAX_0_TRACKS; i++) + parts[i] = md_part_new(); + + maxtnum = 0; + for (i = 0; i < MD_CONTAINER_LEN(con); i++) { + el = MD_GET_INDEX(con, i); + + tnum = el->device_channel % MAX_0_TRACKS; + maxtnum = MAX(tnum, maxtnum); + md_add(MD_CONTAINER(parts[tnum]), el); + } + + md_ensure_track(root, maxtnum - 1); + for (i = 0; i < maxtnum; i++) { + trk = md_track_nth(root, i); + md_extract_track_info(trk, parts[i]); + md_add(MD_CONTAINER(trk), MD_ELEMENT(parts[i])); + } + /* Free remaining */ + for (; i < MAX_0_TRACKS; i++) + MD_FREE(parts[i]); + + MD_FREE(track); + + /* + * This converts the format to type 1 and so if the file is saved + * it will be saved as type 1. This will be changed once + * there is a routine to convert back to type 0. + */ + root->head->format = 1; + + +>>function md_extract_track_info +gboolean +struct trackElement *track; +struct partElement *part; + +>>description +Extract track level information from the existing md tree. +This is used when reading in from a non-native format such as +a midi file. +Of course it is not possible to do this meaningfully in all cases and +because of this music events are not removed from the track. +So tracks will continue to play correctly even if they do +contain a hodge-podge of program and channel information etc. + +>>code + int i; + struct element *el; + + for (i = 0; i < MD_CONTAINER_LEN(part); i++) { + el = MD_GET_INDEX(part, i); + + switch (el->type) { + case MD_TYPE_NOTE: + return TRUE; + + case MD_TYPE_CONTROL: + switch (MD_CONTROL(el)->control) { + case SND_MCTL_MSB_MAIN_VOLUME: + track->volume = MD_MIDI_TO_VOL(MD_CONTROL(el)->value); + break; + case SND_MCTL_MSB_PAN: + track->pan = MD_MIDI_TO_PAN(MD_CONTROL(el)->value); + break; + } + break; + case MD_TYPE_PROGRAM: + track->program = MD_PROGRAM(el)->program; + break; + } + } + + return FALSE; diff -rNu melys-0.0.19/md/mdseq.c melys-0.0.20/md/mdseq.c --- melys-0.0.19/md/mdseq.c Sat Oct 16 15:08:37 1999 +++ melys-0.0.20/md/mdseq.c Mon Oct 25 20:56:34 1999 @@ -409,12 +409,6 @@ ti->need_next = 1; } while (el && MD_TIME(el) < time); -//if (MD_TYPE(ltrack) == MD_TYPE_TRACK)printf("track %d: ", ltrack->number); -//else if (MD_TYPE(ltrack) == MD_TYPE_TEMPOMAP)printf("tempomap: "); -//if (el) -//printf(" final seek at %ld\n", MD_TIME(el)); -//else -//printf(" no el\n"); ti->time = MD_TIME(el); ti->need_next = 0; ti->lastelem = NULL; @@ -453,7 +447,6 @@ g_return_if_fail(i < seq->ntinfo); -//printf("seek back to %ld cur %ld\n", time, ti->time); if (ti->time <= time) return; /* Nothing to do */ diff -rNu melys-0.0.19/md/mdseq.m melys-0.0.20/md/mdseq.m --- melys-0.0.19/md/mdseq.m Sun Oct 10 19:09:00 1999 +++ melys-0.0.20/md/mdseq.m Tue Oct 19 22:58:49 1999 @@ -415,12 +415,6 @@ ti->need_next = 1; } while (el && MD_TIME(el) < time); -//if (MD_TYPE(ltrack) == MD_TYPE_TRACK)printf("track %d: ", ltrack->number); -//else if (MD_TYPE(ltrack) == MD_TYPE_TEMPOMAP)printf("tempomap: "); -//if (el) -//printf(" final seek at %ld\n", MD_TIME(el)); -//else -//printf(" no el\n"); ti->time = MD_TIME(el); ti->need_next = 0; ti->lastelem = NULL; @@ -463,7 +457,6 @@ g_return_if_fail(i < seq->ntinfo); -//printf("seek back to %ld cur %ld\n", time, ti->time); if (ti->time <= time) return; /* Nothing to do */ diff -rNu melys-0.0.19/md/mdtools.c melys-0.0.20/md/mdtools.c --- melys-0.0.19/md/mdtools.c Sat Oct 16 15:08:38 1999 +++ melys-0.0.20/md/mdtools.c Mon Oct 25 20:56:34 1999 @@ -98,6 +98,7 @@ { struct partElement *part2; struct element *el; + unsigned long endtime; int i; part2 = NULL; @@ -118,6 +119,10 @@ el = MD_GET_INDEX(part2, i); md_add(MD_CONTAINER(part1), el); } + + endtime = MD_ENDTIME(part2) - MD_TIME(part1); + if (endtime > MD_ENDTIME(part1)) + MD_SET_DURATION(part1, endtime); /* Remove the second part */ md_remove(c, MD_ELEMENT(part2)); diff -rNu melys-0.0.19/md/mdtools.m melys-0.0.20/md/mdtools.m --- melys-0.0.19/md/mdtools.m Thu Oct 14 12:05:09 1999 +++ melys-0.0.20/md/mdtools.m Sun Oct 24 21:28:04 1999 @@ -94,6 +94,7 @@ >>code struct partElement *part2; struct element *el; + unsigned long endtime; int i; part2 = NULL; @@ -114,6 +115,10 @@ el = MD_GET_INDEX(part2, i); md_add(MD_CONTAINER(part1), el); } + + endtime = MD_ENDTIME(part2) - MD_TIME(part1); + if (endtime > MD_ENDTIME(part1)) + MD_SET_DURATION(part1, endtime); /* Remove the second part */ md_remove(c, MD_ELEMENT(part2)); diff -rNu melys-0.0.19/md/mdutil.c melys-0.0.20/md/mdutil.c --- melys-0.0.19/md/mdutil.c Sat Oct 16 15:08:38 1999 +++ melys-0.0.20/md/mdutil.c Mon Oct 25 20:56:35 1999 @@ -231,21 +231,36 @@ /* * Set the program number for this track. If clear is true, then * all embedded program changes for the track events are - * removed. + * removed. Clear may not be needed, as we always do it? * * Arguments: - * track - The track to set program for + * base - The track to set program for * program - Program number to set * clear - Clear any embedded program changes */ void -md_set_program(struct trackElement *track, int program, gboolean clear) +md_set_program(struct containerElement *base, int program, gboolean clear) { + struct element *el; + int i; + + if (MD_TYPE(base) == MD_TYPE_TRACK) { + MD_TRACK(base)->program = program; + if (clear) + MD_TRACK(base)->hasprogram = FALSE; + } - track->program = program; if (clear) { - track->hasprogram = FALSE; - /* XXX not finished */ + for (i = 0; i < MD_CONTAINER_LEN(base); i++) { + el = MD_GET_INDEX(base, i); + + if (iscontainer(el)) { + md_set_program(MD_CONTAINER(el), program, clear); + } else if (el->type == MD_TYPE_PROGRAM) { + md_remove(base, el); + i--; + } + } } } @@ -317,26 +332,35 @@ /* * Shrink the root duration to just fit the track durations. * This is needed because we artificially increase the root - * duration while recording. + * duration while recording. The tracks are also shrunk down + * to the maximum duration of the parts within them. */ void md_shrink(struct rootElement *root) { struct trackElement *track; - long dur, max_dur; + struct element *epart; + long dur, max_track, max_part; int i; + int j; - max_dur = 0; + max_track = 0; + max_part = 0; for (i = 0; i < root->tracks; i++) { track = md_track_nth(root, i); + for (j = 0; j < MD_CONTAINER_LEN(track); j++) { + epart = MD_GET_INDEX(track, j); + max_part = MAX(max_part, MD_ENDTIME(epart)); + } + MD_SET_DURATION(track, max_part); + dur = MD_ENDTIME(track); - max_dur = MAX(max_dur, dur); + max_track = MAX(max_track, dur); } - if (max_dur < MD_DURATION(root)) - MD_SET_DURATION(root, max_dur); + MD_SET_DURATION(root, max_track); } /* diff -rNu melys-0.0.19/md/mdutil.m melys-0.0.20/md/mdutil.m --- melys-0.0.19/md/mdutil.m Sat Oct 16 15:01:40 1999 +++ melys-0.0.20/md/mdutil.m Fri Oct 22 11:03:30 1999 @@ -71,6 +71,15 @@ MD_SET_MODIFIED(el, 1); \ } while (0) +/* Some MD to Midi macros */ +#define MD_MIDI_VOL_SHIFT 9 +#define MD_VOL_TO_MIDI(vol) (((vol) >> MD_MIDI_VOL_SHIFT) & 0x7f) +#define MD_MIDI_TO_VOL(v) (((v)&0x7f) << MD_MIDI_VOL_SHIFT) +#define MD_MIDI_PAN_SHIFT 9 +#define MD_PAN_TO_MIDI(pan) (((((pan)+(int)0x8000) & 0xffff) >> MD_MIDI_PAN_SHIFT) & 0x7f) +#define MD_MIDI_TO_PAN(v) ((((v)&0x7f) << MD_MIDI_PAN_SHIFT) - (int)0x7fff) + + /* Defines for md_walk() */ #define MD_WALK_NODES 0x01 /* Just callback on nodes */ #define MD_WALK_LEAF 0x02 /* Callback on leaves */ @@ -314,7 +323,7 @@ >>function md_set_program void -struct trackElement *track; The track to set program for +struct containerElement *base; The track to set program for int program; Program number to set gboolean clear; Clear any embedded program changes @@ -324,15 +333,32 @@ .A clear is true, then all embedded program changes for the track events are removed. +Clear may not be needed, as we always do it? >>code + struct element *el; + int i; + + if (MD_TYPE(base) == MD_TYPE_TRACK) { + MD_TRACK(base)->program = program; + if (clear) + MD_TRACK(base)->hasprogram = FALSE; + } - track->program = program; if (clear) { - track->hasprogram = FALSE; - /* XXX not finished */ + for (i = 0; i < MD_CONTAINER_LEN(base); i++) { + el = MD_GET_INDEX(base, i); + + if (iscontainer(el)) { + md_set_program(MD_CONTAINER(el), program, clear); + } else if (el->type == MD_TYPE_PROGRAM) { + md_remove(base, el); + i--; + } + } } + >>function md_change_time void struct element *el; The element to change time @@ -411,23 +437,33 @@ Shrink the root duration to just fit the track durations. This is needed because we artificially increase the root duration while recording. +The tracks are also shrunk down to the maximum duration +of the parts within them. >>code struct trackElement *track; - long dur, max_dur; + struct element *epart; + long dur, max_track, max_part; int i; + int j; - max_dur = 0; + max_track = 0; + max_part = 0; for (i = 0; i < root->tracks; i++) { track = md_track_nth(root, i); + for (j = 0; j < MD_CONTAINER_LEN(track); j++) { + epart = MD_GET_INDEX(track, j); + max_part = MAX(max_part, MD_ENDTIME(epart)); + } + MD_SET_DURATION(track, max_part); + dur = MD_ENDTIME(track); - max_dur = MAX(max_dur, dur); + max_track = MAX(max_track, dur); } - if (max_dur < MD_DURATION(root)) - MD_SET_DURATION(root, max_dur); + MD_SET_DURATION(root, max_track); >>function md_tick_to_mbt void diff -rNu melys-0.0.19/mlib/PROJECT/mgtk.py melys-0.0.20/mlib/PROJECT/mgtk.py --- melys-0.0.19/mlib/PROJECT/mgtk.py Wed Sep 22 10:12:15 1999 +++ melys-0.0.20/mlib/PROJECT/mgtk.py Sat Oct 23 00:24:48 1999 @@ -55,8 +55,6 @@ >>extern -a -static gint %(objprefix)s_signals[LAST_SIGNAL]; - static %(parentname)sClass *parent_class = NULL; >>function %(objprefix)s_get_type @@ -84,6 +82,12 @@ return mtype; """ +signal_skel = """ + +>>extern -a +static gint %(objprefix)s_signals[LAST_SIGNAL]; +""" + ################## # CODE TEMPLATE @@ -104,6 +108,7 @@ >>extern /* The list of signal id's that are being added for %(objname)s. */ +>>set signals enum { // XXX symbols for all signals here LAST_SIGNAL @@ -219,6 +224,13 @@ f = cStringIO.StringIO(str) m.process_file(f) + + try: + nosigs = m.getvar("nosignals") + except (KeyError, mcode.error): + str = signal_skel % vardict + f = cStringIO.StringIO(str) + m.process_file(f) try: dotmpl = m.getvar("gtktemplate") diff -rNu melys-0.0.19/po/melys.pot melys-0.0.20/po/melys.pot --- melys-0.0.19/po/melys.pot Tue Oct 12 00:37:39 1999 +++ melys-0.0.20/po/melys.pot Mon Oct 25 14:48:47 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-10-11 20:00+0100\n" +"POT-Creation-Date: 1999-10-25 14:48+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,31 +14,35 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: file.m:162 file.m:475 +#: file.m:163 file.m:478 msgid "The file type was not recognised" msgstr "" -#: file.m:269 +#: file.m:270 msgid "No information available, sorry" msgstr "" -#: file.m:343 +#: file.m:344 msgid "" "Could not read file\n" "This is probably a bug" msgstr "" -#: file.m:377 +#: file.m:378 msgid "" "Could not write file\n" "This is probably a bug" msgstr "" -#: mdmlread.m:796 mdmlwrite.m:43 +#: mdmlread.m:91 +msgid "Incomplete or partial file" +msgstr "" + +#: mdmlread.m:832 mdmlwrite.m:43 msgid "Could not open file" msgstr "" -#: midiread.m:118 +#: midiread.m:114 #, c-format msgid "" "Could not open file\n" @@ -46,7 +50,7 @@ "%s" msgstr "" -#: midiread.m:169 +#: midiread.m:165 #, c-format msgid "" "Could not read file\n" @@ -54,31 +58,31 @@ "%s" msgstr "" -#: midiread.m:231 +#: midiread.m:227 #, c-format msgid "Bad header (%x), probably not a real midi file" msgstr "" -#: midiread.m:242 +#: midiread.m:238 msgid "Bad header length, probably not a real midi file" msgstr "" -#: midiread.m:283 +#: midiread.m:279 #, c-format msgid "Bad track header (%x), probably not a midi file" msgstr "" -#: midiread.m:493 +#: midiread.m:480 #, c-format msgid "Bad status type 0x%x" msgstr "" -#: midiread.m:567 +#: midiread.m:554 #, c-format msgid "Meta event %d not implemented\n" msgstr "" -#: midiread.m:759 +#: midiread.m:746 #, c-format msgid "" "Unexpected end of file\n" @@ -98,123 +102,134 @@ msgid " difference set to zero" msgstr "" -#: main.m:87 +#: main.m:90 msgid "" "Here you can view the tracks and modify properties of the track such as " "instrument and midi channel. You can also add and delete tracks from this " "menu" msgstr "" -#: main.m:117 +#: main.m:122 msgid "The Melys sequencer" msgstr "" -#: main.m:246 +#: main.m:191 +msgid "Song position" +msgstr "" + +#: main.m:310 msgid "Untitled" msgstr "" -#: main.m:248 +#: main.m:312 #, c-format msgid "Track: %s" msgstr "" +#: main.m:585 +#, c-format +msgid "" +"There was a problem opening the file %s\n" +"%s" +msgstr "" + #: menus.m:40 msgid "New" msgstr "" -#: menus.m:56 +#: menus.m:57 msgid "_Close all" msgstr "" -#: menus.m:56 +#: menus.m:57 msgid "Close all open windows" msgstr "" -#: menus.m:62 +#: menus.m:63 msgid "_Debug" msgstr "" -#: menus.m:62 +#: menus.m:63 msgid "Bring up a debugging window" msgstr "" -#: menus.m:75 +#: menus.m:76 msgid "_Add" msgstr "" -#: menus.m:75 +#: menus.m:76 msgid "Add a new track" msgstr "" -#: menus.m:80 +#: menus.m:81 msgid "_Delete" msgstr "" -#: menus.m:80 +#: menus.m:81 msgid "Delete selected tracks" msgstr "" -#: menus.m:85 +#: menus.m:86 msgid "Delete empty" msgstr "" -#: menus.m:85 +#: menus.m:86 msgid "Delete all empty tracks" msgstr "" -#: melystrackdisplay.m:211 menus.m:90 +#: melystrackdisplay.m:217 menus.m:91 msgid "Properties..." msgstr "" -#: menus.m:90 +#: menus.m:91 msgid "The track properties box" msgstr "" -#: menus.m:101 +#: menus.m:102 msgid "_Start" msgstr "" -#: menus.m:101 -msgid "Start playing" +#: menus.m:102 +msgid "Start or continue playing" msgstr "" -#: menus.m:107 +#: menus.m:108 msgid "_Pause" msgstr "" -#: menus.m:107 +#: menus.m:108 msgid "Pause playing" msgstr "" -#: menus.m:113 +#: menus.m:114 msgid "S_top" msgstr "" -#: menus.m:113 +#: menus.m:114 msgid "Stop and return to beginning" msgstr "" -#: menus.m:119 +#: menus.m:120 msgid "_Record" msgstr "" -#: menus.m:119 +#: menus.m:120 msgid "Start recording" msgstr "" -#: menus.m:125 +#: menus.m:126 msgid "Record stop" msgstr "" -#: menus.m:125 +#: menus.m:126 msgid "Stop recording" msgstr "" -#: menus.m:144 +#: menus.m:145 msgid "_Tracks" msgstr "" -#: menus.m:145 +#: menus.m:146 msgid "_Actions" msgstr "" @@ -222,32 +237,32 @@ #. * is the first time, or the old one was killed from the #. * window manager etc. #. -#: menus.m:212 +#: menus.m:213 msgid "Select the file to read in..." msgstr "" -#: menus.m:295 +#: menus.m:327 msgid "Select the file name to write to..." msgstr "" -#: menus.m:513 +#: menus.m:551 msgid "Copyright Steve Ratcliffe (C) 1999" msgstr "" -#: menus.m:515 -msgid "Melys is a sequencer application for ALSA" +#: menus.m:553 +msgid "Melys is a Midi sequencer for ALSA" msgstr "" -#: menus.m:652 +#: menus.m:698 #, c-format msgid "Number of allocated elements %d\n" msgstr "" -#: menus.m:682 +#: menus.m:728 msgid "No selected tracks" msgstr "" -#: partprop.m:81 trackprop.m:88 +#: partprop.m:81 trackprop.m:97 msgid "Basic" msgstr "" @@ -262,47 +277,54 @@ msgid "Part name" msgstr "" -#: trackprop.m:93 trackprop.m:240 +#: trackprop.m:102 trackprop.m:291 msgid "Instruments" msgstr "" -#: trackprop.m:143 +#: trackprop.m:140 msgid "Track properties" msgstr "" -#. Create the labels -#: trackprop.m:156 +#: trackprop.m:159 msgid "Track name" msgstr "" -#: trackprop.m:157 +#: trackprop.m:180 msgid "Output device" msgstr "" -#: trackprop.m:158 +#: trackprop.m:198 msgid "Channel" msgstr "" -#: trackprop.m:243 +#: trackprop.m:219 +msgid "Initial volume" +msgstr "" + +#: trackprop.m:245 +msgid "Pan position" +msgstr "" + +#: trackprop.m:294 msgid "Instrument" msgstr "" -#: trackprop.m:244 +#: trackprop.m:295 msgid "Bank MSB" msgstr "" -#: trackprop.m:245 +#: trackprop.m:296 msgid "Bank LSB" msgstr "" -#: trackprop.m:248 +#: trackprop.m:299 msgid "" "This page will be a comprehensive instrument selection page\n" "At present you can just select from program\n" "and bank MSB/LSB numbers\n" msgstr "" -#: mdadd.m:150 +#: mdadd.m:179 #, c-format msgid "Freed an element %d with bad reference count %d" msgstr "" @@ -334,66 +356,66 @@ msgid "Reading %s: %s\n" msgstr "" -#: melplay.m:51 +#: melplay.m:52 msgid "port" msgstr "" -#: melplay.m:52 +#: melplay.m:53 msgid "list" msgstr "" -#: melplay.m:53 +#: melplay.m:54 msgid "delay" msgstr "" -#: melplay.m:54 +#: melplay.m:55 msgid "begin" msgstr "" -#: melplay.m:307 showseq.m:98 +#: melplay.m:308 showseq.m:98 #, c-format msgid "Could not open sequencer %s" msgstr "" -#: melplay.m:313 showseq.m:104 +#: melplay.m:314 showseq.m:104 #, c-format msgid "Could not get sequencer information %s" msgstr "" -#: melplay.m:318 +#: melplay.m:319 #, c-format msgid " Port %-30.30s %s\n" msgstr "" -#: melplay.m:318 +#: melplay.m:319 msgid "Client name" msgstr "" -#: melplay.m:318 +#: melplay.m:319 msgid "Port name" msgstr "" -#: melplay.m:348 +#: melplay.m:349 msgid "Usage: melplay [-p client:port ...] [-l] [-d delay] file ..." msgstr "" -#: melplay.m:350 +#: melplay.m:351 msgid " -p client:port - A alsa client and port number to send midi to" msgstr "" -#: melplay.m:351 +#: melplay.m:352 msgid " -l - List possible output ports that could be used" msgstr "" -#: melplay.m:352 +#: melplay.m:353 msgid " -d delay - Delay after song ends (default 2 sec)" msgstr "" -#: melplay.m:353 +#: melplay.m:354 msgid " -b time - Begin time" msgstr "" -#: melys.m:117 +#: melys.m:118 #, c-format msgid "" "A debugging error occurred\n" @@ -403,17 +425,17 @@ "MESSAGE: %s" msgstr "" -#: melys.m:132 +#: melys.m:133 msgid "" "This operation is not possible\n" "because there are no open files\n" msgstr "" -#: melys.m:163 +#: melys.m:164 msgid "Usage: melys [-x level]" msgstr "" -#: melys.m:165 +#: melys.m:166 msgid " -x, --debug=LEVEL Set debuging level" msgstr "" @@ -431,15 +453,7 @@ msgid "Error (%s) creating sequencer port\n" msgstr "" -#: song.m:122 -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 "" - -#: song.m:141 song.m:214 +#: song.m:133 song.m:206 msgid "" "Could not open ALSA sequencer\n" "Perhaps modules are not loaded\n" @@ -449,31 +463,47 @@ msgid "ethrow called without being set up" msgstr "" -#: melystrackdisplay.m:196 +#: melystrack.m:376 +msgid "Expand the height of the tracks" +msgstr "" + +#: melystrack.m:377 +msgid "Shrink the height of the tracks" +msgstr "" + +#: melystrack.m:383 +msgid "Increase horizontal scale" +msgstr "" + +#: melystrack.m:384 +msgid "Decrease horizontail scale" +msgstr "" + +#: melystrackdisplay.m:199 msgid "_Slice" msgstr "" -#: melystrackdisplay.m:196 +#: melystrackdisplay.m:199 msgid "Slice the part into two" msgstr "" -#: melystrackdisplay.m:201 +#: melystrackdisplay.m:205 msgid "_Join" msgstr "" -#: melystrackdisplay.m:201 +#: melystrackdisplay.m:205 msgid "Join this part and the next" msgstr "" -#: melystrackdisplay.m:206 +#: melystrackdisplay.m:211 msgid "Delete" msgstr "" -#: melystrackdisplay.m:206 +#: melystrackdisplay.m:211 msgid "Delete this part" msgstr "" -#: melystrackdisplay.m:211 +#: melystrackdisplay.m:217 msgid "Part property box" msgstr "" @@ -501,12 +531,12 @@ msgid "Rec" msgstr "" -#: melystrackinfo.m:793 +#: melystrackinfo.m:787 #, c-format msgid "Track %d" msgstr "" -#: melystrackinfo.m:864 +#: melystrackinfo.m:858 #, c-format msgid "" "Internal error.\n" diff -rNu melys-0.0.19/po/zz.po melys-0.0.20/po/zz.po --- melys-0.0.19/po/zz.po Tue Oct 12 00:37:39 1999 +++ melys-0.0.20/po/zz.po Mon Oct 25 14:48:47 1999 @@ -5,15 +5,15 @@ msgid "" msgstr "" -#: file.m:162 file.m:475 +#: file.m:163 file.m:478 msgid "The file type was not recognised" msgstr "T.H.E. F.I.L.E. T.Y.P.E. W.A.S. N.O.T. R.E.C.O.G.N.I.S.E.D." -#: file.m:269 +#: file.m:270 msgid "No information available, sorry" msgstr "N.O. I.N.F.O.R.M.A.T.I.O.N. A.V.A.I.L.A.B.L.E., S.O.R.R.Y." -#: file.m:343 +#: file.m:344 msgid "" "Could not read file\n" "This is probably a bug" @@ -21,7 +21,7 @@ "C.O.U.L.D. N.O.T. R.E.A.D. F.I.L.E.\n" "T.H.I.S. I.S. P.R.O.B.A.B.L.Y. A. B.U.G." -#: file.m:377 +#: file.m:378 msgid "" "Could not write file\n" "This is probably a bug" @@ -29,11 +29,15 @@ "C.O.U.L.D. N.O.T. W.R.I.T.E. F.I.L.E.\n" "T.H.I.S. I.S. P.R.O.B.A.B.L.Y. A. B.U.G." -#: mdmlread.m:796 mdmlwrite.m:43 +#: mdmlread.m:91 +msgid "Incomplete or partial file" +msgstr "I.N.C.O.M.P.L.E.T.E. O.R. P.A.R.T.I.A.L. F.I.L.E." + +#: mdmlread.m:832 mdmlwrite.m:43 msgid "Could not open file" msgstr "C.O.U.L.D. N.O.T. O.P.E.N. F.I.L.E." -#: midiread.m:118 +#: midiread.m:114 #, c-format msgid "" "Could not open file\n" @@ -44,7 +48,7 @@ "\n" "%s" -#: midiread.m:169 +#: midiread.m:165 #, c-format msgid "" "Could not read file\n" @@ -55,31 +59,31 @@ "\n" "%s" -#: midiread.m:231 +#: midiread.m:227 #, 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:242 +#: midiread.m:238 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:283 +#: midiread.m:279 #, 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:493 +#: midiread.m:480 #, 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:567 +#: midiread.m:554 #, 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:759 +#: midiread.m:746 #, c-format msgid "" "Unexpected end of file\n" @@ -101,7 +105,7 @@ msgid " difference set to zero" msgstr " D.I.F.F.E.R.E.N.C.E. S.E.T. T.O. Z.E.R.O." -#: main.m:87 +#: main.m:90 msgid "" "Here you can view the tracks and modify properties of the track such as " "instrument and midi channel. You can also add and delete tracks from this " @@ -111,116 +115,129 @@ "I.N.S.T.R.U.M.E.N.T. A.N.D. M.I.D.I. C.H.A.N.N.E.L.. Y.O.U. C.A.N. A.L.S.O. A.D.D. A.N.D. D.E.L.E.T.E. T.R.A.C.K.S. F.R.O.M. T.H.I.S. " "M.E.N.U." -#: main.m:117 +#: main.m:122 msgid "The Melys sequencer" msgstr "T.H.E. M.E.L.Y.S. S.E.Q.U.E.N.C.E.R." -#: main.m:246 +#: main.m:191 +msgid "Song position" +msgstr "S.O.N.G. P.O.S.I.T.I.O.N." + +#: main.m:310 msgid "Untitled" msgstr "U.N.T.I.T.L.E.D." -#: main.m:248 +#: main.m:312 #, c-format msgid "Track: %s" msgstr "T.R.A.C.K.: %s" +#: main.m:585 +#, c-format +msgid "" +"There was a problem opening the file %s\n" +"%s" +msgstr "" +"T.H.E.R.E. W.A.S. A. P.R.O.B.L.E.M. O.P.E.N.I.N.G. T.H.E. F.I.L.E. %s\n" +"%s" + #: menus.m:40 msgid "New" msgstr "N.E.W." -#: menus.m:56 +#: menus.m:57 msgid "_Close all" msgstr "_C.L.O.S.E. A.L.L." -#: menus.m:56 +#: menus.m:57 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:62 +#: menus.m:63 msgid "_Debug" msgstr "_D.E.B.U.G." -#: menus.m:62 +#: menus.m:63 msgid "Bring up a debugging window" msgstr "B.R.I.N.G. U.P. A. D.E.B.U.G.G.I.N.G. W.I.N.D.O.W." -#: menus.m:75 +#: menus.m:76 msgid "_Add" msgstr "_A.D.D." -#: menus.m:75 +#: menus.m:76 msgid "Add a new track" msgstr "A.D.D. A. N.E.W. T.R.A.C.K." -#: menus.m:80 +#: menus.m:81 msgid "_Delete" msgstr "_D.E.L.E.T.E." -#: menus.m:80 +#: menus.m:81 msgid "Delete selected tracks" msgstr "D.E.L.E.T.E. S.E.L.E.C.T.E.D. T.R.A.C.K.S." -#: menus.m:85 +#: menus.m:86 msgid "Delete empty" msgstr "D.E.L.E.T.E. E.M.P.T.Y." -#: menus.m:85 +#: menus.m:86 msgid "Delete all empty tracks" msgstr "D.E.L.E.T.E. A.L.L. E.M.P.T.Y. T.R.A.C.K.S." -#: melystrackdisplay.m:211 menus.m:90 +#: melystrackdisplay.m:217 menus.m:91 msgid "Properties..." msgstr "P.R.O.P.E.R.T.I.E.S...." -#: menus.m:90 +#: menus.m:91 msgid "The track properties box" msgstr "T.H.E. T.R.A.C.K. P.R.O.P.E.R.T.I.E.S. B.O.X." -#: menus.m:101 +#: menus.m:102 msgid "_Start" msgstr "_S.T.A.R.T." -#: menus.m:101 -msgid "Start playing" -msgstr "S.T.A.R.T. P.L.A.Y.I.N.G." +#: menus.m:102 +msgid "Start or continue playing" +msgstr "S.T.A.R.T. O.R. C.O.N.T.I.N.U.E. P.L.A.Y.I.N.G." -#: menus.m:107 +#: menus.m:108 msgid "_Pause" msgstr "_P.A.U.S.E." -#: menus.m:107 +#: menus.m:108 msgid "Pause playing" msgstr "P.A.U.S.E. P.L.A.Y.I.N.G." -#: menus.m:113 +#: menus.m:114 msgid "S_top" msgstr "S._T.O.P." -#: menus.m:113 +#: menus.m:114 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:119 +#: menus.m:120 msgid "_Record" msgstr "_R.E.C.O.R.D." -#: menus.m:119 +#: menus.m:120 msgid "Start recording" msgstr "S.T.A.R.T. R.E.C.O.R.D.I.N.G." -#: menus.m:125 +#: menus.m:126 msgid "Record stop" msgstr "R.E.C.O.R.D. S.T.O.P." -#: menus.m:125 +#: menus.m:126 msgid "Stop recording" msgstr "S.T.O.P. R.E.C.O.R.D.I.N.G." -#: menus.m:144 +#: menus.m:145 msgid "_Tracks" msgstr "_T.R.A.C.K.S." -#: menus.m:145 +#: menus.m:146 msgid "_Actions" msgstr "_A.C.T.I.O.N.S." @@ -228,32 +245,32 @@ #. * is the first time, or the old one was killed from the #. * window manager etc. #. -#: menus.m:212 +#: menus.m:213 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...." -#: menus.m:295 +#: menus.m:327 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:513 +#: menus.m:551 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:515 -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." +#: menus.m:553 +msgid "Melys is a Midi sequencer for ALSA" +msgstr "M.E.L.Y.S. I.S. A. M.I.D.I. S.E.Q.U.E.N.C.E.R. F.O.R. A.L.S.A." -#: menus.m:652 +#: menus.m:698 #, c-format msgid "Number of allocated elements %d\n" msgstr "N.U.M.B.E.R. O.F. A.L.L.O.C.A.T.E.D. E.L.E.M.E.N.T.S. %d\n" -#: menus.m:682 +#: menus.m:728 msgid "No selected tracks" msgstr "N.O. S.E.L.E.C.T.E.D. T.R.A.C.K.S." -#: partprop.m:81 trackprop.m:88 +#: partprop.m:81 trackprop.m:97 msgid "Basic" msgstr "B.A.S.I.C." @@ -268,40 +285,47 @@ msgid "Part name" msgstr "P.A.R.T. N.A.M.E." -#: trackprop.m:93 trackprop.m:240 +#: trackprop.m:102 trackprop.m:291 msgid "Instruments" msgstr "I.N.S.T.R.U.M.E.N.T.S." -#: trackprop.m:143 +#: trackprop.m:140 msgid "Track properties" msgstr "T.R.A.C.K. P.R.O.P.E.R.T.I.E.S." -#. Create the labels -#: trackprop.m:156 +#: trackprop.m:159 msgid "Track name" msgstr "T.R.A.C.K. N.A.M.E." -#: trackprop.m:157 +#: trackprop.m:180 msgid "Output device" msgstr "O.U.T.P.U.T. D.E.V.I.C.E." -#: trackprop.m:158 +#: trackprop.m:198 msgid "Channel" msgstr "C.H.A.N.N.E.L." -#: trackprop.m:243 +#: trackprop.m:219 +msgid "Initial volume" +msgstr "I.N.I.T.I.A.L. V.O.L.U.M.E." + +#: trackprop.m:245 +msgid "Pan position" +msgstr "P.A.N. P.O.S.I.T.I.O.N." + +#: trackprop.m:294 msgid "Instrument" msgstr "I.N.S.T.R.U.M.E.N.T." -#: trackprop.m:244 +#: trackprop.m:295 msgid "Bank MSB" msgstr "B.A.N.K. M.S.B." -#: trackprop.m:245 +#: trackprop.m:296 msgid "Bank LSB" msgstr "B.A.N.K. L.S.B." -#: trackprop.m:248 +#: trackprop.m:299 msgid "" "This page will be a comprehensive instrument selection page\n" "At present you can just select from program\n" @@ -311,7 +335,7 @@ "A.T. P.R.E.S.E.N.T. Y.O.U. C.A.N. J.U.S.T. S.E.L.E.C.T. F.R.O.M. P.R.O.G.R.A.M.\n" "A.N.D. B.A.N.K. M.S.B./L.S.B. N.U.M.B.E.R.S.\n" -#: mdadd.m:150 +#: mdadd.m:179 #, c-format msgid "Freed an element %d with bad reference count %d" msgstr "F.R.E.E.D. A.N. E.L.E.M.E.N.T. %d W.I.T.H. B.A.D. R.E.F.E.R.E.N.C.E. C.O.U.N.T. %d" @@ -348,66 +372,66 @@ msgid "Reading %s: %s\n" msgstr "R.E.A.D.I.N.G. %s: %s\n" -#: melplay.m:51 +#: melplay.m:52 msgid "port" msgstr "P.O.R.T." -#: melplay.m:52 +#: melplay.m:53 msgid "list" msgstr "L.I.S.T." -#: melplay.m:53 +#: melplay.m:54 msgid "delay" msgstr "D.E.L.A.Y." -#: melplay.m:54 +#: melplay.m:55 msgid "begin" msgstr "B.E.G.I.N." -#: melplay.m:307 showseq.m:98 +#: melplay.m:308 showseq.m:98 #, 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" -#: melplay.m:313 showseq.m:104 +#: melplay.m:314 showseq.m:104 #, 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" -#: melplay.m:318 +#: melplay.m:319 #, c-format msgid " Port %-30.30s %s\n" msgstr " P.O.R.T. %-30.30S. %s\n" -#: melplay.m:318 +#: melplay.m:319 msgid "Client name" msgstr "C.L.I.E.N.T. N.A.M.E." -#: melplay.m:318 +#: melplay.m:319 msgid "Port name" msgstr "P.O.R.T. N.A.M.E." -#: melplay.m:348 +#: melplay.m:349 msgid "Usage: melplay [-p client:port ...] [-l] [-d delay] file ..." msgstr "U.S.A.G.E.: M.E.L.P.L.A.Y. [-P. C.L.I.E.N.T.:P.O.R.T. ...] [-L.] [-D. D.E.L.A.Y.] F.I.L.E. ..." -#: melplay.m:350 +#: melplay.m:351 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." -#: melplay.m:351 +#: melplay.m:352 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." -#: melplay.m:352 +#: melplay.m:353 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.)" -#: melplay.m:353 +#: melplay.m:354 msgid " -b time - Begin time" msgstr " -B. T.I.M.E. - B.E.G.I.N. T.I.M.E." -#: melys.m:117 +#: melys.m:118 #, c-format msgid "" "A debugging error occurred\n" @@ -422,7 +446,7 @@ "T.H.E. A.P.P.L.I.C.A.T.I.O.N. A.S. S.O.O.N. A.S. P.O.S.S.I.B.L.E.\n" "M.E.S.S.A.G.E.: %s" -#: melys.m:132 +#: melys.m:133 msgid "" "This operation is not possible\n" "because there are no open files\n" @@ -430,11 +454,11 @@ "T.H.I.S. O.P.E.R.A.T.I.O.N. I.S. N.O.T. P.O.S.S.I.B.L.E.\n" "B.E.C.A.U.S.E. T.H.E.R.E. A.R.E. N.O. O.P.E.N. F.I.L.E.S.\n" -#: melys.m:163 +#: melys.m:164 msgid "Usage: melys [-x level]" msgstr "U.S.A.G.E.: M.E.L.Y.S. [-X. L.E.V.E.L.]" -#: melys.m:165 +#: melys.m:166 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." @@ -452,19 +476,7 @@ 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:122 -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" - -#: song.m:141 song.m:214 +#: song.m:133 song.m:206 msgid "" "Could not open ALSA sequencer\n" "Perhaps modules are not loaded\n" @@ -476,31 +488,47 @@ msgid "ethrow called without being set up" msgstr "E.T.H.R.O.W. C.A.L.L.E.D. W.I.T.H.O.U.T. B.E.I.N.G. S.E.T. U.P." -#: melystrackdisplay.m:196 +#: melystrack.m:376 +msgid "Expand the height of the tracks" +msgstr "E.X.P.A.N.D. T.H.E. H.E.I.G.H.T. O.F. T.H.E. T.R.A.C.K.S." + +#: melystrack.m:377 +msgid "Shrink the height of the tracks" +msgstr "S.H.R.I.N.K. T.H.E. H.E.I.G.H.T. O.F. T.H.E. T.R.A.C.K.S." + +#: melystrack.m:383 +msgid "Increase horizontal scale" +msgstr "I.N.C.R.E.A.S.E. H.O.R.I.Z.O.N.T.A.L. S.C.A.L.E." + +#: melystrack.m:384 +msgid "Decrease horizontail scale" +msgstr "D.E.C.R.E.A.S.E. H.O.R.I.Z.O.N.T.A.I.L. S.C.A.L.E." + +#: melystrackdisplay.m:199 msgid "_Slice" msgstr "_S.L.I.C.E." -#: melystrackdisplay.m:196 +#: melystrackdisplay.m:199 msgid "Slice the part into two" msgstr "S.L.I.C.E. T.H.E. P.A.R.T. I.N.T.O. T.W.O." -#: melystrackdisplay.m:201 +#: melystrackdisplay.m:205 msgid "_Join" msgstr "_J.O.I.N." -#: melystrackdisplay.m:201 +#: melystrackdisplay.m:205 msgid "Join this part and the next" msgstr "J.O.I.N. T.H.I.S. P.A.R.T. A.N.D. T.H.E. N.E.X.T." -#: melystrackdisplay.m:206 +#: melystrackdisplay.m:211 msgid "Delete" msgstr "D.E.L.E.T.E." -#: melystrackdisplay.m:206 +#: melystrackdisplay.m:211 msgid "Delete this part" msgstr "D.E.L.E.T.E. T.H.I.S. P.A.R.T." -#: melystrackdisplay.m:211 +#: melystrackdisplay.m:217 msgid "Part property box" msgstr "P.A.R.T. P.R.O.P.E.R.T.Y. B.O.X." @@ -528,12 +556,12 @@ msgid "Rec" msgstr "R.E.C." -#: melystrackinfo.m:793 +#: melystrackinfo.m:787 #, c-format msgid "Track %d" msgstr "T.R.A.C.K. %d" -#: melystrackinfo.m:864 +#: melystrackinfo.m:858 #, c-format msgid "" "Internal error.\n" @@ -543,13 +571,3 @@ "I.N.T.E.R.N.A.L. E.R.R.O.R..\n" "T.H.E.R.E. I.S. A. M.I.S.S.I.N.G. C.A.S.E. I.N. D.R.A.W._C.O.L._B.U.T.T.O.N.\n" "V.A.L.U.E. W.A.S. %d\n" - -#~ msgid "Delete all selected parts" -#~ msgstr "D.E.L.E.T.E. A.L.L. S.E.L.E.C.T.E.D. P.A.R.T.S." - -#~ msgid "Failed to read file" -#~ msgstr "F.A.I.L.E.D. T.O. R.E.A.D. F.I.L.E." - -#~ msgid "ethrow_setup called when allready set up" -#~ msgstr "" -#~ "E.T.H.R.O.W._S.E.T.U.P. C.A.L.L.E.D. W.H.E.N. A.L.L.R.E.A.D.Y. S.E.T. U.P." diff -rNu melys-0.0.19/programs/Makefile melys-0.0.20/programs/Makefile --- melys-0.0.19/programs/Makefile Sat Oct 16 15:08:33 1999 +++ melys-0.0.20/programs/Makefile Mon Oct 25 20:56:29 1999 @@ -23,7 +23,7 @@ ../files/mdmlwrite.o ../files/file.o \ ../md/elements.o ../md/mdutil.o \ ../util/except.o ../util/util.o ../util/gxstack.o \ - ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o + ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o ../md/mdconv.o MELPLAYOBJS = \ melplay.o \ @@ -32,6 +32,7 @@ ../md/elements.o ../md/mdutil.o \ ../util/except.o ../util/util.o ../util/gxstack.o \ ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o ../md/mdseq.o \ + ../md/mdconv.o \ ../seq/seqlib.o ../seq/seqmidi.o \ ../seq/seqplay.o @@ -45,6 +46,7 @@ ../util/except.o ../util/util.o ../util/gxstack.o \ ../md/elements.o ../md/mdutil.o ../md/mdseq.o \ ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o ../md/mdtools.o \ + ../md/mdconv.o \ ../gui/main.o ../gui/menus.o ../gui/trackprop.o \ ../gui/help.o ../gui/partprop.o ../gui/propbox.o \ ../widgets/register.o ../widgets/misc.o \ @@ -53,7 +55,7 @@ ../config/ports.o \ ../widgets/melystrack.o ../widgets/melystrackinfo.o \ ../widgets/melystrackdisplay.o ../widgets/melyspartitem.o \ - ../widgets/melysrule.o \ + ../widgets/melysrule.o ../widgets/melyspos.o \ ../pixmaps/balls.o ../pixmaps/menu_icons.o ../pixmaps/mag.o SHOWSEQOBJS = \ diff -rNu melys-0.0.19/programs/mdmlconv.m melys-0.0.20/programs/mdmlconv.m --- melys-0.0.19/programs/mdmlconv.m Fri Oct 8 22:16:54 1999 +++ melys-0.0.20/programs/mdmlconv.m Sun Oct 24 19:19:04 1999 @@ -20,7 +20,7 @@ >>make --objects ../files/mdmlwrite.o ../files/file.o >>make --objects ../md/elements.o ../md/mdutil.o >>make --objects ../util/except.o ../util/util.o ../util/gxstack.o ->>make --objects ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o +>>make --objects ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o ../md/mdconv.o >>extern >>header diff -rNu melys-0.0.19/programs/melplay.m melys-0.0.20/programs/melplay.m --- melys-0.0.19/programs/melplay.m Sat Oct 2 20:20:05 1999 +++ melys-0.0.20/programs/melplay.m Sun Oct 24 19:19:04 1999 @@ -41,6 +41,7 @@ >>make --objects ../md/elements.o ../md/mdutil.o >>make --objects ../util/except.o ../util/util.o ../util/gxstack.o >>make --objects ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o ../md/mdseq.o +>>make --objects ../md/mdconv.o >>make --objects ../seq/seqlib.o ../seq/seqmidi.o >>make --objects ../seq/seqplay.o diff -rNu melys-0.0.19/programs/melys.m melys-0.0.20/programs/melys.m --- melys-0.0.19/programs/melys.m Thu Oct 14 17:40:14 1999 +++ melys-0.0.20/programs/melys.m Sun Oct 24 00:56:50 1999 @@ -20,6 +20,7 @@ >>make --objects ../util/except.o ../util/util.o ../util/gxstack.o >>make --objects ../md/elements.o ../md/mdutil.o ../md/mdseq.o >>make --objects ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o ../md/mdtools.o +>>make --objects ../md/mdconv.o >>make --objects ../gui/main.o ../gui/menus.o ../gui/trackprop.o >>make --objects ../gui/help.o ../gui/partprop.o ../gui/propbox.o >>make --objects ../widgets/register.o ../widgets/misc.o @@ -28,7 +29,7 @@ >>make --objects ../config/ports.o >>make --objects ../widgets/melystrack.o ../widgets/melystrackinfo.o >>make --objects ../widgets/melystrackdisplay.o ../widgets/melyspartitem.o ->>make --objects ../widgets/melysrule.o +>>make --objects ../widgets/melysrule.o ../widgets/melyspos.o >>make --objects ../pixmaps/balls.o ../pixmaps/menu_icons.o ../pixmaps/mag.o >>header diff -rNu melys-0.0.19/seq/seqplay.c melys-0.0.20/seq/seqplay.c --- melys-0.0.19/seq/seqplay.c Sat Oct 16 15:08:34 1999 +++ melys-0.0.20/seq/seqplay.c Mon Oct 25 20:56:31 1999 @@ -39,10 +39,13 @@ * After calling this routine you should read an event and wait * for the ECHO_END_PROLOGUE event. Then stop the timer and * restart it and play the reset of the song. - * Note that this is a temporary algorithm. A better one would - * be to calculate how much time is available before notes are + * This is a temporary algorithm. A better one would be to + * calculate how much time is available before notes are * played on each channel and send the setup in order so as to not * have to have any additional time at all. + * We could also schedule program changes to cope with the + * situation where one channel uses different instruments at + * different times. */ void midi_play_prologue(struct seq_context *ctxp, struct rootElement *root) @@ -60,6 +63,20 @@ /* Reset all controllers */ seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); seq_midi_control(ctxp, &ev, SND_MCTL_RESET_CONTROLLERS, 0); + time = set_time(&ev, time); + seq_write(ctxp, &ev); + + /* Set to initial volume */ + seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); + seq_midi_control(ctxp, &ev, + SND_MCTL_MSB_MAIN_VOLUME, MD_VOL_TO_MIDI(track->volume)); + time = set_time(&ev, time); + seq_write(ctxp, &ev); + + /* Set initial pan position */ + seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); + seq_midi_control(ctxp, &ev, + SND_MCTL_MSB_PAN, MD_PAN_TO_MIDI(track->pan)); time = set_time(&ev, time); seq_write(ctxp, &ev); diff -rNu melys-0.0.19/seq/seqplay.m melys-0.0.20/seq/seqplay.m --- melys-0.0.19/seq/seqplay.m Thu Sep 23 16:17:29 1999 +++ melys-0.0.20/seq/seqplay.m Fri Oct 22 23:38:13 1999 @@ -33,11 +33,14 @@ for the ECHO_END_PROLOGUE event. Then stop the timer and restart it and play the reset of the song. -Note that this is a temporary algorithm. +This is a temporary algorithm. A better one would be to calculate how much time is available before notes are played on each channel and send the setup in order so as to not have to have any additional time at all. +We could also schedule program changes to cope with the situation +where one channel uses different instruments at different times. + >>code struct trackElement *track; snd_seq_real_time_t time = {0}; @@ -52,6 +55,20 @@ /* Reset all controllers */ seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); seq_midi_control(ctxp, &ev, SND_MCTL_RESET_CONTROLLERS, 0); + time = set_time(&ev, time); + seq_write(ctxp, &ev); + + /* Set to initial volume */ + seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); + seq_midi_control(ctxp, &ev, + SND_MCTL_MSB_MAIN_VOLUME, MD_VOL_TO_MIDI(track->volume)); + time = set_time(&ev, time); + seq_write(ctxp, &ev); + + /* Set initial pan position */ + seq_midi_event_init(ctxp, &ev, 0, MD_DEVCHAN(track)); + seq_midi_control(ctxp, &ev, + SND_MCTL_MSB_PAN, MD_PAN_TO_MIDI(track->pan)); time = set_time(&ev, time); seq_write(ctxp, &ev); diff -rNu melys-0.0.19/song/song.c melys-0.0.20/song/song.c --- melys-0.0.19/song/song.c Sat Oct 16 15:08:33 1999 +++ melys-0.0.20/song/song.c Mon Oct 25 20:56:30 1999 @@ -78,14 +78,6 @@ song->newtrack = md_track_new(); song->tracknum = MD_CONTAINER(root)->elements->len - 2; /* xxx temp */ - - /* 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); } /* diff -rNu melys-0.0.19/song/song.m melys-0.0.20/song/song.m --- melys-0.0.19/song/song.m Wed Oct 13 21:09:24 1999 +++ melys-0.0.20/song/song.m Sun Oct 24 09:44:59 1999 @@ -117,14 +117,6 @@ song->newtrack = md_track_new(); song->tracknum = MD_CONTAINER(root)->elements->len - 2; /* xxx temp */ - /* 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); - >>function song_play_start void diff -rNu melys-0.0.19/version melys-0.0.20/version --- melys-0.0.19/version Sat Oct 16 15:03:22 1999 +++ melys-0.0.20/version Mon Oct 25 20:46:15 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.0.19" +#define MELYS_VERSION_STRING "0.0.20" diff -rNu melys-0.0.19/widgets/.cvsignore melys-0.0.20/widgets/.cvsignore --- melys-0.0.19/widgets/.cvsignore Sat Oct 16 15:08:32 1999 +++ melys-0.0.20/widgets/.cvsignore Mon Oct 25 20:56:28 1999 @@ -1,4 +1,5 @@ melyspartitem.c +melyspos.c melysrule.c melystrack.c melystrackdisplay.c diff -rNu melys-0.0.19/widgets/Makefile melys-0.0.20/widgets/Makefile --- melys-0.0.19/widgets/Makefile Sat Oct 16 15:08:32 1999 +++ melys-0.0.20/widgets/Makefile Mon Oct 25 20:56:28 1999 @@ -5,6 +5,7 @@ TARGETS = OBJS = melyspartitem.o \ + melyspos.o \ melysrule.o \ melystrack.o \ melystrackdisplay.o \ @@ -13,6 +14,7 @@ misc.o \ register.o GENCFILES = melyspartitem.c \ + melyspos.c \ melysrule.c \ melystrack.c \ melystrackdisplay.c \ @@ -21,6 +23,7 @@ misc.c \ register.c GENHFILES = ../include/melyspartitem.h \ + ../include/melyspos.h \ ../include/melysrule.h \ ../include/melystrack.h \ ../include/melystrackdisplay.h \ @@ -88,10 +91,14 @@ melystrackinfo.o: ../include/melystrackinfo.h melystrackinfo.o: ../include/melystrack.h melystransport.o: ../include/melystransport.h +melyspos.o: ../include/elements.h +melyspos.o: ../include/md.h +melyspos.o: ../include/melyspos.h melystrack.o: ../include/song.h melystrack.o: ../include/elements.h melystrack.o: ../include/pixmaps.h melystrack.o: ../include/md.h +melystrack.o: ../include/melgui.h melystrack.o: ../include/melystrackinfo.h melystrack.o: ../include/melystrackdisplay.h melystrack.o: ../include/melystrack.h diff -rNu melys-0.0.19/widgets/melyspartitem.c melys-0.0.20/widgets/melyspartitem.c --- melys-0.0.19/widgets/melyspartitem.c Sat Oct 16 15:08:41 1999 +++ melys-0.0.20/widgets/melyspartitem.c Mon Oct 25 20:56:37 1999 @@ -57,9 +57,9 @@ static void set_outline(GdkGC *gc, int dotted); -static gint melys_part_item_signals[LAST_SIGNAL]; - static GnomeCanvasRectClass *parent_class = NULL; + +static gint melys_part_item_signals[LAST_SIGNAL]; /* * Return a unique integer that represents the object type. diff -rNu melys-0.0.19/widgets/melyspos.c melys-0.0.20/widgets/melyspos.c --- melys-0.0.19/widgets/melyspos.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.20/widgets/melyspos.c Mon Oct 25 20:56:37 1999 @@ -0,0 +1,198 @@ +/* + * + * Copyright (C) 1999 Steve Ratcliffe + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * A meters, beats and ticks indicator. + * It is currently essentially a label that updates itself based on + * the supplied adjustment. + * + * + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "gtk/gtksignal.h" +#include "gtk/gtkadjustment.h" +#include "gtk/gtklabel.h" +#include "elements.h" +#include "md.h" +#include "melyspos.h" +#include "intl.h" + + +/* Position label defines */ +#define POS_FORMAT "%3d:%02d:%03d" +#define POS_LABEL_LEN 12 /* Max text length */ + +/* Static functions */ +static void melys_pos_init(MelysPos *mpos); +static void melys_pos_class_init(MelysPosClass *klass); +static void pos_destroy(GtkObject *obj); +static void pos_update(GtkObject *obj, gpointer data); + + +static GtkLabelClass *parent_class = NULL; + +/* + * Return a unique integer that represents the object type. + */ +guint +melys_pos_get_type(void) +{ + static guint mtype = 0; + + if (!mtype) { + GtkTypeInfo minfo = { + "MelysPos", + sizeof(MelysPos), + sizeof(MelysPosClass), + (GtkClassInitFunc) melys_pos_class_init, + (GtkObjectInitFunc) melys_pos_init, + (GtkArgSetFunc) NULL, + (GtkArgGetFunc) NULL, + (GtkClassInitFunc) NULL, + }; + + mtype = gtk_type_unique(gtk_label_get_type(), &minfo); + } + + return mtype; +} + +/* + * Create a new MelysPos object. + */ +GtkWidget * +melys_pos_new(void) +{ + GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_pos_get_type())); + char buf[POS_LABEL_LEN]; + + g_snprintf(buf, POS_LABEL_LEN, POS_FORMAT, 1, 1, 0); + gtk_label_set_text(GTK_LABEL(w), buf); + return w; +} + +/* + * Initialise the MelysPos. + * + * Arguments: + * mpos - The MelysPos to init + */ +static void +melys_pos_init(MelysPos *mpos) +{ + +} + +/* + * Initialize the class. + * + * Arguments: + * klass - The class to initialise + */ +static void +melys_pos_class_init(MelysPosClass *klass) +{ + GtkObjectClass *object_class; + GtkLabelClass *label_class; + + object_class = (GtkObjectClass *)klass; + label_class = (GtkLabelClass *)klass; + + parent_class = gtk_type_class(gtk_label_get_type()); + + object_class->destroy = pos_destroy; +} + +void +melys_pos_set_controls(MelysPos *mpos, struct tempomapElement *tmap, + GtkAdjustment *posadj) +{ + + g_return_if_fail(tmap != NULL); + g_return_if_fail(posadj != NULL); + g_return_if_fail(MD_TYPE(tmap) == MD_TYPE_TEMPOMAP); + + dprintf1("melys_pos_set_controls %p %p", tmap, posadj); + melys_pos_clear(mpos); + + MD_REF(tmap); + mpos->tempomap = tmap; + + gtk_object_ref(GTK_OBJECT(posadj)); + mpos->posadj = posadj; + + mpos->sig_id = gtk_signal_connect(GTK_OBJECT(posadj), + "value_changed", pos_update, mpos); + + pos_update(GTK_OBJECT(posadj), mpos); +} + +static void +pos_destroy(GtkObject *obj) +{ + + melys_pos_clear(MELYS_POS(obj)); + + if (GTK_OBJECT_CLASS(parent_class)->destroy) + GTK_OBJECT_CLASS(parent_class)->destroy(obj); +} + +void +melys_pos_clear(MelysPos *mpos) +{ + + dprintf1("melys_pos_clear"); + + if (mpos->sig_id) { + gtk_signal_disconnect(GTK_OBJECT(mpos->posadj), mpos->sig_id); + mpos->sig_id = 0; + } + + if (mpos->tempomap) { + md_free(MD_ELEMENT(mpos->tempomap)); + mpos->tempomap = NULL; + } + + if (mpos->posadj) { + gtk_object_unref(GTK_OBJECT(mpos->posadj)); + mpos->posadj = NULL; + } +} + +static void +pos_update(GtkObject *obj, gpointer data) +{ + MelysPos *mpos = data; + struct mbt mbt; + unsigned long t; + char buf[POS_LABEL_LEN]; + + g_return_if_fail(mpos->tempomap != NULL); + g_return_if_fail(mpos->posadj != NULL); + + t = (unsigned long) mpos->posadj->value; + if (t != mpos->lasttime) { + mpos->lasttime = t; + + md_tick_to_mbt(mpos->tempomap, t, &mbt); + g_snprintf(buf, POS_LABEL_LEN, POS_FORMAT, + mbt.bars+1, mbt.beats+1, mbt.ticks); + + gtk_label_set_text(GTK_LABEL(mpos), buf); + } +} diff -rNu melys-0.0.19/widgets/melyspos.m melys-0.0.20/widgets/melyspos.m --- melys-0.0.19/widgets/melyspos.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.20/widgets/melyspos.m Mon Oct 25 20:37:17 1999 @@ -0,0 +1,177 @@ +>>name melyspos.m - Position indicator + +Copyright (C) 1999 Steve Ratcliffe + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +A meters, beats and ticks indicator. +It is currently essentially a label that updates itself based on +the supplied adjustment. + +>>header gtk/gtksignal.h +>>header gtk/gtkadjustment.h +>>header gtk/gtklabel.h + +>>header elements.h +>>header md.h + +>>set nosignals +>>gtkobject melys_pos gtk_label + +>>headerdef @header + +struct _MelysPos { + GtkLabel label; + + GtkAdjustment *posadj; + struct tempomapElement *tempomap; + + int sig_id; /* Connection to posadj */ + + unsigned long lasttime; +}; + +struct _MelysPosClass { + GtkLabelClass parent_class; +}; + +>>extern + +/* Position label defines */ +#define POS_FORMAT "%3d:%02d:%03d" +#define POS_LABEL_LEN 12 /* Max text length */ + +>>function melys_pos_new +GtkWidget * + +>>description +Create a new MelysPos object. +>>code + GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_pos_get_type())); + char buf[POS_LABEL_LEN]; + + g_snprintf(buf, POS_LABEL_LEN, POS_FORMAT, 1, 1, 0); + gtk_label_set_text(GTK_LABEL(w), buf); + return w; + +>>function melys_pos_init +static void +MelysPos *mpos; The MelysPos to init +>>description +Initialise the MelysPos. +>>code + + +>>function melys_pos_class_init +static void +MelysPosClass *klass; The class to initialise + +>>description +Initialize the class. + +>>code + GtkObjectClass *object_class; + GtkLabelClass *label_class; + + object_class = (GtkObjectClass *)klass; + label_class = (GtkLabelClass *)klass; + + parent_class = gtk_type_class(gtk_label_get_type()); + + object_class->destroy = pos_destroy; + + +>>function melys_pos_set_controls +void +MelysPos *mpos; +struct tempomapElement *tmap; The tempomap for the song +GtkAdjustment *posadj; The song position adjustment +>>code + + g_return_if_fail(tmap != NULL); + g_return_if_fail(posadj != NULL); + g_return_if_fail(MD_TYPE(tmap) == MD_TYPE_TEMPOMAP); + + dprintf1("@func_name %p %p", tmap, posadj); + melys_pos_clear(mpos); + + MD_REF(tmap); + mpos->tempomap = tmap; + + gtk_object_ref(GTK_OBJECT(posadj)); + mpos->posadj = posadj; + + mpos->sig_id = gtk_signal_connect(GTK_OBJECT(posadj), + "value_changed", pos_update, mpos); + + pos_update(GTK_OBJECT(posadj), mpos); + + + +>>function pos_destroy +static void +GtkObject *obj; + +>>code + + melys_pos_clear(MELYS_POS(obj)); + + if (GTK_OBJECT_CLASS(parent_class)->destroy) + GTK_OBJECT_CLASS(parent_class)->destroy(obj); + +>>function melys_pos_clear +void +MelysPos *mpos; + +>>code + + dprintf1("@func_name"); + + if (mpos->sig_id) { + gtk_signal_disconnect(GTK_OBJECT(mpos->posadj), mpos->sig_id); + mpos->sig_id = 0; + } + + if (mpos->tempomap) { + md_free(MD_ELEMENT(mpos->tempomap)); + mpos->tempomap = NULL; + } + + if (mpos->posadj) { + gtk_object_unref(GTK_OBJECT(mpos->posadj)); + mpos->posadj = NULL; + } + + + +>>function pos_update +static void +GtkObject *obj; The adjustment +gpointer data; The mpos + +>>code + MelysPos *mpos = data; + struct mbt mbt; + unsigned long t; + char buf[POS_LABEL_LEN]; + + g_return_if_fail(mpos->tempomap != NULL); + g_return_if_fail(mpos->posadj != NULL); + + t = (unsigned long) mpos->posadj->value; + if (t != mpos->lasttime) { + mpos->lasttime = t; + + md_tick_to_mbt(mpos->tempomap, t, &mbt); + g_snprintf(buf, POS_LABEL_LEN, POS_FORMAT, + mbt.bars+1, mbt.beats+1, mbt.ticks); + + gtk_label_set_text(GTK_LABEL(mpos), buf); + } diff -rNu melys-0.0.19/widgets/melysrule.c melys-0.0.20/widgets/melysrule.c --- melys-0.0.19/widgets/melysrule.c Sat Oct 16 15:08:41 1999 +++ melys-0.0.20/widgets/melysrule.c Mon Oct 25 20:56:38 1999 @@ -52,9 +52,9 @@ static int x_to_tick(MelysRule *mrule, int xpix); -static gint melys_rule_signals[LAST_SIGNAL]; - static GtkDrawingAreaClass *parent_class = NULL; + +static gint melys_rule_signals[LAST_SIGNAL]; /* * Return a unique integer that represents the object type. diff -rNu melys-0.0.19/widgets/melystrack.c melys-0.0.20/widgets/melystrack.c --- melys-0.0.19/widgets/melystrack.c Sat Oct 16 15:08:41 1999 +++ melys-0.0.20/widgets/melystrack.c Mon Oct 25 20:56:38 1999 @@ -22,6 +22,7 @@ #include "elements.h" #include "pixmaps.h" #include "md.h" +#include "melgui.h" #include "melystrackinfo.h" #include "melystrackdisplay.h" #include "libgnomeui/gnome-pixmap.h" @@ -54,10 +55,10 @@ static void button_release(GtkWidget *w, MelysTrack *mtrack); -static gint melys_track_signals[LAST_SIGNAL]; - static GtkVBoxClass *parent_class = NULL; +static gint melys_track_signals[LAST_SIGNAL]; + /* * Return a unique integer that represents the object type. */ @@ -383,11 +384,15 @@ vert_expand, mtrack); gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", vert_shrink, mtrack); + set_tip(plusbutton, _("Expand the height of the tracks")); + set_tip(minusbutton, _("Shrink the height of the tracks")); } else { gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", horiz_expand, mtrack); gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", horiz_shrink, mtrack); + set_tip(plusbutton, _("Increase horizontal scale")); + set_tip(minusbutton, _("Decrease horizontail scale")); } gtk_signal_connect(GTK_OBJECT(plusbutton), "released", diff -rNu melys-0.0.19/widgets/melystrack.m melys-0.0.20/widgets/melystrack.m --- melys-0.0.19/widgets/melystrack.m Fri Oct 15 11:32:54 1999 +++ melys-0.0.20/widgets/melystrack.m Fri Oct 22 23:38:40 1999 @@ -23,6 +23,7 @@ >>header elements.h >>header pixmaps.h >>header md.h +>>header melgui.h >>header melystrackinfo.h >>header melystrackdisplay.h >>header libgnomeui/gnome-pixmap.h @@ -372,11 +373,15 @@ vert_expand, mtrack); gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", vert_shrink, mtrack); + set_tip(plusbutton, _("Expand the height of the tracks")); + set_tip(minusbutton, _("Shrink the height of the tracks")); } else { gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", horiz_expand, mtrack); gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", horiz_shrink, mtrack); + set_tip(plusbutton, _("Increase horizontal scale")); + set_tip(minusbutton, _("Decrease horizontail scale")); } gtk_signal_connect(GTK_OBJECT(plusbutton), "released", diff -rNu melys-0.0.19/widgets/melystrackdisplay.c melys-0.0.20/widgets/melystrackdisplay.c --- melys-0.0.19/widgets/melystrackdisplay.c Sat Oct 16 15:08:42 1999 +++ melys-0.0.20/widgets/melystrackdisplay.c Mon Oct 25 20:56:39 1999 @@ -147,10 +147,10 @@ static void outline_data_free(gpointer data); -static gint melys_track_display_signals[LAST_SIGNAL]; - static GtkVBoxClass *parent_class = NULL; +static gint melys_track_display_signals[LAST_SIGNAL]; + /* The menu for the display pane */ static GnomeUIInfo displaymenu[] = { @@ -386,6 +386,10 @@ { mdisp->hscale = hscale; melys_rule_set_hscale(MELYS_RULE(mdisp->title), hscale); + + /* Get the scroll to position correct */ + mdisp->hadj->value--; /* slight hack, sorry */ + gtk_adjustment_value_changed(mdisp->hadj); } /* @@ -678,7 +682,7 @@ "anchor", GTK_ANCHOR_NORTH_WEST, "clip", TRUE, "clip_width", (double) tick_to_x(mdisp, MD_DURATION(part))-2, - "clip_height", (double) mdisp->height, + "clip_height", (double) mdisp->height-2, NULL); /* This size of the part is set here */ @@ -1606,6 +1610,8 @@ int drop_tick; int track_start = 0; int tick_start = 0; + int minoff = 0; + int snapadj; gboolean needrm = FALSE; int x, y; double dx, dy; @@ -1649,8 +1655,14 @@ /* Check and adjust for droping before the beginning */ if (dp->tick_offset + drop_tick < 0) tick_start = MIN(tick_start, dp->tick_offset + drop_tick); + + minoff = MIN(minoff, dp->tick_offset); } + drop_tick -= tick_start; + + snapadj = md_snap_tick(md_get_tempomap(mdisp->mdroot), minoff + drop_tick, mdisp->snap) - (minoff + drop_tick); + md_undo_begin_set(MD_UNDO(mdisp->mdroot)); for (i = 0; i < len; i++) { @@ -1685,9 +1697,8 @@ track = md_track_nth(mdisp->mdroot, tn); - t = drop_tick + dp->tick_offset - tick_start; + t = snapadj + drop_tick + dp->tick_offset; g_assert(t >= 0); - t = md_snap_tick(md_get_tempomap(mdisp->mdroot), t, mdisp->snap); /* * The new part should have its time and devchan set to @@ -1708,6 +1719,9 @@ md_shrink(mdisp->mdroot); build_sel_list(mdisp); + + if (mdisp->posline) + gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mdisp->posline); song_view_update(mdisp->song); return; diff -rNu melys-0.0.19/widgets/melystrackdisplay.m melys-0.0.20/widgets/melystrackdisplay.m --- melys-0.0.19/widgets/melystrackdisplay.m Sat Oct 16 14:00:59 1999 +++ melys-0.0.20/widgets/melystrackdisplay.m Mon Oct 25 00:25:56 1999 @@ -401,6 +401,10 @@ mdisp->hscale = hscale; melys_rule_set_hscale(MELYS_RULE(mdisp->title), hscale); + /* Get the scroll to position correct */ + mdisp->hadj->value--; /* slight hack, sorry */ + gtk_adjustment_value_changed(mdisp->hadj); + >>function melys_track_display_set_height void @@ -417,6 +421,7 @@ mdisp->htitle = htitle; mdisp->vtitle = htitle + TRACK_SEPARATION; + >>function disp_scroll static void GtkAdjustment *adj; @@ -693,7 +698,7 @@ "anchor", GTK_ANCHOR_NORTH_WEST, "clip", TRUE, "clip_width", (double) tick_to_x(mdisp, MD_DURATION(part))-2, - "clip_height", (double) mdisp->height, + "clip_height", (double) mdisp->height-2, NULL); /* This size of the part is set here */ @@ -708,7 +713,6 @@ "dotted_border", ref, NULL); - >>function disp_destroy static void GtkObject *obj; @@ -1692,6 +1696,8 @@ int drop_tick; int track_start = 0; int tick_start = 0; + int minoff = 0; + int snapadj; gboolean needrm = FALSE; int x, y; double dx, dy; @@ -1735,8 +1741,14 @@ /* Check and adjust for droping before the beginning */ if (dp->tick_offset + drop_tick < 0) tick_start = MIN(tick_start, dp->tick_offset + drop_tick); + + minoff = MIN(minoff, dp->tick_offset); } + drop_tick -= tick_start; + + snapadj = md_snap_tick(md_get_tempomap(mdisp->mdroot), minoff + drop_tick, mdisp->snap) - (minoff + drop_tick); + md_undo_begin_set(MD_UNDO(mdisp->mdroot)); for (i = 0; i < len; i++) { @@ -1771,9 +1783,8 @@ track = md_track_nth(mdisp->mdroot, tn); - t = drop_tick + dp->tick_offset - tick_start; + t = snapadj + drop_tick + dp->tick_offset; g_assert(t >= 0); - t = md_snap_tick(md_get_tempomap(mdisp->mdroot), t, mdisp->snap); /* * The new part should have its time and devchan set to @@ -1794,6 +1805,9 @@ md_shrink(mdisp->mdroot); build_sel_list(mdisp); + + if (mdisp->posline) + gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mdisp->posline); song_view_update(mdisp->song); return; diff -rNu melys-0.0.19/widgets/melystrackinfo.c melys-0.0.20/widgets/melystrackinfo.c --- melys-0.0.19/widgets/melystrackinfo.c Sat Oct 16 15:08:42 1999 +++ melys-0.0.20/widgets/melystrackinfo.c Mon Oct 25 20:56:39 1999 @@ -88,16 +88,14 @@ } def_col_info[] = { {NUMBER, COL_TEXT, "", 20, FALSE}, {NAME, COL_TEXT, N_("Name"), 100, TRUE}, - {PROGRAM, COL_TEXT, N_("Prog"), 30, TRUE}, + {PROGRAM, COL_TEXT, N_("Prog"), 28, TRUE}, {CHANNEL, COL_TEXT, N_("C"), 14, TRUE}, {MUTE, COL_BUTTON, N_("Mute"), 28, TRUE}, - {SOLO, COL_BUTTON, N_("Solo"), 28, TRUE}, - {RECORD, COL_BUTTON, N_("Rec"), 28, TRUE}, + {SOLO, COL_BUTTON, N_("Solo"), 26, TRUE}, + {RECORD, COL_BUTTON, N_("Rec"), 26, TRUE}, }; /* A border to the protect the column lines */ -#define BORDER 2 - #define COL_PADDING 2 @@ -154,9 +152,9 @@ struct trackElement *track); -static gint melys_track_info_signals[LAST_SIGNAL]; - static GtkWidgetClass *parent_class = NULL; + +static gint melys_track_info_signals[LAST_SIGNAL]; /* * Return a unique integer that represents the object type. diff -rNu melys-0.0.19/widgets/melystrackinfo.m melys-0.0.20/widgets/melystrackinfo.m --- melys-0.0.19/widgets/melystrackinfo.m Fri Oct 15 11:57:36 1999 +++ melys-0.0.20/widgets/melystrackinfo.m Sun Oct 24 13:10:27 1999 @@ -144,16 +144,14 @@ } def_col_info[] = { {NUMBER, COL_TEXT, "", 20, FALSE}, {NAME, COL_TEXT, N_("Name"), 100, TRUE}, - {PROGRAM, COL_TEXT, N_("Prog"), 30, TRUE}, + {PROGRAM, COL_TEXT, N_("Prog"), 28, TRUE}, {CHANNEL, COL_TEXT, N_("C"), 14, TRUE}, {MUTE, COL_BUTTON, N_("Mute"), 28, TRUE}, - {SOLO, COL_BUTTON, N_("Solo"), 28, TRUE}, - {RECORD, COL_BUTTON, N_("Rec"), 28, TRUE}, + {SOLO, COL_BUTTON, N_("Solo"), 26, TRUE}, + {RECORD, COL_BUTTON, N_("Rec"), 26, TRUE}, }; /* A border to the protect the column lines */ -#define BORDER 2 - #define COL_PADDING 2 diff -rNu melys-0.0.19/widgets/melystransport.c melys-0.0.20/widgets/melystransport.c --- melys-0.0.19/widgets/melystransport.c Sat Oct 16 15:08:42 1999 +++ melys-0.0.20/widgets/melystransport.c Mon Oct 25 20:56:39 1999 @@ -40,9 +40,9 @@ static void melys_transport_class_init(MelysTransportClass *klass); -static gint melys_transport_signals[LAST_SIGNAL]; - static GtkDrawingAreaClass *parent_class = NULL; + +static gint melys_transport_signals[LAST_SIGNAL]; /* * Return a unique integer that represents the object type.