diff -rNu melys-0.0.9/ChangeLog melys-0.0.10/ChangeLog --- melys-0.0.9/ChangeLog Thu Aug 19 13:07:36 1999 +++ melys-0.0.10/ChangeLog Wed Sep 15 13:49:19 1999 @@ -1,6 +1,125 @@ +1999-09-15 Steve Ratcliffe + + * REL-0-0-10 + + * md/mdadd.m, md/mdutil.m: + Move the MD_ convenience functions all to mdutil.m + + * midi/record.m: Final changes to get fully working record. + + * widgets/melystrackinfo.m: + Improvements to the look and drawing efficiency. + + * md/elements.m, md/mdadd.m, md/mdlist.m: Event merging is now working. + +1999-09-14 Steve Ratcliffe + + * mlib/PROJECT/base.py: + Containers are now regarded as being containers(!) + + * md/mdadd.m, md/mdlist.m: Fixes to get the record merging to work + + * programs/melplay.m: + Added the makefile information. Somehow this had never been + added so it wasn't being built... + + * song/song.m: md_add --> md_add_elem changes + + * md/.cvsignore, md/elements.m, md/mdadd.m, md/mdlist.m, + md/mdundo.m, md/mdutil.m: + Extensive MD changes mainly to allow proper merging + in of events. Preparation for undo function + + * programs/.cvsignore, programs/mdmlconv.m, programs/melys.m, + midi/play.m, midi/record.m: + md_add --> md_add_elem changes + + * gui/main.m, gui/menus.m: New song now has some pre-allocated tracks. + + * files/file.m, files/mdmlread.m, files/mdmlwrite.m, files/midiread.m: + md_add --> md_add_elem changes + + * widgets/melystrack.m, widgets/melystrackinfo.m: + New function for root reference counts. + Clicking in the title area used to set a button. + Now does nothing but will bring up a dialogue in the future. + +1999-09-13 Steve Ratcliffe + + * mlib/PROJECT/base.py: + Fix the element initialisation code generation. Init calls + now correctly chain up. + +1999-09-12 Steve Ratcliffe + + * widgets/melystrack.m, widgets/melystrackinfo.m: + Record and track adding/removing fixes + + * seq/seqlib.m: + A new field was added to subscription in alsa which needs + to be set to get the previous behaviour. + + * midi/record.m: Fix to get the correct input device on recording + + * programs/mdmlconv.m: Add take element to the --new output + + * md/elements.m: Complete the take element + + * doc/mdml.dtd, doc/sgmldecl: Add partref and update the take element + + * files/mdmlread.m, files/mdmlwrite.m, files/midiwrite.m: + Add take element processing + + * programs/mdmlconv.m: + Added option to create a new empty file from scratch. + Mainly to create skeleton mdml files for hand editing but + could also create an empty midi file if you can think + of any use for that. + +1999-09-11 Steve Ratcliffe + + * gui/main.m: Add the button 3 context menu for the info pane. + +1999-09-08 Steve Ratcliffe + + * gui/menus.m, md/elements.m, md/mdutil.m, midi/play.m, + midi/record.m, programs/showseq.m, seq/seqlib.m, Makefile: + Somewhat re-wrote the event input code so that + multiple tracks can be recorded at the same time from potentially + multiple recording sources. + + * help/C/topic.dat, help/C/track.sgml: + New track view section documentation. + +1999-08-29 Steve Ratcliffe + + * help/C/Makefile, help/C/index.html, help/C/melys.sgml, help/C/track.sgml: + Some documentation updates. + Now there is some basic documentation for the track view. + +1999-08-20 Steve Ratcliffe + + * gui/menus.m, pixmaps/mb3.png, pixmaps/menu_icons.m, pixmaps/mpause.png, + pixmaps/mpause.xpm, pixmaps/mplay.png, pixmaps/mplay.xpm, + pixmaps/mrec.xpm, pixmaps/mstop.png, pixmaps/mstop.xpm, + pixmaps/play.png, programs/melys.m: + Made the menu item pixmaps built in data + 1999-08-19 Steve Ratcliffe - * midi/play.m: Updated for latest version of the kernel patch. + * widgets/melystrackinfo.m: Fixed solo to match its specification. + + * programs/showseq.m: + Print out client:port instead of just the port number. + + * ChangeLog, README: For REL-0-0-9 + + * po/FILES, po/melys.pot, po/zz.po: Updated + + * midi/play.m: + Made a better attempt at doing mute if you have stock 0.4.0 + + * midi/play.m: Updated for latest patch. 1999-08-18 Steve Ratcliffe diff -rNu melys-0.0.9/INSTALL melys-0.0.10/INSTALL --- melys-0.0.9/INSTALL Mon Aug 16 12:09:44 1999 +++ melys-0.0.10/INSTALL Wed Sep 15 13:49:19 1999 @@ -9,6 +9,7 @@ make This should build everything. Nothing is installed anywhere yet. +Installation will be fixed in 0.0.11 Run --- @@ -25,5 +26,4 @@ Go to the programs directory and type: ./melys - diff -rNu melys-0.0.9/Makefile melys-0.0.10/Makefile --- melys-0.0.9/Makefile Mon Aug 16 12:00:20 1999 +++ melys-0.0.10/Makefile Wed Sep 15 13:49:19 1999 @@ -1,4 +1,5 @@ -DIRS=config song seq files md util gui po widgets midi programs pixmaps +DIRS=config song seq files md util gui po widgets midi pixmaps \ + programs all: build @@ -23,4 +24,5 @@ clobber: for i in $(DIRS); do (cd $$i; $(MAKE) clobber) || exit 1; done -dist: cfiles +fordist: cfiles + find mlib -name '*.pyo' | xargs rm -f diff -rNu melys-0.0.9/README melys-0.0.10/README --- melys-0.0.9/README Thu Aug 19 13:07:36 1999 +++ melys-0.0.10/README Wed Sep 15 13:49:19 1999 @@ -1,18 +1,32 @@ -This is Melys, a midi sequencer for ALSA. +This is Melys, a MIDI sequencer for ALSA. + +Written by Steve Ratcliffe +Project home page http://www.parabola.demon.co.uk/melys/ +Project mail melys@parabola.demon.co.uk + +See the file COPYING for licence details. + +Features +-------- + +This is very early stage of development, although you can already do +a few useful things with it. At present you can: -1. Read in files in either midi format or the Melys native format MDML. +- Read in files in either midi format or the Melys native format MDML. There can be several files open at once. -2. Play a file, stop it in the middle and resume it. +- Play a file, stop it in the middle and resume it, mute tracks, solo + tracks. -3. Record a new track. +- Record new tracks, include merging in new events to an already + existing track. -4. Save the file. +- Save the file. -5. Mute and solo tracks. +- Mute and solo tracks. There is little of the gui implemented so it is difficult to see what is going on. This release is only for the adventurous. @@ -22,17 +36,12 @@ - You will need the gnome libraries including libxml. I am trying not to require anything too up-to-the minute and so anything past version 1.0 - should be OK. + should be OK. But do get the latest version you can, just for + the bug fixes if nothing else. - GTK+ 1.2 - - ALSA, preferably version 0.4.0 - - - There are some alsa patches that you can apply. I will try to - keep these up to date at http://www.parabola.demon.co.uk/melys/ - Patches are required to allow the mute function to work correctly - and if you are using the AWE64 to allow the reset-all-controllers - midi command work properly. + - ALSA, preferably version 0.4.1 or the latest CVS version - Its not required but it will help if you want to do any development to get mcode. http://www.parabola.demon.co.uk/mcode/ @@ -50,3 +59,13 @@ mdmlconv -o out.mdml infile.mid Showseq lists out all the ALSA clients. + +Melplay is a command line player. It reads all formats that Melys can +read. + +Authors +------- + +Melys is written by: + + Steve Ratcliffe diff -rNu melys-0.0.9/doc/mdml.dtd melys-0.0.10/doc/mdml.dtd --- melys-0.0.9/doc/mdml.dtd Fri Aug 6 11:54:42 1999 +++ melys-0.0.10/doc/mdml.dtd Sun Sep 12 23:40:34 1999 @@ -1,5 +1,5 @@ + + + @@ -38,7 +41,7 @@ - + - + + + + + - + diff -rNu melys-0.0.9/files/file.c melys-0.0.10/files/file.c --- melys-0.0.9/files/file.c Thu Aug 19 13:11:55 1999 +++ melys-0.0.10/files/file.c Wed Sep 15 14:03:58 1999 @@ -269,7 +269,7 @@ /* If there is no filename the return a new, empty MD */ if (file->name == NULL || file->name == "") { - root = md_empty(); + root = md_song_new(); if (root) { file->name = ""; file_set_success(file); diff -rNu melys-0.0.9/files/file.m melys-0.0.10/files/file.m --- melys-0.0.9/files/file.m Tue Aug 10 15:03:31 1999 +++ melys-0.0.10/files/file.m Tue Sep 14 14:56:48 1999 @@ -321,7 +321,7 @@ /* If there is no filename the return a new, empty MD */ if (file->name == NULL || file->name == "") { - root = md_empty(); + root = md_song_new(); if (root) { file->name = ""; file_set_success(file); diff -rNu melys-0.0.9/files/mdmlread.c melys-0.0.10/files/mdmlread.c --- melys-0.0.9/files/mdmlread.c Thu Aug 19 13:11:55 1999 +++ melys-0.0.10/files/mdmlread.c Wed Sep 15 14:03:59 1999 @@ -217,10 +217,25 @@ } else if (strcmp(name, "part") == 0) { struct partElement *pp; + int id; pp = md_part_new(); pp->name = xmlGetProp(node, "name"); + id = get_int(node, "id"); + if (id > 0) + pp->id = id; retel = MD_ELEMENT(pp); + } else if (strcmp(name, "take") == 0) { + struct takeElement *tp; + char *sel; + + tp = md_take_new(); + tp->name = xmlGetProp(node, "name"); + sel = xmlGetProp(node, "selected"); + if (sel && strcmp(sel, "yes")) + tp->selected = 1; + retel = MD_ELEMENT(tp); + } else if (strcmp(name, "tempo") == 0) { struct tempoElement *tp; int us; @@ -330,7 +345,7 @@ el = node_to_md(msp, child); if (el == NULL) continue; - md_add(MD_CONTAINER(retel), el); + md_add_elem(MD_CONTAINER(retel), el); } if (retel && iscontainer(retel)) { diff -rNu melys-0.0.9/files/mdmlread.m melys-0.0.10/files/mdmlread.m --- melys-0.0.9/files/mdmlread.m Mon Aug 16 12:00:20 1999 +++ melys-0.0.10/files/mdmlread.m Tue Sep 14 14:56:48 1999 @@ -198,10 +198,25 @@ } else if (strcmp(name, "part") == 0) { struct partElement *pp; + int id; pp = md_part_new(); pp->name = xmlGetProp(node, "name"); + id = get_int(node, "id"); + if (id > 0) + pp->id = id; retel = MD_ELEMENT(pp); + } else if (strcmp(name, "take") == 0) { + struct takeElement *tp; + char *sel; + + tp = md_take_new(); + tp->name = xmlGetProp(node, "name"); + sel = xmlGetProp(node, "selected"); + if (sel && strcmp(sel, "yes")) + tp->selected = 1; + retel = MD_ELEMENT(tp); + } else if (strcmp(name, "tempo") == 0) { struct tempoElement *tp; int us; @@ -311,7 +326,7 @@ el = node_to_md(msp, child); if (el == NULL) continue; - md_add(MD_CONTAINER(retel), el); + md_add_elem(MD_CONTAINER(retel), el); } if (retel && iscontainer(retel)) { diff -rNu melys-0.0.9/files/mdmlwrite.c melys-0.0.10/files/mdmlwrite.c --- melys-0.0.9/files/mdmlwrite.c Thu Aug 19 13:11:55 1999 +++ melys-0.0.10/files/mdmlwrite.c Wed Sep 15 14:03:59 1999 @@ -285,8 +285,19 @@ case MD_TYPE_PART: node = xmlNewChild(base, 0, "part", 0); set_prop_int(node, "duration", MD_CONTAINER(el)->duration); + if (MD_PART(el)->id > 0) + set_prop_int(node, "id", MD_PART(el)->id); if (MD_PART(el)->name) xmlSetProp(node, "name", MD_PART(el)->name); + build_section(msp, node, MD_CONTAINER(el)); + break; + case MD_TYPE_TAKE: + node = xmlNewChild(base, 0, "take", 0); + set_prop_int(node, "duration", MD_CONTAINER(el)->duration); + if (MD_TAKE(el)->name) + xmlSetProp(node, "name", MD_PART(el)->name); + if (MD_TAKE(el)->selected) + xmlSetProp(node, "selected", "yes"); build_section(msp, node, MD_CONTAINER(el)); break; default: diff -rNu melys-0.0.9/files/mdmlwrite.m melys-0.0.10/files/mdmlwrite.m --- melys-0.0.9/files/mdmlwrite.m Mon Aug 16 12:00:21 1999 +++ melys-0.0.10/files/mdmlwrite.m Tue Sep 14 14:56:48 1999 @@ -265,8 +265,19 @@ case MD_TYPE_PART: node = xmlNewChild(base, 0, "part", 0); set_prop_int(node, "duration", MD_CONTAINER(el)->duration); + if (MD_PART(el)->id > 0) + set_prop_int(node, "id", MD_PART(el)->id); if (MD_PART(el)->name) xmlSetProp(node, "name", MD_PART(el)->name); + build_section(msp, node, MD_CONTAINER(el)); + break; + case MD_TYPE_TAKE: + node = xmlNewChild(base, 0, "take", 0); + set_prop_int(node, "duration", MD_CONTAINER(el)->duration); + if (MD_TAKE(el)->name) + xmlSetProp(node, "name", MD_PART(el)->name); + if (MD_TAKE(el)->selected) + xmlSetProp(node, "selected", "yes"); build_section(msp, node, MD_CONTAINER(el)); break; default: diff -rNu melys-0.0.9/files/midiread.c melys-0.0.10/files/midiread.c --- melys-0.0.9/files/midiread.c Thu Aug 19 13:11:55 1999 +++ melys-0.0.10/files/midiread.c Wed Sep 15 14:03:59 1999 @@ -23,6 +23,7 @@ #include "elements.h" #include #include +#include "md.h" #include "melfile.h" #include "midi.h" #include "intl.h" @@ -153,7 +154,7 @@ return NULL; } - md_add(MD_CONTAINER(root), MD_ELEMENT(msp->tempo_map)); + md_add_elem(MD_CONTAINER(root), MD_ELEMENT(msp->tempo_map)); msp->root->tracks = 0; /* Is re-calculated when tracks are added */ @@ -171,7 +172,7 @@ continue; } - md_add(MD_CONTAINER(root), el); + md_add_elem(MD_CONTAINER(root), el); } msp->tempo_map = NULL; @@ -198,7 +199,7 @@ root = md_root_new(); head = md_head_new(); - md_add(MD_CONTAINER(root), MD_ELEMENT(head)); + md_add_elem(MD_CONTAINER(root), MD_ELEMENT(head)); root->head = head; msp->root = root; @@ -281,7 +282,7 @@ track = md_track_new(); part = md_part_new(); - md_add(MD_CONTAINER(track), MD_ELEMENT(part)); + md_add_elem(MD_CONTAINER(track), MD_ELEMENT(part)); msp->current_time = 0; while (msp->chunk_count < msp->chunk_size) { @@ -469,7 +470,7 @@ el->element_time = msp->current_time; el->device_channel = device; - md_add(MD_CONTAINER(part), el); + md_add_elem(MD_CONTAINER(part), el); } } @@ -539,7 +540,7 @@ /* If this affected the tempo map then add it */ if (map) { MD_ELEMENT(map)->element_time = msp->current_time; - md_add(MD_CONTAINER(msp->tempo_map), MD_ELEMENT(map)); + md_add_elem(MD_CONTAINER(msp->tempo_map), MD_ELEMENT(map)); } return el; diff -rNu melys-0.0.9/files/midiread.m melys-0.0.10/files/midiread.m --- melys-0.0.9/files/midiread.m Mon Aug 16 12:00:21 1999 +++ melys-0.0.10/files/midiread.m Tue Sep 14 14:56:48 1999 @@ -17,6 +17,7 @@ >>header >>header +>>header md.h >>header melfile.h >>headerdef --decl midi.h @@ -171,7 +172,7 @@ return NULL; } - md_add(MD_CONTAINER(root), MD_ELEMENT(msp->tempo_map)); + md_add_elem(MD_CONTAINER(root), MD_ELEMENT(msp->tempo_map)); msp->root->tracks = 0; /* Is re-calculated when tracks are added */ @@ -189,7 +190,7 @@ continue; } - md_add(MD_CONTAINER(root), el); + md_add_elem(MD_CONTAINER(root), el); } msp->tempo_map = NULL; @@ -214,7 +215,7 @@ root = md_root_new(); head = md_head_new(); - md_add(MD_CONTAINER(root), MD_ELEMENT(head)); + md_add_elem(MD_CONTAINER(root), MD_ELEMENT(head)); root->head = head; msp->root = root; @@ -296,7 +297,7 @@ track = md_track_new(); part = md_part_new(); - md_add(MD_CONTAINER(track), MD_ELEMENT(part)); + md_add_elem(MD_CONTAINER(track), MD_ELEMENT(part)); msp->current_time = 0; while (msp->chunk_count < msp->chunk_size) { @@ -483,7 +484,7 @@ el->element_time = msp->current_time; el->device_channel = device; - md_add(MD_CONTAINER(part), el); + md_add_elem(MD_CONTAINER(part), el); } >>function handle_meta @@ -551,7 +552,7 @@ /* If this affected the tempo map then add it */ if (map) { MD_ELEMENT(map)->element_time = msp->current_time; - md_add(MD_CONTAINER(msp->tempo_map), MD_ELEMENT(map)); + md_add_elem(MD_CONTAINER(msp->tempo_map), MD_ELEMENT(map)); } return el; diff -rNu melys-0.0.9/files/midiwrite.c melys-0.0.10/files/midiwrite.c --- melys-0.0.9/files/midiwrite.c Thu Aug 19 13:11:55 1999 +++ melys-0.0.10/files/midiwrite.c Wed Sep 15 14:03:59 1999 @@ -126,9 +126,13 @@ write_elem(struct element *el, void *arg, int flags) { struct midiwstate *msp; + static int skipping; msp = (struct midiwstate *)arg; + if (skipping && el->type != MD_TYPE_TAKE) + return; + switch (el->type) { case MD_TYPE_ROOT: if (flags & MD_WALK_START) { @@ -180,6 +184,14 @@ } break; case MD_TYPE_PART: + break; + case MD_TYPE_TAKE: + if (flags & MD_WALK_START) { + if (!MD_TAKE(el)->selected) + skipping = 1; + } else { + skipping = 0; + } break; case MD_TYPE_NOTE: put_time(msp, el->element_time); diff -rNu melys-0.0.9/files/midiwrite.m melys-0.0.10/files/midiwrite.m --- melys-0.0.9/files/midiwrite.m Tue Aug 10 15:02:51 1999 +++ melys-0.0.10/files/midiwrite.m Sun Sep 12 23:39:36 1999 @@ -107,9 +107,13 @@ >>code struct midiwstate *msp; + static int skipping; msp = (struct midiwstate *)arg; + if (skipping && el->type != MD_TYPE_TAKE) + return; + switch (el->type) { case MD_TYPE_ROOT: if (flags & MD_WALK_START) { @@ -161,6 +165,14 @@ } break; case MD_TYPE_PART: + break; + case MD_TYPE_TAKE: + if (flags & MD_WALK_START) { + if (!MD_TAKE(el)->selected) + skipping = 1; + } else { + skipping = 0; + } break; case MD_TYPE_NOTE: put_time(msp, el->element_time); diff -rNu melys-0.0.9/gui/main.c melys-0.0.10/gui/main.c --- melys-0.0.9/gui/main.c Thu Aug 19 13:11:56 1999 +++ melys-0.0.10/gui/main.c Wed Sep 15 14:04:01 1999 @@ -36,6 +36,14 @@ #include "melmsg.h" #include "intl.h" +/* + * Help text for the context menu on the info pane + */ +static char *trackinfohelp = N_( + "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" + ); static GtkWidget *create_view(GnomeMDIChild *child, gpointer data); static int add_view_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data); @@ -77,7 +85,7 @@ child = gnome_mdi_generic_child_new(_("Untitled")); song = song_new(GTK_OBJECT(mdi), GTK_OBJECT(child)); - song_setup(song, NULL, md_empty()); + song_setup(song, NULL, md_song_new()); gnome_mdi_add_child(mdi, GNOME_MDI_CHILD(child)); @@ -271,7 +279,9 @@ gboolean toplevel) { GtkWidget *w; + MelysTrackInfo *minfo; struct song *song = song_get_data(child); + extern GnomeUIInfo tracksmenu[]; /* Our initial view is the track based view */ w = melys_track_new(root); @@ -287,6 +297,13 @@ gtk_main_iteration(); gnome_mdi_set_active_view(GNOME_MDI(mdi), w); + + /* + * Set the button three context menu. + */ + minfo = MELYS_TRACK(w)->info; + gnome_widget_add_help_with_uidata(GTK_WIDGET(minfo), _(trackinfohelp), + tracksmenu, mdi); song->trackview = w; } diff -rNu melys-0.0.9/gui/main.m melys-0.0.10/gui/main.m --- melys-0.0.9/gui/main.m Mon Aug 16 12:00:21 1999 +++ melys-0.0.10/gui/main.m Tue Sep 14 14:57:50 1999 @@ -57,6 +57,16 @@ extern void mel_song_display(struct song *sd, struct _GtkObject *parent, int _type, char *fmt, ...); +>>extern +/* + * Help text for the context menu on the info pane + */ +static char *trackinfohelp = N_( + "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" + ); + >>function melys_app int int argc; The program argument count @@ -90,7 +100,7 @@ child = gnome_mdi_generic_child_new(_("Untitled")); song = song_new(GTK_OBJECT(mdi), GTK_OBJECT(child)); - song_setup(song, NULL, md_empty()); + song_setup(song, NULL, md_song_new()); gnome_mdi_add_child(mdi, GNOME_MDI_CHILD(child)); @@ -284,7 +294,9 @@ >>code GtkWidget *w; + MelysTrackInfo *minfo; struct song *song = song_get_data(child); + extern GnomeUIInfo tracksmenu[]; /* Our initial view is the track based view */ w = melys_track_new(root); @@ -300,6 +312,13 @@ gtk_main_iteration(); gnome_mdi_set_active_view(GNOME_MDI(mdi), w); + + /* + * Set the button three context menu. + */ + minfo = MELYS_TRACK(w)->info; + gnome_widget_add_help_with_uidata(GTK_WIDGET(minfo), _(trackinfohelp), + tracksmenu, mdi); song->trackview = w; diff -rNu melys-0.0.9/gui/menus.c melys-0.0.10/gui/menus.c --- melys-0.0.9/gui/menus.c Thu Aug 19 13:11:57 1999 +++ melys-0.0.10/gui/menus.c Wed Sep 15 14:04:02 1999 @@ -12,6 +12,7 @@ * GNU General Public License for more details. * * + * */ @@ -27,6 +28,9 @@ #include "melfile.h" #include "melmidi.h" #include "melgui.h" +#include "pixmaps.h" +#include "md.h" +#include "melystrack.h" #include "menus.h" #include "intl.h" @@ -46,6 +50,8 @@ static void record_cb(GtkWidget *w, gpointer data); static void record_stop_cb(GtkWidget *w, gpointer data); static void about_cb(GtkWidget *w, gpointer data); +static void add_track_cb(GtkWidget *w, gpointer data); +static void delete_track_cb(GtkWidget *w, gpointer data); /* The file menu */ @@ -75,30 +81,46 @@ GNOMEUIINFO_END }; +/* The tracks menu */ +/* NOTE: this should only appear with the tracks view */ +GnomeUIInfo tracksmenu[] = { + {GNOME_APP_UI_ITEM, N_("_Add"), N_("Add a new track"), + add_track_cb, (gpointer)0, (gpointer)0, /* Callback and data */ + 0, NULL, /* Pixmap */ + 0, (GdkModifierType)0, /* Accel */ + (GtkWidget*)0 }, + {GNOME_APP_UI_ITEM, N_("_Delete"), N_("Delete selected tracks"), + delete_track_cb, (gpointer)0, (gpointer)0, /* Callback and data */ + 0, NULL, /* Pixmap */ + GDK_Delete, (GdkModifierType)0, /* Accel */ + (GtkWidget*)0 }, + GNOMEUIINFO_END +}; + /* The play menu */ /* NOTE add accelerators later */ GnomeUIInfo actionmenu[] = { {GNOME_APP_UI_ITEM, N_("_Start"), N_("Start playing"), start_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - GNOME_APP_PIXMAP_FILENAME, "../pixmaps/mplay.png", /* Pixmap */ + GNOME_APP_PIXMAP_DATA, mplay_xpm, /* Pixmap */ GDK_Return, (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, {GNOME_APP_UI_ITEM, N_("_Pause"), N_("Pause playing"), pause_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - GNOME_APP_PIXMAP_FILENAME, "../pixmaps/mpause.png", /* Pixmap */ + GNOME_APP_PIXMAP_DATA, mpause_xpm, /* Pixmap */ 'p', (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, {GNOME_APP_UI_ITEM, N_("S_top"), N_("Stop and return to beginning"), stop_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - GNOME_APP_PIXMAP_FILENAME, "../pixmaps/mstop.png", /* Pixmap */ + GNOME_APP_PIXMAP_DATA, mstop_xpm, /* Pixmap */ ' ', (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, {GNOME_APP_UI_ITEM, N_("_Record"), N_("Start recording"), record_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - GNOME_APP_PIXMAP_FILENAME, "../pixmaps/mb3.png", /* Pixmap */ + GNOME_APP_PIXMAP_DATA, mrec_xpm, /* Pixmap */ GDK_KP_Add, (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, @@ -121,6 +143,7 @@ /* The menubar, made up of the file menu etc */ GnomeUIInfo menubar[] = { GNOMEUIINFO_MENU_FILE_TREE(filemenu), + GNOMEUIINFO_SUBTREE(N_("_Tracks"), tracksmenu), GNOMEUIINFO_SUBTREE(N_("_Actions"), actionmenu), GNOMEUIINFO_MENU_WINDOWS_TREE(windowmenu), GNOMEUIINFO_MENU_HELP_TREE(helpmenu), @@ -238,8 +261,11 @@ } else { /* Else reuse it, and ensure raised */ + gtk_window_set_position(GTK_WINDOW(w), GTK_WIN_POS_MOUSE); gdk_window_raise(w->window); } + + gtk_window_set_position(GTK_WINDOW(w), GTK_WIN_POS_MOUSE); gtk_widget_show(w); } @@ -342,6 +368,8 @@ /* Else reuse it, and ensure raised */ gdk_window_raise(w->window); } + + gtk_window_set_position(GTK_WINDOW(w), GTK_WIN_POS_MOUSE); gtk_widget_show(w); } @@ -449,6 +477,7 @@ /* Make some attempt to clean up to help in memleak detection */ gnome_mdi_remove_all(mdi, FALSE); gtk_object_destroy(GTK_OBJECT(mdi)); + gtk_object_unref(GTK_OBJECT(mdi)); while (gtk_events_pending()) gtk_main_iteration(); @@ -545,4 +574,62 @@ ); gtk_widget_show(about); +} + +/* + * Add a new empty track. + * + * Arguments: + * w - Widget event received on + * data - The mdi object + */ +static void +add_track_cb(GtkWidget *w, gpointer data) +{ + struct song *sd; + struct trackElement *track; + GtkObject *mdi = data; + + sd = get_song_from_mdi(mdi); + + if (sd->mdroot) { + track = md_track_new(); + + /* Set the default channel to be the track number */ + MD_ELEMENT(track)->device_channel = sd->mdroot->tracks; + md_add_elem(MD_CONTAINER(sd->mdroot), MD_ELEMENT(track)); + } + + melys_track_redraw(MELYS_TRACK(sd->trackview)); +} + +/* + * Delete all selected tracks. + * + * Arguments: + * w - Widget event received on + * data - The mdi object + */ +static void +delete_track_cb(GtkWidget *w, gpointer data) +{ + struct song *sd; + struct trackElement *track; + GtkObject *mdi = data; + int tn; + + sd = get_song_from_mdi(mdi); + + if (sd->mdroot) { +rescan: + for (tn = 0; tn < sd->mdroot->tracks; tn++) { + track = md_track_nth(sd->mdroot, tn); + if (track->selected) { + md_track_delete(sd->mdroot, track); + goto rescan; + } + } + } + + melys_track_redraw(MELYS_TRACK(sd->trackview)); } diff -rNu melys-0.0.9/gui/menus.m melys-0.0.10/gui/menus.m --- melys-0.0.9/gui/menus.m Wed Aug 11 14:37:56 1999 +++ melys-0.0.10/gui/menus.m Tue Sep 14 14:57:50 1999 @@ -19,6 +19,10 @@ >>header melfile.h >>header melmidi.h >>header melgui.h +>>header pixmaps.h +>>header md.h +>>header melystrack.h + >>headerdef --decl menus.h >>extern -a @@ -50,30 +54,46 @@ GNOMEUIINFO_END }; +/* The tracks menu */ +/* NOTE: this should only appear with the tracks view */ +GnomeUIInfo tracksmenu[] = { + {GNOME_APP_UI_ITEM, N_("_Add"), N_("Add a new track"), + add_track_cb, (gpointer)0, (gpointer)0, /* Callback and data */ + 0, NULL, /* Pixmap */ + 0, (GdkModifierType)0, /* Accel */ + (GtkWidget*)0 }, + {GNOME_APP_UI_ITEM, N_("_Delete"), N_("Delete selected tracks"), + delete_track_cb, (gpointer)0, (gpointer)0, /* Callback and data */ + 0, NULL, /* Pixmap */ + GDK_Delete, (GdkModifierType)0, /* Accel */ + (GtkWidget*)0 }, + GNOMEUIINFO_END +}; + /* The play menu */ /* NOTE add accelerators later */ GnomeUIInfo actionmenu[] = { {GNOME_APP_UI_ITEM, N_("_Start"), N_("Start playing"), start_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - GNOME_APP_PIXMAP_FILENAME, "../pixmaps/mplay.png", /* Pixmap */ + GNOME_APP_PIXMAP_DATA, mplay_xpm, /* Pixmap */ GDK_Return, (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, {GNOME_APP_UI_ITEM, N_("_Pause"), N_("Pause playing"), pause_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - GNOME_APP_PIXMAP_FILENAME, "../pixmaps/mpause.png", /* Pixmap */ + GNOME_APP_PIXMAP_DATA, mpause_xpm, /* Pixmap */ 'p', (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, {GNOME_APP_UI_ITEM, N_("S_top"), N_("Stop and return to beginning"), stop_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - GNOME_APP_PIXMAP_FILENAME, "../pixmaps/mstop.png", /* Pixmap */ + GNOME_APP_PIXMAP_DATA, mstop_xpm, /* Pixmap */ ' ', (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, {GNOME_APP_UI_ITEM, N_("_Record"), N_("Start recording"), record_cb, (gpointer)0, (gpointer)0, /* Callback and data */ - GNOME_APP_PIXMAP_FILENAME, "../pixmaps/mb3.png", /* Pixmap */ + GNOME_APP_PIXMAP_DATA, mrec_xpm, /* Pixmap */ GDK_KP_Add, (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, @@ -96,6 +116,7 @@ /* The menubar, made up of the file menu etc */ GnomeUIInfo menubar[] = { GNOMEUIINFO_MENU_FILE_TREE(filemenu), + GNOMEUIINFO_SUBTREE(N_("_Tracks"), tracksmenu), GNOMEUIINFO_SUBTREE(N_("_Actions"), actionmenu), GNOMEUIINFO_MENU_WINDOWS_TREE(windowmenu), GNOMEUIINFO_MENU_HELP_TREE(helpmenu), @@ -214,8 +235,11 @@ } else { /* Else reuse it, and ensure raised */ + gtk_window_set_position(GTK_WINDOW(w), GTK_WIN_POS_MOUSE); gdk_window_raise(w->window); } + + gtk_window_set_position(GTK_WINDOW(w), GTK_WIN_POS_MOUSE); gtk_widget_show(w); @@ -320,6 +344,8 @@ /* Else reuse it, and ensure raised */ gdk_window_raise(w->window); } + + gtk_window_set_position(GTK_WINDOW(w), GTK_WIN_POS_MOUSE); gtk_widget_show(w); @@ -424,6 +450,7 @@ /* Make some attempt to clean up to help in memleak detection */ gnome_mdi_remove_all(mdi, FALSE); gtk_object_destroy(GTK_OBJECT(mdi)); + gtk_object_unref(GTK_OBJECT(mdi)); while (gtk_events_pending()) gtk_main_iteration(); @@ -528,3 +555,59 @@ ); gtk_widget_show(about); + +>>function add_track_cb +static void +GtkWidget *w; Widget event received on +gpointer data; The mdi object + +>>description +Add a new empty track. + +>>code + struct song *sd; + struct trackElement *track; + GtkObject *mdi = data; + + sd = get_song_from_mdi(mdi); + + if (sd->mdroot) { + track = md_track_new(); + + /* Set the default channel to be the track number */ + MD_ELEMENT(track)->device_channel = sd->mdroot->tracks; + md_add_elem(MD_CONTAINER(sd->mdroot), MD_ELEMENT(track)); + } + + melys_track_redraw(MELYS_TRACK(sd->trackview)); + + +>>function delete_track_cb +static void +GtkWidget *w; Widget event received on +gpointer data; The mdi object + +>>description +Delete all selected tracks. + +>>code + struct song *sd; + struct trackElement *track; + GtkObject *mdi = data; + int tn; + + sd = get_song_from_mdi(mdi); + + if (sd->mdroot) { +rescan: + for (tn = 0; tn < sd->mdroot->tracks; tn++) { + track = md_track_nth(sd->mdroot, tn); + if (track->selected) { + md_track_delete(sd->mdroot, track); + goto rescan; + } + } + } + + melys_track_redraw(MELYS_TRACK(sd->trackview)); + diff -rNu melys-0.0.9/help/C/Makefile melys-0.0.10/help/C/Makefile --- melys-0.0.9/help/C/Makefile Fri Aug 6 22:09:01 1999 +++ melys-0.0.10/help/C/Makefile Sun Aug 29 23:08:04 1999 @@ -3,5 +3,12 @@ # JUNKFILES = melys.tex melys.junk melys.log melys.aux melys.dvi +all: + db2html melys.sgml + clean: rm -rf $(JUNKFILES) core + rm -rf DBTO* + +clobber: clean + rm -rf melys melys.ps melys.html diff -rNu melys-0.0.9/help/C/index.html melys-0.0.10/help/C/index.html --- melys-0.0.9/help/C/index.html Tue Jul 20 11:42:48 1999 +++ melys-0.0.10/help/C/index.html Thu Jan 1 00:00:00 1970 @@ -1,4 +0,0 @@ - - -

This is some help

-Well, it would be, if it were actually helpful. diff -rNu melys-0.0.9/help/C/melys.sgml melys-0.0.10/help/C/melys.sgml --- melys-0.0.9/help/C/melys.sgml Tue Aug 10 15:02:55 1999 +++ melys-0.0.10/help/C/melys.sgml Sun Aug 29 23:08:04 1999 @@ -6,6 +6,7 @@ The chapters are individual files that are sourced in --> + ] > @@ -43,5 +44,6 @@ &MENUS-CHAPTER; +&TRACK-CHAPTER; diff -rNu melys-0.0.9/help/C/topic.dat melys-0.0.10/help/C/topic.dat --- melys-0.0.9/help/C/topic.dat Tue Jul 20 11:42:48 1999 +++ melys-0.0.10/help/C/topic.dat Thu Sep 9 00:22:41 1999 @@ -1 +1 @@ -index.html Manual +melys.html Manual diff -rNu melys-0.0.9/help/C/track.sgml melys-0.0.10/help/C/track.sgml --- melys-0.0.9/help/C/track.sgml Thu Jan 1 00:00:00 1970 +++ melys-0.0.10/help/C/track.sgml Wed Sep 15 13:49:23 1999 @@ -0,0 +1,99 @@ + +Track view + + + This chapter deals with the track view of Melys. + It consists of two parts; a leftmost information pane and to the right + a pane showing the existing parts and current play position (not + yet implemented). + It is possible to drag the divider between these panes with the + button on the divider to display more or less of each pane. + +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. +Columns +<variablelist> + +<varlistentry> + <term> + Track + <listitem> + <para> + This is the track number. The track number always starts + at one and carries on in increasing order down the page. + +<varlistentry> + <term> + Name + <listitem> + <para> + This is the name of the track. + If the track has not been given a name then it will be given + the name of ``<literal>Track <replaceable>N</replaceable></literal>'', + where <replaceable>N</replaceable> is the track number. + -- + Once it has been generated such a name will not change when + tracks are added and deleted. + -- + +<varlistentry> + <term> + Prog + <listitem> + <para> + The program number for the track. + +<varlistentry> + <term> + C + <listitem> + <para> + 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. + +<varlistentry> + <term> + Mute + <listitem> + <para> + 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. + +<varlistentry> + <term> + Solo + <listitem> + <para> + Clicking on this button for a track will mute all other + tracks, leaving the one track playing. + <para> + Further tracks can be unmuted by clicking on the relavent + 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. + +<varlistentry> + <term> + Rec + <listitem> + <para> + 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. + <para> + 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. + +</variablelist> + +</chapter> diff -rNu melys-0.0.9/include/elements.h melys-0.0.10/include/elements.h --- melys-0.0.9/include/elements.h Thu Aug 19 13:11:51 1999 +++ melys-0.0.10/include/elements.h Wed Sep 15 14:03:54 1999 @@ -35,6 +35,7 @@ short device_channel; /* Device/channel for this element */ char type; /* Element type */ char tag; /* Element tag */ + int refcount:8; /* Reference count */ }; #define MD_ELEMENT(e) \ ((struct element *)md_check_cast((struct element *)(e), MD_TYPE_ELEMENT)) @@ -54,7 +55,6 @@ struct containerElement parent; struct headElement *head; /* Pointer to the head information */ short tracks; /* Number of music tracks */ - int refcount; /* Reference count of users */ }; #define MD_ROOT(e) \ ((struct rootElement *)md_check_cast((struct element *)(e), MD_TYPE_ROOT)) @@ -80,6 +80,7 @@ int number; /* Track number from 1 */ char *name; /* Name of track */ int program; /* Extended program number */ + int inputdev; /* Input device for this track */ /* Flags (Maybe should go on container) */ int selected:1; /* track is selected */ int record:1; /* Set for record */ @@ -87,6 +88,9 @@ int solo:1; /* Set for solo */ int solomute:1; /* Track muted because of solo */ int sololast:1; /* The last solo */ + /* Fields below this will not ever be saved out */ + struct containerElement *newpart; /* Part being recorded */ + GPtrArray *notes; /* To save pending on notes */ }; #define MD_TRACK(e) \ ((struct trackElement *)md_check_cast((struct element *)(e), MD_TYPE_TRACK)) @@ -113,6 +117,7 @@ struct partElement { struct containerElement parent; char *name; /* Part name */ + int id; /* Part id unique among all referenced parts */ }; #define MD_PART(e) \ ((struct partElement *)md_check_cast((struct element *)(e), MD_TYPE_PART)) @@ -120,6 +125,8 @@ struct takeElement { struct containerElement parent; + char *name; + char selected; }; #define MD_TAKE(e) \ ((struct takeElement *)md_check_cast((struct element *)(e), MD_TYPE_TAKE)) @@ -242,6 +249,13 @@ ((struct smpteoffsetElement *)md_check_cast((struct element *)(e), MD_TYPE_SMPTEOFFSET)) +struct noopElement { + struct element parent; +}; +#define MD_NOOP(e) \ + ((struct noopElement *)md_check_cast((struct element *)(e), MD_TYPE_NOOP)) + + struct element *md_element_new(void); struct containerElement *md_container_new(void); struct rootElement *md_root_new(void); @@ -266,31 +280,32 @@ struct textElement *md_text_new(int type, char *text); struct smpteoffsetElement *md_smpteoffset_new(short hours, short minutes, short seconds, short frames, short subframes); -void md_add(struct containerElement *c, struct element *e); -void md_free(struct element *el); +struct noopElement *md_noop_new(unsigned long time); struct element *md_check_cast(struct element *el, int type); +struct rootElement *md_root_inc_ref(struct rootElement *root); /* Defines for types */ -#define MD_TYPE_TEXT 0 -#define MD_TYPE_ROOT (1 + MD_CONTAINER_BEGIN) -#define MD_TYPE_PART (2 + MD_CONTAINER_BEGIN) -#define MD_TYPE_KEYTOUCH 3 -#define MD_TYPE_PITCH 4 -#define MD_TYPE_SMPTEOFFSET 5 -#define MD_TYPE_TAKE (6 + MD_CONTAINER_BEGIN) -#define MD_TYPE_PROGRAM 7 -#define MD_TYPE_META 8 -#define MD_TYPE_TEMPOMAP (9 + MD_CONTAINER_BEGIN) -#define MD_TYPE_NOTE 10 -#define MD_TYPE_ELEMENT 11 -#define MD_TYPE_KEYSIG 12 -#define MD_TYPE_TEMPO 13 -#define MD_TYPE_SYSEX 14 -#define MD_TYPE_TRACK (15 + MD_CONTAINER_BEGIN) -#define MD_TYPE_PRESSURE 16 -#define MD_TYPE_TIMESIG 17 -#define MD_TYPE_CONTAINER 18 -#define MD_TYPE_HEAD (19 + MD_CONTAINER_BEGIN) -#define MD_TYPE_MAP 20 -#define MD_TYPE_CONTROL 21 +#define MD_TYPE_ROOT (0 + MD_CONTAINER_BEGIN) +#define MD_TYPE_SMPTEOFFSET 1 +#define MD_TYPE_TAKE (2 + MD_CONTAINER_BEGIN) +#define MD_TYPE_NOOP 3 +#define MD_TYPE_PROGRAM 4 +#define MD_TYPE_TEMPOMAP (5 + MD_CONTAINER_BEGIN) +#define MD_TYPE_NOTE 6 +#define MD_TYPE_ELEMENT 7 +#define MD_TYPE_SYSEX 8 +#define MD_TYPE_TIMESIG 9 +#define MD_TYPE_CONTAINER (10 + MD_CONTAINER_BEGIN) +#define MD_TYPE_KEYTOUCH 11 +#define MD_TYPE_PITCH 12 +#define MD_TYPE_PART (13 + MD_CONTAINER_BEGIN) +#define MD_TYPE_META 14 +#define MD_TYPE_PRESSURE 15 +#define MD_TYPE_TEMPO 16 +#define MD_TYPE_TEXT 17 +#define MD_TYPE_TRACK (18 + MD_CONTAINER_BEGIN) +#define MD_TYPE_KEYSIG 19 +#define MD_TYPE_HEAD (20 + MD_CONTAINER_BEGIN) +#define MD_TYPE_MAP 21 +#define MD_TYPE_CONTROL 22 diff -rNu melys-0.0.9/include/md.h melys-0.0.10/include/md.h --- melys-0.0.9/include/md.h Thu Aug 19 13:11:51 1999 +++ melys-0.0.10/include/md.h Wed Sep 15 14:03:54 1999 @@ -1,5 +1,4 @@ /* - * File: md.h * * Copyright (C) 1999 Steve Ratcliffe * @@ -12,8 +11,72 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * + * Some operations to modify a MD tree. This only covers general purpose + * operations. Specialized tools like quantize or whatever are likely + * to be implmented in tools directory. * + * + */ +/* + * The merge mode types + */ +enum merge_mode { + MD_ADD_MERGE, /* Events are merged in along with existing events */ + //MD_ADD_REPLACE, /* Events comletely replace existing ones in duration */ + //MD_ADD_RETAKE, /* A new take is created as an alternative to existing */ + MD_ADD_LAST +}; + + +#define md_add_elem(c, el) _md_add_elem(c, el, 0) +#define md_add_elem_sort(c, el) _md_add_elem(c, el, 1) + +void _md_add_elem(struct containerElement *c, struct element *el, int sort); +void md_free(struct element *el); +void md_merge_in(struct trackElement *track, struct containerElement *list, + enum merge_mode mode); + +void md_list_append(struct containerElement *c, struct element *el); +void md_list_prepend(struct containerElement *c, struct element *el); +void md_list_add_sort(struct containerElement *c, struct element *el); +int md_list_size(struct containerElement *c); +struct element *md_list_first(struct containerElement *c); +struct element *md_list_last(struct containerElement *c); +struct element *md_list_nth_elem(struct containerElement *c, int n); +struct element *md_list_next(struct containerElement *c, struct element *el); +struct element *md_list_find_by_time(struct containerElement *ctrk, + unsigned long time); +void md_save_elem(struct containerElement *c, struct element *el); + +/* + * The list of operation types that can be undone. This is intended + * to cover all operations that can't simply be undone by the user. + */ +enum undo_op { + MD_UNDO_ADD, /* Event is added */ + MD_UNDO_REMOVE, /* Event is removed */ + MD_UNDO_TIME_CHANGE,/* Begin time of event is changed */ + MD_UNDO_DURATION_CHANGE, /* End time of event is changed */ + MD_UNDO_LAST +}; + +void md_undo_begin_set(void); +void md_undo_end_set(void); +void md_undo_freeze(void); +void md_undo_thaw(void); +void md_undo_save(struct containerElement *c, struct element *el, + enum undo_op op); + +/* + * Some macros to handle accessing some common fields in the + * element */ +#define MD_TIME(el) ( ((struct element *)(el))->element_time) +#define MD_ENDTIME(el) \ + (MD_TIME(el) + ((struct containerElement *)(el))->duration) +#define MD_DEVCHAN(el) (((struct element *)(el))->device_channel) +#define MD_DEV(el) ( (((struct element *)(el))->device_channel & 0xf0) >> 8) +#define MD_CHAN(el) ( (((struct element *)(el))->device_channel & 0x0f)) /* Defines for md_walk() */ #define MD_WALK_ALL 1 /* Include all elements including deleted, hidden*/ @@ -50,4 +113,6 @@ void md_sequence_end(struct sequenceState *seq); unsigned long md_sequence_duration(struct sequenceState *seq); struct rootElement *md_empty(void); +struct rootElement *md_song_new(void); struct trackElement *md_track_nth(struct rootElement *root, int n); +void md_track_delete(struct rootElement *root, struct trackElement *track); diff -rNu melys-0.0.9/include/melmidi.h melys-0.0.10/include/melmidi.h --- melys-0.0.9/include/melmidi.h Thu Aug 19 13:11:52 1999 +++ melys-0.0.10/include/melmidi.h Wed Sep 15 14:03:56 1999 @@ -38,7 +38,6 @@ void record_free(struct record *record); void record_set_mdroot(struct record *record, struct rootElement *root); void record_set_ports(struct record *record); -void XXrecord_open_ports(struct record *record); void record_set_track(struct record *record, struct trackElement *track, int devchan); void record_start(struct record *record); diff -rNu melys-0.0.9/include/melys.h melys-0.0.10/include/melys.h --- melys-0.0.9/include/melys.h Thu Aug 19 13:11:53 1999 +++ melys-0.0.10/include/melys.h Wed Sep 15 14:03:57 1999 @@ -17,5 +17,5 @@ #define PACKAGE "melys" #define LOCALEDIR "foo" -#define MELYS_VERSION_STRING "0.0.8" +#include "../version" diff -rNu melys-0.0.9/include/melystrack.h melys-0.0.10/include/melystrack.h --- melys-0.0.9/include/melystrack.h Thu Aug 19 13:11:51 1999 +++ melys-0.0.10/include/melystrack.h Wed Sep 15 14:03:55 1999 @@ -51,3 +51,4 @@ guint melys_track_get_type(void); GtkWidget *melys_track_new(struct rootElement *root); void melys_track_set_md_root(MelysTrack *mtrack, struct rootElement *root); +void melys_track_redraw(MelysTrack *mtrack); diff -rNu melys-0.0.9/include/melystrackinfo.h melys-0.0.10/include/melystrackinfo.h --- melys-0.0.9/include/melystrackinfo.h Thu Aug 19 13:11:52 1999 +++ melys-0.0.10/include/melystrackinfo.h Wed Sep 15 14:03:56 1999 @@ -12,8 +12,14 @@ * GNU General Public License for more details. * * This is a widget for the left pane of the track view. - * The columns that can be seen will be configurable and will include - * the usual information and controls such as 'mute'. + * The columns that can be seen will be configurable. + * + * Now that I know about the gnome canvas widget and am going to + * use it for the trackdisplay pane, I suspect that some people will + * be wondering why it isn't used here as it looks ideal. I quite + * possibly would have used it if I had known about it then. Anyway + * there would have still have been pretty much the same amount of + * code in the end I think. * * */ @@ -82,10 +88,7 @@ void (*mute_track)(MelysTrackInfo *, struct trackElement *); void (*unmute_track)(MelysTrackInfo *, struct trackElement *); - void (*solo_track)(MelysTrackInfo *, struct rootElement *, - struct trackElement *); - void (*unsolo_track)(MelysTrackInfo *, struct rootElement *, - struct trackElement *); + void (*record_track)(MelysTrackInfo *, struct trackElement *, int); }; guint melys_track_info_get_type(void); @@ -94,5 +97,6 @@ int htitle); void melys_track_info_set_md_root(MelysTrackInfo *minfo, struct rootElement *root); +void melys_track_info_redraw(MelysTrackInfo *minfo); int y_to_track(MelysTrackInfo *minfo, int ypix); char *get_info_string(MelysTrackInfo *minfo, int itype, int ntrack); diff -rNu melys-0.0.9/include/menus.h melys-0.0.10/include/menus.h --- melys-0.0.9/include/menus.h Thu Aug 19 13:11:51 1999 +++ melys-0.0.10/include/menus.h Wed Sep 15 14:03:55 1999 @@ -12,6 +12,7 @@ * GNU General Public License for more details. * * + * */ void mel_init_menus(GnomeMDI *mdi); diff -rNu melys-0.0.9/include/pixmaps.h melys-0.0.10/include/pixmaps.h --- melys-0.0.9/include/pixmaps.h Thu Aug 19 13:11:53 1999 +++ melys-0.0.10/include/pixmaps.h Wed Sep 15 14:03:56 1999 @@ -22,3 +22,9 @@ extern char *yellowball_xpm[]; + +extern char *mrec_xpm[]; +extern char *mplay_xpm[]; +extern char *mpause_xpm[]; +extern char *mstop_xpm[]; + diff -rNu melys-0.0.9/include/seqlib.h melys-0.0.10/include/seqlib.h --- melys-0.0.9/include/seqlib.h Thu Aug 19 13:11:50 1999 +++ melys-0.0.10/include/seqlib.h Wed Sep 15 14:03:53 1999 @@ -24,7 +24,27 @@ */ #include <sys/asoundlib.h> +/* Forward compatibility defines */ +#ifndef SND_SEQ_PORT_CAP_OUT + +#define SND_SEQ_PORT_CAP_OUT SND_SEQ_PORT_CAP_WRITE +#define SND_SEQ_PORT_CAP_IN SND_SEQ_PORT_CAP_READ +#define SND_SEQ_PORT_CAP_SYNC_IN SND_SEQ_PORT_CAP_SYNC_READ +#define SND_SEQ_PORT_CAP_SYNC_OUT SND_SEQ_PORT_CAP_SYNC_WRITE +#define SND_SEQ_PORT_CAP_SUBSCRIPTION SND_SEQ_PORT_CAP_SUBS_WRITE + +#define in_use read_use +#define out_use write_use + +#endif + typedef struct seq_context seq_context_t; + +/* The device part of a devchan */ +#define DEV(devchan) ((devchan)>>4) + +/* The channel part of a devchan */ +#define CHAN(devchan) ((devchan) & 0xf) /* diff -rNu melys-0.0.9/make.conf melys-0.0.10/make.conf --- melys-0.0.9/make.conf Sat Jul 24 20:35:02 1999 +++ melys-0.0.10/make.conf Wed Sep 15 13:49:19 1999 @@ -1,4 +1,7 @@ +# Version of Melys +VERSION = 0.0.10 + # Options required by the C compiler COPTS = -g -O -Wall diff -rNu melys-0.0.9/md/.cvsignore melys-0.0.10/md/.cvsignore --- melys-0.0.9/md/.cvsignore Thu Aug 19 13:11:48 1999 +++ melys-0.0.10/md/.cvsignore Wed Sep 15 14:03:50 1999 @@ -1,4 +1,7 @@ elements.c +mdadd.c +mdlist.c +mdundo.c mdutil.c Makefile *.mdml *.mdml.gz *.mid diff -rNu melys-0.0.9/md/Makefile melys-0.0.10/md/Makefile --- melys-0.0.9/md/Makefile Thu Aug 19 13:11:48 1999 +++ melys-0.0.10/md/Makefile Wed Sep 15 14:03:50 1999 @@ -5,8 +5,14 @@ TARGETS = OBJS = elements.o \ + mdadd.o \ + mdlist.o \ + mdundo.o \ mdutil.o GENCFILES = elements.c \ + mdadd.c \ + mdlist.c \ + mdundo.c \ mdutil.c GENHFILES = ../include/elements.h \ ../include/md.h diff -rNu melys-0.0.9/md/elements.c melys-0.0.10/md/elements.c --- melys-0.0.9/md/elements.c Thu Aug 19 13:11:56 1999 +++ melys-0.0.10/md/elements.c Wed Sep 15 14:04:00 1999 @@ -28,7 +28,15 @@ #include "intl.h" +static void md_element_init(struct element *e); static void md_container_init(struct containerElement *e); +static void md_root_init(struct rootElement *e); +static void md_head_init(struct headElement *e); +static void md_track_init(struct trackElement *e); +static void md_part_init(struct partElement *e); +static void md_take_init(struct takeElement *e); +static void md_meta_init(struct metaElement *e); +static void md_map_init(struct mapElement *e); /* @@ -37,11 +45,25 @@ struct element * md_element_new(void) { - struct element * new; + struct element * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_ELEMENT; - return new; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_ELEMENT; + md_element_init(MD_ELEMENT(e)); + return e; +} + +/* + * Initialize data structures within the element. This is + * only really required when pointers need allocating. + * Arguments: + * e - Element to init + */ +static void +md_element_init(struct element *e) +{ + + e->refcount = 1; } /* @@ -50,11 +72,12 @@ struct containerElement * md_container_new(void) { - struct containerElement * new; + struct containerElement * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_CONTAINER; - return new; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_CONTAINER; + md_container_init(MD_CONTAINER(e)); + return e; } /* @@ -67,6 +90,7 @@ md_container_init(struct containerElement *e) { + md_element_init(MD_ELEMENT(e)); e->elements = g_ptr_array_new(); e->playptr = NULL; e->duration = 0; @@ -78,14 +102,26 @@ struct rootElement * md_root_new(void) { - struct rootElement * new; + struct rootElement * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_ROOT; - md_container_init(MD_CONTAINER(new)); - new->head = NULL; - new->refcount = 1; - return new; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_ROOT; + md_root_init(MD_ROOT(e)); + return e; +} + +/* + * Initialize data structures within the element. This is + * only really required when pointers need allocating. + * Arguments: + * e - Element to init + */ +static void +md_root_init(struct rootElement *e) +{ + + md_container_init(MD_CONTAINER(e)); + e->head = NULL; } /* @@ -94,16 +130,29 @@ struct headElement * md_head_new(void) { - struct headElement * new; + struct headElement * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_HEAD; - md_container_init(MD_CONTAINER(new)); - new->copyright = NULL; - new->author = NULL; - new->title = NULL; - new->comment = NULL; - return new; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_HEAD; + md_head_init(MD_HEAD(e)); + return e; +} + +/* + * Initialize data structures within the element. This is + * only really required when pointers need allocating. + * Arguments: + * e - Element to init + */ +static void +md_head_init(struct headElement *e) +{ + + md_container_init(MD_CONTAINER(e)); + e->copyright = NULL; + e->author = NULL; + e->title = NULL; + e->comment = NULL; } /* @@ -112,14 +161,27 @@ struct trackElement * md_track_new(void) { - struct trackElement * new; + struct trackElement * e; + + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_TRACK; + md_track_init(MD_TRACK(e)); + return e; +} + +/* + * Initialize data structures within the element. This is + * only really required when pointers need allocating. + * Arguments: + * e - Element to init + */ +static void +md_track_init(struct trackElement *e) +{ - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_TRACK; - md_container_init(MD_CONTAINER(new)); - new->name = NULL; - new->program = 0; - return new; + md_container_init(MD_CONTAINER(e)); + e->name = NULL; + e->program = 0; } /* @@ -128,12 +190,12 @@ struct tempomapElement * md_tempomap_new(void) { - struct tempomapElement * new; + struct tempomapElement * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_TEMPOMAP; - md_container_init(MD_CONTAINER(new)); - return new; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_TEMPOMAP; + md_container_init(MD_CONTAINER(e)); + return e; } /* @@ -142,15 +204,15 @@ struct noteElement * md_note_new(char note, char vel, short length) { - struct noteElement * new; + struct noteElement * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_NOTE; - new->note = note; - new->vel = vel; - new->length = length; - new->offvel = 0; - return new; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_NOTE; + md_element_init(MD_ELEMENT(e)); + e->note = note; + e->vel = vel; + e->length = length; + return e; } /* @@ -159,13 +221,26 @@ struct partElement * md_part_new(void) { - struct partElement * new; + struct partElement * e; + + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_PART; + md_part_init(MD_PART(e)); + return e; +} + +/* + * Initialize data structures within the element. This is + * only really required when pointers need allocating. + * Arguments: + * e - Element to init + */ +static void +md_part_init(struct partElement *e) +{ - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_PART; - md_container_init(MD_CONTAINER(new)); - new->name = NULL; - return new; + md_container_init(MD_CONTAINER(e)); + e->name = NULL; } /* @@ -174,12 +249,26 @@ struct takeElement * md_take_new(void) { - struct takeElement * new; + struct takeElement * e; + + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_TAKE; + md_take_init(MD_TAKE(e)); + return e; +} + +/* + * Initialize data structures within the element. This is + * only really required when pointers need allocating. + * Arguments: + * e - Element to init + */ +static void +md_take_init(struct takeElement *e) +{ - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_TAKE; - md_container_init(MD_CONTAINER(new)); - return new; + md_container_init(MD_CONTAINER(e)); + e->name = NULL; } /* @@ -188,13 +277,14 @@ struct controlElement * md_control_new(char control, char value) { - struct controlElement * new; + struct controlElement * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_CONTROL; - new->control = control; - new->value = value; - return new; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_CONTROL; + md_element_init(MD_ELEMENT(e)); + e->control = control; + e->value = value; + return e; } /* @@ -203,12 +293,13 @@ struct programElement * md_program_new(int program) { - struct programElement * new; + struct programElement * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_PROGRAM; - new->program = program; - return new; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_PROGRAM; + md_element_init(MD_ELEMENT(e)); + e->program = program; + return e; } /* @@ -217,13 +308,14 @@ struct keytouchElement * md_keytouch_new(int note, int vel) { - struct keytouchElement * new; + struct keytouchElement * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_KEYTOUCH; - new->note = note; - new->velocity = vel; - return new; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_KEYTOUCH; + md_element_init(MD_ELEMENT(e)); + e->note = note; + e->velocity = vel; + return e; } /* @@ -232,12 +324,13 @@ struct pressureElement * md_pressure_new(int vel) { - struct pressureElement * new; + struct pressureElement * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_PRESSURE; - new->velocity = vel; - return new; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_PRESSURE; + md_element_init(MD_ELEMENT(e)); + e->velocity = vel; + return e; } /* @@ -246,12 +339,13 @@ struct pitchElement * md_pitch_new(int val) { - struct pitchElement * new; + struct pitchElement * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_PITCH; - new->pitch = val; - return new; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_PITCH; + md_element_init(MD_ELEMENT(e)); + e->pitch = val; + return e; } /* @@ -260,19 +354,20 @@ struct sysexElement * md_sysex_new(int status, unsigned char *data, int len) { - struct sysexElement * new; + struct sysexElement * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_SYSEX; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_SYSEX; + md_element_init(MD_ELEMENT(e)); { unsigned char *dp; dp = g_malloc(len); - new->data = dp; + e->data = dp; memcpy(dp, data, len); } - new->status = status; - new->length = len; - return new; + e->status = status; + e->length = len; + return e; } /* @@ -281,11 +376,26 @@ struct metaElement * md_meta_new(void) { - struct metaElement * new; + struct metaElement * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_META; - return new; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_META; + md_meta_init(MD_META(e)); + return e; +} + +/* + * Initialize data structures within the element. This is + * only really required when pointers need allocating. + * Arguments: + * e - Element to init + */ +static void +md_meta_init(struct metaElement *e) +{ + + md_element_init(MD_ELEMENT(e)); + /* nothing to do */; } /* @@ -294,11 +404,26 @@ struct mapElement * md_map_new(void) { - struct mapElement * new; + struct mapElement * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_MAP; - return new; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_MAP; + md_map_init(MD_MAP(e)); + return e; +} + +/* + * Initialize data structures within the element. This is + * only really required when pointers need allocating. + * Arguments: + * e - Element to init + */ +static void +md_map_init(struct mapElement *e) +{ + + md_meta_init(MD_META(e)); + /* nothing to do */; } /* @@ -307,13 +432,14 @@ struct keysigElement * md_keysig_new(short key, short minor) { - struct keysigElement * new; + struct keysigElement * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_KEYSIG; - new->key = key; - new->minor = minor != 0? 1: 0; - return new; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_KEYSIG; + md_map_init(MD_MAP(e)); + e->key = key; + e->minor = minor != 0? 1: 0; + return e; } /* @@ -322,15 +448,16 @@ struct timesigElement * md_timesig_new(short top, short bottom, short clocks, short n32pq) { - struct timesigElement * new; + struct timesigElement * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_TIMESIG; - new->top = top; - new->bottom = bottom; - new->clocks = clocks; - new->n32pq = n32pq; - return new; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_TIMESIG; + md_map_init(MD_MAP(e)); + e->top = top; + e->bottom = bottom; + e->clocks = clocks; + e->n32pq = n32pq; + return e; } /* @@ -339,12 +466,13 @@ struct tempoElement * md_tempo_new(int m) { - struct tempoElement * new; + struct tempoElement * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_TEMPO; - new->micro_tempo = m; - return new; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_TEMPO; + md_map_init(MD_MAP(e)); + e->micro_tempo = m; + return e; } /* @@ -353,10 +481,11 @@ struct textElement * md_text_new(int type, char *text) { - struct textElement * new; + struct textElement * e; - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_TEXT; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_TEXT; + md_element_init(MD_ELEMENT(e)); { static char *typenames[] = { "", @@ -368,15 +497,15 @@ "marker", "cuepoint", }; - new->type = type; - new->name = typenames[type]; - new->text = g_strdup(text); + e->type = type; + e->name = typenames[type]; + e->text = g_strdup(text); if (text) - new->length = strlen(text); + e->length = strlen(text); else - new->length = 0; + e->length = 0; } - return new; + return e; } /* @@ -386,86 +515,32 @@ md_smpteoffset_new(short hours, short minutes, short seconds, short frames, short subframes) { - struct smpteoffsetElement * new; - - new = g_malloc0(sizeof(*new)); - MD_ELEMENT(new)->type = MD_TYPE_SMPTEOFFSET; - new->hours = hours; - new->minutes = minutes; - new->seconds = seconds; - new->frames = frames; - new->subframes = subframes; - return new; -} - -/* - * Add an element to a container element. - * - */ -void -md_add(struct containerElement *c, struct element *e) -{ - unsigned long t; + struct smpteoffsetElement * e; - if (!e) - return; - - g_ptr_array_add(c->elements, e); - - t = e->element_time; - if (e->type == MD_TYPE_NOTE) { - t += MD_NOTE(e)->length; - } else if (e->type == MD_TYPE_TRACK) { - MD_TRACK(e)->number = MD_ROOT(c)->tracks; - MD_ROOT(c)->tracks++; - } else if (iscontainer(e)) { - t += MD_CONTAINER(e)->duration; - } - - t -= MD_ELEMENT(c)->element_time; - if (t > c->duration) - c->duration = t; + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_SMPTEOFFSET; + md_element_init(MD_ELEMENT(e)); + e->hours = hours; + e->minutes = minutes; + e->seconds = seconds; + e->frames = frames; + e->subframes = subframes; + return e; } /* - * Free a complete element tree. - * - * Arguments: - * el - Element tree to free + * Create and initialise a noop element. */ -void -md_free(struct element *el) +struct noopElement * +md_noop_new(unsigned long time) { - struct containerElement *c; - int i; - - if (el->type == MD_TYPE_ROOT) { - if (--MD_ROOT(el)->refcount > 0) - return; - if (MD_ROOT(el)->refcount < 0) { - ethrow(debugError, _("Freed an mdroot %d with bad reference count"), - MD_ROOT(el)->refcount); - return; - } - } + struct noopElement * e; - if (el->type >= MD_CONTAINER_BEGIN) { - c = MD_CONTAINER(el); - for (i = 0; i < c->elements->len; i++) { - struct element *p = g_ptr_array_index(c->elements, i); - md_free(p); - } - g_ptr_array_free(c->elements, 1); - } - switch (el->type) { - case MD_TYPE_TEXT: - g_free(MD_TEXT(el)->text); - break; - case MD_TYPE_SYSEX: - g_free(MD_SYSEX(el)->data); - break; - } - g_free(el); + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_NOOP; + md_element_init(MD_ELEMENT(e)); + MD_TIME(e) = time; + return e; } /* @@ -506,4 +581,21 @@ ethrow(debugError, "Cast from %d to %d not allowed", el->type, type); return NULL;/* not reached */ +} + +/* + * Normal reference count operations are handled with in the + * md layer, but other code needs to hold references to the + * root. Hence this routine to increase the root reference + * count. Returns the root so that you can use code like: + * + * foo->mdroot = md_root_inc_ref(root); + + */ +struct rootElement * +md_root_inc_ref(struct rootElement *root) +{ + + ((struct element *)root)->refcount++; + return root; } diff -rNu melys-0.0.9/md/elements.m melys-0.0.10/md/elements.m --- melys-0.0.9/md/elements.m Thu Aug 19 00:08:04 1999 +++ melys-0.0.10/md/elements.m Wed Sep 15 10:38:43 1999 @@ -37,6 +37,9 @@ short device_channel; /* Device/channel for this element */ char type; /* Element type */ char tag; /* Element tag */ + int refcount:8; /* Reference count */ +init + e->refcount = 1; /* * An element that holds others. This includes tracks, parts and the @@ -57,10 +60,8 @@ >>elementdef root container struct headElement *head; /* Pointer to the head information */ short tracks; /* Number of music tracks */ - int refcount; /* Reference count of users */ -new - new->head = NULL; - new->refcount = 1; +init + e->head = NULL; /* * A holder for all kinds of information about the file. @@ -74,17 +75,19 @@ char *author; /* Author information */ char *title; /* The title of the piece */ char *comment; /* Comments/notes about the piece */ -new - new->copyright = NULL; - new->author = NULL; - new->title = NULL; - new->comment = NULL; +init + e->copyright = NULL; + e->author = NULL; + e->title = NULL; + e->comment = NULL; >>elementdef track container int number; /* Track number from 1 */ char *name; /* Name of track */ int program; /* Extended program number */ + int inputdev; /* Input device for this track */ + /* Flags (Maybe should go on container) */ int selected:1; /* track is selected */ int record:1; /* Set for record */ @@ -92,9 +95,13 @@ int solo:1; /* Set for solo */ int solomute:1; /* Track muted because of solo */ int sololast:1; /* The last solo */ -new - new->name = NULL; - new->program = 0; + + /* Fields below this will not ever be saved out */ + struct containerElement *newpart; /* Part being recorded */ + GPtrArray *notes; /* To save pending on notes */ +init + e->name = NULL; + e->program = 0; >>elementdef tempomap container @@ -107,49 +114,52 @@ char offvel; /* Note Off velocity */ short length; /* Length of note */ new char note, char vel, short length - new->note = note; - new->vel = vel; - new->length = length; - new->offvel = 0; + e->note = note; + e->vel = vel; + e->length = length; >>elementdef part container char *name; /* Part name */ -new - new->name = NULL; + int id; /* Part id unique among all referenced parts */ +init + e->name = NULL; >>elementdef take container -new + char *name; + char selected; +init + e->name = NULL; >># As with note should be kept as small as possible >>elementdef control element char control; /* Controller number */ char value; /* Controller value */ new char control, char value - new->control = control; - new->value = value; + e->control = control; + e->value = value; >>elementdef program element int program; /* Program number */ new int program - new->program = program; + e->program = program; >>elementdef keytouch element int note; int velocity; new int note, int vel - new->note = note; - new->velocity = vel; + e->note = note; + e->velocity = vel; >>elementdef pressure element int velocity; new int vel - new->velocity = vel; + e->velocity = vel; >>elementdef pitch element int pitch; new int val - new->pitch = val; + e->pitch = val; >>elementdef sysex element int status; @@ -161,24 +171,28 @@ dp = g_malloc(len); - new->data = dp; + e->data = dp; memcpy(dp, data, len); } - new->status = status; - new->length = len; + e->status = status; + e->length = len; free g_free(e->data); >>elementdef meta element +init + /* nothing to do */; >>elementdef map meta +init + /* nothing to do */; >>elementdef keysig map char key; /* Key signature */ char minor; /* Is this a minor key or not */ new short key, short minor - new->key = key; - new->minor = minor != 0? 1: 0; + e->key = key; + e->minor = minor != 0? 1: 0; >>elementdef timesig map short top; /* 'top' of timesignature */ @@ -186,15 +200,15 @@ short clocks; /* Can't remember what this is */ short n32pq; /* Thirtysecond notes per quarter */ new short top, short bottom, short clocks, short n32pq - new->top = top; - new->bottom = bottom; - new->clocks = clocks; - new->n32pq = n32pq; + e->top = top; + e->bottom = bottom; + e->clocks = clocks; + e->n32pq = n32pq; >>elementdef tempo map int micro_tempo; /* The tempo in microsec per quarter note */ new int m - new->micro_tempo = m; + e->micro_tempo = m; >>elementdef text element int type; /* Type of text (lyric, copyright etc) */ @@ -213,13 +227,13 @@ "marker", "cuepoint", }; - new->type = type; - new->name = typenames[type]; - new->text = g_strdup(text); + e->type = type; + e->name = typenames[type]; + e->text = g_strdup(text); if (text) - new->length = strlen(text); + e->length = strlen(text); else - new->length = 0; + e->length = 0; } free g_free(e->text); @@ -231,80 +245,24 @@ short frames; short subframes; new short hours, short minutes, short seconds, short frames, short subframes - new->hours = hours; - new->minutes = minutes; - new->seconds = seconds; - new->frames = frames; - new->subframes = subframes; + e->hours = hours; + e->minutes = minutes; + e->seconds = seconds; + e->frames = frames; + e->subframes = subframes; ->>function md_add -void -struct containerElement *c; -struct element *e; ->>description -Add an element to a container element. - ->>code - unsigned long t; - - if (!e) - return; - - g_ptr_array_add(c->elements, e); - - t = e->element_time; - if (e->type == MD_TYPE_NOTE) { - t += MD_NOTE(e)->length; - } else if (e->type == MD_TYPE_TRACK) { - MD_TRACK(e)->number = MD_ROOT(c)->tracks; - MD_ROOT(c)->tracks++; - } else if (iscontainer(e)) { - t += MD_CONTAINER(e)->duration; - } - - t -= MD_ELEMENT(c)->element_time; - if (t > c->duration) - c->duration = t; - ->>function md_free -void -struct element *el; // Element tree to free ->>description -Free a complete element tree. - ->>code - struct containerElement *c; - int i; - - if (el->type == MD_TYPE_ROOT) { - if (--MD_ROOT(el)->refcount > 0) - return; - if (MD_ROOT(el)->refcount < 0) { - ethrow(debugError, _("Freed an mdroot %d with bad reference count"), - MD_ROOT(el)->refcount); - return; - } - } +/* + * A do nothing event. This is always totally ignored. + * It exists to provide begining and end markers for containers. + * By adding this event you can stretch a container, or cause + * one to be created. + */ +>>elementdef noop element +new unsigned long time + MD_TIME(e) = time; - if (el->type >= MD_CONTAINER_BEGIN) { - c = MD_CONTAINER(el); - for (i = 0; i < c->elements->len; i++) { - struct element *p = g_ptr_array_index(c->elements, i); - md_free(p); - } - g_ptr_array_free(c->elements, 1); - } - switch (el->type) { - case MD_TYPE_TEXT: - g_free(MD_TEXT(el)->text); - break; - case MD_TYPE_SYSEX: - g_free(MD_SYSEX(el)->data); - break; - } - g_free(el); >>function md_check_cast struct element * @@ -344,3 +302,19 @@ ethrow(debugError, "Cast from %d to %d not allowed", el->type, type); return NULL;/* not reached */ +>>function md_root_inc_ref +struct rootElement * +struct rootElement *root; + +>>description +Normal reference count operations are handled with in the md layer, +but other code needs to hold references to the root. +Hence this routine to increase the root reference count. +Returns the root so that you can use code like: + + foo->mdroot = md_root_inc_ref(root); + +>>code + + ((struct element *)root)->refcount++; + return root; diff -rNu melys-0.0.9/md/mdadd.c melys-0.0.10/md/mdadd.c --- melys-0.0.9/md/mdadd.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.10/md/mdadd.c Wed Sep 15 14:04:00 1999 @@ -0,0 +1,283 @@ +/* + * + * 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. + * + * Some operations to modify a MD tree. This only covers general purpose + * operations. Specialized tools like quantize or whatever are likely + * to be implmented in tools directory. + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "elements.h" +#include "md.h" +#include "intl.h" + + +/* Short cut for cast */ +#define CONTAINER struct containerElement * + +static void merge_events(struct trackElement *track, + struct containerElement *list); +static void merge_in_elem(struct containerElement *ctrk, struct element *el); +static void ensure_part_filled(struct containerElement *ctrk, + unsigned long begin, unsigned long end); + + +/* + * Add an event to a track/part etc. Event is appended or sorted + * into its correct position. + * + */ +void +_md_add_elem(struct containerElement *c, struct element *el, int sort) +{ + unsigned long endtime; + unsigned long t; + + endtime = el->element_time; + if (iscontainer(el)) { + endtime += ((struct containerElement *)el)->duration; + } + + switch (el->type) { + case MD_TYPE_NOTE: + endtime += ((struct noteElement *)el)->length; + break; + case MD_TYPE_TRACK: + MD_TRACK(el)->number = MD_ROOT(c)->tracks++; + break; + default: + break; + } + + t = endtime - MD_TIME(c); + if (t > c->duration) + c->duration = t; + + g_assert(c->duration >= 0); + if (sort) + md_list_add_sort(c, el); + else + g_ptr_array_add(c->elements, el); +} + +/* + * Free a complete element tree. + * + * Arguments: + * el - Element tree to free + */ +void +md_free(struct element *el) +{ + struct containerElement *c; + int i; + + if (--el->refcount > 0) + return; + if (el->refcount < 0) { + ethrow(debugError, _("Freed an mdroot %d with bad reference count"), + MD_ELEMENT(el)->refcount); + return; + } + + if (el->type >= MD_CONTAINER_BEGIN) { + c = (struct containerElement *)el; + for (i = 0; i < c->elements->len; i++) { + struct element *p = g_ptr_array_index(c->elements, i); + md_free(p); + } + g_ptr_array_free(c->elements, 1); + } + + switch (el->type) { + case MD_TYPE_TEXT: + g_free(MD_TEXT(el)->text); + break; + case MD_TYPE_SYSEX: + g_free(MD_SYSEX(el)->data); + break; + default: + break; + } + g_free(el); +} + +/* + * Add a list of events to a track. The container c consists of + * events that are not containers. They are merged into the + * existing track in one of several ways. + * + * Arguments: + * track - Track to add events to + * list - list of elements to be merged in + * mode - Merge mode + */ +void +md_merge_in(struct trackElement *track, struct containerElement *list, + enum merge_mode mode) +{ + + switch (mode) { + case MD_ADD_MERGE: + merge_events(track, list); + break; + case MD_ADD_LAST: + break; + default: + break;//XXX + } +} + +/* + * Add a list of events to a track. The container track consists + * of events that are not containers. They are merged into the + * existing track in one of several ways. + * + * Arguments: + * track - Track etc. to merge events into + * list - list of elements to be merged in + */ +static void +merge_events(struct trackElement *track, struct containerElement *list) +{ + struct containerElement *ctrk; + struct element *el; + int n; + + ctrk = MD_CONTAINER(track); + + md_undo_begin_set(); + + /* Make sure that part elements cover all the duration of the list */ + ensure_part_filled(ctrk, MD_TIME(list), MD_ENDTIME(list)); + + for (n = 0; n < md_list_size(list); n++) { + el = md_list_nth_elem(list, n); + merge_in_elem(ctrk, el); + } + + md_undo_end_set(); +} + +/* + * If the container c consists of other containers, then find + * the place where the event should go and create a new part if + * needed. Once we have found the part that it can fit into, + * recurse to add to that part. Once we get to a container that is + * full of events, add it. + * + * A more concrete way of looking at it. We are adding to a track, + * but cannot add events directly to the track. The events must + * be added to a part within the track. Therefore we search for + * the part. If one does not exist then it is created. + * + * We then step into the part that we found or created and add the + * event. + * + * Extra complexity arrises because parts can be nested, but + * this just involves recursing down until the bottom is + * reached. There can also be references to other parts. + * + */ +static void +merge_in_elem(struct containerElement *ctrk, struct element *el) +{ + struct element *first; + struct containerElement *con; + + /* + * See what is in this container. If it is ordinary elements or + * empty then just add the event (sorted) and we are done. + */ + first = md_list_first(ctrk); + if (!first || !iscontainer(first)) { + md_add_elem_sort(ctrk, el); + return; + } + + /* + * Search though all the parts (or whatever) in this track and + * find the one where the time range fits the event. + */ + con = (struct containerElement *)md_list_find_by_time(ctrk, MD_TIME(el)); + g_return_if_fail(con != NULL); /* This should have been ensured */ + + /* Recursion will be ended when at bottom of tree */ + merge_in_elem(con, el); +} + +/* + * Ensure that there are part containers allocated from the + * times begin to end . + * + * Arguments: + * begin - Begin time + * end - End time + */ +static void +ensure_part_filled(struct containerElement *ctrk, unsigned long begin, + unsigned long end) +{ + struct containerElement *con; + struct containerElement *cnext; + struct element *el; + unsigned long end2; + + el = md_list_first(ctrk); + if (el && !iscontainer(el)) + return; /* Return if only leaf elements */ + + if (!el && MD_ELEMENT(ctrk)->type != MD_TYPE_TRACK) + return; + + do { + con = (struct containerElement *)md_list_find_by_time(ctrk, begin); + if (con) { + end2 = MIN(end, MD_ENDTIME(con)); + ensure_part_filled(con, begin, end2); + } else { + + /* + * Create a new part starting at begin. + */ + con = (struct containerElement *)md_part_new(); + MD_TIME(con) = begin; + + md_list_add_sort(ctrk, MD_ELEMENT(con)); + + /* + * Examine the next part, if any, and adjust the duration + * of the current part so that it does not overlap the + * next part. + */ + cnext = (CONTAINER)md_list_next(ctrk, MD_ELEMENT(con)); + if (cnext) + end2 = MIN(MD_TIME(cnext), end); + else + end2 = end; + + con->duration = end2 - MD_TIME(con); + } + + begin = MD_ENDTIME(con); + + } while (end > end2); + + if (MD_ENDTIME(ctrk) < end) + ctrk->duration = end - MD_TIME(ctrk); +} diff -rNu melys-0.0.9/md/mdadd.m melys-0.0.10/md/mdadd.m --- melys-0.0.9/md/mdadd.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.10/md/mdadd.m Wed Sep 15 13:49:23 1999 @@ -0,0 +1,290 @@ +>>name mdadd.m - Modifications to an MD tree + +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. + +Some operations to modify a MD tree. This only covers general purpose +operations. Specialized tools like quantize or whatever are likely +to be implmented in tools directory. + +>>headerdef --decl md.h +/* + * The merge mode types + */ +enum merge_mode { + MD_ADD_MERGE, /* Events are merged in along with existing events */ + //MD_ADD_REPLACE, /* Events comletely replace existing ones in duration */ + //MD_ADD_RETAKE, /* A new take is created as an alternative to existing */ + MD_ADD_LAST +}; + + +#define md_add_elem(c, el) _md_add_elem(c, el, 0) +#define md_add_elem_sort(c, el) _md_add_elem(c, el, 1) + +>>extern + +/* Short cut for cast */ +#define CONTAINER struct containerElement * + +>>function _md_add_elem +void +struct containerElement *c; +struct element *el; +int sort; + +>>description +Add an event to a track/part etc. +Event is appended or sorted into its correct position. + +>>code + unsigned long endtime; + unsigned long t; + + endtime = el->element_time; + if (iscontainer(el)) { + endtime += ((struct containerElement *)el)->duration; + } + + switch (el->type) { + case MD_TYPE_NOTE: + endtime += ((struct noteElement *)el)->length; + break; + case MD_TYPE_TRACK: + MD_TRACK(el)->number = MD_ROOT(c)->tracks++; + break; + default: + break; + } + + t = endtime - MD_TIME(c); + if (t > c->duration) + c->duration = t; + + g_assert(c->duration >= 0); + if (sort) + md_list_add_sort(c, el); + else + g_ptr_array_add(c->elements, el); + + +>>function md_free +void +struct element *el; // Element tree to free + +>>description +Free a complete element tree. + +>>code + struct containerElement *c; + int i; + + if (--el->refcount > 0) + return; + if (el->refcount < 0) { + ethrow(debugError, _("Freed an mdroot %d with bad reference count"), + MD_ELEMENT(el)->refcount); + return; + } + + if (el->type >= MD_CONTAINER_BEGIN) { + c = (struct containerElement *)el; + for (i = 0; i < c->elements->len; i++) { + struct element *p = g_ptr_array_index(c->elements, i); + md_free(p); + } + g_ptr_array_free(c->elements, 1); + } + + switch (el->type) { + case MD_TYPE_TEXT: + g_free(MD_TEXT(el)->text); + break; + case MD_TYPE_SYSEX: + g_free(MD_SYSEX(el)->data); + break; + default: + break; + } + g_free(el); + + +>>function md_merge_in +void +struct trackElement *track; Track to add events to +struct containerElement *list; list of elements to be merged in +enum merge_mode mode; Merge mode + +>>description +Add a list of events to a track. +The container +.A c +consists of events that are not containers. +They are merged into the existing track in one of several +ways. + +>>code + + switch (mode) { + case MD_ADD_MERGE: + merge_events(track, list); + break; + case MD_ADD_LAST: + break; + default: + break;//XXX + } + + +>>function merge_events +static void +struct trackElement *track; Track etc. to merge events into +struct containerElement *list; list of elements to be merged in + +>>description +Add a list of events to a track. +The container +.A track +consists of events that are not containers. +They are merged into the existing track in one of several +ways. + +>>code + struct containerElement *ctrk; + struct element *el; + int n; + + ctrk = MD_CONTAINER(track); + + md_undo_begin_set(); + + /* Make sure that part elements cover all the duration of the list */ + ensure_part_filled(ctrk, MD_TIME(list), MD_ENDTIME(list)); + + for (n = 0; n < md_list_size(list); n++) { + el = md_list_nth_elem(list, n); + merge_in_elem(ctrk, el); + } + + md_undo_end_set(); + +>>function merge_in_elem +static void +struct containerElement *ctrk; +struct element *el; + +>>description +If the container +.A c +consists of other containers, then find the place +where the event should go and create a new part if needed. +Once we have found the part that it can fit into, recurse to +add to that part. +Once we get to a container that is full of events, add it. + +A more concrete way of looking at it. +We are adding to a track, but cannot add events directly to the track. +The events must be added to a part within the track. +Therefore we search for the part. +If one does not exist then it is created. + +We then step into the part that we found or created +and add the event. + +Extra complexity arrises because parts can be nested, but this +just involves recursing down until the bottom is reached. +There can also be references to other parts. + +>>code + struct element *first; + struct containerElement *con; + + /* + * See what is in this container. If it is ordinary elements or + * empty then just add the event (sorted) and we are done. + */ + first = md_list_first(ctrk); + if (!first || !iscontainer(first)) { + md_add_elem_sort(ctrk, el); + return; + } + + /* + * Search though all the parts (or whatever) in this track and + * find the one where the time range fits the event. + */ + con = (struct containerElement *)md_list_find_by_time(ctrk, MD_TIME(el)); + g_return_if_fail(con != NULL); /* This should have been ensured */ + + /* Recursion will be ended when at bottom of tree */ + merge_in_elem(con, el); + + +>>function ensure_part_filled +static void +struct containerElement *ctrk; +unsigned long begin; Begin time +unsigned long end; End time + +>>description +Ensure that there are part containers allocated from the times +.A begin +to +.A end . + +>>code + struct containerElement *con; + struct containerElement *cnext; + struct element *el; + unsigned long end2; + + el = md_list_first(ctrk); + if (el && !iscontainer(el)) + return; /* Return if only leaf elements */ + + if (!el && MD_ELEMENT(ctrk)->type != MD_TYPE_TRACK) + return; + + do { + con = (struct containerElement *)md_list_find_by_time(ctrk, begin); + if (con) { + end2 = MIN(end, MD_ENDTIME(con)); + ensure_part_filled(con, begin, end2); + } else { + + /* + * Create a new part starting at begin. + */ + con = (struct containerElement *)md_part_new(); + MD_TIME(con) = begin; + + md_list_add_sort(ctrk, MD_ELEMENT(con)); + + /* + * Examine the next part, if any, and adjust the duration + * of the current part so that it does not overlap the + * next part. + */ + cnext = (CONTAINER)md_list_next(ctrk, MD_ELEMENT(con)); + if (cnext) + end2 = MIN(MD_TIME(cnext), end); + else + end2 = end; + + con->duration = end2 - MD_TIME(con); + } + + begin = MD_ENDTIME(con); + + } while (end > end2); + + if (MD_ENDTIME(ctrk) < end) + ctrk->duration = end - MD_TIME(ctrk); diff -rNu melys-0.0.9/md/mdlist.c melys-0.0.10/md/mdlist.c --- melys-0.0.9/md/mdlist.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.10/md/mdlist.c Wed Sep 15 14:04:00 1999 @@ -0,0 +1,210 @@ +/* + * + * 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. + * + * Do not call these except from other MD routines. + * + * These are lowlevel list manipulation routines. They do not preserve + * the integrity of the MD tree or provide any undo facility etc. + * and so they should not be called from outside of + * the md routines. + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "elements.h" +#include <string.h> +#include "melmsg.h" +#include "md.h" +#include "intl.h" + + + + +void +md_list_append(struct containerElement *c, struct element *el) +{ + + g_ptr_array_add(c->elements, (gpointer)el); +} + +void +md_list_prepend(struct containerElement *c, struct element *el) +{ + g_assert_not_reached(); /* Becuase not implemented yet */ +} + +/* + * Add element at a position sorted by time. + * + */ +void +md_list_add_sort(struct containerElement *c, struct element *el) +{ + gpointer p; + int n; + + g_return_if_fail(el != NULL); + + g_ptr_array_add(c->elements, NULL); /* Ensure enough space */ + for (n = 0; n < c->elements->len; n++) { + p = c->elements->pdata[n]; + if (p == NULL) { + /* This was the one we have just added, add */ + g_assert(n == c->elements->len - 1); /* check it was */ + c->elements->pdata[n] = el; + return; + } else if (MD_TIME(p) <= MD_TIME(el)) { + + /* Keep going */ + continue; + } + + /* This is the correct place: add it here */ + memmove(c->elements->pdata+n+1, c->elements->pdata+n, + sizeof(gpointer) * (c->elements->len - n - 1)); + c->elements->pdata[n] = el; + + return; + } + + g_assert_not_reached(); +} + +/* + * Return the number of elements in this container. + */ +int +md_list_size(struct containerElement *c) +{ + + return c->elements->len; +} + +/* + * Return the first element. + */ +struct element * +md_list_first(struct containerElement *c) +{ + + if (c->elements->len == 0) + return NULL; + return (struct element *)c->elements->pdata[0]; +} + +/* + * Return the last element. + */ +struct element * +md_list_last(struct containerElement *c) +{ + int len; + + len = c->elements->len; + if (len <= 0) + return NULL; + + return (struct element *)c->elements->pdata[len - 1]; +} + +/* + * Return the nth element. + * Arguments: + * n - Return element at this position + */ +struct element * +md_list_nth_elem(struct containerElement *c, int n) +{ + int len; + + len = c->elements->len; + if (len <= 0 || n < 0) + return NULL; + if (n >= len) + return NULL; + + return (struct element *)c->elements->pdata[n]; +} + +/* + * Find the element in the specified container, c, that comes + * after the specified element, el . + * + */ +struct element * +md_list_next(struct containerElement *c, struct element *el) +{ + int n; + + for (n = 0; n < c->elements->len; n++) { + if (c->elements->pdata[n] == el) { + if (n < c->elements->len - 1) + return c->elements->pdata[n+1]; + break; + } + } + return NULL; +} + +/* + * Find the container that encompases the given time. The + * argument c is a list of containers. We find the one that + * covers the specified time . If none do then returns NULL. + * + * If only leaf elements are present then return if the element + * is a direct match. + * + * Arguments: + * ctrk - A track like container + * time - Find container that covers this element + */ +struct element * +md_list_find_by_time(struct containerElement *ctrk, unsigned long time) +{ + struct element *el; + int n; + + el = md_list_first(ctrk); + for (n = 0; n < md_list_size(ctrk); n++) { + el = md_list_nth_elem(ctrk, n); + + if (iscontainer(el)) { + if (time >= MD_TIME(el) && time < MD_ENDTIME(el)) + return el; + } else { + if (time == MD_TIME(el)) + return el; + } + } + + return NULL; +} + +/* + * Save events into a container. This must not be part of an MD + * tree. The routine only exists so I can follow my own rules + * about not using the md_list_* routines. + * + */ +void +md_save_elem(struct containerElement *c, struct element *el) +{ + + /* When possible assert that this is not in a tree */ + + md_list_append(c, el); +} diff -rNu melys-0.0.9/md/mdlist.m melys-0.0.10/md/mdlist.m --- melys-0.0.9/md/mdlist.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.10/md/mdlist.m Wed Sep 15 10:38:43 1999 @@ -0,0 +1,206 @@ +>>name mdlist.m - list operations + +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. + +Do not call these except from other MD routines. + +These are lowlevel list manipulation routines. They do not preserve +the integrity of the MD tree or provide any undo facility etc. +and so they should not be called from outside of +the md routines. + +>>header <string.h> +>>header melmsg.h +>>headerdef --decl md.h + +>>function md_list_append +void +struct containerElement *c; +struct element *el; + +>>code + + g_ptr_array_add(c->elements, (gpointer)el); + +>>function md_list_prepend +void +struct containerElement *c; +struct element *el; +>>code + g_assert_not_reached(); /* Becuase not implemented yet */ + + +>>function md_list_add_sort +void +struct containerElement *c; +struct element *el; + +>>description +Add element at a position sorted by time. + +>>code + gpointer p; + int n; + + g_return_if_fail(el != NULL); + + g_ptr_array_add(c->elements, NULL); /* Ensure enough space */ + for (n = 0; n < c->elements->len; n++) { + p = c->elements->pdata[n]; + if (p == NULL) { + /* This was the one we have just added, add */ + g_assert(n == c->elements->len - 1); /* check it was */ + c->elements->pdata[n] = el; + return; + } else if (MD_TIME(p) <= MD_TIME(el)) { + + /* Keep going */ + continue; + } + + /* This is the correct place: add it here */ + memmove(c->elements->pdata+n+1, c->elements->pdata+n, + sizeof(gpointer) * (c->elements->len - n - 1)); + c->elements->pdata[n] = el; + + return; + } + + g_assert_not_reached(); + +>>function md_list_size +int +struct containerElement *c; +>>description +Return the number of elements in this container. +>>code + + return c->elements->len; + + +>>function md_list_first +struct element * +struct containerElement *c; +>>description +Return the first element. +>>code + + if (c->elements->len == 0) + return NULL; + return (struct element *)c->elements->pdata[0]; + +>>function md_list_last +struct element * +struct containerElement *c; +>>description +Return the last element. +>>code + int len; + + len = c->elements->len; + if (len <= 0) + return NULL; + + return (struct element *)c->elements->pdata[len - 1]; + +>>function md_list_nth_elem +struct element * +struct containerElement *c; +int n; Return element at this position +>>description +Return the nth element. +>>code + int len; + + len = c->elements->len; + if (len <= 0 || n < 0) + return NULL; + if (n >= len) + return NULL; + + return (struct element *)c->elements->pdata[n]; + +>>function md_list_next +struct element * +struct containerElement *c; +struct element *el; + +>>description +Find the element in the specified container, +.A c, +that comes after the specified element, +.A el . + +>>code + int n; + + for (n = 0; n < c->elements->len; n++) { + if (c->elements->pdata[n] == el) { + if (n < c->elements->len - 1) + return c->elements->pdata[n+1]; + break; + } + } + return NULL; + + +>>function md_list_find_by_time +struct element * +struct containerElement *ctrk; A track like container +unsigned long time; Find container that covers this element + +>>description +Find the container that encompases the given time. +The argument +.A c +is a list of containers. +We find the one that covers the specified +.A time . +If none do then returns NULL. + +If only leaf elements are present then return if the element +is a direct match. + +>>code + struct element *el; + int n; + + el = md_list_first(ctrk); + for (n = 0; n < md_list_size(ctrk); n++) { + el = md_list_nth_elem(ctrk, n); + + if (iscontainer(el)) { + if (time >= MD_TIME(el) && time < MD_ENDTIME(el)) + return el; + } else { + if (time == MD_TIME(el)) + return el; + } + } + + return NULL; + +>>function md_save_elem +void +struct containerElement *c; +struct element *el; +>>description +Save events into a container. +This must not be part of an MD tree. +The routine only exists so I can follow my own rules about +not using the md_list_* routines. + +>>code + + /* When possible assert that this is not in a tree */ + + md_list_append(c, el); diff -rNu melys-0.0.9/md/mdundo.c melys-0.0.10/md/mdundo.c --- melys-0.0.9/md/mdundo.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.10/md/mdundo.c Wed Sep 15 14:04:01 1999 @@ -0,0 +1,88 @@ +/* + * + * 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 "md.h" +#include "intl.h" + + + + +/* + * Begin a set of operations that are to be treated as one. For + * example if you select a number of events and delete them all + * at once, they will be undone as one unit as well. + * + + */ +void +md_undo_begin_set(void) +{ +} + +/* + * End a previous md_undo_begin_set . If undoable operations + * are performed outside of a md_undo_begin_set / + * md_undo_end_set pair, then they are undoable + * individually. + * + + */ +void +md_undo_end_set(void) +{ +} + +/* + * Undo saving is switched off. This would happen when + * building up a tree for example by reading in from a file, or by + * hand. + * + + */ +void +md_undo_freeze(void) +{ +} + +/* + * Undo saving is switched back on again after a + * md_undo_freeze . + * + + */ +void +md_undo_thaw(void) +{ +} + +/* + * Save an operation so that it can be undone again. + * + + * Arguments: + * c - Container added/removed from + * el - Element that was added/removed/changed + * op - Operation performed + */ +void +md_undo_save(struct containerElement *c, struct element *el, enum undo_op op) +{ +} diff -rNu melys-0.0.9/md/mdundo.m melys-0.0.10/md/mdundo.m --- melys-0.0.9/md/mdundo.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.10/md/mdundo.m Tue Sep 14 14:59:46 1999 @@ -0,0 +1,71 @@ +>>name mdundo.m - Routines to implement undo functionality + +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. + +>>headerdef --decl md.h + +/* + * The list of operation types that can be undone. This is intended + * to cover all operations that can't simply be undone by the user. + */ +enum undo_op { + MD_UNDO_ADD, /* Event is added */ + MD_UNDO_REMOVE, /* Event is removed */ + MD_UNDO_TIME_CHANGE,/* Begin time of event is changed */ + MD_UNDO_DURATION_CHANGE, /* End time of event is changed */ + MD_UNDO_LAST +}; + +>>function md_undo_begin_set +void +>>description +Begin a set of operations that are to be treated as one. +For example if you select a number of events and delete +them all at once, they will be undone as one unit as well. + + +>>function md_undo_end_set +void +>>description +End a previous +.F md_undo_begin_set . +If undoable operations are performed outside of a +.F md_undo_begin_set / +.F md_undo_end_set +pair, then they are undoable individually. + + +>>function md_undo_freeze +void +>>description +Undo saving is switched off. +This would happen when building up a tree for +example by reading in from a file, or by hand. + + +>>function md_undo_thaw +void +>>description +Undo saving is switched back on again after a +.F md_undo_freeze . + + +>>function md_undo_save +void +struct containerElement *c; Container added/removed from +struct element *el; Element that was added/removed/changed +enum undo_op op; Operation performed + +>>description +Save an operation so that it can be undone again. + + diff -rNu melys-0.0.9/md/mdutil.c melys-0.0.10/md/mdutil.c --- melys-0.0.9/md/mdutil.c Thu Aug 19 13:11:56 1999 +++ melys-0.0.10/md/mdutil.c Wed Sep 15 14:04:01 1999 @@ -108,8 +108,7 @@ state = g_new(struct sequenceState, 1); nchild = MD_CONTAINER(root)->elements->len; - root->refcount++; - state->root = root; + state->root = md_root_inc_ref(root); state->retroot = root; state->ntracks = 0; @@ -420,7 +419,6 @@ struct rootElement *root; struct headElement *head; struct tempomapElement *map; - //struct trackElement *track; struct tempoElement *tempo; root = md_root_new(); @@ -434,17 +432,37 @@ head->format = 1; head->time_base = 96; - md_add(MD_CONTAINER(root), MD_ELEMENT(head)); + md_add_elem(MD_CONTAINER(root), MD_ELEMENT(head)); map = md_tempomap_new(); tempo = md_tempo_new(500000); - md_add(MD_CONTAINER(map), MD_ELEMENT(tempo)); + md_add_elem(MD_CONTAINER(map), MD_ELEMENT(tempo)); - md_add(MD_CONTAINER(root), MD_ELEMENT(map)); + md_add_elem(MD_CONTAINER(root), MD_ELEMENT(map)); - //track = md_track_new(); - //md_add(MD_CONTAINER(root), MD_ELEMENT(track)); + return root; +} + +/* + * Create a new song with a default number of tracks already + * initialised. + * + */ +struct rootElement * +md_song_new(void) +{ + struct rootElement *root; + struct trackElement *track; + int i; + + root = md_empty(); + + for (i = 0; i < 32; i++) { + track = md_track_new(); + MD_ELEMENT(track)->device_channel = i; + md_add_elem((struct containerElement *)root, (struct element *)track); + } return root; } @@ -476,4 +494,27 @@ } return track; +} + +/* + * Deletes the specified track. XXX Still a major decision to + * make regarding undo actions. I want to be able to undo + * arbitary actions to any depth if possible. + * + * Arguments: + * root - Root to delete from + * track - Track to delete. + */ +void +md_track_delete(struct rootElement *root, struct trackElement *track) +{ + gboolean t; + + if (root->tracks > 0) { + t = g_ptr_array_remove(MD_CONTAINER(root)->elements, (gpointer)track); + if (t) { + root->tracks--; + md_free(MD_ELEMENT(track)); + } + } } diff -rNu melys-0.0.9/md/mdutil.m melys-0.0.10/md/mdutil.m --- melys-0.0.9/md/mdutil.m Thu Aug 19 00:08:04 1999 +++ melys-0.0.10/md/mdutil.m Wed Sep 15 13:49:23 1999 @@ -16,6 +16,17 @@ >>header "stdlib.h" >>headerdef --decl md.h +/* + * Some macros to handle accessing some common fields in the + * element + */ +#define MD_TIME(el) ( ((struct element *)(el))->element_time) +#define MD_ENDTIME(el) \ + (MD_TIME(el) + ((struct containerElement *)(el))->duration) +#define MD_DEVCHAN(el) (((struct element *)(el))->device_channel) +#define MD_DEV(el) ( (((struct element *)(el))->device_channel & 0xf0) >> 8) +#define MD_CHAN(el) ( (((struct element *)(el))->device_channel & 0x0f)) + /* Defines for md_walk() */ #define MD_WALK_ALL 1 /* Include all elements including deleted, hidden*/ @@ -119,8 +130,7 @@ state = g_new(struct sequenceState, 1); nchild = MD_CONTAINER(root)->elements->len; - root->refcount++; - state->root = root; + state->root = md_root_inc_ref(root); state->retroot = root; state->ntracks = 0; @@ -429,7 +439,6 @@ struct rootElement *root; struct headElement *head; struct tempomapElement *map; - //struct trackElement *track; struct tempoElement *tempo; root = md_root_new(); @@ -443,17 +452,37 @@ head->format = 1; head->time_base = 96; - md_add(MD_CONTAINER(root), MD_ELEMENT(head)); + md_add_elem(MD_CONTAINER(root), MD_ELEMENT(head)); map = md_tempomap_new(); tempo = md_tempo_new(500000); - md_add(MD_CONTAINER(map), MD_ELEMENT(tempo)); + md_add_elem(MD_CONTAINER(map), MD_ELEMENT(tempo)); + + md_add_elem(MD_CONTAINER(root), MD_ELEMENT(map)); + + return root; + - md_add(MD_CONTAINER(root), MD_ELEMENT(map)); +>>function md_song_new +struct rootElement * + +>>description +Create a new song with a default number of tracks already +initialised. - //track = md_track_new(); - //md_add(MD_CONTAINER(root), MD_ELEMENT(track)); +>>code + struct rootElement *root; + struct trackElement *track; + int i; + + root = md_empty(); + + for (i = 0; i < 32; i++) { + track = md_track_new(); + MD_ELEMENT(track)->device_channel = i; + md_add_elem((struct containerElement *)root, (struct element *)track); + } return root; @@ -488,6 +517,28 @@ } return track; + + +>>function md_track_delete +void +struct rootElement *root; Root to delete from +struct trackElement *track; Track to delete. + +>>description +Deletes the specified track. +XXX Still a major decision to make regarding undo actions. +I want to be able to undo arbitary actions to any depth if possible. + +>>code + gboolean t; + + if (root->tracks > 0) { + t = g_ptr_array_remove(MD_CONTAINER(root)->elements, (gpointer)track); + if (t) { + root->tracks--; + md_free(MD_ELEMENT(track)); + } + } >># ### Static functions #### diff -rNu melys-0.0.9/midi/play.c melys-0.0.10/midi/play.c --- melys-0.0.9/midi/play.c Thu Aug 19 13:11:58 1999 +++ melys-0.0.10/midi/play.c Wed Sep 15 14:04:04 1999 @@ -139,8 +139,7 @@ play_set_mdroot(struct play *play, struct rootElement *root) { - root->refcount++; - play->mdroot = root; + play->mdroot = md_root_inc_ref(root); return; } @@ -185,7 +184,6 @@ play->seq = md_sequence_init(play->mdroot); play->pend_element = NULL; - /* Need to flush the whole queue, just re-open at present TEMP */ seq_drain_output(play->ctxp); seq_connect_addresses(play->ctxp, SEQ_ADDR_OUTPUT); diff -rNu melys-0.0.9/midi/play.m melys-0.0.10/midi/play.m --- melys-0.0.9/midi/play.m Thu Aug 19 12:31:49 1999 +++ melys-0.0.10/midi/play.m Tue Sep 14 14:58:08 1999 @@ -120,8 +120,7 @@ >>code - root->refcount++; - play->mdroot = root; + play->mdroot = md_root_inc_ref(root); return; @@ -165,7 +164,6 @@ play->seq = md_sequence_init(play->mdroot); play->pend_element = NULL; - /* Need to flush the whole queue, just re-open at present TEMP */ seq_drain_output(play->ctxp); seq_connect_addresses(play->ctxp, SEQ_ADDR_OUTPUT); diff -rNu melys-0.0.9/midi/record.c melys-0.0.10/midi/record.c --- melys-0.0.9/midi/record.c Thu Aug 19 13:11:58 1999 +++ melys-0.0.10/midi/record.c Wed Sep 15 14:04:04 1999 @@ -36,16 +36,10 @@ seq_context_t *ctxp; /* Record context */ struct rootElement *mdroot; /* The current song */ - int echo_devchan; /* Echo device channel */ - guint write_id; /* ID of write handler */ guint read_id; /* ID of read handler */ struct trackElement *curtrack; /* Current track */ - struct partElement *newpart; /* New part being recorded */ - int curchan; /* Current recording channel */ - - GPtrArray *notes; /* To save pending off notes */ }; #define INPUT_ALL (GDK_INPUT_READ|GDK_INPUT_WRITE) @@ -53,14 +47,16 @@ #define EPTR struct element * static void run_events(gpointer vrecord, gint fd, GdkInputCondition cond); -static void save_event(struct record *record, snd_seq_event_t *ep); +static int get_dev_from_addr(struct record *record, snd_seq_addr_t *addr, + int inout); +static void save_event(struct trackElement *track, snd_seq_event_t *ep); static void push_events(gpointer vrecord, gint fd, GdkInputCondition cond); static void add_io_cb(struct record *record, int which); static void remove_io_cb(struct record *record, int which); -static struct element *save_note(struct record *record, int dev, - unsigned long time, snd_seq_event_t *ep); -static void finish_note(struct record *record, int devchan, +static struct element *save_note(struct trackElement *track, unsigned long time, snd_seq_event_t *ep); +static void finish_note(struct trackElement *track, unsigned long time, + snd_seq_event_t *ep); /* @@ -86,8 +82,6 @@ snd_seq_block_mode(seq_handle(record->ctxp), 0); - record->notes = g_ptr_array_new(); - return record; } @@ -105,7 +99,6 @@ record->ctxp = NULL; - g_ptr_array_free(record->notes, 1); g_free(record); } @@ -113,8 +106,7 @@ record_set_mdroot(struct record *record, struct rootElement *root) { - root->refcount++; - record->mdroot = root; + record->mdroot = md_root_inc_ref(root); } /* @@ -138,26 +130,6 @@ } /* - * Open all the sequencer ports that will be needed for this - * song. XXX is this needed? We should have a copy of the - * destination list on the subcontext. There will be no actual - * connection but this does not matter as we can send the events - * anyway. - * - * Arguments: - * record - The record object - */ -void -XXrecord_open_ports(struct record *record) -{ - - if (record->mdroot == NULL) - ethrow(debugError, "No md root set in XXrecord_open_ports"); - - //record->ctxp = seq_md_open_ports(record->mdroot); -} - -/* * Set the current track that we are recording on. * * Arguments: @@ -169,7 +141,6 @@ { record->curtrack = track; - record->curchan = devchan; } /* @@ -182,14 +153,25 @@ void record_start(struct record *record) { + int n; unsigned long t; + struct trackElement *track; record->isrecording = TRUE; - record->newpart = md_part_new(); t = seq_get_time(record->ctxp); - MD_ELEMENT(record->newpart)->element_time = t; - MD_ELEMENT(record->newpart)->device_channel = record->curchan; + + for (n = 0; n < record->mdroot->tracks; n++) { + track = md_track_nth(record->mdroot, n); + + if (track->record) { + track->newpart = md_container_new(); + track->notes = g_ptr_array_new(); + MD_TIME(track->newpart) = t; + MD_ELEMENT(track->newpart)->device_channel + = MD_ELEMENT(track)->device_channel; + } + } } /* @@ -202,33 +184,46 @@ record_stop(struct record *record) { unsigned long endtime; + unsigned long duration; + struct trackElement *track; struct element *el; int i; + int n; if (!record || !record->isrecording) return; record->isrecording = FALSE; - if (record->curtrack == NULL || record->newpart == NULL) - return; - endtime = seq_get_time(record->ctxp); - /* - * Must finish off any note that is not released. - */ - for (i = 0; i < record->notes->len; i++) { - el = (struct element *)g_ptr_array_index(record->notes, i); - MD_NOTE(el)->length = endtime - el->element_time; - } - g_ptr_array_set_size(record->notes, 0); - endtime -= MD_ELEMENT(record->newpart)->element_time; - MD_CONTAINER(record->newpart)->duration = endtime; + for (n = 0; n < record->mdroot->tracks; n++) { + track = md_track_nth(record->mdroot, n); + + if (!track->record) + continue; - md_add(MD_CONTAINER(record->curtrack), MD_ELEMENT(record->newpart)); - record->newpart = NULL; + if (!track->notes) + continue; /* TEMP */ + + /* + * Must finish off any note that is not released. The pointers + * are just copies pointing to the real saved note events, so + * we just have to adjust the duration. + */ + for (i = 0; i < track->notes->len; i++) { + el = (struct element *)g_ptr_array_index(track->notes, i); + MD_NOTE(el)->length = endtime - el->element_time; + } + + duration = endtime - MD_TIME(track->newpart); + track->newpart->duration = duration; + + md_merge_in(MD_TRACK(track), track->newpart, MD_ADD_MERGE); + track->newpart = NULL; + g_ptr_array_free(track->notes, 1); + } } /* @@ -244,56 +239,108 @@ { snd_seq_event_t *ep; struct record *record = vrecord; + struct trackElement *track; while ((ep = seq_read(record->ctxp)) != NULL) { int n; + int tn; + //if (ep->type != 50) g_message("Got event %d", ep->type); + //g_message("Got event %d", ep->type); ep->flags &= ~SND_SEQ_TIME_MODE_REL; - if (record->isrecording) - save_event(record, ep); - - n = seq_sendto_now(record->ctxp, ep, 0, 15); /* XXX from set dev/chan */ - if (n != 0) { - g_message("Mmm n is %d", n); - add_io_cb(record, GDK_INPUT_WRITE); + for (tn = 0; tn < record->mdroot->tracks; tn++) { + track = md_track_nth(record->mdroot, tn); + if (!track->record) + continue; + + save_event(track, ep); + + n = seq_sendto_now(record->ctxp, ep, + DEV(MD_ELEMENT(track)->device_channel), + CHAN(MD_ELEMENT(track)->device_channel)); + + if (n != 0) { + g_message("Mmm n is %d", n); + add_io_cb(record, GDK_INPUT_WRITE); + } } } } /* + * Return the device number that corresponds to the given + * address. + * + * Sould be in seqlib? + * + * Arguments: + * record - The recording structure + * addr - Address to convert to device number + * inout - Is this an input or output device + */ +static int +get_dev_from_addr(struct record *record, snd_seq_addr_t *addr, int inout) +{ + int dev; + snd_seq_addr_t *daddr; + + for (dev = 0; ; dev++) { + daddr = seq_dev_addr(record->ctxp, dev, inout); + if (daddr == NULL) + break; + + /* + * Sometimes we will want to distinguish between input from + * different channels and sometime we don't. At present there + * is no configuration for this: input from any channel + * is accepted. + */ + if (daddr->client == addr->client && daddr->port == addr->port) + return dev; + } + + return -1; +} + +/* * Save the event in the current part that is being recorded. * Arguments: * ep - Event to save */ static void -save_event(struct record *record, snd_seq_event_t *ep) +save_event(struct trackElement *track, snd_seq_event_t *ep) { struct element *el; unsigned long time; - int devchan; + //int devchan; - time = ep->time.tick; /* What if REAL and not TICK? */ - devchan = record->curchan; + if (!track->newpart) + return; + + time = ep->time.tick; /* NB: could be REAL and not TICK */ + //devchan = get_dev_from_addr(record, &ep->source, SEQ_ADDR_INPUT); + //if (devchan < 0) + // return; el = NULL; switch (ep->type) { case SND_SEQ_EVENT_NOTE: - /* Don't expect to see this from realy midi devices */ + /* Don't expect to see this from real midi devices */ el = (EPTR)md_note_new(ep->data.note.note, ep->data.note.velocity, ep->data.note.duration); break; case SND_SEQ_EVENT_NOTEON: if (ep->data.note.velocity == 0) /* Really a note off */ - finish_note(record, devchan, time, ep); + finish_note(track, time, ep); else - el = save_note(record, devchan, time, ep); + el = save_note(track, time, ep); break; case SND_SEQ_EVENT_NOTEOFF: - finish_note(record, devchan, time, ep); + finish_note(track, time, ep); break; case SND_SEQ_EVENT_KEYPRESS: el = (EPTR) md_keytouch_new(ep->data.control.param, @@ -345,15 +392,14 @@ if (el) { el->element_time = time; - el->device_channel = devchan; + el->device_channel = MD_ELEMENT(track)->device_channel; - md_add(MD_CONTAINER(record->newpart), el); + md_save_elem(track->newpart, el); } } /* * Push out the events waiting to be written to the sequencer. - * Not needed! * * Arguments: * vrecord - This will be a record object @@ -419,20 +465,18 @@ * arrives. Sorry this is just about a duplicate of routine in * midiread.c * Arguments: - * dev - The device/channel this note arrived on * time - The current song time * ep - The note event */ static struct element * -save_note(struct record *record, int dev, unsigned long time, - snd_seq_event_t *ep) +save_note(struct trackElement *track, unsigned long time, snd_seq_event_t *ep) { struct element *el; el = (struct element *)md_note_new (ep->data.note.note, ep->data.note.velocity, -1); - g_ptr_array_add(record->notes, el); + g_ptr_array_add(track->notes, el); return el; } @@ -442,12 +486,11 @@ * on and constructs a note element. * * Arguments: - * devchan - The device/channel note arrived on * time - The time of the off note * ep - The off note */ static void -finish_note(struct record *record, int devchan, unsigned long time, +finish_note(struct trackElement *track, unsigned long time, snd_seq_event_t *ep) { int i; @@ -455,18 +498,19 @@ struct noteElement *n; int len; - notes = record->notes; + notes = track->notes; n = NULL; for (i = notes->len-1; i >= 0; i--) { n = g_ptr_array_index(notes, i); - if (n->note == ep->data.note.note - && MD_ELEMENT(n)->device_channel == devchan) { + if (n->note == ep->data.note.note) { + //&& MD_ELEMENT(n)->device_channel == track->inputdev) { + len = time - MD_ELEMENT(n)->element_time; n->offvel = ep->data.note.velocity; n->length = len; - if (n->length < 0) { + if (n->length < 0) n->length = 0; - } + g_ptr_array_remove_index_fast(notes, i); break; } diff -rNu melys-0.0.9/midi/record.m melys-0.0.10/midi/record.m --- melys-0.0.9/midi/record.m Wed Aug 18 22:17:03 1999 +++ melys-0.0.10/midi/record.m Wed Sep 15 13:26:04 1999 @@ -32,16 +32,10 @@ seq_context_t *ctxp; /* Record context */ struct rootElement *mdroot; /* The current song */ - int echo_devchan; /* Echo device channel */ - guint write_id; /* ID of write handler */ guint read_id; /* ID of read handler */ struct trackElement *curtrack; /* Current track */ - struct partElement *newpart; /* New part being recorded */ - int curchan; /* Current recording channel */ - - GPtrArray *notes; /* To save pending off notes */ }; #define INPUT_ALL (GDK_INPUT_READ|GDK_INPUT_WRITE) @@ -68,8 +62,6 @@ snd_seq_block_mode(seq_handle(record->ctxp), 0); - record->notes = g_ptr_array_new(); - return record; >>function record_free @@ -88,7 +80,6 @@ record->ctxp = NULL; - g_ptr_array_free(record->notes, 1); g_free(record); @@ -99,8 +90,7 @@ >>code - root->refcount++; - record->mdroot = root; + record->mdroot = md_root_inc_ref(root); >>function record_set_ports @@ -122,25 +112,6 @@ seq_connect_addresses(record->ctxp, SEQ_ADDR_INPUT); add_io_cb(record, INPUT_ALL); ->>function XXrecord_open_ports -void -struct record *record; The record object - ->>description -Open all the sequencer ports that will be needed for this song. -XXX is this needed? -We should have a copy of the destination list on -the subcontext. -There will be no actual connection but this does not matter -as we can send the events anyway. - ->>code - - if (record->mdroot == NULL) - ethrow(debugError, "No md root set in @func_name"); - - //record->ctxp = seq_md_open_ports(record->mdroot); - >>function record_set_track void @@ -153,7 +124,6 @@ >>code record->curtrack = track; - record->curchan = devchan; >>function record_start @@ -165,14 +135,25 @@ Events are saved and added to the current take. >>code + int n; unsigned long t; + struct trackElement *track; record->isrecording = TRUE; - record->newpart = md_part_new(); t = seq_get_time(record->ctxp); - MD_ELEMENT(record->newpart)->element_time = t; - MD_ELEMENT(record->newpart)->device_channel = record->curchan; + + for (n = 0; n < record->mdroot->tracks; n++) { + track = md_track_nth(record->mdroot, n); + + if (track->record) { + track->newpart = md_container_new(); + track->notes = g_ptr_array_new(); + MD_TIME(track->newpart) = t; + MD_ELEMENT(track->newpart)->device_channel + = MD_ELEMENT(track)->device_channel; + } + } >>function record_stop void @@ -183,33 +164,47 @@ >>code unsigned long endtime; + unsigned long duration; + struct trackElement *track; struct element *el; int i; + int n; if (!record || !record->isrecording) return; record->isrecording = FALSE; - if (record->curtrack == NULL || record->newpart == NULL) - return; - endtime = seq_get_time(record->ctxp); - /* - * Must finish off any note that is not released. - */ - for (i = 0; i < record->notes->len; i++) { - el = (struct element *)g_ptr_array_index(record->notes, i); - MD_NOTE(el)->length = endtime - el->element_time; - } - g_ptr_array_set_size(record->notes, 0); - endtime -= MD_ELEMENT(record->newpart)->element_time; - MD_CONTAINER(record->newpart)->duration = endtime; + for (n = 0; n < record->mdroot->tracks; n++) { + track = md_track_nth(record->mdroot, n); + + if (!track->record) + continue; + + if (!track->notes) + continue; /* TEMP */ + + /* + * Must finish off any note that is not released. The pointers + * are just copies pointing to the real saved note events, so + * we just have to adjust the duration. + */ + for (i = 0; i < track->notes->len; i++) { + el = (struct element *)g_ptr_array_index(track->notes, i); + MD_NOTE(el)->length = endtime - el->element_time; + } + + duration = endtime - MD_TIME(track->newpart); + track->newpart->duration = duration; + + md_merge_in(MD_TRACK(track), track->newpart, MD_ADD_MERGE); + track->newpart = NULL; + g_ptr_array_free(track->notes, 1); + } - md_add(MD_CONTAINER(record->curtrack), MD_ELEMENT(record->newpart)); - record->newpart = NULL; >>function run_events static void @@ -222,19 +217,31 @@ >>code snd_seq_event_t *ep; struct record *record = vrecord; + struct trackElement *track; while ((ep = seq_read(record->ctxp)) != NULL) { int n; + int tn; + //if (ep->type != 50) g_message("Got event %d", ep->type); + //g_message("Got event %d", ep->type); ep->flags &= ~SND_SEQ_TIME_MODE_REL; - if (record->isrecording) - save_event(record, ep); - - n = seq_sendto_now(record->ctxp, ep, 0, 15); /* XXX from set dev/chan */ - if (n != 0) { - g_message("Mmm n is %d", n); - add_io_cb(record, GDK_INPUT_WRITE); + for (tn = 0; tn < record->mdroot->tracks; tn++) { + track = md_track_nth(record->mdroot, tn); + if (!track->record) + continue; + + save_event(track, ep); + + n = seq_sendto_now(record->ctxp, ep, + DEV(MD_ELEMENT(track)->device_channel), + CHAN(MD_ELEMENT(track)->device_channel)); + + if (n != 0) { + g_message("Mmm n is %d", n); + add_io_cb(record, GDK_INPUT_WRITE); + } } } @@ -243,37 +250,75 @@ >>extern #define EPTR struct element * +>>function get_dev_from_addr +static int +struct record *record; The recording structure +snd_seq_addr_t *addr; Address to convert to device number +int inout; Is this an input or output device + +>>description +Return the device number that corresponds to the given address. + +Sould be in seqlib? + +>>code + int dev; + snd_seq_addr_t *daddr; + + for (dev = 0; ; dev++) { + daddr = seq_dev_addr(record->ctxp, dev, inout); + if (daddr == NULL) + break; + + /* + * Sometimes we will want to distinguish between input from + * different channels and sometime we don't. At present there + * is no configuration for this: input from any channel + * is accepted. + */ + if (daddr->client == addr->client && daddr->port == addr->port) + return dev; + } + + return -1; + + >>function save_event static void -struct record *record; +struct trackElement *track; snd_seq_event_t *ep; Event to save >>description Save the event in the current part that is being recorded. >>code struct element *el; unsigned long time; - int devchan; + //int devchan; - time = ep->time.tick; /* What if REAL and not TICK? */ - devchan = record->curchan; + if (!track->newpart) + return; + + time = ep->time.tick; /* NB: could be REAL and not TICK */ + //devchan = get_dev_from_addr(record, &ep->source, SEQ_ADDR_INPUT); + //if (devchan < 0) + // return; el = NULL; switch (ep->type) { case SND_SEQ_EVENT_NOTE: - /* Don't expect to see this from realy midi devices */ + /* Don't expect to see this from real midi devices */ el = (EPTR)md_note_new(ep->data.note.note, ep->data.note.velocity, ep->data.note.duration); break; case SND_SEQ_EVENT_NOTEON: if (ep->data.note.velocity == 0) /* Really a note off */ - finish_note(record, devchan, time, ep); + finish_note(track, time, ep); else - el = save_note(record, devchan, time, ep); + el = save_note(track, time, ep); break; case SND_SEQ_EVENT_NOTEOFF: - finish_note(record, devchan, time, ep); + finish_note(track, time, ep); break; case SND_SEQ_EVENT_KEYPRESS: el = (EPTR) md_keytouch_new(ep->data.control.param, @@ -325,9 +370,9 @@ if (el) { el->element_time = time; - el->device_channel = devchan; + el->device_channel = MD_ELEMENT(track)->device_channel; - md_add(MD_CONTAINER(record->newpart), el); + md_save_elem(track->newpart, el); } @@ -339,7 +384,6 @@ >>description Push out the events waiting to be written to the sequencer. -Not needed! >>code int n; @@ -393,10 +437,10 @@ >>function save_note static struct element * -struct record *record; -int dev; The device/channel this note arrived on +struct trackElement *track; unsigned long time; The current song time snd_seq_event_t *ep; The note event + >>description Allocate a note element and save it for when the off note arrives. @@ -407,15 +451,14 @@ el = (struct element *)md_note_new (ep->data.note.note, ep->data.note.velocity, -1); - g_ptr_array_add(record->notes, el); + g_ptr_array_add(track->notes, el); return el; >>function finish_note static void -struct record *record; -int devchan; The device/channel note arrived on +struct trackElement *track; unsigned long time; The time of the off note snd_seq_event_t *ep; The off note @@ -429,18 +472,19 @@ struct noteElement *n; int len; - notes = record->notes; + notes = track->notes; n = NULL; for (i = notes->len-1; i >= 0; i--) { n = g_ptr_array_index(notes, i); - if (n->note == ep->data.note.note - && MD_ELEMENT(n)->device_channel == devchan) { + if (n->note == ep->data.note.note) { + //&& MD_ELEMENT(n)->device_channel == track->inputdev) { + len = time - MD_ELEMENT(n)->element_time; n->offvel = ep->data.note.velocity; n->length = len; - if (n->length < 0) { + if (n->length < 0) n->length = 0; - } + g_ptr_array_remove_index_fast(notes, i); break; } Binary files melys-0.0.9/mlib/PROJECT/__init__.pyo and melys-0.0.10/mlib/PROJECT/__init__.pyo differ diff -rNu melys-0.0.9/mlib/PROJECT/base.py melys-0.0.10/mlib/PROJECT/base.py --- melys-0.0.9/mlib/PROJECT/base.py Sat Jul 17 20:06:42 1999 +++ melys-0.0.10/mlib/PROJECT/base.py Tue Sep 14 17:08:48 1999 @@ -67,8 +67,7 @@ for l in mdelem.members: lines.append(" %s" % l) lines.append("};") - #lines.append("#define MD_%s(e) ((struct %s *)(e))" % ( - # string.upper(name), sname(name))) + lines.append( """#define MD_%s(e) \\ ((struct %s *)md_check_cast((struct element *)(e), MD_TYPE_%s)) @@ -89,21 +88,22 @@ lines.append(">>description") lines.append("Create and initialise a %s element." % name) lines.append(">>code") - lines.append(" @func_type new;") + lines.append(" @func_type e;") lines.append("") - lines.append(" new = g_malloc0(sizeof(*new));") - lines.append(" MD_ELEMENT(new)->type = MD_TYPE_%s;" + lines.append(" e = g_malloc0(sizeof(*e));") + lines.append(" MD_ELEMENT(e)->type = MD_TYPE_%s;" % string.upper(name)) + # Call the init function (if any) initname = self.find_init(mdelem) if initname: - lines.append(" md_%s_init(MD_%s(new));" % (mdelem.parent, - string.upper(mdelem.parent))) + lines.append(" md_%s_init(MD_%s(e));" % (initname, + string.upper(initname))) for l in mdelem.newfn: lines.append("%s" % l) - lines.append(" return new;") + lines.append(" return e;") # Do the initialiser if mdelem.initfn: @@ -116,6 +116,14 @@ lines.append("when pointers need allocating.") lines.append(">>code") lines.append("") + + # Chain up to any parent initialiser + initname = self.find_init(mdelem.parent) + if initname: + lines.append(" md_%s_init(MD_%s(e));" % (initname, + string.upper(initname))) + + # Write out the initialisations for l in mdelem.initfn: lines.append("%s" % l) @@ -150,6 +158,8 @@ # Return true if the element name is a kind of container. def iscontainer(self, name, dict): parent = dict[name].parent + if name == "container": + return 1 while parent != None: if dict[parent].name == "container": return 1 @@ -158,13 +168,22 @@ return 0 def find_init(self, mdelem): + + if not mdelem: + return + + # In case we are given a name, convert back to mdelem + if type(mdelem) == type(""): + mdelem = self.mdelemdict[mdelem] + name = mdelem.name - parent = mdelem.parent dict = self.mdelemdict - while parent: - if dict[parent].initfn: - return parent - parent = dict[parent].parent + while name: + if dict[name].initfn: + return name + name = dict[name].parent + + return None # Get the structure name def sname(name): Binary files melys-0.0.9/mlib/PROJECT/base.pyo and melys-0.0.10/mlib/PROJECT/base.pyo differ Binary files melys-0.0.9/mlib/PROJECT/cmds.pyo and melys-0.0.10/mlib/PROJECT/cmds.pyo differ Binary files melys-0.0.9/mlib/PROJECT/code.pyo and melys-0.0.10/mlib/PROJECT/code.pyo differ Binary files melys-0.0.9/mlib/PROJECT/header.pyo and melys-0.0.10/mlib/PROJECT/header.pyo differ Binary files melys-0.0.9/mlib/PROJECT/make.pyo and melys-0.0.10/mlib/PROJECT/make.pyo differ Binary files melys-0.0.9/mlib/PROJECT/mgtk.pyo and melys-0.0.10/mlib/PROJECT/mgtk.pyo differ diff -rNu melys-0.0.9/pixmaps/.cvsignore melys-0.0.10/pixmaps/.cvsignore --- melys-0.0.9/pixmaps/.cvsignore Thu Aug 19 13:11:49 1999 +++ melys-0.0.10/pixmaps/.cvsignore Wed Sep 15 14:03:52 1999 @@ -1,4 +1,5 @@ balls.c +menu_icons.c Makefile *.mdml *.mdml.gz *.mid .cvsignore diff -rNu melys-0.0.9/pixmaps/Makefile melys-0.0.10/pixmaps/Makefile --- melys-0.0.9/pixmaps/Makefile Thu Aug 19 13:11:49 1999 +++ melys-0.0.10/pixmaps/Makefile Wed Sep 15 14:03:52 1999 @@ -4,8 +4,10 @@ include $(TOP)/make.conf TARGETS = -OBJS = balls.o -GENCFILES = balls.c +OBJS = balls.o \ + menu_icons.o +GENCFILES = balls.c \ + menu_icons.c GENHFILES = ../include/pixmaps.h Binary files melys-0.0.9/pixmaps/mb3.png and melys-0.0.10/pixmaps/mb3.png differ diff -rNu melys-0.0.9/pixmaps/menu_icons.c melys-0.0.10/pixmaps/menu_icons.c --- melys-0.0.9/pixmaps/menu_icons.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.10/pixmaps/menu_icons.c Wed Sep 15 14:04:04 1999 @@ -0,0 +1,31 @@ +/* + * + * 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 "pixmaps.h" +#include "intl.h" + + +#include "mrec.xpm" +#include "mplay.xpm" +#include "mpause.xpm" +#include "mstop.xpm" + + + diff -rNu melys-0.0.9/pixmaps/menu_icons.m melys-0.0.10/pixmaps/menu_icons.m --- melys-0.0.9/pixmaps/menu_icons.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.10/pixmaps/menu_icons.m Fri Aug 20 17:36:40 1999 @@ -0,0 +1,26 @@ +>>name menu_icons.m - Icons that go on the menus. + +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. + +>>headerdef pixmaps.h + +extern char *mrec_xpm[]; +extern char *mplay_xpm[]; +extern char *mpause_xpm[]; +extern char *mstop_xpm[]; + +>>extern + +#include "mrec.xpm" +#include "mplay.xpm" +#include "mpause.xpm" +#include "mstop.xpm" Binary files melys-0.0.9/pixmaps/mpause.png and melys-0.0.10/pixmaps/mpause.png differ diff -rNu melys-0.0.9/pixmaps/mpause.xpm melys-0.0.10/pixmaps/mpause.xpm --- melys-0.0.9/pixmaps/mpause.xpm Thu Jan 1 00:00:00 1970 +++ melys-0.0.10/pixmaps/mpause.xpm Fri Aug 20 17:36:40 1999 @@ -0,0 +1,54 @@ +/* XPM */ +char * mpause_xpm[] = { +"12 12 39 1", +" c None", +". c #1B3142", +"+ c #213C50", +"@ c #1D3446", +"# c #2D526E", +"$ c #3A6A8D", +"% c #325A78", +"& c #366182", +"* c #233F54", +"= c #305875", +"- c #467EA9", +"; c #4781AC", +"> c #4780AB", +", c #3D6E94", +"' c #244157", +") c #315977", +"! c #5294C6", +"~ c #4F8EBE", +"{ c #3E7096", +"] c #254359", +"^ c #5497CA", +"/ c #4F90C0", +"( c #3E7197", +"_ c #26445B", +": c #5192C3", +"< c #4E8DBD", +"[ c #3E6F95", +"} c #244258", +"| c #315876", +"1 c #457DA8", +"2 c #447BA5", +"3 c #447CA5", +"4 c #3D6E93", +"5 c #2C506B", +"6 c #366384", +"7 c #2E5370", +"8 c #335C7B", +"9 c #223E53", +"0 c #1C3243", +" ", +" .+ @ ", +" #$% %&* ", +" =-; >,' ", +" )>! ~{] ", +" )>^ /(_ ", +" )>^ /(_ ", +" )>: <[} ", +" |12 34' ", +" 56# 789 ", +" 0 ", +" "}; Binary files melys-0.0.9/pixmaps/mplay.png and melys-0.0.10/pixmaps/mplay.png differ diff -rNu melys-0.0.9/pixmaps/mplay.xpm melys-0.0.10/pixmaps/mplay.xpm --- melys-0.0.9/pixmaps/mplay.xpm Thu Jan 1 00:00:00 1970 +++ melys-0.0.10/pixmaps/mplay.xpm Fri Aug 20 17:36:40 1999 @@ -0,0 +1,67 @@ +/* XPM */ +char * mplay_xpm[] = { +"12 12 52 1", +" c None", +". c #014E05", +"+ c #02620B", +"@ c #02680D", +"# c #015E0A", +"$ c #015406", +"% c #037212", +"& c #03851B", +"* c #038319", +"= c #037413", +"- c #02680E", +"; c #015908", +"> c #057E1A", +", c #059927", +"' c #05A32D", +") c #059B28", +"! c #058C20", +"~ c #047E1A", +"{ c #047213", +"] c #025E0A", +"^ c #078821", +"/ c #08A331", +"( c #08B43D", +"_ c #08AB38", +": c #07A030", +"< c #079428", +"[ c #078820", +"} c #057819", +"| c #02600B", +"1 c #08A031", +"2 c #08B73E", +"3 c #08AE3A", +"4 c #08A333", +"5 c #07992B", +"6 c #078C24", +"7 c #067C1A", +"8 c #047C18", +"9 c #059926", +"0 c #06A630", +"a c #05A02B", +"b c #059124", +"c c #05831C", +"d c #047414", +"e c #037011", +"f c #03881B", +"g c #03881C", +"h c #037A15", +"i c #026A0F", +"j c #02620A", +"k c #026C0D", +"l c #01600A", +"m c #014E04", +" ", +" .. ", +" +@#$ ", +" %&*=-; ", +" >,')!~{] ", +" ^/((_:<[}| ", +" [1(234567| ", +" 890abcd] ", +" efghi; ", +" jkl$ ", +" mm ", +" "}; diff -rNu melys-0.0.9/pixmaps/mrec.xpm melys-0.0.10/pixmaps/mrec.xpm --- melys-0.0.9/pixmaps/mrec.xpm Thu Jan 1 00:00:00 1970 +++ melys-0.0.10/pixmaps/mrec.xpm Fri Aug 20 17:36:40 1999 @@ -0,0 +1,65 @@ +/* XPM */ +char * mrec_xpm[] = { +"12 12 50 1", +" c None", +". c #910000", +"+ c #7B0000", +"@ c #7F0000", +"# c #7A0000", +"$ c #6E0000", +"% c #810000", +"& c #8A0000", +"* c #950000", +"= c #990000", +"- c #930000", +"; c #860000", +"> c #750000", +", c #680000", +"' c #8D0000", +") c #9D0000", +"! c #AB0000", +"~ c #B10000", +"{ c #9B0000", +"] c #6B0000", +"^ c #710000", +"/ c #BA0000", +"( c #C10000", +"_ c #A90000", +": c #8F0000", +"< c #550000", +"[ c #970000", +"} c #AD0000", +"| c #CF0000", +"1 c #780000", +"2 c #580000", +"3 c #A70000", +"4 c #BF0000", +"5 c #B80000", +"6 c #A50000", +"7 c #730000", +"8 c #530000", +"9 c #840000", +"0 c #660000", +"a c #470000", +"b c #820000", +"c c #6D0000", +"d c #540000", +"e c #170000", +"f c #610000", +"g c #650000", +"h c #310000", +"i c #630000", +"j c #510000", +"k c #1A0000", +" ", +" .+@#$% ", +" %&*=-;>, ", +" '&)!~!{;]^ ", +" #-!/(/_:>< ", +" +[}(|(!-12 ", +" 1.3/456'78 ", +" ]9=6_6[%0a ", +" >^b:.'%cde ", +" f,7>^gdh ", +" ij<jak ", +" "}; Binary files melys-0.0.9/pixmaps/mstop.png and melys-0.0.10/pixmaps/mstop.png differ diff -rNu melys-0.0.9/pixmaps/mstop.xpm melys-0.0.10/pixmaps/mstop.xpm --- melys-0.0.9/pixmaps/mstop.xpm Thu Jan 1 00:00:00 1970 +++ melys-0.0.10/pixmaps/mstop.xpm Fri Aug 20 17:36:40 1999 @@ -0,0 +1,17 @@ +/* XPM */ +char * mstop_xpm[] = { +"12 12 2 1", +" c None", +". c #000000", +" ", +" ", +" ........ ", +" ........ ", +" ........ ", +" ........ ", +" ........ ", +" ........ ", +" ........ ", +" ........ ", +" ", +" "}; Binary files melys-0.0.9/pixmaps/play.png and melys-0.0.10/pixmaps/play.png differ diff -rNu melys-0.0.9/po/melys.pot melys-0.0.10/po/melys.pot --- melys-0.0.9/po/melys.pot Thu Aug 19 13:06:35 1999 +++ melys-0.0.10/po/melys.pot Tue Sep 14 15:00:25 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-08-19 13:04+0100\n" +"POT-Creation-Date: 1999-09-12 23:45+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -90,97 +90,124 @@ msgid "Can not open file" msgstr "" -#: midiwrite.m:381 +#: midiwrite.m:393 #, c-format msgid "Negative time difference (%d) writing midi file" msgstr "" -#: midiwrite.m:383 +#: midiwrite.m:395 msgid " difference set to zero" msgstr "" -#: main.m:76 +#: main.m:65 +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:86 msgid "The Melys sequencer" msgstr "" #. Create the first child -#: main.m:90 menus.m:148 +#: main.m:100 menus.m:169 msgid "Untitled" msgstr "" -#: menus.m:28 +#: menus.m:32 msgid "New" msgstr "" -#: menus.m:44 +#: menus.m:48 msgid "_Close all" msgstr "" -#: menus.m:44 +#: menus.m:48 msgid "Close all open windows" msgstr "" -#: menus.m:56 +#: menus.m:60 +msgid "_Add" +msgstr "" + +#: menus.m:60 +msgid "Add a new track" +msgstr "" + +#: menus.m:65 +msgid "_Delete" +msgstr "" + +#: menus.m:65 +msgid "Delete selected tracks" +msgstr "" + +#: menus.m:76 msgid "_Start" msgstr "" -#: menus.m:56 +#: menus.m:76 msgid "Start playing" msgstr "" -#: menus.m:62 +#: menus.m:82 msgid "_Pause" msgstr "" -#: menus.m:62 +#: menus.m:82 msgid "Pause playing" msgstr "" -#: menus.m:68 +#: menus.m:88 msgid "S_top" msgstr "" -#: menus.m:68 +#: menus.m:88 msgid "Stop and return to beginning" msgstr "" -#: menus.m:74 +#: menus.m:94 msgid "_Record" msgstr "" -#: menus.m:74 +#: menus.m:94 msgid "Start recording" msgstr "" -#: menus.m:80 +#: menus.m:100 msgid "Record stop" msgstr "" -#: menus.m:80 +#: menus.m:100 msgid "Stop recording" msgstr "" -#: menus.m:99 +#: menus.m:119 +msgid "_Tracks" +msgstr "" + +#: menus.m:120 msgid "_Actions" msgstr "" -#: menus.m:206 +#: menus.m:227 msgid "Select the file to read in..." msgstr "" -#: menus.m:310 +#: menus.m:334 msgid "Select the file name to write to..." msgstr "" -#: menus.m:524 +#: menus.m:551 msgid "Copyright Steve Ratcliffe (C) 1999" msgstr "" -#: menus.m:526 +#: menus.m:553 msgid "Melys is a sequencer application for ALSA" msgstr "" -#: elements.m:285 +#: elements.m:294 #, c-format msgid "Freed an mdroot %d with bad reference count" msgstr "" @@ -191,29 +218,29 @@ "Perhaps modules are not loaded\n" msgstr "" -#: play.m:339 +#: play.m:338 msgid "" "Melys was not built with the ALSA remove_events\n" "patch. The muting function will not work very well\n" "You will get hanging notes, for example" msgstr "" -#: play.m:368 +#: play.m:367 msgid "" "Melys should be built with ALSA version 0.4.0\n" "patch. The muting function will hardly work at all" msgstr "" -#: play.m:451 +#: play.m:450 #, c-format msgid "BUG: play_unmute: t2=%ld, ahead time=%ld\n" msgstr "" -#: record.m:67 +#: record.m:61 msgid "Melys sequencer (record)" msgstr "" -#: mdmlconv.m:125 mdmlconv.m:133 +#: mdmlconv.m:140 mdmlconv.m:149 #, c-format msgid "Reading %s: %s\n" msgstr "" @@ -236,64 +263,75 @@ msgid " -x, --debug=LEVEL Set debuging level" msgstr "" -#: melplay.m:271 showseq.m:98 +#: melplay.m:23 +msgid "port" +msgstr "" + +#: melplay.m:24 +msgid "list" +msgstr "" + +#: melplay.m:25 +msgid "delay" +msgstr "" + +#: melplay.m:26 +msgid "begin" +msgstr "" + +#: melplay.m:268 showseq.m:98 #, c-format msgid "Could not open sequencer %s" msgstr "" -#: melplay.m:277 showseq.m:104 +#: melplay.m:274 showseq.m:104 #, c-format msgid "Could not get sequencer information %s" msgstr "" -#: melplay.m:282 +#: melplay.m:279 #, c-format msgid " Port %-30.30s %s\n" msgstr "" -#: melplay.m:282 +#: melplay.m:279 msgid "Client name" msgstr "" -#: melplay.m:282 showseq.m:109 +#: melplay.m:279 msgid "Port name" msgstr "" -#: melplay.m:311 +#: melplay.m:308 msgid "Usage: melplay [-p client:port ...] [-l] [-d delay] file ..." msgstr "" -#: melplay.m:313 +#: melplay.m:310 msgid " -p client:port - A alsa client and port number to send midi to" msgstr "" -#: melplay.m:314 +#: melplay.m:311 msgid " -l - List possible output ports that could be used" msgstr "" -#: melplay.m:315 +#: melplay.m:312 msgid " -d delay - Delay after song ends (default 2 sec)" msgstr "" -#: showseq.m:109 -#, c-format -msgid " %4s %-30.30s\n" -msgstr "" - -#: showseq.m:109 -msgid "Port" +#: melplay.m:313 +msgid " -b time - Begin time" msgstr "" #: showseq.m:160 msgid "Usage: showseq" msgstr "" -#: seqlib.m:80 seqlib.m:145 +#: seqlib.m:100 seqlib.m:165 #, c-format msgid "Could not open sequencer: %s" msgstr "" -#: seqlib.m:232 +#: seqlib.m:252 #, c-format msgid "Error (%s) creating sequencer port\n" msgstr "" @@ -314,32 +352,31 @@ msgid "ethrow_setup called when allready set up" msgstr "" -#. No real need to have this included -#: melystrackinfo.m:142 +#: melystrackinfo.m:138 msgid "Name" msgstr "" -#: melystrackinfo.m:143 +#: melystrackinfo.m:139 msgid "Prog" msgstr "" -#: melystrackinfo.m:144 +#: melystrackinfo.m:140 msgid "C" msgstr "" -#: melystrackinfo.m:145 +#: melystrackinfo.m:141 msgid "Mute" msgstr "" -#: melystrackinfo.m:146 +#: melystrackinfo.m:142 msgid "Solo" msgstr "" -#: melystrackinfo.m:147 +#: melystrackinfo.m:143 msgid "Rec" msgstr "" -#: melystrackinfo.m:826 +#: melystrackinfo.m:850 #, c-format msgid "" "Internal error.\n" diff -rNu melys-0.0.9/po/zz.po melys-0.0.10/po/zz.po --- melys-0.0.9/po/zz.po Thu Aug 19 13:06:35 1999 +++ melys-0.0.10/po/zz.po Tue Sep 14 15:00:25 1999 @@ -95,98 +95,128 @@ msgid "Can not open file" msgstr "C.A.N. N.O.T. O.P.E.N. F.I.L.E." -#: midiwrite.m:381 +#: midiwrite.m:393 #, c-format msgid "Negative time difference (%d) writing midi file" msgstr "N.E.G.A.T.I.V.E. T.I.M.E. D.I.F.F.E.R.E.N.C.E. (%d) W.R.I.T.I.N.G. M.I.D.I. F.I.L.E." -#: midiwrite.m:383 +#: midiwrite.m:395 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:76 +#: main.m:65 +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 "" +"H.E.R.E. Y.O.U. C.A.N. V.I.E.W. T.H.E. T.R.A.C.K.S. A.N.D. M.O.D.I.F.Y. P.R.O.P.E.R.T.I.E.S. O.F. T.H.E. T.R.A.C.K. S.U.C.H. A.S. " +"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:86 msgid "The Melys sequencer" msgstr "T.H.E. M.E.L.Y.S. S.E.Q.U.E.N.C.E.R." #. Create the first child -#: main.m:90 menus.m:148 +#: main.m:100 menus.m:169 msgid "Untitled" msgstr "U.N.T.I.T.L.E.D." -#: menus.m:28 +#: menus.m:32 msgid "New" msgstr "N.E.W." -#: menus.m:44 +#: menus.m:48 msgid "_Close all" msgstr "_C.L.O.S.E. A.L.L." -#: menus.m:44 +#: menus.m:48 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:56 +#: menus.m:60 +msgid "_Add" +msgstr "_A.D.D." + +#: menus.m:60 +msgid "Add a new track" +msgstr "A.D.D. A. N.E.W. T.R.A.C.K." + +#: menus.m:65 +msgid "_Delete" +msgstr "_D.E.L.E.T.E." + +#: menus.m:65 +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:76 msgid "_Start" msgstr "_S.T.A.R.T." -#: menus.m:56 +#: menus.m:76 msgid "Start playing" msgstr "S.T.A.R.T. P.L.A.Y.I.N.G." -#: menus.m:62 +#: menus.m:82 msgid "_Pause" msgstr "_P.A.U.S.E." -#: menus.m:62 +#: menus.m:82 msgid "Pause playing" msgstr "P.A.U.S.E. P.L.A.Y.I.N.G." -#: menus.m:68 +#: menus.m:88 msgid "S_top" msgstr "S._T.O.P." -#: menus.m:68 +#: menus.m:88 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:74 +#: menus.m:94 msgid "_Record" msgstr "_R.E.C.O.R.D." -#: menus.m:74 +#: menus.m:94 msgid "Start recording" msgstr "S.T.A.R.T. R.E.C.O.R.D.I.N.G." -#: menus.m:80 +#: menus.m:100 msgid "Record stop" msgstr "R.E.C.O.R.D. S.T.O.P." -#: menus.m:80 +#: menus.m:100 msgid "Stop recording" msgstr "S.T.O.P. R.E.C.O.R.D.I.N.G." -#: menus.m:99 +#: menus.m:119 +msgid "_Tracks" +msgstr "_T.R.A.C.K.S." + +#: menus.m:120 msgid "_Actions" msgstr "_A.C.T.I.O.N.S." -#: menus.m:206 +#: menus.m:227 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:310 +#: menus.m:334 #, fuzzy msgid "Select the file name to write to..." msgstr "S.E.L.E.C.T. T.H.E. F.I.L.E. N.A.M.E. T.O. W.R.I.T.E. T.O...." -#: menus.m:524 +#: 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:526 +#: menus.m:553 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." -#: elements.m:285 +#: elements.m:294 #, c-format msgid "Freed an mdroot %d with bad reference count" msgstr "F.R.E.E.D. A.N. M.D.R.O.O.T. %d W.I.T.H. B.A.D. R.E.F.E.R.E.N.C.E. C.O.U.N.T." @@ -199,7 +229,7 @@ "C.O.U.L.D. N.O.T. O.P.E.N. A.L.S.A. S.E.Q.U.E.N.C.E.R.\n" "P.E.R.H.A.P.S. M.O.D.U.L.E.S. A.R.E. N.O.T. L.O.A.D.E.D.\n" -#: play.m:339 +#: play.m:338 msgid "" "Melys was not built with the ALSA remove_events\n" "patch. The muting function will not work very well\n" @@ -209,7 +239,7 @@ "P.A.T.C.H.. T.H.E. M.U.T.I.N.G. F.U.N.C.T.I.O.N. W.I.L.L. N.O.T. W.O.R.K. V.E.R.Y. W.E.L.L.\n" "Y.O.U. W.I.L.L. G.E.T. H.A.N.G.I.N.G. N.O.T.E.S., F.O.R. E.X.A.M.P.L.E." -#: play.m:368 +#: play.m:367 msgid "" "Melys should be built with ALSA version 0.4.0\n" "patch. The muting function will hardly work at all" @@ -217,17 +247,17 @@ "M.E.L.Y.S. S.H.O.U.L.D. B.E. B.U.I.L.T. W.I.T.H. A.L.S.A. V.E.R.S.I.O.N. 0.4.0\n" "P.A.T.C.H.. T.H.E. M.U.T.I.N.G. F.U.N.C.T.I.O.N. W.I.L.L. H.A.R.D.L.Y. W.O.R.K. A.T. A.L.L." -#: play.m:451 +#: play.m:450 #, c-format msgid "BUG: play_unmute: t2=%ld, ahead time=%ld\n" msgstr "B.U.G.: P.L.A.Y._U.N.M.U.T.E.: T.2=%lD., A.H.E.A.D. T.I.M.E.=%lD.\n" -#: record.m:67 +#: record.m:61 #, fuzzy msgid "Melys sequencer (record)" msgstr "M.E.L.Y.S. S.E.Q.U.E.N.C.E.R. (R.E.C.O.R.D.)" -#: mdmlconv.m:125 mdmlconv.m:133 +#: mdmlconv.m:140 mdmlconv.m:149 #, c-format msgid "Reading %s: %s\n" msgstr "R.E.A.D.I.N.G. %s: %s\n" @@ -255,65 +285,77 @@ 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." -#: melplay.m:271 showseq.m:98 +#: melplay.m:23 +#, fuzzy +msgid "port" +msgstr "P.O.R.T." + +#: melplay.m:24 +msgid "list" +msgstr "L.I.S.T." + +#: melplay.m:25 +msgid "delay" +msgstr "D.E.L.A.Y." + +#: melplay.m:26 +msgid "begin" +msgstr "B.E.G.I.N." + +#: melplay.m:268 showseq.m:98 #, fuzzy, c-format msgid "Could not open sequencer %s" msgstr "C.O.U.L.D. N.O.T. O.P.E.N. S.E.Q.U.E.N.C.E.R. %s" -#: melplay.m:277 showseq.m:104 +#: melplay.m:274 showseq.m:104 #, fuzzy, c-format msgid "Could not get sequencer information %s" msgstr "C.O.U.L.D. N.O.T. G.E.T. S.E.Q.U.E.N.C.E.R. I.N.F.O.R.M.A.T.I.O.N. %s" -#: melplay.m:282 +#: melplay.m:279 #, c-format msgid " Port %-30.30s %s\n" msgstr " P.O.R.T. %-30.30S. %s\n" -#: melplay.m:282 +#: melplay.m:279 msgid "Client name" msgstr "C.L.I.E.N.T. N.A.M.E." -#: melplay.m:282 showseq.m:109 +#: melplay.m:279 msgid "Port name" msgstr "P.O.R.T. N.A.M.E." -#: melplay.m:311 +#: melplay.m:308 #, fuzzy 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:313 +#: melplay.m:310 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:314 +#: melplay.m:311 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:315 +#: melplay.m:312 msgid " -d delay - Delay after song ends (default 2 sec)" msgstr " -D. D.E.L.A.Y. - D.E.L.A.Y. A.F.T.E.R. S.O.N.G. E.N.D.S. (D.E.F.A.U.L.T. 2 S.E.C.)" -#: showseq.m:109 -#, c-format -msgid " %4s %-30.30s\n" -msgstr " %4S. %-30.30S.\n" - -#: showseq.m:109 -msgid "Port" -msgstr "P.O.R.T." +#: melplay.m:313 +msgid " -b time - Begin time" +msgstr " -B. T.I.M.E. - B.E.G.I.N. T.I.M.E." #: showseq.m:160 msgid "Usage: showseq" msgstr "U.S.A.G.E.: S.H.O.W.S.E.Q." -#: seqlib.m:80 seqlib.m:145 +#: seqlib.m:100 seqlib.m:165 #, c-format msgid "Could not open sequencer: %s" msgstr "C.O.U.L.D. N.O.T. O.P.E.N. S.E.Q.U.E.N.C.E.R.: %s" -#: seqlib.m:232 +#: seqlib.m:252 #, c-format msgid "Error (%s) creating sequencer port\n" msgstr "E.R.R.O.R. (%s) C.R.E.A.T.I.N.G. S.E.Q.U.E.N.C.E.R. P.O.R.T.\n" @@ -338,33 +380,32 @@ 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." -#. No real need to have this included -#: melystrackinfo.m:142 +#: melystrackinfo.m:138 msgid "Name" msgstr "N.A.M.E." -#: melystrackinfo.m:143 +#: melystrackinfo.m:139 msgid "Prog" msgstr "P.R.O.G." -#: melystrackinfo.m:144 +#: melystrackinfo.m:140 msgid "C" msgstr "C." -#: melystrackinfo.m:145 +#: melystrackinfo.m:141 msgid "Mute" msgstr "M.U.T.E." -#: melystrackinfo.m:146 +#: melystrackinfo.m:142 msgid "Solo" msgstr "S.O.L.O." -#: melystrackinfo.m:147 +#: melystrackinfo.m:143 #, fuzzy msgid "Rec" msgstr "R.E.C." -#: melystrackinfo.m:826 +#: melystrackinfo.m:850 #, c-format msgid "" "Internal error.\n" @@ -374,6 +415,9 @@ "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 " %4s %-30.30s\n" +#~ msgstr " %4S. %-30.30S.\n" #~ msgid "Unrecognised file type" #~ msgstr "U.N.R.E.C.O.G.N.I.S.E.D. F.I.L.E. T.Y.P.E." diff -rNu melys-0.0.9/programs/.cvsignore melys-0.0.10/programs/.cvsignore --- melys-0.0.9/programs/.cvsignore Thu Aug 19 13:11:49 1999 +++ melys-0.0.10/programs/.cvsignore Wed Sep 15 14:03:52 1999 @@ -1,5 +1,5 @@ mdmlconv.c -melplay.c +mdmlconv.c melys.c showseq.c mdmlconv diff -rNu melys-0.0.9/programs/Makefile melys-0.0.10/programs/Makefile --- melys-0.0.9/programs/Makefile Thu Aug 19 13:11:49 1999 +++ melys-0.0.10/programs/Makefile Wed Sep 15 14:03:52 1999 @@ -8,11 +8,11 @@ melys \ showseq OBJS = mdmlconv.o \ - melplay.o \ + mdmlconv.o \ melys.o \ showseq.o GENCFILES = mdmlconv.c \ - melplay.c \ + mdmlconv.c \ melys.c \ showseq.c GENHFILES = ../include/melys.h @@ -21,16 +21,16 @@ mdmlconv.o \ ../files/midiread.o ../files/midiwrite.o ../files/mdmlread.o \ ../files/mdmlwrite.o ../files/file.o ../md/elements.o \ - ../md/mdutil.o ../util/except.o ../util/util.o + ../md/mdutil.o ../util/except.o ../util/util.o \ + ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o MELPLAYOBJS = \ melplay.o \ - ../files/midiread.o ../files/midiwrite.o \ - ../files/mdmlread.o ../files/mdmlwrite.o \ - ../seq/seqlib.o ../seq/seqmidi.o \ - ../util/except.o ../md/elements.o ../md/mdutil.o \ - ../files/file.o \ - ../util/util.o + ../files/midiread.o ../files/midiwrite.o ../files/mdmlread.o \ + ../files/mdmlwrite.o ../files/file.o ../md/elements.o \ + ../md/mdutil.o ../util/except.o ../util/util.o \ + ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o \ + ../seq/seqlib.o ../seq/seqmidi.o MELYSOBJS = \ melys.o \ @@ -40,6 +40,7 @@ ../seq/seqlib.o ../seq/seqmidi.o ../seq/sequtil.o \ ../util/except.o ../util/util.o \ ../md/elements.o ../md/mdutil.o \ + ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o \ ../gui/main.o ../gui/menus.o \ ../widgets/register.o \ ../midi/play.o ../midi/record.o \ @@ -47,7 +48,7 @@ ../config/ports.o \ ../widgets/melystrack.o ../widgets/melystrackinfo.o \ ../widgets/melystrackdisplay.o \ - ../pixmaps/balls.o + ../pixmaps/balls.o ../pixmaps/menu_icons.o SHOWSEQOBJS = \ showseq.o \ diff -rNu melys-0.0.9/programs/mdmlconv.c melys-0.0.10/programs/mdmlconv.c --- melys-0.0.9/programs/mdmlconv.c Thu Aug 19 13:11:58 1999 +++ melys-0.0.10/programs/mdmlconv.c Wed Sep 15 14:04:04 1999 @@ -27,6 +27,7 @@ #include <getopt.h> #include "melfile.h" #include "elements.h" +#include "md.h" #include <stdio.h> #include "intl.h" @@ -37,9 +38,11 @@ {"input-type", HAS_ARG, NULL, 'I'}, {"output-type", HAS_ARG, NULL, 'O'}, {"output-file", HAS_ARG, NULL, 'o'}, + {"new", 0, NULL, 'n'}, {0, 0, 0, 0}, }; +static struct rootElement *new_file(void); static void show_usage(void); @@ -47,6 +50,7 @@ * Usage: * * mdmlconv [-I input-type] [-O output-type] -o out-file input-file + * mdmlconv -n -o out-file * Recognised types are: * midi midi * midi0 midi format 0 @@ -56,6 +60,9 @@ * If you do not specify a type it defaults by guessing from the * file extension or by looking for magic numbers in the file. * + * The -n flag creates a new empty file with some basic + * initialisation. + * * Arguments: * argc - number of arguments * argv - argument vector @@ -67,14 +74,16 @@ char *cp; char opts[NELEM(long_opts) * 2 + 1]; struct option *op; - char *outputfile = NULL; - char *inputfile = NULL; - char *inputtype = NULL; - char *outputtype = NULL; - struct File *fin = NULL; + volatile int newfile = 0; + char *volatile outputfile = NULL; + char *volatile inputfile = NULL; + char *volatile inputtype = NULL; + char *volatile outputtype = NULL; + struct File *volatile fin = NULL; struct File *fout = NULL; struct rootElement *root; + /* Build up the short option string */ cp = opts; for (op = long_opts; op < &long_opts[NELEM(long_opts)]; op++) { @@ -99,38 +108,54 @@ case 'o': outputfile = optarg; break; + case 'n': + newfile = 1; + break; case '?': show_usage(); break; } } + if (outputfile == NULL) { fprintf(stderr, "No output filename supplied\n"); exit(1); } - if (argc - optind != 1) { - fprintf(stderr, "One input file name must be supplied\n"); - exit(1); + if (CATCH(debugError)) { + fprintf(stderr, "Error: %s\n", debugError->message); + return 1; } - inputfile = argv[optind]; + if (!newfile) { + if (argc - optind != 1) { + fprintf(stderr, "One input file name must be supplied\n"); + exit(1); + } + + inputfile = argv[optind]; + + fin = file_new(inputfile); + } - fin = file_new(inputfile); fout = file_new(outputfile); - if (inputtype) + if (fin && inputtype) file_set_type(fin, inputtype); if (outputtype) file_set_type(fout, outputtype); - /* Read in the file */ - root = file_read(fin); - if (file_get_status(fin) != FILE_SUCCESS) { - fprintf(stderr, _("Reading %s: %s\n"), - inputfile, file_get_message(fin)); - return 1; + /* Read in, or create the file */ + if (newfile) { + root = new_file(); + } else { + root = file_read(fin); + if (file_get_status(fin) != FILE_SUCCESS) { + fprintf(stderr, _("Reading %s: %s\n"), + inputfile, file_get_message(fin)); + return 1; + } } /* Get and call function to write out file */ @@ -143,7 +168,47 @@ md_free(MD_ELEMENT(root)); + UNCATCH(debugError); + return 0; +} + +/* + * Create a new file template. Many of the possible fields are + * present so they can easily be filled in by hand. + */ +static struct rootElement * +new_file(void) +{ + struct rootElement *root; + struct trackElement *track; + struct partElement *part; + struct takeElement *take; + struct sysexElement *gm; + static unsigned char gminit[] = { + 0xf0, 0x7e, 0x7f, 0x09, 0x01, 0xf7 + }; + + root = md_empty(); + track = md_track_new(); + part = md_part_new(); + take = md_take_new(); + gm = md_sysex_new(0xf0, gminit+1, NELEM(gminit)-1); + + md_add_elem(MD_CONTAINER(root), MD_ELEMENT(track)); + md_add_elem(MD_CONTAINER(track), MD_ELEMENT(part)); + md_add_elem(MD_CONTAINER(part), MD_ELEMENT(take)); + md_add_elem(MD_CONTAINER(take), MD_ELEMENT(gm)); + + root->head->copyright = "Copyright (c) ..."; + root->head->author = "author"; + root->head->title = "Sweet song"; + root->head->comment = "This template was created with mdmlconv"; + take->selected = 1; + track->name = "Track 1"; + part->name = "part1"; + + return root; } /* diff -rNu melys-0.0.9/programs/mdmlconv.m melys-0.0.10/programs/mdmlconv.m --- melys-0.0.9/programs/mdmlconv.m Mon Aug 16 12:00:21 1999 +++ melys-0.0.10/programs/mdmlconv.m Tue Sep 14 14:58:35 1999 @@ -19,6 +19,7 @@ >>make --objects ../files/midiread.o ../files/midiwrite.o ../files/mdmlread.o >>make --objects ../files/mdmlwrite.o ../files/file.o ../md/elements.o >>make --objects ../md/mdutil.o ../util/except.o ../util/util.o +>>make --objects ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o >>extern >>header <stdlib.h> @@ -27,6 +28,7 @@ >>header util.h >>header melfile.h >>header elements.h +>>header md.h /* Options for the command */ #define HAS_ARG 1 @@ -34,6 +36,7 @@ {"input-type", HAS_ARG, NULL, 'I'}, {"output-type", HAS_ARG, NULL, 'O'}, {"output-file", HAS_ARG, NULL, 'o'}, + {"new", 0, NULL, 'n'}, {0, 0, 0, 0}, }; @@ -47,6 +50,7 @@ Usage: mdmlconv [-I input-type] [-O output-type] -o out-file input-file + mdmlconv -n -o out-file Recognised types are: midi midi midi0 midi format 0 @@ -56,19 +60,23 @@ If you do not specify a type it defaults by guessing from the file extension or by looking for magic numbers in the file. +The -n flag creates a new empty file with some basic initialisation. + >>code int c; char *cp; char opts[NELEM(long_opts) * 2 + 1]; struct option *op; - char *outputfile = NULL; - char *inputfile = NULL; - char *inputtype = NULL; - char *outputtype = NULL; - struct File *fin = NULL; + volatile int newfile = 0; + char *volatile outputfile = NULL; + char *volatile inputfile = NULL; + char *volatile inputtype = NULL; + char *volatile outputtype = NULL; + struct File *volatile fin = NULL; struct File *fout = NULL; struct rootElement *root; + /* Build up the short option string */ cp = opts; for (op = long_opts; op < &long_opts[NELEM(long_opts)]; op++) { @@ -93,38 +101,54 @@ case 'o': outputfile = optarg; break; + case 'n': + newfile = 1; + break; case '?': show_usage(); break; } } + if (outputfile == NULL) { fprintf(stderr, "No output filename supplied\n"); exit(1); } - if (argc - optind != 1) { - fprintf(stderr, "One input file name must be supplied\n"); - exit(1); + if (CATCH(debugError)) { + fprintf(stderr, "Error: %s\n", debugError->message); + return 1; } - inputfile = argv[optind]; + if (!newfile) { + if (argc - optind != 1) { + fprintf(stderr, "One input file name must be supplied\n"); + exit(1); + } + + inputfile = argv[optind]; + + fin = file_new(inputfile); + } - fin = file_new(inputfile); fout = file_new(outputfile); - if (inputtype) + if (fin && inputtype) file_set_type(fin, inputtype); if (outputtype) file_set_type(fout, outputtype); - /* Read in the file */ - root = file_read(fin); - if (file_get_status(fin) != FILE_SUCCESS) { - fprintf(stderr, _("Reading %s: %s\n"), - inputfile, file_get_message(fin)); - return 1; + /* Read in, or create the file */ + if (newfile) { + root = new_file(); + } else { + root = file_read(fin); + if (file_get_status(fin) != FILE_SUCCESS) { + fprintf(stderr, _("Reading %s: %s\n"), + inputfile, file_get_message(fin)); + return 1; + } } /* Get and call function to write out file */ @@ -137,8 +161,46 @@ md_free(MD_ELEMENT(root)); + UNCATCH(debugError); + return 0; +>>function new_file +static struct rootElement * +>>description +Create a new file template. +Many of the possible fields are present so they can +easily be filled in by hand. +>>code + struct rootElement *root; + struct trackElement *track; + struct partElement *part; + struct takeElement *take; + struct sysexElement *gm; + static unsigned char gminit[] = { + 0xf0, 0x7e, 0x7f, 0x09, 0x01, 0xf7 + }; + + root = md_empty(); + track = md_track_new(); + part = md_part_new(); + take = md_take_new(); + gm = md_sysex_new(0xf0, gminit+1, NELEM(gminit)-1); + + md_add_elem(MD_CONTAINER(root), MD_ELEMENT(track)); + md_add_elem(MD_CONTAINER(track), MD_ELEMENT(part)); + md_add_elem(MD_CONTAINER(part), MD_ELEMENT(take)); + md_add_elem(MD_CONTAINER(take), MD_ELEMENT(gm)); + + root->head->copyright = "Copyright (c) ..."; + root->head->author = "author"; + root->head->title = "Sweet song"; + root->head->comment = "This template was created with mdmlconv"; + take->selected = 1; + track->name = "Track 1"; + part->name = "part1"; + + return root; >>function show_usage static void diff -rNu melys-0.0.9/programs/melplay.c melys-0.0.10/programs/melplay.c --- melys-0.0.9/programs/melplay.c Thu Aug 19 13:11:58 1999 +++ melys-0.0.10/programs/melplay.c Thu Jan 1 00:00:00 1970 @@ -1,386 +0,0 @@ -/* - * - * 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 <stdlib.h> -#include <stdio.h> -#include <unistd.h> -#include <getopt.h> -#include <sys/asoundlib.h> -#include "seqlib.h" -#include "elements.h" -#include "melfile.h" -#include "midi.h" -#include "md.h" -#include <string.h> -#include <errno.h> -#include "intl.h" - -/* - * Play a melys file (midi, mdml, whatever melys supports). - * melplay [-p client:port,... ] [-l] [-d delay] file ... - * - * -p client:port - A alsa client and port number to send midi to - * -l - List possible output ports that could be used - * -d delay - Delay after song ends (default 2 sec) - */ - -/* Options for the command */ -#define HAS_ARG 1 -static struct option long_opts[] = { - {"port", HAS_ARG, NULL, 'p'}, - {"list", 0, NULL, 'l'}, - {"delay", HAS_ARG, NULL, 'd'}, - {0, 0, 0, 0}, -}; - -/* Delay at the end of a song */ -static int delay = 2; - -#define ADDR_PARTS 4 /* Number of part in a port description addr 1:2:3:4 */ -#define SEP ", \t" /* Separators for port description */ - -static seq_context_t *openports(char *portdesc); -static void playfile(seq_context_t *ctxp, char *filename); -static void showlist(void); -static void showusage(void); -static void play(void *arg, struct element *el); - - -/* - * Play a midi file - * melplay [-p client:port ...] [-l] [-d delay] file ... - - * -p, --port=client:port - An ALSA client and port number to use - * -l, --list - List possible output ports that could be used - * -d, --delay=SECS - Delay after song ends (default 2 sec) - * Arguments: - * argc - arg count - * argv - arg vector - */ -int -main(int argc, char **argv) -{ - char opts[NELEM(long_opts) * 2 + 1]; - seq_context_t *ctxp; - char *portdesc; - char *cp; - int c; - struct option *op; - - /* Build up the short option string */ - cp = opts; - for (op = long_opts; op < &long_opts[NELEM(long_opts)]; op++) { - *cp++ = op->val; - if (op->has_arg) - *cp++ = ':'; - } - - if (CATCH(debugError)) { - fprintf(stderr, "A fatal debugging error occurred\n"); - fprintf(stderr, "The message was: %s\n", debugError->message); - return 1; - } - - portdesc = NULL; - - /* Deal with the options */ - for (;;) { - c = getopt_long(argc, argv, opts, long_opts, NULL); - if (c == -1) - break; - - switch(c) { - case 'p': - portdesc = optarg; - break; - case 'd': - delay = atoi(optarg); - break; - case 'l': - showlist(); - exit(0); - break; - case '?': - showusage(); - exit(1); - } - } - - - if (portdesc == NULL) { - portdesc = getenv("ALSA_OUTPUT_PORTS"); - if (portdesc == NULL) { - fprintf(stderr, "No client/port specified.\n" - "You must supply one with the -p option or with the\n" - "environment variable ALSA_OUTPUT_PORTS\n" - ); - exit(1); - } - } - - ctxp = openports(portdesc); - if (ctxp == NULL) - return 1; - - /* Now play all the files */ - for (; optind < argc; optind++) - playfile(ctxp, argv[optind]); - - seq_context_free(ctxp); - - UNCATCH(debugError); - - return 0; -} - -/* - * Read a list of client/port specifications and return an - * array of snd_seq_addr_t that describes them. - * - */ -static seq_context_t * -openports(char *portdesc) -{ - char *astr; - char *cp; - seq_context_t *ctxp; - snd_seq_addr_t *addr; - snd_seq_addr_t *ap; - int a[ADDR_PARTS]; - int count, naddr; - - if (portdesc == NULL) - return NULL; - - ctxp = seq_context_new("melplay"); - - addr = g_new(snd_seq_addr_t, strlen(portdesc)); - - naddr = 0; - ap = addr; - - for (astr = strtok(portdesc, SEP); astr; astr = strtok(NULL, SEP)) { - for (cp = astr, count = 0; cp && *cp; cp++) { - if (count < ADDR_PARTS) - a[count++] = atoi(cp); - cp = strchr(cp, ':'); - if (cp == NULL) - break; - } - - switch (count) { - case 2: - ap->client = a[0]; - ap->port = a[1]; - break; - default: - printf("Addresses in %d parts not supported yet\n", count); - break; - } - ap++; - naddr++; - } - - seq_set_addresses(ctxp, SEQ_ADDR_OUTPUT, addr, naddr); - seq_connect_addresses(ctxp, SEQ_ADDR_OUTPUT); - - g_free(addr); - - if (naddr == 0) { - fprintf(stderr, "Could not set up any output sequencer ports\n"); - seq_context_free(ctxp); - return NULL; - } - - return ctxp; -} - -/* - * Play a single file. - */ -static void -playfile(seq_context_t *ctxp, char *filename) -{ - struct rootElement *root; - struct sequenceState *seq; - struct element *el; - unsigned long end; - snd_seq_event_t *ep; - struct File *file; - - file = file_new(filename); - root = file_read(file); - if (file_get_status(file) != FILE_SUCCESS) { - fprintf(stderr, "%s\n", file_get_message(file)); - return; - } - if (!root) - return; - - /* Loop through all the elements in the song and play them */ - seq = md_sequence_init(root); - while ((el = md_sequence_next(seq)) != NULL) { - play(ctxp, el); - } - - /* Get the end time for the tracks and echo an event to - * wake us up at that time - */ - end = md_sequence_duration(seq); - seq_midi_send_echo(ctxp, end, 0); - - /* Wait for all the events to be played */ - snd_seq_event_input(seq_handle(ctxp), &ep); - - /* Wait some extra time to allow for note to decay etc */ - sleep(delay); - seq_timer_stop(ctxp); - - md_free(MD_ELEMENT(root)); -} - -/* - * Show a list of possible output ports that midi could be sent - * to. - * - */ -static void -showlist(void) -{ - snd_seq_client_info_t cinfo; - snd_seq_port_info_t pinfo; - snd_seq_system_info_t sysinfo; - int client; - int port; - int err; - snd_seq_t *handle; - - err = snd_seq_open(&handle, SND_SEQ_OPEN); - if (err < 0) { - fprintf(stderr, _("Could not open sequencer %s"), snd_strerror(errno)); - exit(1); - } - - err = snd_seq_system_info(handle, &sysinfo); - if (err < 0) { - fprintf(stderr, _("Could not get sequencer information %s"), - snd_strerror(err)); - exit(1); - } - - printf(_(" Port %-30.30s %s\n"), _("Client name"), _("Port name")); - for (client = 0; client < sysinfo.clients; client++) { - err = snd_seq_get_any_client_info(handle, client, &cinfo); - if (err < 0) - continue; - - for (port = 0; port < sysinfo.ports; port++) { - int cap; - - err = snd_seq_get_any_port_info(handle, client, port, &pinfo); - if (err < 0) - continue; - - cap = (SND_SEQ_PORT_CAP_SUBSCRIPTION|SND_SEQ_PORT_CAP_OUT); - if ((pinfo.capability & cap) == cap) { - printf("%3d:%-3d %-30.30s %s\n", - pinfo.client, pinfo.port, cinfo.name, pinfo.name); - } - } - } -} - -/* - * Show a usage message - */ -static void -showusage(void) -{ -char **cpp; -static char *msg[] = { -N_("Usage: melplay [-p client:port ...] [-l] [-d delay] file ..."), -"", -N_(" -p client:port - A alsa client and port number to send midi to"), -N_(" -l - List possible output ports that could be used"), -N_(" -d delay - Delay after song ends (default 2 sec)"), -}; - - for (cpp = msg; cpp < msg+NELEM(msg); cpp++) { - fprintf(stderr, "%s\n", _(*cpp)); - } -} - -static void -play(void *arg, struct element *el) -{ - seq_context_t *ctxp = arg; - snd_seq_event_t ev; - - seq_midi_event_init(ctxp, &ev, el->element_time, el->device_channel); - switch (el->type) { - case MD_TYPE_HEAD: - seq_init_tempo(ctxp, MD_HEAD(el)->time_base, 120, 1); - seq_timer_start(ctxp); - return; - case MD_TYPE_NOTE: - seq_midi_note(ctxp, &ev, MD_NOTE(el)->note, MD_NOTE(el)->vel, - MD_NOTE(el)->length); - break; - case MD_TYPE_CONTROL: - seq_midi_control(ctxp, &ev, MD_CONTROL(el)->control, - MD_CONTROL(el)->value); - break; - case MD_TYPE_PROGRAM: - seq_midi_program(ctxp, &ev, MD_PROGRAM(el)->program); - break; - case MD_TYPE_TEMPO: - seq_midi_tempo(ctxp, &ev, MD_TEMPO(el)->micro_tempo); - break; - case MD_TYPE_PITCH: - seq_midi_pitchbend(ctxp, &ev, MD_PITCH(el)->pitch); - break; - case MD_TYPE_PRESSURE: - seq_midi_chanpress(ctxp, &ev, MD_PRESSURE(el)->velocity); - break; - case MD_TYPE_KEYTOUCH: - seq_midi_keypress(ctxp, &ev, MD_KEYTOUCH(el)->note, - MD_KEYTOUCH(el)->velocity); - break; - case MD_TYPE_SYSEX: - seq_midi_sysex(ctxp, &ev, MD_SYSEX(el)->status, MD_SYSEX(el)->data, - MD_SYSEX(el)->length); - break; - - case MD_TYPE_ROOT: - case MD_TYPE_TEXT: - case MD_TYPE_KEYSIG: - case MD_TYPE_TIMESIG: - case MD_TYPE_SMPTEOFFSET: - case MD_TYPE_PART: - /* Ones that have no sequencer action */ - return; - default: - printf("WARNING: play: not implemented yet %d\n", el->type); - return; - } - - seq_write(ctxp, &ev); -} diff -rNu melys-0.0.9/programs/melplay.m melys-0.0.10/programs/melplay.m --- melys-0.0.9/programs/melplay.m Mon Aug 16 12:00:21 1999 +++ melys-0.0.10/programs/melplay.m Tue Sep 14 15:03:46 1999 @@ -1,33 +1,9 @@ ->>name melplay.m A play midi program - -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. - ->>target melplay ->>make --objects melplay.o ->>make --objects ../files/midiread.o ../files/midiwrite.o ->>make --objects ../files/mdmlread.o ../files/mdmlwrite.o ->>make --objects ../seq/seqlib.o ../seq/seqmidi.o ->>make --objects ../util/except.o ../md/elements.o ../md/mdutil.o ->>make --objects ../files/file.o ->>make --objects ../util/util.o - ->>extern -/* - * Play a melys file (midi, mdml, whatever melys supports). - * melplay [-p client:port,... ] [-l] [-d delay] file ... +-d delay] file ... * * -p client:port - A alsa client and port number to send midi to * -l - List possible output ports that could be used * -d delay - Delay after song ends (default 2 sec) + * -b time - Time to begin playing */ >>header <stdlib.h> >>header <stdio.h> @@ -40,17 +16,28 @@ >>header midi.h >>header md.h +>>target melplay +>>make --objects melplay.o +>>make --objects ../files/midiread.o ../files/midiwrite.o ../files/mdmlread.o +>>make --objects ../files/mdmlwrite.o ../files/file.o ../md/elements.o +>>make --objects ../md/mdutil.o ../util/except.o ../util/util.o +>>make --objects ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o +>>make --objects ../seq/seqlib.o ../seq/seqmidi.o + +>>extern /* Options for the command */ #define HAS_ARG 1 static struct option long_opts[] = { - {"port", HAS_ARG, NULL, 'p'}, - {"list", 0, NULL, 'l'}, - {"delay", HAS_ARG, NULL, 'd'}, + {N_("port"), HAS_ARG, NULL, 'p'}, + {N_("list"), 0, NULL, 'l'}, + {N_("delay"), HAS_ARG, NULL, 'd'}, + {N_("begin"), HAS_ARG, NULL, 'b'}, {0, 0, 0, 0}, }; /* Delay at the end of a song */ static int delay = 2; +static long beginat = 0; #define ADDR_PARTS 4 /* Number of part in a port description addr 1:2:3:4 */ #define SEP ", \t" /* Separators for port description */ @@ -67,6 +54,7 @@ -p, --port=client:port - An ALSA client and port number to use -l, --list - List possible output ports that could be used -d, --delay=SECS - Delay after song ends (default 2 sec) + -b, --begin=TIME - Begin time to start at >>code char opts[NELEM(long_opts) * 2 + 1]; seq_context_t *ctxp; @@ -104,6 +92,9 @@ case 'd': delay = atoi(optarg); break; + case 'b': + beginat = atol(optarg); + break; case 'l': showlist(); exit(0); @@ -217,6 +208,8 @@ unsigned long end; snd_seq_event_t *ep; struct File *file; + int tr; + struct trackElement *track; file = file_new(filename); root = file_read(file); @@ -229,6 +222,18 @@ /* Loop through all the elements in the song and play them */ seq = md_sequence_init(root); + +#ifdef notyet /* Completly non-working */ + if (beginat) { + for (tr = 0; ; tr++) { + track = md_track_nth(root, tr); + if (track == NULL) + break; + md_elem_seek(MD_CONTAINER(track), beginat); + } + } +#endif + while ((el = md_sequence_next(seq)) != NULL) { play(ctxp, el); } @@ -314,6 +319,7 @@ N_(" -p client:port - A alsa client and port number to send midi to"), N_(" -l - List possible output ports that could be used"), N_(" -d delay - Delay after song ends (default 2 sec)"), +N_(" -b time - Begin time"), }; for (cpp = msg; cpp < msg+NELEM(msg); cpp++) { diff -rNu melys-0.0.9/programs/melys.m melys-0.0.10/programs/melys.m --- melys-0.0.9/programs/melys.m Mon Aug 16 12:09:44 1999 +++ melys-0.0.10/programs/melys.m Tue Sep 14 14:58:35 1999 @@ -18,6 +18,7 @@ >>make --objects ../seq/seqlib.o ../seq/seqmidi.o ../seq/sequtil.o >>make --objects ../util/except.o ../util/util.o >>make --objects ../md/elements.o ../md/mdutil.o +>>make --objects ../md/mdadd.o ../md/mdlist.o ../md/mdundo.o >>make --objects ../gui/main.o ../gui/menus.o >>make --objects ../widgets/register.o >>make --objects ../midi/play.o ../midi/record.o @@ -25,7 +26,7 @@ >>make --objects ../config/ports.o >>make --objects ../widgets/melystrack.o ../widgets/melystrackinfo.o >>make --objects ../widgets/melystrackdisplay.o ->>make --objects ../pixmaps/balls.o +>>make --objects ../pixmaps/balls.o ../pixmaps/menu_icons.o >>header <stdio.h> >>header <stdlib.h> @@ -39,7 +40,7 @@ #define PACKAGE "melys" #define LOCALEDIR "foo" -#define MELYS_VERSION_STRING "0.0.8" +#include "../version" >>extern /* diff -rNu melys-0.0.9/programs/showseq.c melys-0.0.10/programs/showseq.c --- melys-0.0.9/programs/showseq.c Thu Aug 19 13:11:59 1999 +++ melys-0.0.10/programs/showseq.c Wed Sep 15 14:04:05 1999 @@ -115,7 +115,6 @@ exit(1); } - printf(_(" %4s %-30.30s\n"), _("Port"), _("Port name")); for (client = 0; client < sysinfo.clients; client++) { err = snd_seq_get_any_client_info(handle, client, &cinfo); if (err < 0) @@ -140,22 +139,23 @@ if (err < 0) continue; - printf(" %-3d %-30.30s ", - pinfo.port, pinfo.name); + printf(" %d:%-3d %-30.30s ", + pinfo.client, pinfo.port, pinfo.name); if (pinfo.capability & SND_SEQ_PORT_CAP_IN) - printf("in "); + printf("read "); if (pinfo.capability & SND_SEQ_PORT_CAP_OUT) - printf("out "); + printf("write "); if (pinfo.capability & SND_SEQ_PORT_CAP_SUBSCRIPTION) printf("sub "); if (pinfo.capability & SND_SEQ_PORT_CAP_SYNC_IN) - printf("sync-in "); + printf("sync-read "); if (pinfo.capability & SND_SEQ_PORT_CAP_SYNC_OUT) - printf("sync-out "); + printf("sync-write "); if (pinfo.capability & SND_SEQ_PORT_CAP_DUPLEX) printf("duplex "); printf("\n"); } + printf("\n"); } } diff -rNu melys-0.0.9/programs/showseq.m melys-0.0.10/programs/showseq.m --- melys-0.0.9/programs/showseq.m Tue Aug 10 16:56:39 1999 +++ melys-0.0.10/programs/showseq.m Thu Sep 9 00:23:46 1999 @@ -106,7 +106,6 @@ exit(1); } - printf(_(" %4s %-30.30s\n"), _("Port"), _("Port name")); for (client = 0; client < sysinfo.clients; client++) { err = snd_seq_get_any_client_info(handle, client, &cinfo); if (err < 0) @@ -131,22 +130,23 @@ if (err < 0) continue; - printf(" %-3d %-30.30s ", - pinfo.port, pinfo.name); + printf(" %d:%-3d %-30.30s ", + pinfo.client, pinfo.port, pinfo.name); if (pinfo.capability & SND_SEQ_PORT_CAP_IN) - printf("in "); + printf("read "); if (pinfo.capability & SND_SEQ_PORT_CAP_OUT) - printf("out "); + printf("write "); if (pinfo.capability & SND_SEQ_PORT_CAP_SUBSCRIPTION) printf("sub "); if (pinfo.capability & SND_SEQ_PORT_CAP_SYNC_IN) - printf("sync-in "); + printf("sync-read "); if (pinfo.capability & SND_SEQ_PORT_CAP_SYNC_OUT) - printf("sync-out "); + printf("sync-write "); if (pinfo.capability & SND_SEQ_PORT_CAP_DUPLEX) printf("duplex "); printf("\n"); } + printf("\n"); } diff -rNu melys-0.0.9/seq/seqlib.c melys-0.0.10/seq/seqlib.c --- melys-0.0.9/seq/seqlib.c Thu Aug 19 13:11:54 1999 +++ melys-0.0.10/seq/seqlib.c Wed Sep 15 14:03:58 1999 @@ -343,6 +343,12 @@ subs.realtime = 0; /* XXX */ subs.exclusive = 0; +#ifdef SND_SEQ_CLIENT_DUMMY + /* TEMP this about identifies when this thing was added + * Unfortunately the old and desired behaviour is not default + */ + subs.convert_time = 1; +#endif ret = snd_seq_subscribe_port(ctxp->handle, &subs); if (ret < 0) g_warning("subscribe failed %s", snd_strerror(ret)); @@ -581,6 +587,8 @@ seq_control_timer(seq_context_t *ctxp, int onoff) { snd_seq_event_t ev; + + ev.source = ctxp->source; ev.dest.queue = ctxp->queue; ev.dest.client = SND_SEQ_CLIENT_SYSTEM; /* system */ diff -rNu melys-0.0.9/seq/seqlib.m melys-0.0.10/seq/seqlib.m --- melys-0.0.9/seq/seqlib.m Thu Aug 19 00:08:04 1999 +++ melys-0.0.10/seq/seqlib.m Sun Sep 12 23:43:16 1999 @@ -26,8 +26,28 @@ >>headerdef --decl seqlib.h #include <sys/asoundlib.h> +/* Forward compatibility defines */ +#ifndef SND_SEQ_PORT_CAP_OUT + +#define SND_SEQ_PORT_CAP_OUT SND_SEQ_PORT_CAP_WRITE +#define SND_SEQ_PORT_CAP_IN SND_SEQ_PORT_CAP_READ +#define SND_SEQ_PORT_CAP_SYNC_IN SND_SEQ_PORT_CAP_SYNC_READ +#define SND_SEQ_PORT_CAP_SYNC_OUT SND_SEQ_PORT_CAP_SYNC_WRITE +#define SND_SEQ_PORT_CAP_SUBSCRIPTION SND_SEQ_PORT_CAP_SUBS_WRITE + +#define in_use read_use +#define out_use write_use + +#endif + typedef struct seq_context seq_context_t; +/* The device part of a devchan */ +#define DEV(devchan) ((devchan)>>4) + +/* The channel part of a devchan */ +#define CHAN(devchan) ((devchan) & 0xf) + >>headerdef --local seqpriv.h struct seq_context { @@ -368,6 +388,12 @@ subs.realtime = 0; /* XXX */ subs.exclusive = 0; +#ifdef SND_SEQ_CLIENT_DUMMY + /* TEMP this about identifies when this thing was added + * Unfortunately the old and desired behaviour is not default + */ + subs.convert_time = 1; +#endif ret = snd_seq_subscribe_port(ctxp->handle, &subs); if (ret < 0) g_warning("subscribe failed %s", snd_strerror(ret)); @@ -604,6 +630,8 @@ int onoff; // SND_SEQ_EVENT_START or ...STOP >>code snd_seq_event_t ev; + + ev.source = ctxp->source; ev.dest.queue = ctxp->queue; ev.dest.client = SND_SEQ_CLIENT_SYSTEM; /* system */ diff -rNu melys-0.0.9/song/song.c melys-0.0.10/song/song.c --- melys-0.0.9/song/song.c Thu Aug 19 13:11:54 1999 +++ melys-0.0.10/song/song.c Wed Sep 15 14:03:57 1999 @@ -121,7 +121,7 @@ */ if (MD_CONTAINER(song->newtrack)->elements->len) { g_message("adding the new track"); - md_add(MD_CONTAINER(song->mdroot), MD_ELEMENT(song->newtrack)); + md_add_elem(MD_CONTAINER(song->mdroot), MD_ELEMENT(song->newtrack)); /* Set the new tracks channel to the track number TEMP */ MD_ELEMENT(song->newtrack)->device_channel = song->newtrack->number; diff -rNu melys-0.0.9/song/song.m melys-0.0.10/song/song.m --- melys-0.0.9/song/song.m Thu Aug 19 00:08:04 1999 +++ melys-0.0.10/song/song.m Tue Sep 14 15:00:38 1999 @@ -154,7 +154,7 @@ */ if (MD_CONTAINER(song->newtrack)->elements->len) { g_message("adding the new track"); - md_add(MD_CONTAINER(song->mdroot), MD_ELEMENT(song->newtrack)); + md_add_elem(MD_CONTAINER(song->mdroot), MD_ELEMENT(song->newtrack)); /* Set the new tracks channel to the track number TEMP */ MD_ELEMENT(song->newtrack)->device_channel = song->newtrack->number; diff -rNu melys-0.0.9/version melys-0.0.10/version --- melys-0.0.9/version Thu Jan 1 00:00:00 1970 +++ melys-0.0.10/version Wed Sep 15 13:40:09 1999 @@ -0,0 +1 @@ +#define MELYS_VERSION_STRING "0.0.10" diff -rNu melys-0.0.9/widgets/melystrack.c melys-0.0.10/widgets/melystrack.c --- melys-0.0.9/widgets/melystrack.c Thu Aug 19 13:11:57 1999 +++ melys-0.0.10/widgets/melystrack.c Wed Sep 15 14:04:02 1999 @@ -21,6 +21,7 @@ #include "util.h" #include "gtk/gtk.h" #include "elements.h" +#include "md.h" #include "melystrackinfo.h" #include "melystrackdisplay.h" #include "melystrack.h" @@ -118,6 +119,7 @@ info = (MelysTrackInfo*)melys_track_info_new(vadj); disp = (MelysTrackDisplay*)melys_track_display_new(); + hpan = (GtkHPaned*)gtk_hpaned_new(); gtk_paned_add1(GTK_PANED(hpan), GTK_WIDGET(info)); gtk_paned_add2(GTK_PANED(hpan), GTK_WIDGET(disp)); @@ -149,7 +151,10 @@ mtp->vadj = vadj; mtp->hadj = hadj; gtk_object_ref((GtkObject*)vadj); + gtk_object_sink((GtkObject*)vadj); + gtk_object_ref((GtkObject*)hadj); + gtk_object_sink((GtkObject*)hadj); mtp->info = info; mtp->display = disp; @@ -198,8 +203,7 @@ if (root == NULL) return; - root->refcount++; - mtrack->mdroot = root; + mtrack->mdroot = md_root_inc_ref(root); mtrack->vadj->lower = 0.0; mtrack->vadj->upper = root->tracks; @@ -207,7 +211,27 @@ gtk_adjustment_changed(mtrack->vadj); melys_track_info_set_md_root(mtrack->info, root); - //melys_track_display_set_md_root(mtrack->info, root); + //melys_track_display_set_md_root(mtrack->display, root); +} + +/* + * This is called when a track is added or removed or some other + * change is made to the song. Everything is re-calculated and + * redrawn. Emit a signal to allow all other views to also be + * redrawn. + * + */ +void +melys_track_redraw(MelysTrack *mtrack) +{ + + /* Re-set the vertical scrollbar limits */ + mtrack->vadj->lower = 0.0; + mtrack->vadj->upper = (double)mtrack->mdroot->tracks; + + melys_track_info_redraw(mtrack->info); + + /* No signal yet */ } /* diff -rNu melys-0.0.9/widgets/melystrack.m melys-0.0.10/widgets/melystrack.m --- melys-0.0.9/widgets/melystrack.m Thu Aug 19 00:08:04 1999 +++ melys-0.0.10/widgets/melystrack.m Wed Sep 15 13:49:24 1999 @@ -13,6 +13,7 @@ >>header gtk/gtk.h >>header elements.h +>>header md.h >>header melystrackinfo.h >>header melystrackdisplay.h @@ -101,6 +102,7 @@ info = (MelysTrackInfo*)melys_track_info_new(vadj); disp = (MelysTrackDisplay*)melys_track_display_new(); + hpan = (GtkHPaned*)gtk_hpaned_new(); gtk_paned_add1(GTK_PANED(hpan), GTK_WIDGET(info)); gtk_paned_add2(GTK_PANED(hpan), GTK_WIDGET(disp)); @@ -132,7 +134,10 @@ mtp->vadj = vadj; mtp->hadj = hadj; gtk_object_ref((GtkObject*)vadj); + gtk_object_sink((GtkObject*)vadj); + gtk_object_ref((GtkObject*)hadj); + gtk_object_sink((GtkObject*)hadj); mtp->info = info; mtp->display = disp; @@ -181,8 +186,7 @@ if (root == NULL) return; - root->refcount++; - mtrack->mdroot = root; + mtrack->mdroot = md_root_inc_ref(root); mtrack->vadj->lower = 0.0; mtrack->vadj->upper = root->tracks; @@ -190,7 +194,28 @@ gtk_adjustment_changed(mtrack->vadj); melys_track_info_set_md_root(mtrack->info, root); - //melys_track_display_set_md_root(mtrack->info, root); + //melys_track_display_set_md_root(mtrack->display, root); + + +>>function melys_track_redraw +void +MelysTrack *mtrack; +>>description +This is called when a track is added or removed or some +other change is made to the song. +Everything is re-calculated and redrawn. +Emit a signal to allow all other views to also be redrawn. + +>>code + + /* Re-set the vertical scrollbar limits */ + mtrack->vadj->lower = 0.0; + mtrack->vadj->upper = (double)mtrack->mdroot->tracks; + + melys_track_info_redraw(mtrack->info); + + /* No signal yet */ + >>function destroy static void diff -rNu melys-0.0.9/widgets/melystrackinfo.c melys-0.0.10/widgets/melystrackinfo.c --- melys-0.0.9/widgets/melystrackinfo.c Thu Aug 19 13:11:57 1999 +++ melys-0.0.10/widgets/melystrackinfo.c Wed Sep 15 14:04:03 1999 @@ -12,8 +12,14 @@ * GNU General Public License for more details. * * This is a widget for the left pane of the track view. - * The columns that can be seen will be configurable and will include - * the usual information and controls such as 'mute'. + * The columns that can be seen will be configurable. + * + * Now that I know about the gnome canvas widget and am going to + * use it for the trackdisplay pane, I suspect that some people will + * be wondering why it isn't used here as it looks ideal. I quite + * possibly would have used it if I had known about it then. Anyway + * there would have still have been pretty much the same amount of + * code in the end I think. * * */ @@ -35,11 +41,10 @@ #include "intl.h" -enum { +enum signals { MUTE_TRACK, UNMUTE_TRACK, - SOLO_TRACK, - UNSOLO_TRACK, + RECORD_TRACK, LAST_SIGNAL }; @@ -81,13 +86,13 @@ int totwidth; /* Total width up to end of this column */ } def_col_info[] = { - {NUMBER, COL_TEXT, "", 20, TRUE}, /* No real need to have this included */ + {NUMBER, COL_TEXT, "", 20, FALSE}, {NAME, COL_TEXT, N_("Name"), 100, TRUE}, {PROGRAM, COL_TEXT, N_("Prog"), 30, 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, FALSE}, + {RECORD, COL_BUTTON, N_("Rec"), 28, TRUE}, }; /* A border to the protect the column lines */ @@ -109,6 +114,7 @@ static void track_info_size_request(GtkWidget *widget, GtkRequisition *req); static void track_info_size_allocate(GtkWidget *widget, GtkAllocation *allocation); +static void track_vscroll_calc(MelysTrackInfo *minfo); static void track_info_draw(GtkWidget *widget, GdkRectangle *ap); static void draw_row(MelysTrackInfo *minfo, int ntrack); static void draw_col(MelysTrackInfo *minfo, int ntrack, @@ -126,6 +132,8 @@ struct col_info *cip, GdkEventButton *event); static void set_solo(MelysTrackInfo *minfo, struct trackElement *track); static void unset_solo(MelysTrackInfo *minfo, struct trackElement *track); +static void set_record(MelysTrackInfo *minfo, struct trackElement *track, + int modifiers); static void select_track(MelysTrackInfo *minfo, struct trackElement *track); static void unselect_track(MelysTrackInfo *minfo, struct trackElement *track); static void mute_track(MelysTrackInfo *minfo, struct trackElement *track); @@ -133,18 +141,10 @@ static void real_mute_track(MelysTrackInfo *minfo, struct trackElement *track); static void real_unmute_track(MelysTrackInfo *minfo, struct trackElement *track); -static void solo_track(MelysTrackInfo *minfo, struct rootElement *root, - struct trackElement *track); -static void real_solo_track(MelysTrackInfo *minfo, struct rootElement *root, - struct trackElement *track); -static void unsolo_track(MelysTrackInfo *minfo, struct rootElement *root, - struct trackElement *track); -static void real_unsolo_track(MelysTrackInfo *minfo, struct rootElement *root, - struct trackElement *track); static int track_to_y(MelysTrackInfo *minfo, int n); static struct col_info *x_to_col_info(MelysTrackInfo *minfo, int x); static void track_info_scroll(GtkAdjustment *adj, gpointer data); -static void track_redraw(MelysTrackInfo *minfo, int number, +static void one_track_redraw(MelysTrackInfo *minfo, int number, struct trackElement *track); @@ -196,7 +196,6 @@ (GtkSignalFunc)track_info_scroll, minfo); gtk_object_ref((GtkObject*)vadj); - // XXX? gtk_object_sink((GtkObject*)vadj); return w; } @@ -246,7 +245,6 @@ minfo->voffset = 0; minfo->mdroot = NULL; - } /* @@ -285,22 +283,13 @@ gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); - melys_track_info_signals[SOLO_TRACK] = gtk_signal_new("solo_track", - GTK_RUN_FIRST, - object_class->type, - GTK_SIGNAL_OFFSET(MelysTrackInfoClass, solo_track), - gtk_marshal_NONE__POINTER_POINTER, - GTK_TYPE_NONE, 2, - GTK_TYPE_POINTER, - GTK_TYPE_POINTER); - melys_track_info_signals[UNSOLO_TRACK] = gtk_signal_new("unsolo_track", - GTK_RUN_FIRST, + melys_track_info_signals[RECORD_TRACK] = gtk_signal_new("record_track", + GTK_RUN_ACTION, object_class->type, - GTK_SIGNAL_OFFSET(MelysTrackInfoClass, unsolo_track), - gtk_marshal_NONE__POINTER_POINTER, + GTK_SIGNAL_OFFSET(MelysTrackInfoClass, record_track), + gtk_marshal_NONE__POINTER_INT, GTK_TYPE_NONE, 2, - GTK_TYPE_POINTER, - GTK_TYPE_POINTER); + GTK_TYPE_POINTER, GTK_TYPE_INT); gtk_object_class_add_signals @@ -320,8 +309,7 @@ klass->mute_track = real_mute_track; klass->unmute_track = real_unmute_track; - klass->solo_track = real_solo_track; - klass->unsolo_track = real_unsolo_track; + klass->record_track = NULL; } /* @@ -368,13 +356,34 @@ if (minfo->mdroot) md_free((struct element *)minfo->mdroot); - root->refcount++; - minfo->mdroot = root; + minfo->mdroot = md_root_inc_ref(root); gtk_widget_queue_draw(GTK_WIDGET(minfo)); } /* + * Recalculate and redraw. The song has changed and now we need + * to re-draw everything. Probably only need to re-draw if the + * number of tracks has changed in this widget. + * + */ +void +melys_track_info_redraw(MelysTrackInfo *minfo) +{ + + gtk_widget_queue_draw(GTK_WIDGET(minfo)); + + /* + * We have to do this because even though the page size has + * not changed, gtk itself modifies the page size that we set + * when it is larger than upper-lower. Therefore we have to + * keep resetting it. + * I consider this a bug in gtk + */ + track_vscroll_calc(minfo); +} + +/* * Create the windows for this widget. The main window itself * is not mapped, but any subwindows are shown. * @@ -405,6 +414,7 @@ attributes.event_mask = gtk_widget_get_events(widget); attributes.event_mask |= (GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | 0 @@ -542,7 +552,7 @@ if (GTK_WIDGET_REALIZED (widget)) { - /* Save the track area */ + /* Save the track area, not including title area */ minfo->track_area.x = allocation->x; minfo->track_area.y = allocation->y + minfo->vtitle; minfo->track_area.width = allocation->width - PAN_PADDING; @@ -552,19 +562,28 @@ allocation->x, allocation->y, allocation->width - PAN_PADDING, allocation->height); - /* - * Calculate how many tracks are visible on the page and set this - * as the page increment. Verge on the low side. - */ - minfo->vadj->page_size = - ((gfloat)minfo->track_area.height / minfo->vspace) - 1.5; - minfo->vadj->page_increment = minfo->vadj->page_size; - - gtk_adjustment_changed(minfo->vadj); + /* Set up the vertical scrollbar */ + track_vscroll_calc(minfo); } } /* + * Calculate how many tracks are visible on the page and set + * this as the page increment. Err on the low side. + * + */ +static void +track_vscroll_calc(MelysTrackInfo *minfo) +{ + + minfo->vadj->page_size = + ((gfloat)minfo->track_area.height / minfo->vspace) - 1.5; + minfo->vadj->page_increment = minfo->vadj->page_size; + + gtk_adjustment_changed(minfo->vadj); +} + +/* * This is the main routine that draws the whole widget. To * simplify the code, it is split into routines for drawing * each line (and the title is line -1 for this purpose), and for @@ -602,12 +621,6 @@ gdk_window_clear_area(widget->window, ap->x, ap->y, ap->width, ap->height); - gtk_draw_shadow(widget->style, widget->window, - GTK_STATE_NORMAL, GTK_SHADOW_IN, - 0, 0, - minfo->track_area.width, minfo->vtitle + minfo->track_area.height); - - /* This draws in the title row */ draw_row(minfo, -1); @@ -621,12 +634,19 @@ start = y_to_track(minfo, ap->y); end = y_to_track(minfo, ap->y + ap->height) + 1; - if (end > minfo->mdroot->tracks) + if (start < 0) + start = 0; + if (end < 0 || end > minfo->mdroot->tracks) end = minfo->mdroot->tracks; dprintf2("start %d end %d, tracks %d", start, end, minfo->mdroot->tracks); for (ntrack = start; ntrack < end; ntrack++) draw_row(minfo, ntrack); + + gtk_draw_shadow(widget->style, widget->window, + GTK_STATE_NORMAL, GTK_SHADOW_IN, + 0, 0, + minfo->track_area.width, minfo->vtitle + minfo->track_area.height); } /* @@ -677,10 +697,8 @@ if (area.x + area.width > wid && area.x < wid) area.width = wid - area.x; - if (cip->kind == COL_TEXT) { - gdk_draw_rectangle(widget->window, bg_gc, TRUE, area.x, area.y, - area.width, area.height); - } + gdk_draw_rectangle(widget->window, bg_gc, TRUE, area.x, area.y, + area.width, area.height); /* * Set up a clipping region for the content area of this cell. @@ -773,6 +791,8 @@ } else { g_snprintf(buf, TMP_BUF_SIZE, "Track %d", ntrack+1); str = buf; + if (track) + track->name = g_strdup(buf); } break; case PROGRAM: @@ -782,8 +802,7 @@ break; case CHANNEL: if (track) - g_snprintf(buf, TMP_BUF_SIZE, "%2d", - MD_ELEMENT(track)->device_channel & 0xf); + g_snprintf(buf, TMP_BUF_SIZE, "%2d", MD_CHAN(track) + 1); str = buf; default: break; @@ -801,6 +820,7 @@ GdkPixmap *pixmap; GdkBitmap *mask; int width, height; + int shadow_type; int x, y; #define BUTTON_SURROUND 2 @@ -810,11 +830,7 @@ widget = (GtkWidget *)minfo; - gtk_draw_shadow(widget->style, widget->window, - GTK_STATE_NORMAL, GTK_SHADOW_OUT, - ap->x, ap->y + BUTTON_SURROUND, - ap->width, ap->height - 2*BUTTON_SURROUND); - + shadow_type = GTK_SHADOW_OUT; pixmap = NULL; mask = NULL; @@ -862,7 +878,14 @@ gdk_gc_set_clip_mask (widget->style->black_gc, NULL); gdk_gc_set_clip_origin (widget->style->black_gc, 0, 0); + + shadow_type = GTK_SHADOW_IN; } + + gtk_draw_shadow(widget->style, widget->window, + GTK_STATE_NORMAL, shadow_type, + ap->x, ap->y + BUTTON_SURROUND, + ap->width, ap->height - 2*BUTTON_SURROUND); } /* @@ -932,14 +955,17 @@ minfo = MELYS_TRACK_INFO(widget); + /* Check if we are in the title area */ + if (event->y < minfo->track_area.y) + return FALSE; /* Will do something later */ + /* Get the appropriate track for this button press */ row = y_to_track(minfo, event->y); - track = md_track_nth(minfo->mdroot, row); + track = md_track_nth(minfo->mdroot, row); if (track == NULL) return FALSE; - /* Now work out the column */ cip = x_to_col_info(minfo, event->x); if (cip == NULL) @@ -1000,6 +1026,7 @@ select_track(minfo, track); } else if (masks == GDK_SHIFT_MASK) { + /* TODO */ } } @@ -1008,6 +1035,13 @@ struct col_info *cip, GdkEventButton *event) { + /* + * The multi-click events just confuse things so we just return if + * we get one. + */ + if (event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) + return; + switch (cip->type) { case MUTE: if (track->mute) @@ -1017,14 +1051,12 @@ break; case SOLO: if (track->solo) - //unsolo_track(minfo, minfo->mdroot, track); unset_solo(minfo, track); else - //solo_track(minfo, minfo->mdroot, track); set_solo(minfo, track); break; case RECORD: - track->record ^= 1; + set_record(minfo, track, event->state); break; default: break; @@ -1044,24 +1076,40 @@ set_solo(MelysTrackInfo *minfo, struct trackElement *track) { struct trackElement *te; + int last; int i; + if (track->sololast) + last = 1; + else + last = 0; + + track->solo = 1; + track->sololast = 1; + unmute_track(minfo, track); + track->solomute = 0; + for (i = 0; i < minfo->mdroot->tracks; i++) { te = md_track_nth(minfo->mdroot, i); - /* XXX TEMP */ - if (i != track->number) { - te->solo = 0; + if (i == track->number) + continue; + + te->solo = 0; + te->sololast = 0; + + if (te->mute) + continue; + + if (last) { + if (te->solomute) { + mute_track(minfo, te); + te->solomute = 1; + } + } else { mute_track(minfo, te); - te->mute = 1; te->solomute = 1; - } else { - track->solo = 1; - track->sololast = 1; - unmute_track(minfo, te); - te->mute = 0; - te->solomute = 0; } } } @@ -1090,10 +1138,52 @@ if (te->solomute) { unmute_track(minfo, te); te->mute = 0; + te->solomute = 1; } } } +/* + * A normal click on a record button sets that button and turns + * off all others. If you click while holding the control key, + * multiple tracks can be set for recording. If a button is + * control-clicked it will toggle. + * + * Arguments: + * track - The track that is being set + * modifiers - The modifier keys used + */ +static void +set_record(MelysTrackInfo *minfo, struct trackElement *track, int modifiers) +{ + int n; + struct trackElement *tr; + + if ((modifiers & GDK_CONTROL_MASK) == 0) { + /* + * First turn off all any other existing record button. + */ + for (n = 0; n < minfo->mdroot->tracks; n++) { + tr = md_track_nth(minfo->mdroot, n); + if (tr == track) { + one_track_redraw(minfo, -1, tr); + track->record ^= 1; + } else if (tr->record) { + if (tr->record) + one_track_redraw(minfo, -1, tr); + tr->record = 0; + gtk_signal_emit(GTK_OBJECT(minfo), + melys_track_info_signals[RECORD_TRACK], track, 0); + } + } + } else { + track->record ^= 1; + } + + gtk_signal_emit(GTK_OBJECT(minfo), + melys_track_info_signals[RECORD_TRACK], track, 1); +} + static void select_track(MelysTrackInfo *minfo, struct trackElement *track) { @@ -1106,22 +1196,22 @@ { track->selected = 0; - track_redraw(minfo, -1, track); + one_track_redraw(minfo, -1, track); } static void mute_track(MelysTrackInfo *minfo, struct trackElement *track) { - gtk_signal_emit(GTK_OBJECT(minfo), - melys_track_info_signals[MUTE_TRACK], track); + gtk_signal_emit(GTK_OBJECT(minfo), melys_track_info_signals[MUTE_TRACK], + track); } static void unmute_track(MelysTrackInfo *minfo, struct trackElement *track) { - gtk_signal_emit(GTK_OBJECT(minfo), - melys_track_info_signals[UNMUTE_TRACK], track); + gtk_signal_emit(GTK_OBJECT(minfo), melys_track_info_signals[UNMUTE_TRACK], + track); } static void @@ -1129,7 +1219,7 @@ { track->mute = 1; - track_redraw(minfo, -1, track); + one_track_redraw(minfo, -1, track); } static void @@ -1138,54 +1228,14 @@ track->mute = 0; track->solomute = 0; - track_redraw(minfo, -1, track); -} - -static void -solo_track(MelysTrackInfo *minfo, struct rootElement *root, - struct trackElement *track) -{ - dprintf(0, "unreal solo track %d", track->number); - gtk_signal_emit(GTK_OBJECT(minfo), - melys_track_info_signals[SOLO_TRACK], root, track); -} - -static void -real_solo_track(MelysTrackInfo *minfo, struct rootElement *root, - struct trackElement *track) -{ - dprintf(0, "solo track %d", track->number); - set_solo(minfo, track); - gtk_widget_queue_draw_area(GTK_WIDGET(minfo), - minfo->track_area.x, minfo->track_area.y, - minfo->track_area.width, minfo->track_area.height); -} - -static void -unsolo_track(MelysTrackInfo *minfo, struct rootElement *root, - struct trackElement *track) -{ - dprintf(0, "unreal unsolo track %d", track->number); - - gtk_signal_emit(GTK_OBJECT(minfo), - melys_track_info_signals[UNSOLO_TRACK], root, track); -} - -static void -real_unsolo_track(MelysTrackInfo *minfo, struct rootElement *root, - struct trackElement *track) -{ - dprintf(0, "UN-solo track %d", track->number); - unset_solo(minfo, track); - gtk_widget_queue_draw_area(GTK_WIDGET(minfo), - minfo->track_area.x, minfo->track_area.y, - minfo->track_area.width, minfo->track_area.height); + one_track_redraw(minfo, -1, track); } /* * Given a y position within the widget window, return the * track number that belongs to that co-ordintate. Track - * numbers start at 0. + * numbers start at 0, -1 means no track in other words the y + * position is before the tracks start or after. * * Arguments: * minfo - The widget @@ -1198,7 +1248,7 @@ n = (ypix - minfo->vtitle); if (n < 0) - n = 0; + return minfo->voffset; n /= minfo->vspace; @@ -1222,10 +1272,10 @@ { int ypix; - if (n == -1) + n -= minfo->voffset; + if (n <= -1) return GTK_WIDGET(minfo)->style->klass->xthickness; - n -= minfo->voffset; ypix = n * minfo->vspace + minfo->vtitle; return ypix; @@ -1331,7 +1381,8 @@ * track - Track or NULL */ static void -track_redraw(MelysTrackInfo *minfo, int number, struct trackElement *track) +one_track_redraw(MelysTrackInfo *minfo, int number, + struct trackElement *track) { int x, y; int width, height; diff -rNu melys-0.0.9/widgets/melystrackinfo.m melys-0.0.10/widgets/melystrackinfo.m --- melys-0.0.9/widgets/melystrackinfo.m Thu Aug 19 00:44:39 1999 +++ melys-0.0.10/widgets/melystrackinfo.m Wed Sep 15 13:49:24 1999 @@ -12,8 +12,14 @@ GNU General Public License for more details. This is a widget for the left pane of the track view. -The columns that can be seen will be configurable and will include -the usual information and controls such as 'mute'. +The columns that can be seen will be configurable. + +Now that I know about the gnome canvas widget and am going to +use it for the trackdisplay pane, I suspect that some people will +be wondering why it isn't used here as it looks ideal. I quite +possibly would have used it if I had known about it then. Anyway +there would have still have been pretty much the same amount of +code in the end I think. >>header gtk/gtkwidget.h >>header gtk/gtkadjustment.h @@ -83,20 +89,16 @@ void (*mute_track)(MelysTrackInfo *, struct trackElement *); void (*unmute_track)(MelysTrackInfo *, struct trackElement *); - void (*solo_track)(MelysTrackInfo *, struct rootElement *, - struct trackElement *); - void (*unsolo_track)(MelysTrackInfo *, struct rootElement *, - struct trackElement *); + void (*record_track)(MelysTrackInfo *, struct trackElement *, int); }; >>header melystrack.h >>extern -enum { +enum signals { MUTE_TRACK, UNMUTE_TRACK, - SOLO_TRACK, - UNSOLO_TRACK, + RECORD_TRACK, LAST_SIGNAL }; @@ -138,13 +140,13 @@ int totwidth; /* Total width up to end of this column */ } def_col_info[] = { - {NUMBER, COL_TEXT, "", 20, TRUE}, /* No real need to have this included */ + {NUMBER, COL_TEXT, "", 20, FALSE}, {NAME, COL_TEXT, N_("Name"), 100, TRUE}, {PROGRAM, COL_TEXT, N_("Prog"), 30, 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, FALSE}, + {RECORD, COL_BUTTON, N_("Rec"), 28, TRUE}, }; /* A border to the protect the column lines */ @@ -171,7 +173,6 @@ (GtkSignalFunc)track_info_scroll, minfo); gtk_object_ref((GtkObject*)vadj); - // XXX? gtk_object_sink((GtkObject*)vadj); return w; @@ -218,7 +219,8 @@ minfo->voffset = 0; minfo->mdroot = NULL; - + + >>function melys_track_info_class_init static void MelysTrackInfoClass *klass; The class to initialise @@ -254,22 +256,13 @@ gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); - melys_track_info_signals[SOLO_TRACK] = gtk_signal_new("solo_track", - GTK_RUN_FIRST, + melys_track_info_signals[RECORD_TRACK] = gtk_signal_new("record_track", + GTK_RUN_ACTION, object_class->type, - GTK_SIGNAL_OFFSET(MelysTrackInfoClass, solo_track), - gtk_marshal_NONE__POINTER_POINTER, + GTK_SIGNAL_OFFSET(MelysTrackInfoClass, record_track), + gtk_marshal_NONE__POINTER_INT, GTK_TYPE_NONE, 2, - GTK_TYPE_POINTER, - GTK_TYPE_POINTER); - melys_track_info_signals[UNSOLO_TRACK] = gtk_signal_new("unsolo_track", - GTK_RUN_FIRST, - object_class->type, - GTK_SIGNAL_OFFSET(MelysTrackInfoClass, unsolo_track), - gtk_marshal_NONE__POINTER_POINTER, - GTK_TYPE_NONE, 2, - GTK_TYPE_POINTER, - GTK_TYPE_POINTER); + GTK_TYPE_POINTER, GTK_TYPE_INT); gtk_object_class_add_signals @@ -289,8 +282,7 @@ klass->mute_track = real_mute_track; klass->unmute_track = real_unmute_track; - klass->solo_track = real_solo_track; - klass->unsolo_track = real_unsolo_track; + klass->record_track = NULL; >>function melys_track_info_set_height @@ -338,12 +330,34 @@ if (minfo->mdroot) md_free((struct element *)minfo->mdroot); - root->refcount++; - minfo->mdroot = root; + minfo->mdroot = md_root_inc_ref(root); gtk_widget_queue_draw(GTK_WIDGET(minfo)); +>>function melys_track_info_redraw +void +MelysTrackInfo *minfo; + +>>description +Recalculate and redraw. +The song has changed and now we need to re-draw everything. +Probably only need to re-draw if the number of tracks has changed +in this widget. + +>>code + + gtk_widget_queue_draw(GTK_WIDGET(minfo)); + + /* + * We have to do this because even though the page size has + * not changed, gtk itself modifies the page size that we set + * when it is larger than upper-lower. Therefore we have to + * keep resetting it. + * I consider this a bug in gtk + */ + track_vscroll_calc(minfo); + >>function track_info_realise static void GtkWidget *widget; @@ -375,6 +389,7 @@ attributes.event_mask = gtk_widget_get_events(widget); attributes.event_mask |= (GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | 0 @@ -517,7 +532,7 @@ if (GTK_WIDGET_REALIZED (widget)) { - /* Save the track area */ + /* Save the track area, not including title area */ minfo->track_area.x = allocation->x; minfo->track_area.y = allocation->y + minfo->vtitle; minfo->track_area.width = allocation->width - PAN_PADDING; @@ -527,18 +542,30 @@ allocation->x, allocation->y, allocation->width - PAN_PADDING, allocation->height); - /* - * Calculate how many tracks are visible on the page and set this - * as the page increment. Verge on the low side. - */ - minfo->vadj->page_size = - ((gfloat)minfo->track_area.height / minfo->vspace) - 1.5; - minfo->vadj->page_increment = minfo->vadj->page_size; - - gtk_adjustment_changed(minfo->vadj); + /* Set up the vertical scrollbar */ + track_vscroll_calc(minfo); } + +>>function track_vscroll_calc +static void +MelysTrackInfo *minfo; + +>>description +Calculate how many tracks are visible on the page and set this +as the page increment. +Err on the low side. + +>>code + + minfo->vadj->page_size = + ((gfloat)minfo->track_area.height / minfo->vspace) - 1.5; + minfo->vadj->page_increment = minfo->vadj->page_size; + + gtk_adjustment_changed(minfo->vadj); + + >>function track_info_draw static void GtkWidget *widget; @@ -577,12 +604,6 @@ gdk_window_clear_area(widget->window, ap->x, ap->y, ap->width, ap->height); - gtk_draw_shadow(widget->style, widget->window, - GTK_STATE_NORMAL, GTK_SHADOW_IN, - 0, 0, - minfo->track_area.width, minfo->vtitle + minfo->track_area.height); - - /* This draws in the title row */ draw_row(minfo, -1); @@ -596,13 +617,19 @@ start = y_to_track(minfo, ap->y); end = y_to_track(minfo, ap->y + ap->height) + 1; - if (end > minfo->mdroot->tracks) + if (start < 0) + start = 0; + if (end < 0 || end > minfo->mdroot->tracks) end = minfo->mdroot->tracks; dprintf2("start %d end %d, tracks %d", start, end, minfo->mdroot->tracks); for (ntrack = start; ntrack < end; ntrack++) draw_row(minfo, ntrack); + gtk_draw_shadow(widget->style, widget->window, + GTK_STATE_NORMAL, GTK_SHADOW_IN, + 0, 0, + minfo->track_area.width, minfo->vtitle + minfo->track_area.height); >>function draw_row static void @@ -653,10 +680,8 @@ if (area.x + area.width > wid && area.x < wid) area.width = wid - area.x; - if (cip->kind == COL_TEXT) { - gdk_draw_rectangle(widget->window, bg_gc, TRUE, area.x, area.y, - area.width, area.height); - } + gdk_draw_rectangle(widget->window, bg_gc, TRUE, area.x, area.y, + area.width, area.height); /* * Set up a clipping region for the content area of this cell. @@ -752,6 +777,8 @@ } else { g_snprintf(buf, TMP_BUF_SIZE, "Track %d", ntrack+1); str = buf; + if (track) + track->name = g_strdup(buf); } break; case PROGRAM: @@ -761,8 +788,7 @@ break; case CHANNEL: if (track) - g_snprintf(buf, TMP_BUF_SIZE, "%2d", - MD_ELEMENT(track)->device_channel & 0xf); + g_snprintf(buf, TMP_BUF_SIZE, "%2d", MD_CHAN(track) + 1); str = buf; default: break; @@ -786,6 +812,7 @@ GdkPixmap *pixmap; GdkBitmap *mask; int width, height; + int shadow_type; int x, y; #define BUTTON_SURROUND 2 @@ -795,11 +822,7 @@ widget = (GtkWidget *)minfo; - gtk_draw_shadow(widget->style, widget->window, - GTK_STATE_NORMAL, GTK_SHADOW_OUT, - ap->x, ap->y + BUTTON_SURROUND, - ap->width, ap->height - 2*BUTTON_SURROUND); - + shadow_type = GTK_SHADOW_OUT; pixmap = NULL; mask = NULL; @@ -847,8 +870,15 @@ gdk_gc_set_clip_mask (widget->style->black_gc, NULL); gdk_gc_set_clip_origin (widget->style->black_gc, 0, 0); + + shadow_type = GTK_SHADOW_IN; } + gtk_draw_shadow(widget->style, widget->window, + GTK_STATE_NORMAL, shadow_type, + ap->x, ap->y + BUTTON_SURROUND, + ap->width, ap->height - 2*BUTTON_SURROUND); + >>function track_info_expose static int GtkWidget *widget; @@ -923,14 +953,17 @@ minfo = MELYS_TRACK_INFO(widget); + /* Check if we are in the title area */ + if (event->y < minfo->track_area.y) + return FALSE; /* Will do something later */ + /* Get the appropriate track for this button press */ row = y_to_track(minfo, event->y); - track = md_track_nth(minfo->mdroot, row); + track = md_track_nth(minfo->mdroot, row); if (track == NULL) return FALSE; - /* Now work out the column */ cip = x_to_col_info(minfo, event->x); if (cip == NULL) @@ -1008,6 +1041,7 @@ select_track(minfo, track); } else if (masks == GDK_SHIFT_MASK) { + /* TODO */ } @@ -1016,10 +1050,17 @@ MelysTrackInfo *minfo; struct trackElement *track; Track that was clicked in struct col_info *cip; Column that was clicked in -GdkEventButton *event; +GdkEventButton *event; The click event itself >>code + /* + * The multi-click events just confuse things so we just return if + * we get one. + */ + if (event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) + return; + switch (cip->type) { case MUTE: if (track->mute) @@ -1029,14 +1070,12 @@ break; case SOLO: if (track->solo) - //unsolo_track(minfo, minfo->mdroot, track); unset_solo(minfo, track); else - //solo_track(minfo, minfo->mdroot, track); set_solo(minfo, track); break; case RECORD: - track->record ^= 1; + set_record(minfo, track, event->state); break; default: break; @@ -1057,24 +1096,40 @@ >>code struct trackElement *te; + int last; int i; + if (track->sololast) + last = 1; + else + last = 0; + + track->solo = 1; + track->sololast = 1; + unmute_track(minfo, track); + track->solomute = 0; + for (i = 0; i < minfo->mdroot->tracks; i++) { te = md_track_nth(minfo->mdroot, i); - /* XXX TEMP */ - if (i != track->number) { - te->solo = 0; + if (i == track->number) + continue; + + te->solo = 0; + te->sololast = 0; + + if (te->mute) + continue; + + if (last) { + if (te->solomute) { + mute_track(minfo, te); + te->solomute = 1; + } + } else { mute_track(minfo, te); - te->mute = 1; te->solomute = 1; - } else { - track->solo = 1; - track->sololast = 1; - unmute_track(minfo, te); - te->mute = 0; - te->solomute = 0; } } @@ -1104,9 +1159,52 @@ if (te->solomute) { unmute_track(minfo, te); te->mute = 0; + te->solomute = 1; + } + } + + +>>function set_record +static void +MelysTrackInfo *minfo; +struct trackElement *track; The track that is being set +int modifiers; The modifier keys used + +>>description +A normal click on a record button sets that button and +turns off all others. +If you click while holding the control key, multiple tracks +can be set for recording. +If a button is control-clicked it will toggle. + +>>code + int n; + struct trackElement *tr; + + if ((modifiers & GDK_CONTROL_MASK) == 0) { + /* + * First turn off all any other existing record button. + */ + for (n = 0; n < minfo->mdroot->tracks; n++) { + tr = md_track_nth(minfo->mdroot, n); + if (tr == track) { + one_track_redraw(minfo, -1, tr); + track->record ^= 1; + } else if (tr->record) { + if (tr->record) + one_track_redraw(minfo, -1, tr); + tr->record = 0; + gtk_signal_emit(GTK_OBJECT(minfo), + melys_track_info_signals[RECORD_TRACK], track, 0); + } } + } else { + track->record ^= 1; } + gtk_signal_emit(GTK_OBJECT(minfo), + melys_track_info_signals[RECORD_TRACK], track, 1); + >># ==== Selection and click actions @@ -1127,7 +1225,7 @@ >>code track->selected = 0; - track_redraw(minfo, -1, track); + one_track_redraw(minfo, -1, track); >>function mute_track static void @@ -1136,8 +1234,8 @@ >>code - gtk_signal_emit(GTK_OBJECT(minfo), - melys_track_info_signals[MUTE_TRACK], track); + gtk_signal_emit(GTK_OBJECT(minfo), melys_track_info_signals[MUTE_TRACK], + track); >>function unmute_track static void @@ -1145,8 +1243,8 @@ struct trackElement *track; >>code - gtk_signal_emit(GTK_OBJECT(minfo), - melys_track_info_signals[UNMUTE_TRACK], track); + gtk_signal_emit(GTK_OBJECT(minfo), melys_track_info_signals[UNMUTE_TRACK], + track); >>function real_mute_track static void @@ -1156,7 +1254,7 @@ >>code track->mute = 1; - track_redraw(minfo, -1, track); + one_track_redraw(minfo, -1, track); >>function real_unmute_track @@ -1168,58 +1266,8 @@ track->mute = 0; track->solomute = 0; - track_redraw(minfo, -1, track); - - ->>function solo_track -static void -MelysTrackInfo *minfo; -struct rootElement *root; -struct trackElement *track; - ->>code - dprintf(0, "unreal solo track %d", track->number); - gtk_signal_emit(GTK_OBJECT(minfo), - melys_track_info_signals[SOLO_TRACK], root, track); - ->>function real_solo_track -static void -MelysTrackInfo *minfo; -struct rootElement *root; -struct trackElement *track; - ->>code - dprintf(0, "solo track %d", track->number); - set_solo(minfo, track); - gtk_widget_queue_draw_area(GTK_WIDGET(minfo), - minfo->track_area.x, minfo->track_area.y, - minfo->track_area.width, minfo->track_area.height); - ->>function unsolo_track -static void -MelysTrackInfo *minfo; -struct rootElement *root; -struct trackElement *track; - ->>code - dprintf(0, "unreal unsolo track %d", track->number); - - gtk_signal_emit(GTK_OBJECT(minfo), - melys_track_info_signals[UNSOLO_TRACK], root, track); - + one_track_redraw(minfo, -1, track); ->>function real_unsolo_track -static void -MelysTrackInfo *minfo; -struct rootElement *root; -struct trackElement *track; - ->>code - dprintf(0, "UN-solo track %d", track->number); - unset_solo(minfo, track); - gtk_widget_queue_draw_area(GTK_WIDGET(minfo), - minfo->track_area.x, minfo->track_area.y, - minfo->track_area.width, minfo->track_area.height); >># ==== Utility routines @@ -1231,14 +1279,15 @@ >>description Given a y position within the widget window, return the track number that belongs to that co-ordintate. -Track numbers start at 0. +Track numbers start at 0, -1 means no track in other words +the y position is before the tracks start or after. >>code int n; n = (ypix - minfo->vtitle); if (n < 0) - n = 0; + return minfo->voffset; n /= minfo->vspace; @@ -1260,10 +1309,10 @@ >>code int ypix; - if (n == -1) + n -= minfo->voffset; + if (n <= -1) return GTK_WIDGET(minfo)->style->klass->xthickness; - n -= minfo->voffset; ypix = n * minfo->vspace + minfo->vtitle; return ypix; @@ -1366,7 +1415,7 @@ } ->>function track_redraw +>>function one_track_redraw static void MelysTrackInfo *minfo; int number; Track number or -1