diff -rNu melys-0.0.3/ChangeLog melys-0.0.4/ChangeLog --- melys-0.0.3/ChangeLog Tue Jul 20 11:45:23 1999 +++ melys-0.0.4/ChangeLog Fri Jul 30 00:35:41 1999 @@ -1,4 +1,82 @@ +1999-07-29 Steve Ratcliffe + + * README: Updated the README a little + + * programs/showseq.m: + Modify output slightly to put user/kernel in brackets + + * midi/record.m: Finish off notes that were not released + + * files/mdmlread.m, files/midiread.m, files/midiwrite.m: + Slight re-org so that saving of constructed trees works. + + * md/elements.m, md/mdutil.m: Fixes for record/save of new song + + * song/song.m: Fixes to work better with new song + + * gui/main.m, gui/menus.m: Add save as feature. + Added some keyboard accelerators. + + * midi/play.m: Reset timer so that all tracks start at 0 + + * md/elements.m, midi/record.m, seq/seqlib.m: Track extension now works + + * files/midiread.m, gui/main.m, gui/menus.m, midi/play.m, + midi/record.m, po/melys.pot, po/zz.po, programs/melys.m, + programs/pmidi.m, seq/seqlib.m, seq/seqmidi.m, seq/sequtil.m, + song/song.m: + First working record feature + +1999-07-27 Steve Ratcliffe + + * config/ports.m, files/format.m, gui/main.m, gui/menus.m, + midi/play.m, midi/record.m, programs/melys.m, seq/seqlib.m, + seq/sequtil.m, song/song.m, widgets/register.m, Makefile: + Seemingly endless changes to restructure parts of the + play engine in preparation for record. Now back to the state + it was in before: can play files. + +1999-07-24 Steve Ratcliffe + + * programs/.cvsignore, programs/melys.m, programs/pmidi.m: + Modified to track the library functions + + * mlib/PROJECT/quickdoc.py: added + + * make.conf: Tidied up defines to get rid of duplicates in flags and + link + + * md/mdutil.m: Check for null arg to free + + * md/elements.m: Added the element + + * programs/showseq.m: + A utility to show all the ALSA clients, will probably extend to show + other status stuff for the queues etc. + + * seq/.cvsignore, seq/seqlib.m, seq/seqmidi.m, seq/sequtil.m: + There appears to be vast changes without a lot of new functionality. + Changes mainly to deal with setting, connecting and disconnecting + ports. + + * doc/mdml.dtd: Took out some SGML ism's. Has now been run though a + real xml validating parser so it should now be valid XML. + +1999-07-21 Steve Ratcliffe + + * midi/play.m: Lots of changes but mainly re-organisation. No new + features. Should ease adding record. + 1999-07-20 Steve Ratcliffe + + * seq/seqlib.m: Bugs with freeing the context fixed + + * README: Added note about getting mcode + + * midi/play.m: Fix crash on exit when ctxp was not set. + + * COPYING, ChangeLog, INSTALL, README, make.conf: + Added files and configuration and changelog changes * widgets/register.m: Tidy up and remove printfs. diff -rNu melys-0.0.3/Makefile melys-0.0.4/Makefile --- melys-0.0.3/Makefile Sun Jul 18 23:41:13 1999 +++ melys-0.0.4/Makefile Tue Jul 27 10:01:39 1999 @@ -1,4 +1,4 @@ -DIRS=seq files md util gui po widgets midi programs +DIRS=config song seq files md util gui po widgets midi programs all: build @@ -8,7 +8,7 @@ for i in $(DIRS); \ do (cd $$i; pwd;\ l="$$(echo *.m)"; \ - if [ "$$l" != "*.m" ]; \ + if [ ! -f Makefile -a "$$l" != "*.m" ]; \ then mcode -fmake *.m > Makefile; fi) || exit 1;\ done headers: diff -rNu melys-0.0.3/README melys-0.0.4/README --- melys-0.0.3/README Tue Jul 20 11:53:05 1999 +++ melys-0.0.4/README Fri Jul 30 00:33:37 1999 @@ -8,8 +8,13 @@ 2. Play a file, stop it in the middle and resume it. -3. Close the files. +3. Record a new track. +4. Save the file. + +There is very little of the gui implemented so it is very difficult +to see what is going on. This release is only for the very +adventurous. Requirements. ------------- @@ -29,12 +34,17 @@ Other utilities --------------- -Also in the program directroy you will find two other utilities. +Also in the program directory you will find other utilities. + The first is pmidi which is also available as a standalone distribution -and is a command line interface for playing midi files. The other -is mdmlconv which converts to and from MDML. +and is a command line interface for playing midi files. +This is not functional at present. If you want it get the separate +pmidi distribution. http://www.parabola.demon.co.uk/alsa/pmidi.html + +Mdmlconv which converts MIDI to and from MDML. For example: mdmlconv -o out.mdml infile.mid +Showseq lists out all the ALSA clients. diff -rNu melys-0.0.3/config/.cvsignore melys-0.0.4/config/.cvsignore --- melys-0.0.3/config/.cvsignore Thu Jan 1 00:00:00 1970 +++ melys-0.0.4/config/.cvsignore Fri Jul 30 00:43:11 1999 @@ -0,0 +1,5 @@ +ports.c +Makefile +*.mdml +*.mid +.cvsignore diff -rNu melys-0.0.3/config/Makefile melys-0.0.4/config/Makefile --- melys-0.0.3/config/Makefile Thu Jan 1 00:00:00 1970 +++ melys-0.0.4/config/Makefile Fri Jul 30 00:43:11 1999 @@ -0,0 +1,37 @@ + + +TOP = .. +include $(TOP)/make.conf + +TARGETS = +OBJS = ports.o +GENCFILES = ports.c +GENHFILES = ../include/config.h + + + +# Build all the targets. +# +all: $(TARGETS) $(OBJS) + + + +# Remove all object files and exectutables +# +clean: + rm -f $(TARGETS) $(OBJS) core a.out + +# Remove all generated and built files. +# +clobber: clean + rm -f $(GENCFILES) $(GENHFILES) Makefile + +cfiles: $(GENCFILES) + +hfiles headers: + mcode -f header *.m + +.SUFFIXES: .m +.m.c: + mcode $(MCODEFLAGS) -o $@ $< + diff -rNu melys-0.0.3/config/ports.c melys-0.0.4/config/ports.c --- melys-0.0.3/config/ports.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.4/config/ports.c Fri Jul 30 00:43:16 1999 @@ -0,0 +1,79 @@ +/* + * + * 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 +#include "linux/asequencer.h" +#include "seqlib.h" +#include "config.h" +#include "intl.h" + + + +/* + * Get the input ports that have been configured for use. + * + * Arguments: + * addrp - Address returned here + */ +int +conf_get_input_ports(snd_seq_addr_t **addrp) +{ + char *portdesc; + int naddr; + + /* At present there is no configuration of course */ + portdesc = getenv("ALSA_INPUT_PORTS"); + if (portdesc == NULL) { + ethrow(debugError, "ALSA_INPUT_PORTS not set in environment"); + return 0; + } + + naddr = seq_get_ports_from_desc(portdesc, addrp); + + return naddr; +} + +/* + * Get the output ports that have been configured. + * + * Arguments: + * addrp - Address returned here + */ +int +conf_get_output_ports(snd_seq_addr_t **addrp) +{ + char *portdesc; + int naddr; + + /* At present there is no configuration of course */ + portdesc = getenv("ALSA_OUTPUT_PORTS"); + if (portdesc == NULL) { + /* Old name, for compatability */ + portdesc = getenv("ALSA_OUT_PORT"); + if (portdesc == NULL) { + ethrow(debugError, "ALSA_OUTPUT_PORTS not set in environment"); + return 0; + } + } + + naddr = seq_get_ports_from_desc(portdesc, addrp); + + return naddr; +} diff -rNu melys-0.0.3/doc/mdml.dtd melys-0.0.4/doc/mdml.dtd --- melys-0.0.3/doc/mdml.dtd Sun Jul 18 23:41:13 1999 +++ melys-0.0.4/doc/mdml.dtd Sat Jul 24 11:03:11 1999 @@ -1,4 +1,3 @@ - @@ -28,7 +27,7 @@ version, format, timebase, title?, author?, comment?)> - + - + - + - + @@ -81,11 +80,11 @@ division CDATA #REQUIRED > - + - + - + @@ -96,7 +95,7 @@ @@ -163,7 +162,7 @@ @@ -216,4 +215,3 @@ -]> diff -rNu melys-0.0.3/files/Makefile melys-0.0.4/files/Makefile --- melys-0.0.3/files/Makefile Tue Jul 20 23:07:27 1999 +++ melys-0.0.4/files/Makefile Fri Jul 30 00:43:12 1999 @@ -29,16 +29,16 @@ # Remove all object files and exectutables # clean: - rm -f $(OBJS) core a.out + rm -f $(TARGETS) $(OBJS) core a.out # Remove all generated and built files. # clobber: clean - rm -f $(TARGETS) $(GENCFILES) $(GENHFILES) Makefile + rm -f $(GENCFILES) $(GENHFILES) Makefile cfiles: $(GENCFILES) -headers: +hfiles headers: mcode -f header *.m .SUFFIXES: .m diff -rNu melys-0.0.3/files/format.c melys-0.0.4/files/format.c --- melys-0.0.3/files/format.c Tue Jul 20 23:07:36 1999 +++ melys-0.0.4/files/format.c Fri Jul 30 00:43:17 1999 @@ -138,3 +138,40 @@ type = file_guess_type(filename); return file_get_write_func(type); } + +/* + * Read in the file filename . On error NULL is returned and a + * message is returned into errmsg . + * + * Arguments: + * filename - File to read + * errmsg - An error message to be displayed. + */ +struct rootElement * +file_guess_read_with_msg(char *filename, char **errmsg) +{ + char *type; + struct rootElement *root; + fileReadFunc readfn; + + *errmsg = NULL; + + type = file_guess_type(filename); + if (type == NULL) { + *errmsg = _("Unrecognised file type"); + return NULL; + } + + readfn = file_get_read_func(type); + if (readfn == NULL) { + *errmsg = _("Unrecognised file type"); + return NULL; + } + + root = readfn(filename); + + if (root == NULL) + *errmsg = _("Could not read file"); + + return root; +} diff -rNu melys-0.0.3/files/mdmlread.c melys-0.0.4/files/mdmlread.c --- melys-0.0.3/files/mdmlread.c Tue Jul 20 23:07:36 1999 +++ melys-0.0.4/files/mdmlread.c Fri Jul 30 00:43:17 1999 @@ -185,13 +185,11 @@ msp->currtime = 0; msp->maxtime = 0; msp->devchan = 0; - msp->root->head->tracks++; retel = MD_ELEMENT(md_track_new()); } else if (strcmp(name, "tempomap") == 0) { struct tempomapElement *tmap; tmap = md_tempomap_new(); - msp->root->head->tracks++; retel = MD_ELEMENT(tmap); } else if (strcmp(name, "part") == 0) { @@ -325,7 +323,6 @@ * like time and channel that can apply to almost any element. * * Arguments: - * msp - * node - Node to examine for attributes * el - Element to set attributes */ diff -rNu melys-0.0.3/files/midiread.c melys-0.0.4/files/midiread.c --- melys-0.0.3/files/midiread.c Tue Jul 20 23:07:36 1999 +++ melys-0.0.4/files/midiread.c Fri Jul 30 00:43:17 1999 @@ -37,7 +37,7 @@ int current_time; /* Current midi time */ int port; /* Midi port number */ int device; /* Midi device number */ - int track_count; /* Count of current track */ + int num_chunks; /* Count of chunks */ int chunk_size; /* Size of current chunk */ int chunk_count; /* Count within current chunk */ GPtrArray *notes; /* Currently on notes */ @@ -45,6 +45,7 @@ struct tempomapElement *tempo_map; /* The tempo map */ struct headElement *head; /* Pointer into head element */ + struct rootElement *root; /* Pointer into the root */ }; static struct rootElement *read_head(struct midistate *msp); static struct trackElement *read_track(struct midistate *msp); @@ -57,7 +58,7 @@ static gint32 read_var(struct midistate *msp); static void put_back(struct midistate *msp, char c); static struct element *save_note(struct midistate *msp, int note, int vel); -static void finish_note(struct midistate *msp, int note, int vel); +static void finish_note(struct midistate *msp, int note, int offvel); static void skip_chunk(struct midistate *msp); @@ -84,8 +85,11 @@ msp->port = 0; root = read_head(msp); - md_add(MD_CONTAINER(root), NULL); /* Leave room for the tempo map */ - for (i = 0; i < msp->head->tracks; i++) { + md_add(MD_CONTAINER(root), MD_ELEMENT(msp->tempo_map)); + + msp->root->tracks = 0; /* Is re-calculated when tracks are added */ + + for (i = 0; i < msp->num_chunks; i++) { el = MD_ELEMENT(read_track(msp)); /* If format 1 then the first track is really the tempo map */ @@ -98,7 +102,7 @@ md_add(MD_CONTAINER(root), el); } - g_ptr_array_index(MD_CONTAINER(root)->elements, 1) = msp->tempo_map; + //g_ptr_array_index(MD_CONTAINER(root)->elements, 1) = msp->tempo_map; msp->tempo_map = NULL; g_ptr_array_free(msp->notes, 1); @@ -147,6 +151,7 @@ head = md_head_new(); md_add(MD_CONTAINER(root), MD_ELEMENT(head)); root->head = head; + msp->root = root; msp->head = head; /* The first word just identifies the file as a midi file */ @@ -161,7 +166,7 @@ ethrow(formatError, _("Bad header length, probably not a real midi file")); head->format = read_int(msp, 2); - head->tracks = read_int(msp, 2); + msp->num_chunks = read_int(msp, 2); head->time_base = read_int(msp, 2); /* Should skip any extra bytes, (may not be seekable) */ @@ -238,8 +243,6 @@ goto restart; } - msp->track_count++; - MD_CONTAINER(track)->duration = msp->track_duration; msp->track_duration = 0; @@ -573,10 +576,10 @@ * Arguments: * msp - Midi file state * note - Note number - * vel - Note velocity + * offvel - Note off velocity */ static void -finish_note(struct midistate *msp, int note, int vel) +finish_note(struct midistate *msp, int note, int offvel) { int i; GPtrArray *notes; @@ -589,7 +592,7 @@ n = g_ptr_array_index(notes, i); if (n->note == note && MD_ELEMENT(n)->device_channel == msp->device) { len = msp->current_time - MD_ELEMENT(n)->element_time; - n->offvel = vel; + n->offvel = offvel; n->length = len; if (n->length < 0) { printf("Len neg: msp->time%d, s->time%d, note=%d, s.vel%d\n", diff -rNu melys-0.0.3/files/midiwrite.c melys-0.0.4/files/midiwrite.c --- melys-0.0.3/files/midiwrite.c Tue Jul 20 23:07:37 1999 +++ melys-0.0.4/files/midiwrite.c Fri Jul 30 00:43:17 1999 @@ -122,10 +122,15 @@ switch (el->type) { case MD_TYPE_ROOT: if (flags & MD_WALK_START) { + int nchunks; + put_int(msp, 4, MIDI_HEAD_MAGIC); put_int(msp, 4, 6); /* Header length, always 6 */ put_int(msp, 2, msp->root->head->format); - put_int(msp, 2, msp->root->head->tracks); + nchunks = msp->root->tracks; + if (msp->root->head->format == 1) + nchunks++; + put_int(msp, 2, nchunks); put_int(msp, 2, msp->root->head->time_base); } break; diff -rNu melys-0.0.3/gui/Makefile melys-0.0.4/gui/Makefile --- melys-0.0.3/gui/Makefile Tue Jul 20 23:07:28 1999 +++ melys-0.0.4/gui/Makefile Fri Jul 30 00:43:12 1999 @@ -22,16 +22,16 @@ # Remove all object files and exectutables # clean: - rm -f $(OBJS) core a.out + rm -f $(TARGETS) $(OBJS) core a.out # Remove all generated and built files. # clobber: clean - rm -f $(TARGETS) $(GENCFILES) $(GENHFILES) Makefile + rm -f $(GENCFILES) $(GENHFILES) Makefile cfiles: $(GENCFILES) -headers: +hfiles headers: mcode -f header *.m .SUFFIXES: .m diff -rNu melys-0.0.3/gui/main.c melys-0.0.4/gui/main.c --- melys-0.0.3/gui/main.c Tue Jul 20 23:07:38 1999 +++ melys-0.0.4/gui/main.c Fri Jul 30 00:43:19 1999 @@ -22,12 +22,13 @@ #include "menus.h" #include "elements.h" #include "melreg.h" -#include "melplay.h" +#include "melmidi.h" +#include "song.h" #include "melgui.h" #include "intl.h" GtkWidget *GlobalNewView; /* XXX */ -static int add_view_cb(GnomeMDI *mdi, GtkWidget *widget, gpointer user_data); +static int add_view_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data); /* @@ -43,6 +44,9 @@ GnomeMDI *mdi; GnomeMDIGenericChild *child; int *child_count; + struct song *song; + + gnome_init("melys", "0.0.1", argc, argv); mdi = GNOME_MDI(gnome_mdi_new("melys", _("The Melys sequencer"))); @@ -57,7 +61,11 @@ /* Create the first child */ child = gnome_mdi_generic_child_new(_("Untitled")); - create_child_data(mdi, GNOME_MDI_GENERIC_CHILD(child)); + song = song_new(GTK_OBJECT(mdi), GTK_OBJECT(child)); + + song_open_file(song, NULL); + + /* Get warning, will all be changed anyway */ gnome_mdi_generic_child_set_view_creator(child, create_view, "FOO"); gnome_mdi_add_child(mdi, GNOME_MDI_CHILD(child)); gnome_mdi_add_toplevel_view(mdi, GNOME_MDI_CHILD(child)); @@ -80,110 +88,19 @@ * Arguments: * mdi - The MDI to find the active child */ -struct child_data * -get_child_data_from_mdi(GnomeMDI *mdi) +struct song * +get_song_from_mdi(GtkObject *mdi) { - struct child_data *cd; + struct song *sd; GnomeMDIChild *child; - child = gnome_mdi_get_active_child(mdi); + child = gnome_mdi_get_active_child(GNOME_MDI(mdi)); if (child == NULL) ethrow(debugError, "No active child"); - cd = gtk_object_get_data(GTK_OBJECT(child), MEL_CHILD_DATA); - if (cd == NULL) - //cd = create_child_data(mdi, GNOME_MDI_GENERIC_CHILD(child)); - g_assert_not_reached(); - - return cd; -} - -/* - * Get the child info data from the specified child. If it does - * not exist then this is an error, you are meant to access it - * from the parent mdi first. - * Arguments: - * child - Child to get data from - */ -struct child_data * -get_child_data(GnomeMDIGenericChild *child) -{ - struct child_data *cd; - - cd = gtk_object_get_data(GTK_OBJECT(child), MEL_CHILD_DATA); - if (cd == NULL) - ethrow(debugError, "No child data in get_child_data"); - - return cd; -} - -/* - * Create and initialise the child data. The newly created - * data is returned. - * - * Arguments: - * mdi - The parent MDI - * child - Child on which to create the data - */ -struct child_data * -create_child_data(GnomeMDI *mdi, GnomeMDIGenericChild *child) -{ - struct child_data *cd; - - cd = g_new(struct child_data, 1); - cd->mdi = mdi; - cd->child = child; - cd->filename = NULL; - cd->mdroot = NULL; - cd->open_dialog = 0; - cd->save_dialog = 0; - cd->dialog = 0; - cd->play = play_new(); - - gtk_object_set_data_full(GTK_OBJECT(child), MEL_CHILD_DATA, - cd, destroy_child_data); - - return cd; -} - -/* - * Destroy the child data structure and any resourse - * allocated off it. This will be called automatically when - * the child is destroyed. - * - * Arguments: - * data - - */ -void -destroy_child_data(gpointer data) -{ - struct child_data *cd; - GtkWidget *w; - - cd = data; - - /* Destroy all resources */ - if (cd->mdroot) { - md_free(MD_ELEMENT(cd->mdroot)); - cd->mdroot = NULL; - } - - if (cd->open_dialog) { - w = reg_get_widget(cd->open_dialog); - if (w) - gtk_widget_destroy(w); - } - if (cd->save_dialog) { - w = reg_get_widget(cd->save_dialog); - if (w) - gtk_widget_destroy(w); - } + sd = song_get_data(GTK_OBJECT(child)); - if (cd->play) - play_free(cd->play); - - /* Free the data itself */ - g_free(cd); + return sd; } /* @@ -192,7 +109,7 @@ * mdi - MDI to set count on */ int -get_child_count(GnomeMDI *mdi) +get_child_count(GtkObject *mdi) { int *ip; @@ -207,7 +124,7 @@ * count - The new count to set */ void -set_child_count(GnomeMDI *mdi, int count) +set_child_count(GtkObject *mdi, int count) { int *ip; @@ -216,25 +133,52 @@ } /* - * TEMPORARY. This is just junk + * Put up an error box. There can only be one error box active for + * a file at once although they are not modal. Another message + * will just cause the original to go away. If parent is + * supplied then when that object is destroyed or unmapped the + * dialog will be destroyed to. + * * Arguments: - * child - - * data - + * msg - The message to place in the dialog box + * parent - The parent that the dialog 'belongs' to + */ +void +mel_ui_error(struct song *sd, char *msg, GtkObject *parent) +{ + GtkWidget *dialog; + + /* Destroy any old one */ + reg_destroy(sd->dialog); + + /* Create the gnome dialog */ + dialog = gnome_error_dialog(msg); + + sd->dialog = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); + + /* Destroy dialog when the parent is hidden as well */ + if (parent) + gtk_signal_connect_object_while_alive(GTK_OBJECT(parent), "hide" + , gtk_widget_destroy, GTK_OBJECT(dialog)); +} + +/* + * TEMPORARY. This is just junk */ /*XXX static*/GtkWidget * -create_view(GnomeMDIChild *child, gpointer data) +create_view(GtkObject *child, gpointer data) { GtkWidget *new; GtkWidget *lab; - struct child_data *cd; + struct song *sd; char *labtxt; mel_debug_print_type("child", GTK_OBJECT(child)); - cd = get_child_data(GNOME_MDI_GENERIC_CHILD(child)); + sd = song_get_data(GTK_OBJECT(child)); new = gtk_frame_new("label"); labtxt = g_strdup_printf("This is a null view of the file\n" - "%s\n", cd->filename? g_basename(cd->filename): ""); + "%s\n", sd->filename? g_basename(sd->filename): ""); lab = gtk_label_new(labtxt); gtk_container_add(GTK_CONTAINER(new), lab); g_free(labtxt); @@ -254,7 +198,7 @@ * user_data - User data */ static int -add_view_cb(GnomeMDI *mdi, GtkWidget *widget, gpointer user_data) +add_view_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data) { //gnome_mdi_set_active_view(mdi, widget); diff -rNu melys-0.0.3/gui/menus.c melys-0.0.4/gui/menus.c --- melys-0.0.3/gui/menus.c Tue Jul 20 23:07:38 1999 +++ melys-0.0.4/gui/menus.c Fri Jul 30 00:43:19 1999 @@ -22,25 +22,33 @@ #include "melgui.h" #include "format.h" #include "melreg.h" -#include "melplay.h" +#include "seqlib.h" +#include "elements.h" +#include "melmidi.h" +#include "song.h" #include "menus.h" #include "intl.h" static void open_cb(GtkWidget *wid, gpointer data); static void open_ok_cb(GtkWidget *button, gpointer data); +static void save_as_cb(GtkWidget *mi, gpointer data); +static void save_ok_cb(GtkWidget *button, gpointer data); static void file_cancel_cb(GtkWidget *button, gpointer data); static void close_cb(GtkWidget *w, gpointer data); static void close_all_cb(GtkWidget *w, gpointer data); static void exit_cb(GtkWidget *w, gpointer data); static void start_cb(GtkWidget *w, gpointer data); +static void pause_cb(GtkWidget *w, gpointer data); static void stop_cb(GtkWidget *w, gpointer data); -static void rewind_cb(GtkWidget *w, gpointer data); +static void record_cb(GtkWidget *w, gpointer data); +static void record_stop_cb(GtkWidget *w, gpointer data); /* The file menu */ GnomeUIInfo filemenu[] = { GNOMEUIINFO_MENU_OPEN_ITEM(open_cb, NULL), GNOMEUIINFO_MENU_CLOSE_ITEM(close_cb, NULL), + GNOMEUIINFO_MENU_SAVE_AS_ITEM(save_as_cb, NULL), GNOMEUIINFO_SEPARATOR, GNOMEUIINFO_MENU_EXIT_ITEM(exit_cb, NULL), GNOMEUIINFO_END @@ -52,7 +60,7 @@ * filled in at run time */ GnomeUIInfo windowmenu[] = { - {GNOME_APP_UI_ITEM, N_("_Close all (not yet)"), N_("Close all open windows"), + {GNOME_APP_UI_ITEM, N_("_Close all"), N_("Close all open windows"), close_all_cb, (gpointer)0, (gpointer)0, /* Callback and data */ (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ 0, (GdkModifierType)0, /* Accel */ @@ -63,11 +71,37 @@ /* The play menu */ /* NOTE add accelerators later */ -GnomeUIInfo playmenu[] = { - GNOMEUIINFO_ITEM_NONE(N_("_Start"), N_("Start playing"), start_cb), - GNOMEUIINFO_ITEM_NONE(N_("S_top"), N_("Stop playing"), stop_cb), - GNOMEUIINFO_ITEM_NONE(N_("Rewind (not yet)"), N_("Go to the beginning of the song"), - rewind_cb), +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 */ + 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 */ + '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 */ + ' ', (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 */ + GDK_KP_Add, (GdkModifierType)0, /* Accel */ + (GtkWidget*)0 }, + + {GNOME_APP_UI_ITEM, N_("Record stop"), N_("Stop recording"), + record_stop_cb, (gpointer)0, (gpointer)0, /* Callback and data */ + 0, NULL, /* Pixmap */ + GDK_KP_Subtract, (GdkModifierType)0, /* Accel */ + (GtkWidget*)0 }, + GNOMEUIINFO_END }; @@ -80,7 +114,7 @@ /* The menubar, made up of the file menu etc */ GnomeUIInfo menubar[] = { GNOMEUIINFO_MENU_FILE_TREE(filemenu), - GNOMEUIINFO_SUBTREE(N_("_Play"), playmenu), + GNOMEUIINFO_SUBTREE(N_("_Actions"), actionmenu), GNOMEUIINFO_MENU_WINDOWS_TREE(windowmenu), GNOMEUIINFO_MENU_HELP_TREE(helpmenu), GNOMEUIINFO_END @@ -115,24 +149,24 @@ static void open_cb(GtkWidget *wid, gpointer data) { - GnomeMDI *mdi = data; - GnomeMDIGenericChild *child; - struct child_data *cd; + GtkObject *mdi = data; + GtkObject *child; + struct song *sd; GtkWidget *w; GtkFileSelection *sel; - cd = get_child_data_from_mdi(mdi); - child = cd->child; + sd = get_song_from_mdi(mdi); + child = sd->child; /* Get a new file selection dialog or re-use the old one */ w = NULL; - if (cd->open_dialog) - w = reg_get_widget(cd->open_dialog); + if (sd->open_dialog) + w = reg_get_widget(sd->open_dialog); if (w == NULL) { w = gtk_file_selection_new(_("Select the file to read in...")); sel = GTK_FILE_SELECTION(w); - cd->open_dialog = reg_object(GTK_OBJECT(sel), GTK_OBJECT(child)); + sd->open_dialog = reg_object(GTK_OBJECT(sel), GTK_OBJECT(child)); gtk_signal_connect(GTK_OBJECT(sel->ok_button), "clicked", open_ok_cb, child); @@ -149,16 +183,13 @@ /* * Open a file. A new child window will be created if necessary. * - * Arguments: - * button - - * data - */ static void open_ok_cb(GtkWidget *button, gpointer data) { - GnomeMDI *mdi; - GnomeMDIGenericChild *child = GNOME_MDI_GENERIC_CHILD(data); - struct child_data *cd = get_child_data(child); + GtkObject *mdi; + GtkObject *child = GTK_OBJECT(data); + struct song *sd = song_get_data(child); GtkFileSelection *sel; fileReadFunc readfn; gchar *basename; @@ -166,7 +197,7 @@ int open_id; /* Get the filename that the user selected */ - open_id = cd->open_dialog; + open_id = sd->open_dialog; sel = (GtkFileSelection*)reg_get(open_id); if (sel == NULL) { printf("NO sel\n"); @@ -178,7 +209,6 @@ readfn = file_guess_read_func(filename); if (readfn == NULL) { char *msg; - GtkWidget *dialog; /* Failed so put up a message for the user */ msg = g_strdup_printf(_("The file %s\n" @@ -187,44 +217,37 @@ "extension of .mid or .mdml" ), filename); - /* Destroy any old one */ - reg_destroy(cd->dialog); - - dialog = gnome_error_dialog(msg); - cd->dialog = reg_object(GTK_OBJECT(dialog), (GtkObject*)sel); - - /* Destroy dialog when the file selection is hidden */ - gtk_signal_connect_object_while_alive(GTK_OBJECT(sel), "hide" - , gtk_widget_destroy, GTK_OBJECT(dialog)); + mel_ui_error(sd, msg, GTK_OBJECT(sel)); g_free(msg); return; } - mdi = cd->mdi; + mdi = sd->mdi; /* * If this child already has a file or music data, then we need * to create a new file. This will usually be the case except * after the first open. */ - if (cd->mdroot || cd->filename) { + if (sd->mdroot || sd->filename) { int count; basename = g_basename(filename); - child = gnome_mdi_generic_child_new(basename); + child = (GtkObject*)gnome_mdi_generic_child_new(basename); - cd = create_child_data(mdi, child); - cd->filename = filename; - cd->open_dialog = open_id; + sd = song_new(GTK_OBJECT(mdi), GTK_OBJECT(child)); + sd->filename = filename; + sd->open_dialog = open_id; count = get_child_count(mdi); set_child_count(mdi, ++count); - gnome_mdi_generic_child_set_view_creator(child, create_view, "FOO"); - gnome_mdi_add_child(mdi, GNOME_MDI_CHILD(child)); - gnome_mdi_add_view(mdi, GNOME_MDI_CHILD(child)); + gnome_mdi_generic_child_set_view_creator + (GNOME_MDI_GENERIC_CHILD(child), create_view, "FOO"); + gnome_mdi_add_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); + gnome_mdi_add_view(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); } else { /* @@ -242,23 +265,113 @@ while (gtk_events_pending()) gtk_main_iteration(); - gnome_mdi_set_active_view(mdi, GlobalNewView); + gnome_mdi_set_active_view(GNOME_MDI(mdi), GlobalNewView); } gtk_widget_hide(GTK_WIDGET(sel)); /* read in the file */ - cd->mdroot = readfn(filename); - play_set_mdroot(cd->play, cd->mdroot); + song_open_file(sd, filename); +} + +/* + * Bring up a save-as dialog and write the song to the selected + * file. + * + * Arguments: + * mi - The menu item selected + * data - The mdi object + */ +static void +save_as_cb(GtkWidget *mi, gpointer data) +{ + GtkObject *mdi = data; + GtkObject *child; + struct song *sd; + GtkWidget *w; + GtkFileSelection *sel; + + sd = get_song_from_mdi(mdi); + child = sd->child; + + /* Get a new file selection dialog or re-use the old one */ + w = NULL; + if (sd->save_dialog) + w = reg_get_widget(sd->save_dialog); + + if (w == NULL) { + w = gtk_file_selection_new(_("Select the file name to write to...")); + sel = GTK_FILE_SELECTION(w); + sd->save_dialog = reg_object(GTK_OBJECT(sel), GTK_OBJECT(child)); + + gtk_signal_connect(GTK_OBJECT(sel->ok_button), "clicked", + save_ok_cb, child); + gtk_signal_connect(GTK_OBJECT(sel->cancel_button), "clicked", + file_cancel_cb, sel); + } else { + + /* Else reuse it, and ensure raised */ + gdk_window_raise(w->window); + } + gtk_widget_show(w); +} + +/* + * User has selected a file to write to. All we now have to do is + * write it out! + * + */ +static void +save_ok_cb(GtkWidget *button, gpointer data) +{ + GtkObject *mdi; + GtkObject *child = GTK_OBJECT(data); + struct song *sd = song_get_data(child); + GtkFileSelection *sel; + fileWriteFunc writefn; + char *filename; + int save_id; + + /* Get the filename that the user selected */ + save_id = sd->save_dialog; + sel = (GtkFileSelection*)reg_get(save_id); + if (sel == NULL) { + printf("NO sel\n"); + return; + } + filename = gtk_file_selection_get_filename(sel); + + /* Try to guess its type */ + writefn = file_guess_write_func(filename); + if (writefn == NULL) { + char *msg; + + /* Failed so put up a message for the user */ + msg = g_strdup_printf(_("The file %s\n" + "does not have a known extension.\n" + "Please select a file with an\n" + "extension of .mid or .mdml" + ), filename); + + mel_ui_error(sd, msg, GTK_OBJECT(sel)); + + g_free(msg); + + return; + } + + mdi = sd->mdi; + + gtk_widget_hide(GTK_WIDGET(sel)); + + /* write out the file */ + writefn(filename, sd->mdroot, 0); } /* * Cancel has been clicked, so just hide the dialog. Allows you * to carry on from where you left off after a cancel. * - * Arguments: - * button - - * data - */ static void file_cancel_cb(GtkWidget *button, gpointer data) @@ -279,13 +392,13 @@ static void close_cb(GtkWidget *w, gpointer data) { - GnomeMDI *mdi = GNOME_MDI(data); - struct child_data *cd = get_child_data_from_mdi(mdi); + GtkObject *mdi = GTK_OBJECT(data); + struct song *sd = get_song_from_mdi(mdi); int count; count = get_child_count(mdi); - if (count > 1 && cd->child) { - gnome_mdi_remove_child(mdi, GNOME_MDI_CHILD(cd->child), 0); + if (count > 1 && sd->child) { + gnome_mdi_remove_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(sd->child), 0); set_child_count(mdi, --count); } } @@ -300,10 +413,10 @@ static void close_all_cb(GtkWidget *w, gpointer data) { - //GnomeMDI *mdi = GNOME_MDI(data); + GnomeMDI *mdi = GNOME_MDI(data); - g_warning("Close all not implemented yet"); - //gnome_mdi_remove_all(mdi, 0); + g_warning("Close all not fully implemented yet"); + gnome_mdi_remove_all(mdi, 0); } /* @@ -320,7 +433,14 @@ GnomeMDI *mdi = GNOME_MDI(data); /* TODO: check for unsaved stuff */ + + /* Make some attempt to clean up to help in memleak detection */ gnome_mdi_remove_all(mdi, FALSE); + gtk_object_destroy(GTK_OBJECT(mdi)); + + while (gtk_events_pending()) + gtk_main_iteration(); + gtk_main_quit(); } @@ -334,30 +454,54 @@ static void start_cb(GtkWidget *w, gpointer data) { - GnomeMDI *mdi = GNOME_MDI(data); - struct child_data *cd; + GtkObject *mdi = GTK_OBJECT(data); + struct song *sd; + + sd = get_song_from_mdi(mdi); + + song_play_start(sd); +} + +static void +pause_cb(GtkWidget *w, gpointer data) +{ + GtkObject *mdi = GTK_OBJECT(data); + struct song *sd; - cd = get_child_data_from_mdi(mdi); + sd = get_song_from_mdi(mdi); - if (cd) - play_start(cd->play); + song_play_pause(sd); } static void stop_cb(GtkWidget *w, gpointer data) { - GnomeMDI *mdi = GNOME_MDI(data); - struct child_data *cd; + GtkObject *mdi = GTK_OBJECT(data); + struct song *sd; + + sd = get_song_from_mdi(mdi); + + song_play_stop(sd); +} + +static void +record_cb(GtkWidget *w, gpointer data) +{ + GtkObject *mdi = GTK_OBJECT(data); + struct song *sd; - cd = get_child_data_from_mdi(mdi); + sd = get_song_from_mdi(mdi); - if (cd) - play_stop(cd->play); + song_record_start(sd); } static void -rewind_cb(GtkWidget *w, gpointer data) +record_stop_cb(GtkWidget *w, gpointer data) { + GtkObject *mdi = GTK_OBJECT(data); + struct song *sd; - printf("Rewind is not implemented yet\n"); + sd = get_song_from_mdi(mdi); + + song_record_stop(sd); } diff -rNu melys-0.0.3/include/config.h melys-0.0.4/include/config.h --- melys-0.0.3/include/config.h Thu Jan 1 00:00:00 1970 +++ melys-0.0.4/include/config.h Fri Jul 30 00:43:13 1999 @@ -0,0 +1,18 @@ +/* + * + * 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. + * + * + */ + +int conf_get_input_ports(snd_seq_addr_t **addrp); +int conf_get_output_ports(snd_seq_addr_t **addrp); diff -rNu melys-0.0.3/include/elements.h melys-0.0.4/include/elements.h --- melys-0.0.3/include/elements.h Tue Jul 20 23:07:34 1999 +++ melys-0.0.4/include/elements.h Fri Jul 30 00:43:14 1999 @@ -51,6 +51,7 @@ struct rootElement { struct containerElement parent; struct headElement *head; /* Pointer to the head information */ + short tracks; /* Number of tracks */ }; #define MD_ROOT(e) \ ((struct rootElement *)md_check_cast((struct element *)(e), MD_TYPE_ROOT)) @@ -61,7 +62,6 @@ short ver_major; /* Major part of version number */ short ver_minor; /* Minor part of version number */ short format; /* Midi format */ - short tracks; /* Number of tracks */ short time_base; /* Time base value */ char *copyright; /* A copyright message */ char *author; /* Author information */ @@ -104,6 +104,13 @@ ((struct partElement *)md_check_cast((struct element *)(e), MD_TYPE_PART)) +struct takeElement { + struct containerElement parent; +}; +#define MD_TAKE(e) \ + ((struct takeElement *)md_check_cast((struct element *)(e), MD_TYPE_TAKE)) + + struct controlElement { struct element parent; char control; /* Controller number */ @@ -229,6 +236,7 @@ struct tempomapElement *md_tempomap_new(); struct noteElement *md_note_new(char note, char vel, short length); struct partElement *md_part_new(void); +struct takeElement *md_take_new(void); struct controlElement *md_control_new(char control, char value); struct programElement *md_program_new(int program); struct keytouchElement *md_keytouch_new(int note, int vel); @@ -250,24 +258,25 @@ /* Defines for types */ -#define MD_TYPE_PART (0 + MD_CONTAINER_BEGIN) +#define MD_TYPE_TEXT 0 #define MD_TYPE_ROOT (1 + MD_CONTAINER_BEGIN) -#define MD_TYPE_KEYTOUCH 2 -#define MD_TYPE_TEXT 3 +#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_PROGRAM 6 -#define MD_TYPE_META 7 -#define MD_TYPE_TEMPOMAP (8 + MD_CONTAINER_BEGIN) -#define MD_TYPE_NOTE 9 -#define MD_TYPE_ELEMENT 10 -#define MD_TYPE_KEYSIG 11 -#define MD_TYPE_TEMPO 12 -#define MD_TYPE_SYSEX 13 -#define MD_TYPE_TRACK (14 + MD_CONTAINER_BEGIN) -#define MD_TYPE_PRESSURE 15 -#define MD_TYPE_TIMESIG 16 -#define MD_TYPE_CONTAINER 17 -#define MD_TYPE_HEAD (18 + MD_CONTAINER_BEGIN) -#define MD_TYPE_MAP 19 -#define MD_TYPE_CONTROL 20 +#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 diff -rNu melys-0.0.3/include/format.h melys-0.0.4/include/format.h --- melys-0.0.3/include/format.h Tue Jul 20 23:07:34 1999 +++ melys-0.0.4/include/format.h Fri Jul 30 00:43:14 1999 @@ -21,3 +21,4 @@ fileWriteFunc file_get_write_func(char *type); fileReadFunc file_guess_read_func(char *filename); fileWriteFunc file_guess_write_func(char *filename); +struct rootElement *file_guess_read_with_msg(char *filename, char **errmsg); diff -rNu melys-0.0.3/include/md.h melys-0.0.4/include/md.h --- melys-0.0.3/include/md.h Tue Jul 20 23:07:34 1999 +++ melys-0.0.4/include/md.h Fri Jul 30 00:43:14 1999 @@ -13,7 +13,6 @@ * GNU General Public License for more details. * * - * */ /* Defines for md_walk() */ @@ -51,3 +50,4 @@ struct element *md_sequence_next(struct sequenceState *seq); void md_sequence_end(struct sequenceState *seq); unsigned long md_sequence_duration(struct sequenceState *seq); +struct rootElement *md_empty(); diff -rNu melys-0.0.3/include/melgui.h melys-0.0.4/include/melgui.h --- melys-0.0.3/include/melgui.h Tue Jul 20 23:07:35 1999 +++ melys-0.0.4/include/melgui.h Fri Jul 30 00:43:15 1999 @@ -14,38 +14,10 @@ * */ -/* - * Properties for the parent MDI - */ -#define MEL_MDI_CHILD_COUNT "MDI_CHILD_COUNT" - -/* - * The following are properties that can be set on the mdi child - */ -#define MEL_CHILD_DATA "CHILD_DATA" - -/* - * A structure that contains all the information that is particular to - * a song. It is placed as a property on the MDI child. - */ -struct child_data { - GnomeMDI *mdi; /* Back pointer to the parent MDI */ - GnomeMDIGenericChild *child; /* Back pointer to the MDI child */ - struct rootElement *mdroot; /* MD root */ - char *filename; /* File that this song is associated with */ - int open_dialog; /* Open dialog box */ - int save_dialog; /* Save dialog box */ - int dialog; /* Set if a dialog is in action */ - struct play *play; /* Play data */ -}; - int melys_app(int argc, char **argv); -struct child_data *get_child_data_from_mdi(GnomeMDI *mdi); -struct child_data *get_child_data(GnomeMDIGenericChild *child); -struct child_data *create_child_data(GnomeMDI *mdi, - GnomeMDIGenericChild *child); -void destroy_child_data(gpointer data); -int get_child_count(GnomeMDI *mdi); -void set_child_count(GnomeMDI *mdi, int count); -/*XXX static*/GtkWidget *create_view(GnomeMDIChild *child, gpointer data); +struct song *get_song_from_mdi(GtkObject *mdi); +int get_child_count(GtkObject *mdi); +void set_child_count(GtkObject *mdi, int count); +void mel_ui_error(struct song *sd, char *msg, GtkObject *parent); +/*XXX static*/GtkWidget *create_view(GtkObject *child, gpointer data); void mel_debug_print_type(char *msg, GtkObject *o); diff -rNu melys-0.0.3/include/melmidi.h melys-0.0.4/include/melmidi.h --- melys-0.0.3/include/melmidi.h Thu Jan 1 00:00:00 1970 +++ melys-0.0.4/include/melmidi.h Fri Jul 30 00:43:15 1999 @@ -0,0 +1,46 @@ +/* + * + * 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. + * + * + * + */ + +/* Opaque type to save all playing state */ +struct play; +struct seq_context; + +struct play *play_new(); +void play_free(struct play *play); +void play_set_mdroot(struct play *play, struct rootElement *root); +void play_set_ports(struct play *play); +void XXX_REMOVE_play_open_ports(struct play *play); +void play_start(struct play *play); +void play_pause(struct play *play); +void play_stop(struct play *play); +void play_set_record(struct play *play, int recmode); +struct seq_context *play_get_context(struct play *play); +void XX_play_add_midi_echo(struct play *play, int indev, int inchan, + int outdev, int outchan); + +/* Opaque type to store all record state */ +struct record; + +struct record *record_new(struct seq_context *ctxp); +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); +void record_stop(struct record *record); diff -rNu melys-0.0.3/include/melplay.h melys-0.0.4/include/melplay.h --- melys-0.0.3/include/melplay.h Tue Jul 20 23:07:35 1999 +++ melys-0.0.4/include/melplay.h Thu Jan 1 00:00:00 1970 @@ -1,25 +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. - * - * - */ - -/* Opaque type to save all playing state */ -struct play; - -struct play *play_new(); -void play_set_mdroot(struct play *play, struct rootElement *root); -void play_open_ports(struct play *play); -void play_start(struct play *play); -void play_stop(struct play *play); -void play_free(struct play *play); diff -rNu melys-0.0.3/include/melreg.h melys-0.0.4/include/melreg.h --- melys-0.0.3/include/melreg.h Tue Jul 20 23:07:35 1999 +++ melys-0.0.4/include/melreg.h Fri Jul 30 00:43:15 1999 @@ -13,6 +13,9 @@ * * */ + +typedef int regid_t; + int reg_object(GtkObject *obj, GtkObject *parent); GtkObject *reg_get(int id); GtkWidget *reg_get_widget(int id); diff -rNu melys-0.0.3/include/seqlib.h melys-0.0.4/include/seqlib.h --- melys-0.0.3/include/seqlib.h Tue Jul 20 23:07:33 1999 +++ melys-0.0.4/include/seqlib.h Fri Jul 30 00:43:14 1999 @@ -26,27 +26,46 @@ typedef struct seq_context seq_context_t; -seq_context_t *seq_context_new(); + +/* + * Defines to indicate whether input or output address are + * to be dealt with. + */ +enum addrtype { + SEQ_ADDR_INPUT, + SEQ_ADDR_OUTPUT +}; + +seq_context_t *seq_context_new(char *name); seq_context_t *seq_add_subcontext(seq_context_t *ctxp); -void seq_context_free(seq_context_t *cxtp); +void seq_context_free(seq_context_t *ctxp); int seq_new_port(seq_context_t *ctxp); -void seq_destroy_port(seq_context_t *cxtp, int port); -int seq_connect_add(seq_context_t *ctxp, int client, int port); -int seq_server_add(seq_context_t *ctxp); +void seq_destroy_port(seq_context_t *ctxp, int port); +void seq_set_client_name(seq_context_t *ctxp, char *name); +void seq_set_addresses(seq_context_t *ctxp, enum addrtype inout, + snd_seq_addr_t *addrlist, int n); +int seq_connect_addresses(seq_context_t *ctxp, int inout); +int seq_disconnect_addresses(seq_context_t *ctxp, int inout); +snd_seq_addr_t *seq_dev_addr(seq_context_t *ctxp, int dev, int inout); int seq_init_tempo(seq_context_t *ctxp, int resolution, int tempo, int realtime); void seq_set_queue(seq_context_t *ctxp, int q); -int seq_sendto(seq_context_t *ctxp, snd_seq_event_t *ev, int client, int port); +int seq_sendto(seq_context_t *ctxp, snd_seq_event_t *ep, int dev, int chan); +int seq_sendto_now(seq_context_t *ctxp, snd_seq_event_t *ep, int dev, + int chan); void seq_timer_start(seq_context_t *ctxp); void seq_timer_stop(seq_context_t *ctxp); void seq_timer_continue(seq_context_t *ctxp); void seq_control_timer(seq_context_t *ctxp, int onoff); +unsigned long seq_get_time(seq_context_t *ctxp); int seq_write(seq_context_t *ctxp, snd_seq_event_t *ep); int seq_control_write(seq_context_t *ctxp, snd_seq_event_t *ep); snd_seq_event_t *seq_read(seq_context_t *ctxp); +void seq_drain_output(seq_context_t *ctxp); void seq_event_data_free(snd_seq_event_t *ep); void *seq_handle(seq_context_t *ctxp); int seq_descriptor(seq_context_t *ctxp); +char *seq_addr_string(snd_seq_addr_t *addr); void seq_midi_event_init(seq_context_t *ctxp, snd_seq_event_t *ep, unsigned long time, int devchan); @@ -68,3 +87,6 @@ void seq_midi_sysex(seq_context_t *ctxp, snd_seq_event_t *ep, int status, unsigned char *data, int length); void seq_midi_send_echo(seq_context_t *ctxp, unsigned long time, int type); + +struct rootElement; +int seq_get_ports_from_desc(char *portdesc, snd_seq_addr_t **addrp); diff -rNu melys-0.0.3/include/song.h melys-0.0.4/include/song.h --- melys-0.0.3/include/song.h Thu Jan 1 00:00:00 1970 +++ melys-0.0.4/include/song.h Fri Jul 30 00:43:13 1999 @@ -0,0 +1,63 @@ +/* + * + * 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. + * + */ + +/* + * Properties for the parent MDI + */ +#define MEL_MDI_CHILD_COUNT "MDI_CHILD_COUNT" + +/* + * The following are properties that can be set on the mdi child + */ +#define MEL_SONG_DATA "SONG_DATA" + + +/* + * A structure that contains all the information that is particular to + * a song. It is placed as a property on the MDI child. + */ +struct song { + struct rootElement *mdroot; /* MD root */ + char *filename; /* File that this song is associated with */ + + GtkObject *mdi; /* Back pointer to the parent MDI */ + GtkObject *child; /* Back pointer to the MDI child */ + + int open_dialog; /* Open dialog box */ + int save_dialog; /* Save dialog box */ + int dialog; /* Set if a dialog is in action */ + + struct play *play; /* Play data */ + //struct play *echo; /* Midi echo data */ + struct record *record; /* Record data */ + + + /* Somewhat temporary recording of track */ + struct trackElement *newtrack; /* Track being recorded */ + int tracknum; /* The output dev/channel */ +}; + + +void song_open_file(struct song *song, char *filename); +void song_set_echo(); +void song_reset_echo(); +void song_play_start(struct song *song); +void song_play_pause(struct song *song); +void song_play_stop(struct song *song); +void song_record_start(struct song *song); +void song_record_stop(struct song *song); +struct song *song_get_data(GtkObject *child); +struct song *song_new(GtkObject *mdi, GtkObject *child); +void song_destroy(gpointer data); diff -rNu melys-0.0.3/make.conf melys-0.0.4/make.conf --- melys-0.0.3/make.conf Tue Jul 20 11:45:23 1999 +++ melys-0.0.4/make.conf Sat Jul 24 20:35:02 1999 @@ -39,6 +39,6 @@ INSTDIR = /usr/local/bin # --- -CFLAGS = $(COPTS) $(DEFINES) $(INCLUDES) $(GLIBFLAGS) $(GNOMEFLAGS) +CFLAGS = $(COPTS) $(DEFINES) $(GNOMEFLAGS) $(INCLUDES) -LIBS = $(GNOMELIBS) -lxml -lz -lasound +LIBS = $(GNOMELIBS) -lxml -lz -lasound $(DBMALLOC) diff -rNu melys-0.0.3/md/Makefile melys-0.0.4/md/Makefile --- melys-0.0.3/md/Makefile Tue Jul 20 23:07:28 1999 +++ melys-0.0.4/md/Makefile Fri Jul 30 00:43:12 1999 @@ -22,16 +22,16 @@ # Remove all object files and exectutables # clean: - rm -f $(OBJS) core a.out + rm -f $(TARGETS) $(OBJS) core a.out # Remove all generated and built files. # clobber: clean - rm -f $(TARGETS) $(GENCFILES) $(GENHFILES) Makefile + rm -f $(GENCFILES) $(GENHFILES) Makefile cfiles: $(GENCFILES) -headers: +hfiles headers: mcode -f header *.m .SUFFIXES: .m diff -rNu melys-0.0.3/md/elements.c melys-0.0.4/md/elements.c --- melys-0.0.3/md/elements.c Tue Jul 20 23:07:37 1999 +++ melys-0.0.4/md/elements.c Fri Jul 30 00:43:18 1999 @@ -72,8 +72,6 @@ /* * Create and initialise a root element. - * Arguments: - * - */ struct rootElement * md_root_new(void) @@ -89,8 +87,6 @@ /* * Create and initialise a head element. - * Arguments: - * - */ struct headElement * md_head_new(void) @@ -109,8 +105,6 @@ /* * Create and initialise a track element. - * Arguments: - * - */ struct trackElement * md_track_new(void) @@ -139,10 +133,6 @@ /* * Create and initialise a note element. - * Arguments: - * note - - * vel - - * length - */ struct noteElement * md_note_new(char note, char vel, short length) @@ -160,8 +150,6 @@ /* * Create and initialise a part element. - * Arguments: - * - */ struct partElement * md_part_new(void) @@ -175,10 +163,21 @@ } /* + * Create and initialise a take element. + */ +struct takeElement * +md_take_new(void) +{ + struct takeElement * new; + + new = g_malloc0(sizeof(*new)); + MD_ELEMENT(new)->type = MD_TYPE_TAKE; + md_container_init(MD_CONTAINER(new)); + return new; +} + +/* * Create and initialise a control element. - * Arguments: - * control - - * value - */ struct controlElement * md_control_new(char control, char value) @@ -194,8 +193,6 @@ /* * Create and initialise a program element. - * Arguments: - * program - */ struct programElement * md_program_new(int program) @@ -210,9 +207,6 @@ /* * Create and initialise a keytouch element. - * Arguments: - * note - - * vel - */ struct keytouchElement * md_keytouch_new(int note, int vel) @@ -228,8 +222,6 @@ /* * Create and initialise a pressure element. - * Arguments: - * vel - */ struct pressureElement * md_pressure_new(int vel) @@ -244,8 +236,6 @@ /* * Create and initialise a pitch element. - * Arguments: - * val - */ struct pitchElement * md_pitch_new(int val) @@ -260,10 +250,6 @@ /* * Create and initialise a sysex element. - * Arguments: - * status - - * data - - * len - */ struct sysexElement * md_sysex_new(int status, unsigned char *data, int len) @@ -311,9 +297,6 @@ /* * Create and initialise a keysig element. - * Arguments: - * key - - * minor - */ struct keysigElement * md_keysig_new(short key, short minor) @@ -329,11 +312,6 @@ /* * Create and initialise a timesig element. - * Arguments: - * top - - * bottom - - * clocks - - * n32pq - */ struct timesigElement * md_timesig_new(short top, short bottom, short clocks, short n32pq) @@ -351,8 +329,6 @@ /* * Create and initialise a tempo element. - * Arguments: - * m - */ struct tempoElement * md_tempo_new(int m) @@ -367,9 +343,6 @@ /* * Create and initialise a text element. - * Arguments: - * type - - * text - */ struct textElement * md_text_new(int type, char *text) @@ -402,12 +375,6 @@ /* * Create and initialise a smpteoffset element. - * Arguments: - * hours - - * minutes - - * seconds - - * frames - - * subframes - */ struct smpteoffsetElement * md_smpteoffset_new(short hours, short minutes, short seconds, short frames, @@ -428,15 +395,29 @@ /* * Add an element to a container element. * - * Arguments: - * c - - * e - */ void md_add(struct containerElement *c, struct element *e) { + 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_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; } /* diff -rNu melys-0.0.3/md/mdutil.c melys-0.0.4/md/mdutil.c --- melys-0.0.3/md/mdutil.c Tue Jul 20 23:07:37 1999 +++ melys-0.0.4/md/mdutil.c Fri Jul 30 00:43:18 1999 @@ -13,7 +13,6 @@ * GNU General Public License for more details. * * - * */ @@ -21,8 +20,9 @@ #include "except.h" #include "util.h" #include "elements.h" +#include "seqlib.h" +#include "stdlib.h" #include "md.h" -#include #include "intl.h" static struct trackPos *push_track_info(GPtrArray *sp, @@ -157,6 +157,9 @@ struct trackPos *tp; int i; + if (seq == NULL) + return NULL; + if (seq->root) { /* The first time we return the root element */ el = MD_ELEMENT(seq->root); @@ -239,6 +242,45 @@ { return seq->duration; +} + +/* + * Create a new empty md tree. + * + */ +struct rootElement * +md_empty() +{ + struct rootElement *root; + struct headElement *head; + struct tempomapElement *map; + //struct trackElement *track; + struct tempoElement *tempo; + + root = md_root_new(); + head = md_head_new(); + + root->head = head; + root->tracks = 0; + + head->ver_major = MDML_VERSION_MAJOR; + head->ver_major = MDML_VERSION_MINOR; + head->format = 1; + head->time_base = 96; + + md_add(MD_CONTAINER(root), MD_ELEMENT(head)); + + map = md_tempomap_new(); + + tempo = md_tempo_new(50000); + md_add(MD_CONTAINER(map), MD_ELEMENT(tempo)); + + md_add(MD_CONTAINER(root), MD_ELEMENT(map)); + + //track = md_track_new(); + //md_add(MD_CONTAINER(root), MD_ELEMENT(track)); + + return root; } /* diff -rNu melys-0.0.3/midi/.cvsignore melys-0.0.4/midi/.cvsignore --- melys-0.0.3/midi/.cvsignore Tue Jul 20 23:07:33 1999 +++ melys-0.0.4/midi/.cvsignore Fri Jul 30 00:43:13 1999 @@ -1,4 +1,5 @@ play.c +record.c Makefile *.mdml *.mid diff -rNu melys-0.0.3/midi/Makefile melys-0.0.4/midi/Makefile --- melys-0.0.3/midi/Makefile Tue Jul 20 23:07:33 1999 +++ melys-0.0.4/midi/Makefile Fri Jul 30 00:43:13 1999 @@ -4,9 +4,11 @@ include $(TOP)/make.conf TARGETS = -OBJS = play.o -GENCFILES = play.c -GENHFILES = ../include/melplay.h +OBJS = play.o \ + record.o +GENCFILES = play.c \ + record.c +GENHFILES = ../include/melmidi.h @@ -19,16 +21,16 @@ # Remove all object files and exectutables # clean: - rm -f $(OBJS) core a.out + rm -f $(TARGETS) $(OBJS) core a.out # Remove all generated and built files. # clobber: clean - rm -f $(TARGETS) $(GENCFILES) $(GENHFILES) Makefile + rm -f $(GENCFILES) $(GENHFILES) Makefile cfiles: $(GENCFILES) -headers: +hfiles headers: mcode -f header *.m .SUFFIXES: .m diff -rNu melys-0.0.3/midi/play.c melys-0.0.4/midi/play.c --- melys-0.0.3/midi/play.c Tue Jul 20 23:07:38 1999 +++ melys-0.0.4/midi/play.c Fri Jul 30 00:43:19 1999 @@ -12,6 +12,7 @@ * GNU General Public License for more details. * * + * */ @@ -25,8 +26,9 @@ #include "seqlib.h" #include "elements.h" #include "md.h" -#include "gtk/gtk.h" -#include "melplay.h" +#include "config.h" +#include "gdk/gdk.h" +#include "melmidi.h" #include "intl.h" @@ -36,27 +38,39 @@ #define INPUT_ALL (GDK_INPUT_READ | GDK_INPUT_WRITE) struct play { - int playing:1, /* True if playing now */ - paused:1, /* True if paused */ - ended:1 /* True if sequence is finished */ - ; + int isplaying:1, /* True if playing now */ + ispaused:1, /* True if paused */ + isfinish:1, /* True if sequence is finished */ + isecho_on:1, /* True if midi echo is active */ + isrecording:1, /* True if recording */ + isended:1 /* True if song ended */ + ; guint write_id; /* ID of write handler */ guint read_id; /* ID of read handler */ - struct element *pend_element;/* Element that is pending play */ seq_context_t *ctxp; /* Sequencer context */ - struct sequenceState *seq; /* To hold current sequence position */ struct rootElement *mdroot; /* Midi song to play */ + struct sequenceState *seq; /* To hold current sequence position */ + struct element *pend_element;/* Element that is pending play */ + + GArray *echolist; /* Midi echo list */ }; #define ADDR_PARTS 4 #define SEP ", \t\n" + +/* Data for midi echo */ +struct echo_data { + snd_seq_addr_t inaddr; /* Input address */ + int inchan; /* Input channel to receive on */ + snd_seq_addr_t outaddr; /* Output address */ + int outchan; /* Output channel to send event to */ +}; static void run_events(gpointer vplay, gint fd, GdkInputCondition cond); static void get_events(gpointer vplay, gint fd, GdkInputCondition cond); -static void do_echo(struct play *play, int type); -static seq_context_t *openports(char *portdesc); -static int send_element(seq_context_t *ctxp, struct element *el); -static void conv_event(seq_context_t *ctxp, struct element *el, +static void do_special(struct play *play, int type); +static int send_element(struct seq_context *ctxp, struct element *el); +static void conv_event(struct seq_context *ctxp, struct element *el, snd_seq_event_t *ep); static void add_io_cb(struct play *play, int which); static void remove_io_cb(struct play *play, int which); @@ -73,20 +87,51 @@ play = g_new0(struct play, 1); - play->playing = 0; - play->paused = 0; - play->ended = 0; + play->isplaying = 0; + play->ispaused = 0; + play->isfinish = 0; + play->isecho_on = 0; + play->isended = 0; + play->mdroot = NULL; play->pend_element = NULL; - play->ctxp = NULL; + play->ctxp = seq_context_new("Melys sequencer"); + snd_seq_block_mode(seq_handle(play->ctxp), 0); play->seq = NULL; play->write_id = 0; play->read_id = 0; + play->echolist = g_array_new(0, 0, sizeof(struct echo_data)); + return play; } /* + * Free all resources. + * + * Arguments: + * play - The play object to free + */ +void +play_free(struct play *play) +{ + + remove_io_cb(play, INPUT_ALL); + if (play->seq) + (void) md_sequence_end(play->seq); + + /* NB: mdroot does not belong to us, freed elsewhere */ + + if (play->ctxp) + seq_context_free(play->ctxp); + + if (play->echolist) + g_array_free(play->echolist, 1); + + g_free(play); +} + +/* * Sets the md root for this play structure. It is an error to set * it if one is already set. * @@ -107,26 +152,35 @@ } /* + * Set the port addresses from the configuration and any + * information from the current song. + */ +void +play_set_ports(struct play *play) +{ + int n; + snd_seq_addr_t *addrs; + + n = conf_get_input_ports(&addrs); + seq_set_addresses(play->ctxp, SEQ_ADDR_INPUT, addrs, n); + + n = conf_get_output_ports(&addrs); + seq_set_addresses(play->ctxp, SEQ_ADDR_OUTPUT, addrs, n); +} + +/* * Open all the sequencer ports that will be needed for this * song. * - * Arguments: - * play - The play object */ void -play_open_ports(struct play *play) +XXX_REMOVE_play_open_ports(struct play *play) { - char *portdesc; if (play->mdroot == NULL) - ethrow(debugError, "No md root set in play_open_ports"); + ethrow(debugError, "No md root set in XXX_REMOVE_play_open_ports"); - /* mdroot is not actually used yet, just use env variable at present */ - portdesc = getenv("ALSA_OUT_PORT"); - if (portdesc == NULL) - ethrow(debugError, "ALSA_OUT_PORT not set in environment"); - - play->ctxp = openports(portdesc); + //play->ctxp = seq_md_open_ports(play->mdroot); } /* @@ -140,52 +194,62 @@ play_start(struct play *play) { - if (play->playing || play->mdroot == NULL) + if (play->isplaying || play->mdroot == NULL) return; /* Init the sequence */ - if (play->paused) { + if (play->ispaused) { seq_timer_continue(play->ctxp); } else { - play->ended = FALSE; + play->isfinish = FALSE; + play->isended = FALSE; play->seq = md_sequence_init(play->mdroot); play->pend_element = NULL; - play_open_ports(play); + /* 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); + + /* Reset timer */ + seq_timer_start(play->ctxp); + seq_timer_stop(play->ctxp); } /* set playing */ - play->playing = TRUE; + play->isplaying = TRUE; add_io_cb(play, INPUT_ALL); /* * ALSA bug 19 Jul 1999, select does not return write possible - * until after at least one write has been done. Remove - * this code about 6 months after bug is fixed. + * until after at least one write has been done. * Therefore kick it off with an echo. + * + * Remove this code in about 6 months, when all have the fix. */ seq_midi_send_echo(play->ctxp, 0, ECHO_NOOP); } /* - * Stop playing the midi. + * Stop playing. If start is called after the song will be + * restarted from where it was stopped. Use play_stop to stop + * and play from the beginning. * * Arguments: * play - The play object */ void -play_stop(struct play *play) +play_pause(struct play *play) { seq_context_t *ctxp; snd_seq_event_t ev; int i; - if (play->playing == FALSE || play->mdroot == NULL) + if (play->isplaying == FALSE || play->mdroot == NULL) return; - play->playing = FALSE; - play->paused = TRUE; + play->isplaying = FALSE; + play->ispaused = TRUE; remove_io_cb(play, INPUT_ALL); @@ -200,6 +264,109 @@ } /* + * Rewind the song back to the beginning. The next start will + * play the song from the beginning. + * + * Arguments: + * play - The play object to stop and rewind + */ +void +play_stop(struct play *play) +{ + + play_pause(play); + + if (play->seq) + (void) md_sequence_end(play->seq); + play->seq = NULL; + + play->ispaused = FALSE; +} + +/* + * Sets a flag to say if recording is active or not. Needed + * because if recording we must not stop the timer at the end of + * the song as it should be extended instead. + * + * Arguments: + * recmode - True if recording is started + */ +void +play_set_record(struct play *play, int recmode) +{ + + if (recmode == 0 && play->isrecording && play->isended) { + play_pause(play); + + play->isplaying = FALSE; + play->ispaused = FALSE; + } + + play->isrecording = recmode; +} + +/* + * Get the sequencer context. + * Arguments: + * play - Will return play->ctxp + */ +struct seq_context * +play_get_context(struct play *play) +{ + return play->ctxp; +} + +/* + * Set up a midi echo. Events arriving on one port are + * immediately output to the corresponding output port. In a + * complete system there may be multiple inputs that all need + * to go to a different output. Conversely in another complete + * system this routine may not be needed at all as the echo + * function could be handled by a separate kernel client. + * + * Is this really needed? + * + * Arguments: + * play - Play state + * indev - Events from this device... + * inchan - Channel to accept, or -1 for all + * outdev - Are echoed to this device/channel + * outchan - Channel to send event to + */ +void +XX_play_add_midi_echo(struct play *play, int indev, int inchan, int outdev, + int outchan) +{ + struct echo_data edata; + snd_seq_addr_t *addr; + + + /* + * There is a list of echo routes. Although we will just be + * using one to begin with. + */ + + /* Save actual address, rather than device to avoid constant lookups */ + addr = seq_dev_addr(play->ctxp, indev, SEQ_ADDR_INPUT); + if (!addr) + return; + edata.inaddr = *addr; + + /* Now the output */ + addr = seq_dev_addr(play->ctxp, outdev, SEQ_ADDR_OUTPUT); + if (!addr) + return; + edata.outaddr = *addr; + + edata.inchan = inchan; + edata.outchan = outchan; + + g_array_append_val(play->echolist, edata); + + play->isecho_on = TRUE; +} + +/* * This is called when the front end is not busy and is used to * control the interaction between the front end and the midi * engine. It is possible that this will be done in a separate @@ -207,7 +374,7 @@ * between threads and this is it. * * Arguments: - * vplay - Play object to be used + * vplay - This will be a play object * fd - The file descriptor that is ready * cond - The condition that matched */ @@ -219,20 +386,10 @@ unsigned long end; int status; - /* - * If not playing then return false which will stop this - * routine from being called again by gtk. - */ - if (play->playing == FALSE) + if (play->isplaying == FALSE) ethrow(debugError, "Not playing in run_events"); - if (play->ended) { - status = snd_seq_flush_output(seq_handle(play->ctxp)); - if (status == 0) - remove_io_cb(play, GDK_INPUT_WRITE); - return; - } - + /* Push out any pending element */ if (play->pend_element) { status = send_element(play->ctxp, play->pend_element); if (status < 0) @@ -241,6 +398,7 @@ play->pend_element = NULL; } + /* Try and push out next items in the sequence */ while ((el = md_sequence_next(play->seq)) != NULL) { status = send_element(play->ctxp, el); if (status < 0) { @@ -249,40 +407,23 @@ } } - if (el == NULL && play->ended == FALSE) { + /* Detect the end of the sequence */ + if (el == NULL && play->isfinish == FALSE) { end = md_sequence_duration(play->seq); play->seq = NULL; - play->ended = 1; + play->isfinish = 1; /* MMM this could fail */ seq_midi_send_echo(play->ctxp, end, ECHO_ENDSONG); /* XXX */ } - return; -} - -/* - * Free all resources. - * - * Arguments: - * play - The play object to free - */ -void -play_free(struct play *play) -{ - - remove_io_cb(play, INPUT_ALL); - if (play->seq) - (void) md_sequence_end(play->seq); - - /* NB: mdroot does not belong to us, freed elsewhere */ + status = snd_seq_flush_output(seq_handle(play->ctxp)); + if (status == 0 && play->isfinish) + remove_io_cb(play, GDK_INPUT_WRITE); - if (play->ctxp) - seq_context_free(play->ctxp); - - g_free(play); + return; } /* @@ -308,7 +449,7 @@ switch (ep->type) { case SND_SEQ_EVENT_ECHO: - do_echo(play, ep->data.raw32.d[0]); + do_special(play, ep->data.raw32.d[0]); break; default: printf("Event NOT ECHO type %d revceived\n", ep->type); @@ -320,14 +461,17 @@ } /* - * Deal with an echo event. + * Deal with an echo event, which are used to schedule events + * within melys that are related to the song being played. For + * example when it ends: this is not an absolute time as it may be + * paused, have its tempo changed etc. * * Arguments: * play - The play object * type - Type of echo event */ static void -do_echo(struct play *play, int type) +do_special(struct play *play, int type) { switch (type) { @@ -336,11 +480,14 @@ case ECHO_ENDSONG: - play_stop(play); + if (!play->isrecording) { + play_pause(play); - play->playing = FALSE; - play->paused = FALSE; + play->isplaying = FALSE; + play->ispaused = FALSE; + } + play->isended = TRUE; play->seq = NULL; break; @@ -351,92 +498,6 @@ } /* - * Create a seq context and connect to the ports specified in - * portdesc . The context is returned. - * - * Used for pmidi. Used temporarily for melys as ports will be - * selected from the interface in the future. - * - * Arguments: - * portdesc - String containing port descriptions - */ -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; - int i; - - if (portdesc == NULL) - return NULL; - - ctxp = seq_context_new(); - snd_seq_block_mode(seq_handle(ctxp), 0); - - addr = g_new(snd_seq_addr_t, strlen(portdesc)); - naddr = 0; - ap = addr; - - /* - * Loop though all the ports given in portdesc. - */ - 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; - } - - /* Depending on how many colons were present, we split up the address */ - switch (count) { - case 1: - ap->client = a[0]; - ap->port = 0; - break; - 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++; - } - - for (count = 0, i = 0; i < naddr; i++) { - int err; - - err = seq_connect_add(ctxp, addr[i].client, addr[i].port); - - if (err < 0) - fprintf(stderr, _("Could not connect to port %d:%d\n"), - addr[i].client, addr[i].port); - else - count++; - } - - g_free(addr); - - if (count == 0) { - seq_context_free(ctxp); - return NULL; - } - - return ctxp; - -} - -/* * The element is converted into an event and sent to the * sequencer. * @@ -445,7 +506,7 @@ * el - Element to send to sequencer */ static int -send_element(seq_context_t *ctxp, struct element *el) +send_element(struct seq_context *ctxp, struct element *el) { snd_seq_event_t ev; int status = 0; @@ -470,7 +531,7 @@ * ep - Event is written here */ static void -conv_event(seq_context_t *ctxp, struct element *el, snd_seq_event_t *ep) +conv_event(struct seq_context *ctxp, struct element *el, snd_seq_event_t *ep) { seq_midi_event_init(ctxp, ep, el->element_time, el->device_channel); diff -rNu melys-0.0.3/midi/record.c melys-0.0.4/midi/record.c --- melys-0.0.3/midi/record.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.4/midi/record.c Fri Jul 30 00:43:20 1999 @@ -0,0 +1,471 @@ +/* + * + * 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 "seqlib.h" +#include "elements.h" +#include "config.h" +#include "md.h" +#include "gdk/gdk.h" +#include "melmidi.h" +#include "intl.h" + + +struct record { + + int isrecording:1 /* Recording events */ + ; + + seq_context_t *ctxp; /* Record context */ + struct rootElement *mdroot; /* The current song */ + + struct takeElement *take; /* To save recorded events */ + + 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) + +#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 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, + unsigned long time, snd_seq_event_t *ep); + + +/* + * Allocate and initialise a record state. A new sequencer + * context is created that will receive the incoming midi + * events. + * + * Arguments: + * ctxp - The seq context + */ +struct record * +record_new(struct seq_context *ctxp) +{ + struct record *record; + + record = g_new0(struct record, 1); + + record->ctxp = seq_add_subcontext(ctxp); + seq_set_client_name(record->ctxp, _("Melys sequencer (record)")); + + snd_seq_block_mode(seq_handle(record->ctxp), 0); + record->take = md_take_new(); + + record->notes = g_ptr_array_new(); + + return record; +} + +void +record_free(struct record *record) +{ + + remove_io_cb(record, INPUT_ALL); + + seq_context_free(record->ctxp); + md_free(MD_ELEMENT(record->take)); + + g_ptr_array_free(record->notes, 1); + g_free(record); +} + +void +record_set_mdroot(struct record *record, struct rootElement *root) +{ + + record->mdroot = root; +} + +/* + * Set the port addresses from the configuration and any + * information from the current song. + */ +void +record_set_ports(struct record *record) +{ + int n; + snd_seq_addr_t *addrs; + + n = conf_get_input_ports(&addrs); + seq_set_addresses(record->ctxp, SEQ_ADDR_INPUT, addrs, n); + + n = conf_get_output_ports(&addrs); + seq_set_addresses(record->ctxp, SEQ_ADDR_OUTPUT, addrs, n); + + seq_connect_addresses(record->ctxp, SEQ_ADDR_INPUT); + add_io_cb(record, INPUT_ALL); +} + +/* + * 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: + * devchan - Channel for this track + */ +void +record_set_track(struct record *record, struct trackElement *track, + int devchan) +{ + + record->curtrack = track; + record->curchan = devchan; +} + +/* + * Start recording. Events are saved and added to the current + * take. + * + * Arguments: + * record - Record state + */ +void +record_start(struct record *record) +{ + unsigned long t; + + record->isrecording = TRUE; + record->newpart = md_part_new(); + + t = seq_get_time(record->ctxp); + MD_ELEMENT(record->newpart)->element_time = t; +} + +/* + * Stop recording. + * + * Arguments: + * record - Record state + */ +void +record_stop(struct record *record) +{ + unsigned long endtime; + struct element *el; + int i; + + if (!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; + + md_add(MD_CONTAINER(record->curtrack), MD_ELEMENT(record->newpart)); + record->newpart = NULL; +} + +/* + * Read and save the incoming events. + * + * Arguments: + * vrecord - This will be a record object + * fd - The file descriptor that is ready + * cond - The condition that matched + */ +static void +run_events(gpointer vrecord, gint fd, GdkInputCondition cond) +{ + snd_seq_event_t *ep; + struct record *record = vrecord; + + while ((ep = seq_read(record->ctxp)) != NULL) { + int n; + //if (ep->type != 50) 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); + } + + } +} + +/* + * 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) +{ + struct element *el; + unsigned long time; + int devchan; + + time = ep->time.tick; /* What if REAL and not TICK? */ + devchan = record->curchan; + + // devchan |= (input dev << 4); xxx + + el = NULL; + + switch (ep->type) { + case SND_SEQ_EVENT_NOTE: + /* Don't expect to see this from realy midi devices */ + el = (EPTR)md_note_new(ep->data.note.note, ep->data.note.velocity, + ep->data.note.duration); + //el->element_time = time; + //el->devchan = devchan; + break; + case SND_SEQ_EVENT_NOTEON: + if (ep->data.note.velocity == 0) + /* Really a note off */ + finish_note(record, devchan, time, ep); + else + el = save_note(record, devchan, time, ep); + break; + case SND_SEQ_EVENT_NOTEOFF: + finish_note(record, devchan, time, ep); + break; + case SND_SEQ_EVENT_KEYPRESS: + el = (EPTR) md_keytouch_new(ep->data.control.param, + ep->data.control.value); + break; + case SND_SEQ_EVENT_CONTROLLER: + el = (EPTR) md_control_new(ep->data.control.param, + ep->data.control.value); + break; + case SND_SEQ_EVENT_PGMCHANGE: + el = (EPTR) md_program_new(ep->data.control.value); + break; + case SND_SEQ_EVENT_CHANPRESS: + el = (EPTR) md_pressure_new(ep->data.control.value); + break; + case SND_SEQ_EVENT_PITCHBEND: + el = (EPTR) md_pitch_new(ep->data.control.value); + break; + case SND_SEQ_EVENT_SYSEX: + el = (EPTR) md_sysex_new(*(guchar *)ep->data.ext.ptr, + ((guchar *)ep->data.ext.ptr)+1, ep->data.ext.len-1); + break; + + case SND_SEQ_EVENT_HEARTBEAT: + /* Ignore these */ + break; + + case SND_SEQ_EVENT_CONTROL14: + case SND_SEQ_EVENT_NONREGPARAM: + case SND_SEQ_EVENT_REGPARAM: + case SND_SEQ_EVENT_SONGPOS: + case SND_SEQ_EVENT_SONGSEL: + case SND_SEQ_EVENT_CLOCK: + case SND_SEQ_EVENT_START: + case SND_SEQ_EVENT_CONTINUE: + case SND_SEQ_EVENT_STOP: + case SND_SEQ_EVENT_QFRAME: + case SND_SEQ_EVENT_TICK: + case SND_SEQ_EVENT_TEMPO: + case SND_SEQ_EVENT_TIMESIGN: + case SND_SEQ_EVENT_KEYSIGN: + case SND_SEQ_EVENT_SYSTEM: + /* We may want to do something with these or may want to + * ignore them. Will decide when they actually start happening. + */ + g_warning("Event type %d seen in save_event", ep->type); + break; + } + + if (el) { + el->element_time = time; + el->device_channel = devchan; + + md_add(MD_CONTAINER(record->newpart), el); + } +} + +/* + * Push out the events waiting to be written to the sequencer. + * Not needed! + * + * Arguments: + * vrecord - This will be a record object + * fd - The file descriptor that is ready + * cond - The condition that matched + */ +static void +push_events(gpointer vrecord, gint fd, GdkInputCondition cond) +{ + int n; + struct record *record = vrecord; + + n = snd_seq_flush_output(seq_handle(record->ctxp)); +//g_message("push event %d\n", n); + if (n == 0) + remove_io_cb(record, GDK_INPUT_WRITE); +} + +/* + * Add the io callbacks. + * + * Arguments: + * record - The record object + * which - Which callbacks to add + */ +static void +add_io_cb(struct record *record, int which) +{ + /* Set up callbacks for IO activity */ + + if ((which & GDK_INPUT_WRITE) && !record->write_id) + record->write_id = gdk_input_add(seq_descriptor(record->ctxp), + GDK_INPUT_WRITE, push_events, record); + + if ((which & GDK_INPUT_READ) && !record->read_id) + record->read_id = gdk_input_add(seq_descriptor(record->ctxp), + GDK_INPUT_READ, run_events, record); +} + +/* + * Remove the io callbacks. + * + * Arguments: + * record - The record object + * which - Which callbacks to remove + */ +static void +remove_io_cb(struct record *record, int which) +{ + /* Remove callbacks for IO activity */ + + if ((which & GDK_INPUT_WRITE) && record->write_id) { + gdk_input_remove(record->write_id); + record->write_id = 0; + } + if ((which & GDK_INPUT_READ) && record->read_id) { + gdk_input_remove(record->read_id); + record->read_id = 0; + } +} + +/* + * Allocate a note element and save it for when the off note + * 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) +{ + 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); + + return el; +} + +/* + * Called when a note off is seen. Finds the corresponding note + * 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, + snd_seq_event_t *ep) +{ + int i; + GPtrArray *notes; + struct noteElement *n; + int len; + + notes = record->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) { + len = time - MD_ELEMENT(n)->element_time; + n->offvel = ep->data.note.velocity; + n->length = len; + if (n->length < 0) { + n->length = 0; + } + g_ptr_array_remove_index_fast(notes, i); + break; + } + } +} Binary files melys-0.0.3/mlib/PROJECT/__init__.pyo and melys-0.0.4/mlib/PROJECT/__init__.pyo differ Binary files melys-0.0.3/mlib/PROJECT/base.pyo and melys-0.0.4/mlib/PROJECT/base.pyo differ Binary files melys-0.0.3/mlib/PROJECT/cmds.pyo and melys-0.0.4/mlib/PROJECT/cmds.pyo differ Binary files melys-0.0.3/mlib/PROJECT/code.pyo and melys-0.0.4/mlib/PROJECT/code.pyo differ Binary files melys-0.0.3/mlib/PROJECT/header.pyo and melys-0.0.4/mlib/PROJECT/header.pyo differ Binary files melys-0.0.3/mlib/PROJECT/make.pyo and melys-0.0.4/mlib/PROJECT/make.pyo differ diff -rNu melys-0.0.3/mlib/PROJECT/quickdoc.py melys-0.0.4/mlib/PROJECT/quickdoc.py --- melys-0.0.3/mlib/PROJECT/quickdoc.py Thu Jan 1 00:00:00 1970 +++ melys-0.0.4/mlib/PROJECT/quickdoc.py Sat Jul 24 20:38:47 1999 @@ -0,0 +1,25 @@ +# +# File: code.py - Project defines for melys +# +# Copyright (C) 1999 Steve Ratcliffe +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# + +import string +import PROJECT.base +import c.quickdoc + +class quickdoc(PROJECT.base.base, c.quickdoc.quickdoc): + def __init__(self): + PROJECT.base.base.__init__(self) + c.quickdoc.quickdoc.__init__(self) + + Binary files melys-0.0.3/pixmaps/mb3.png and melys-0.0.4/pixmaps/mb3.png differ Binary files melys-0.0.3/pixmaps/mpause.png and melys-0.0.4/pixmaps/mpause.png differ Binary files melys-0.0.3/pixmaps/mplay.png and melys-0.0.4/pixmaps/mplay.png differ Binary files melys-0.0.3/pixmaps/mstop.png and melys-0.0.4/pixmaps/mstop.png differ Binary files melys-0.0.3/pixmaps/play.png and melys-0.0.4/pixmaps/play.png differ diff -rNu melys-0.0.3/po/melys.pot melys-0.0.4/po/melys.pot --- melys-0.0.3/po/melys.pot Tue Jul 20 11:41:45 1999 +++ melys-0.0.4/po/melys.pot Thu Jul 29 14:21:42 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-07-20 10:52+0100\n" +"POT-Creation-Date: 1999-07-28 13:49+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,40 +14,48 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" +#: format.m:144 format.m:150 +msgid "Unrecognised file type" +msgstr "" + +#: format.m:157 +msgid "Could not read file" +msgstr "" + #: mdmlwrite.m:141 msgid "Could not open file" msgstr "" -#: midiread.m:139 +#: midiread.m:140 #, c-format msgid "Could not open file %s" msgstr "" -#: midiread.m:169 +#: midiread.m:170 #, c-format msgid "Bad header (%x), probably not a real midi file" msgstr "" -#: midiread.m:175 +#: midiread.m:176 msgid "Bad header length, probably not a real midi file" msgstr "" -#: midiread.m:212 +#: midiread.m:213 #, c-format msgid "Bad track header (%x), probably not a midi file" msgstr "" -#: midiread.m:368 +#: midiread.m:376 #, c-format msgid "Bad status type 0x%x" msgstr "" -#: midiread.m:435 +#: midiread.m:443 #, c-format msgid "Meta event %d not implemented\n" msgstr "" -#: midiread.m:469 midiread.m:494 midiread.m:516 +#: midiread.m:477 midiread.m:502 midiread.m:524 msgid "Unexpected end of file" msgstr "" @@ -56,57 +64,73 @@ msgid "Can not open file %s" msgstr "" -#: main.m:60 +#: main.m:38 msgid "The Melys sequencer" msgstr "" #. Create the first child -#: main.m:72 +#: main.m:50 msgid "Untitled" msgstr "" -#: menus.m:37 +#: menus.m:39 msgid "_Close all" msgstr "" -#: menus.m:37 +#: menus.m:39 msgid "Close all open windows" msgstr "" -#: menus.m:49 +#: menus.m:51 msgid "_Start" msgstr "" -#: menus.m:49 +#: menus.m:51 msgid "Start playing" msgstr "" -#: menus.m:50 +#: menus.m:57 +msgid "_Pause" +msgstr "" + +#: menus.m:57 +msgid "Pause playing" +msgstr "" + +#: menus.m:63 msgid "S_top" msgstr "" -#: menus.m:50 -msgid "Stop playing" +#: menus.m:63 +msgid "Stop and return to beginning" msgstr "" -#: menus.m:51 -msgid "Rewind" +#: menus.m:69 +msgid "_Record" msgstr "" -#: menus.m:51 -msgid "Go to the beginning of the song" +#: menus.m:69 +msgid "Start recording" +msgstr "" + +#: menus.m:75 +msgid "Record stop" +msgstr "" + +#: menus.m:75 +msgid "Stop recording" msgstr "" -#: menus.m:65 -msgid "_Play" +#: menus.m:93 +msgid "_Actions" msgstr "" -#: menus.m:116 +#: menus.m:144 msgid "Select the file to read in..." msgstr "" #. Failed so put up a message for the user -#: menus.m:167 +#: menus.m:194 #, c-format msgid "" "The file %s\n" @@ -115,12 +139,12 @@ "extension of .mid or .mdml" msgstr "" -#: seqlib.m:67 seqlib.m:127 +#: seqlib.m:73 seqlib.m:139 #, c-format msgid "Could not open sequencer: %s" msgstr "" -#: seqlib.m:186 +#: seqlib.m:208 #, c-format msgid "Error (%s) creating sequencer port\n" msgstr "" diff -rNu melys-0.0.3/po/zz.po melys-0.0.4/po/zz.po --- melys-0.0.3/po/zz.po Tue Jul 20 11:41:45 1999 +++ melys-0.0.4/po/zz.po Thu Jul 29 14:21:42 1999 @@ -5,61 +5,49 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-07-20 10:52+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" + +#: format.m:144 format.m:150 +msgid "Unrecognised file type" +msgstr "U.N.R.E.C.O.G.N.I.S.E.D. F.I.L.E. T.Y.P.E." + +#: format.m:157 +msgid "Could not read file" +msgstr "C.O.U.L.D. N.O.T. R.E.A.D. F.I.L.E." #: mdmlwrite.m:141 msgid "Could not open file" msgstr "C.O.U.L.D. N.O.T. O.P.E.N. F.I.L.E." -#: midiread.m:139 +#: midiread.m:140 #, c-format msgid "Could not open file %s" msgstr "C.O.U.L.D. N.O.T. O.P.E.N. F.I.L.E. %s" -#: midiread.m:169 +#: midiread.m:170 #, c-format msgid "Bad header (%x), probably not a real midi file" msgstr "B.A.D. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. N.O.T. A. R.E.A.L. M.I.D.I. F.I.L.E." -"B.A.D. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. N.O.T. A. R.E.A.L. M.I.D.I. " -"F.I.L.E.B.A.D. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. N.O.T. A. R.E.A.L. " -"M.I.D.I. F.I.L.E.B.A.D. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. N.O.T. A. " -"R.E.A.L. M.I.D.I. F.I.L.E." -#: midiread.m:175 +#: midiread.m:176 msgid "Bad header length, probably not a real midi file" msgstr "B.A.D. H.E.A.D.E.R. L.E.N.G.T.H., P.R.O.B.A.B.L.Y. N.O.T. A. R.E.A.L. M.I.D.I. F.I.L.E." -"B.A.D. H.E.A.D.E.R. L.E.N.G.T.H., P.R.O.B.A.B.L.Y. N.O.T. A. R.E.A.L. " -"M.I.D.I. F.I.L.E.B.A.D. H.E.A.D.E.R. L.E.N.G.T.H., P.R.O.B.A.B.L.Y. N.O.T. " -"A. R.E.A.L. M.I.D.I. F.I.L.E.B.A.D. H.E.A.D.E.R. L.E.N.G.T.H., " -"P.R.O.B.A.B.L.Y. N.O.T. A. R.E.A.L. M.I.D.I. F.I.L.E." -#: midiread.m:212 +#: midiread.m:213 #, c-format msgid "Bad track header (%x), probably not a midi file" msgstr "B.A.D. T.R.A.C.K. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. N.O.T. A. M.I.D.I. F.I.L.E." -"B.A.D. T.R.A.C.K. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. N.O.T. A. M.I.D.I. " -"F.I.L.E.B.A.D. T.R.A.C.K. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. N.O.T. A. " -"M.I.D.I. F.I.L.E.B.A.D. T.R.A.C.K. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. " -"N.O.T. A. M.I.D.I. F.I.L.E." -#: midiread.m:368 +#: midiread.m:376 #, c-format msgid "Bad status type 0x%x" msgstr "B.A.D. S.T.A.T.U.S. T.Y.P.E. 0X.%x" -#: midiread.m:435 +#: midiread.m:443 #, c-format msgid "Meta event %d not implemented\n" msgstr "M.E.T.A. E.V.E.N.T. %d N.O.T. I.M.P.L.E.M.E.N.T.E.D.\n" -#: midiread.m:469 midiread.m:494 midiread.m:516 +#: midiread.m:477 midiread.m:502 midiread.m:524 msgid "Unexpected end of file" msgstr "U.N.E.X.P.E.C.T.E.D. E.N.D. O.F. F.I.L.E." @@ -68,58 +56,74 @@ msgid "Can not open file %s" msgstr "C.A.N. N.O.T. O.P.E.N. F.I.L.E. %s" -#: main.m:60 +#: main.m:38 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:72 +#: main.m:50 msgid "Untitled" msgstr "U.N.T.I.T.L.E.D." -#: menus.m:37 +#: menus.m:39 msgid "_Close all" msgstr "_C.L.O.S.E. A.L.L." -#: menus.m:37 +#: menus.m:39 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:49 +#: menus.m:51 msgid "_Start" msgstr "_S.T.A.R.T." -#: menus.m:49 +#: menus.m:51 msgid "Start playing" msgstr "S.T.A.R.T. P.L.A.Y.I.N.G." -#: menus.m:50 +#: menus.m:57 +msgid "_Pause" +msgstr "_P.A.U.S.E." + +#: menus.m:57 +msgid "Pause playing" +msgstr "P.A.U.S.E. P.L.A.Y.I.N.G." + +#: menus.m:63 msgid "S_top" msgstr "S._T.O.P." -#: menus.m:50 -msgid "Stop playing" -msgstr "S.T.O.P. P.L.A.Y.I.N.G." - -#: menus.m:51 -msgid "Rewind" -msgstr "R.E.W.I.N.D." - -#: menus.m:51 -msgid "Go to the beginning of the song" -msgstr "G.O. T.O. T.H.E. B.E.G.I.N.N.I.N.G. O.F. T.H.E. S.O.N.G." - -#: menus.m:65 -msgid "_Play" -msgstr "_P.L.A.Y." +#: menus.m:63 +msgid "Stop and return to beginning" +msgstr "S.T.O.P. A.N.D. R.E.T.U.R.N. T.O. B.E.G.I.N.N.I.N.G." + +#: menus.m:69 +msgid "_Record" +msgstr "_R.E.C.O.R.D." + +#: menus.m:69 +msgid "Start recording" +msgstr "S.T.A.R.T. R.E.C.O.R.D.I.N.G." + +#: menus.m:75 +msgid "Record stop" +msgstr "R.E.C.O.R.D. S.T.O.P." + +#: menus.m:75 +msgid "Stop recording" +msgstr "S.T.O.P. R.E.C.O.R.D.I.N.G." + +#: menus.m:93 +msgid "_Actions" +msgstr "_A.C.T.I.O.N.S." -#: menus.m:116 +#: menus.m:144 msgid "Select the file to read in..." msgstr "S.E.L.E.C.T. T.H.E. F.I.L.E. T.O. R.E.A.D. I.N...." #. Failed so put up a message for the user -#: menus.m:167 -#, fuzzy, c-format +#: menus.m:194 +#, c-format msgid "" "The file %s\n" "does not have a known extension.\n" @@ -130,23 +134,13 @@ "D.O.E.S. N.O.T. H.A.V.E. A. K.N.O.W.N. E.X.T.E.N.S.I.O.N..\n" "P.L.E.A.S.E. S.E.L.E.C.T. A. F.I.L.E. W.I.T.H. A.N.\n" "E.X.T.E.N.S.I.O.N. O.F. .M.I.D. O.R. .M.D.M.L." -"T.H.E. F.I.L.E. %s\n" -"D.O.E.S. N.O.T. H.A.V.E. A. K.N.O.W.N. E.X.T.E.N.S.I.O.N..\n" -"P.L.E.A.S.E. S.E.L.E.C.T. A. F.I.L.E. W.I.T.H. A.N.\n" -"E.X.T.E.N.S.I.O.N. O.F. .M.I.D. O.R. .M.D.M.L.T.H.E. F.I.L.E. %s\n" -"D.O.E.S. N.O.T. H.A.V.E. A. K.N.O.W.N. E.X.T.E.N.S.I.O.N..\n" -"P.L.E.A.S.E. S.E.L.E.C.T. A. F.I.L.E. W.I.T.H. A.N.\n" -"E.X.T.E.N.S.I.O.N. O.F. .M.I.D. O.R. .M.D.M.L.T.H.E. F.I.L.E. %s\n" -"D.O.E.S. N.O.T. H.A.V.E. A. K.N.O.W.N. E.X.T.E.N.S.I.O.N..\n" -"P.L.E.A.S.E. S.E.L.E.C.T. A. F.I.L.E. W.I.T.H. T.H.E. E.X.T.E.N.S.I.O.N.S.\n" -"O.F. .M.I.D. O.R. .M.D.M.L." -#: seqlib.m:67 seqlib.m:127 -#, fuzzy, c-format +#: seqlib.m:73 seqlib.m:139 +#, 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:186 +#: seqlib.m:208 #, 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" diff -rNu melys-0.0.3/programs/.cvsignore melys-0.0.4/programs/.cvsignore --- melys-0.0.3/programs/.cvsignore Tue Jul 20 23:07:33 1999 +++ melys-0.0.4/programs/.cvsignore Fri Jul 30 00:43:13 1999 @@ -1,9 +1,11 @@ mdmlconv.c melys.c pmidi.c +showseq.c mdmlconv melys pmidi +showseq Makefile *.mdml *.mid diff -rNu melys-0.0.3/programs/Makefile melys-0.0.4/programs/Makefile --- melys-0.0.3/programs/Makefile Tue Jul 20 23:07:33 1999 +++ melys-0.0.4/programs/Makefile Fri Jul 30 00:43:13 1999 @@ -5,13 +5,16 @@ TARGETS = mdmlconv \ melys \ - pmidi + pmidi \ + showseq OBJS = mdmlconv.o \ melys.o \ - pmidi.o + pmidi.o \ + showseq.o GENCFILES = mdmlconv.c \ melys.c \ - pmidi.c + pmidi.c \ + showseq.c GENHFILES = ../include/melys.h MDMLCONVOBJS = \ @@ -25,17 +28,24 @@ ../files/midiread.o ../files/midiwrite.o \ ../files/mdmlread.o ../files/mdmlwrite.o \ ../files/format.o \ - ../seq/seqlib.o ../seq/seqmidi.o \ + ../seq/seqlib.o ../seq/seqmidi.o ../seq/sequtil.o \ ../util/except.o ../md/elements.o ../md/mdutil.o \ ../gui/main.o ../gui/menus.o \ ../widgets/register.o \ - ../midi/play.o + ../midi/play.o ../midi/record.o \ + ../song/song.o \ + ../config/ports.o PMIDIOBJS = \ pmidi.o \ ../files/midiread.o ../seq/seqlib.o ../seq/seqmidi.o \ ../util/except.o ../md/elements.o ../md/mdutil.o +SHOWSEQOBJS = \ + showseq.o \ + ../seq/seqlib.o \ + ../util/except.o + # Build all the targets. # all: $(TARGETS) $(OBJS) @@ -52,19 +62,23 @@ $(CC) $(CFLAGS) -o pmidi $(PMIDIOBJS) $(LIBS) +showseq: $(SHOWSEQOBJS) + $(CC) $(CFLAGS) -o showseq $(SHOWSEQOBJS) $(LIBS) + + # Remove all object files and exectutables # clean: - rm -f $(OBJS) core a.out + rm -f $(TARGETS) $(OBJS) core a.out # Remove all generated and built files. # clobber: clean - rm -f $(TARGETS) $(GENCFILES) $(GENHFILES) Makefile + rm -f $(GENCFILES) $(GENHFILES) Makefile cfiles: $(GENCFILES) -headers: +hfiles headers: mcode -f header *.m .SUFFIXES: .m diff -rNu melys-0.0.3/programs/melys.c melys-0.0.4/programs/melys.c --- melys-0.0.3/programs/melys.c Tue Jul 20 23:07:38 1999 +++ melys-0.0.4/programs/melys.c Fri Jul 30 00:43:20 1999 @@ -24,8 +24,7 @@ #include #include #include -#include "gnome.h" -#include "melgui.h" +#include "gtk/gtkmain.h" #include "melys.h" #include "intl.h" @@ -40,6 +39,8 @@ static struct option long_opts[] = { {0, 0, 0, 0}, }; + +extern int melys_app(int argc, char **argv); static void showusage(); @@ -60,6 +61,7 @@ //bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); + /* Build up the short option string */ cp = opts; for (op = long_opts; op < &long_opts[NELEM(long_opts)]; op++) { @@ -81,10 +83,17 @@ } } - gnome_init("melys", "0.0.1", argc, argv); melys_app(argc, argv); gtk_main(); + + { + void *p; + + p = malloc(1); /* Only used to get db malloc package linked in */ + free(p); + } + return 0; } diff -rNu melys-0.0.3/programs/pmidi.c melys-0.0.4/programs/pmidi.c --- melys-0.0.3/programs/pmidi.c Tue Jul 20 23:07:39 1999 +++ melys-0.0.4/programs/pmidi.c Fri Jul 30 00:43:20 1999 @@ -142,8 +142,6 @@ * Read a list of client/port specifications and return an * array of snd_seq_addr_t that describes them. * - * Arguments: - * portdesc - */ static seq_context_t * openports(char *portdesc) @@ -160,7 +158,7 @@ if (portdesc == NULL) return NULL; - ctxp = seq_context_new(); + ctxp = seq_context_new("pmidi"); addr = g_new(snd_seq_addr_t, strlen(portdesc)); @@ -191,9 +189,10 @@ count = 0; for (i = 0; i < naddr; i++) { - int err; + int err = 0; - err = seq_connect_add(ctxp, addr[i].client, addr[i].port); + //XXX err = seq_connect_add(ctxp, addr[i].client, addr[i].port); + printf("openports need seq_connect_add\n"); if (err < 0) { fprintf(stderr, _("Could not connect to port %d:%d\n"), addr[i].client, addr[i].port); @@ -213,9 +212,6 @@ /* * Play a single file. - * Arguments: - * ctxp - - * filename - */ static void playfile(seq_context_t *ctxp, char *filename) diff -rNu melys-0.0.3/programs/showseq.c melys-0.0.4/programs/showseq.c --- melys-0.0.3/programs/showseq.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.4/programs/showseq.c Fri Jul 30 00:43:20 1999 @@ -0,0 +1,172 @@ +/* + * + * 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 +#include +#include +#include +#include +#include "seqlib.h" +#include +#include "intl.h" + + +/* Options for the command */ +#define HAS_ARG 1 +static struct option long_opts[] = { + {0, 0, 0, 0}, +}; + +#define ADDR_PARTS 4 /* Number of part in a port description addr 1:2:3:4 */ +#define SEP ", \t" /* Separators for port description */ +static void showlist(); +static void showusage(); + + +/* + * Show all ALSA sequencer ports. + * showseq + + * Arguments: + * argc - arg count + * argv - arg vector + */ +int +main(int argc, char **argv) +{ + char opts[NELEM(long_opts) * 2 + 1]; + 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++ = ':'; + } + + portdesc = NULL; + + /* Deal with the options */ + for (;;) { + c = getopt_long(argc, argv, opts, long_opts, NULL); + if (c == -1) + break; + + switch(c) { + case '?': + showusage(); + exit(1); + } + } + + showlist(); + return 0; +} + +/* + * Show a list of possible output ports that midi could be sent + * to. + * + */ +static void +showlist() +{ + 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) + ethrow(ioError, _("Could not open sequencer %s"), snd_strerror(errno)); + + err = snd_seq_system_info(handle, &sysinfo); + if (err < 0) + ethrow(ioError, _("Could not get sequencer information %s"), + snd_strerror(err)); + + 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) + continue; + + printf("%d: %s ", cinfo.client, cinfo.name); + switch (cinfo.type) { + case NO_CLIENT: + printf("[none] "); + break; + case USER_CLIENT: + printf("[user] "); + break; + case KERNEL_CLIENT: + printf("[kernel] "); + break; + } + printf("\n"); + for (port = 0; port < sysinfo.ports; port++) { + + err = snd_seq_get_any_port_info(handle, client, port, &pinfo); + if (err < 0) + continue; + + printf(" %-3d %-30.30s ", + pinfo.port, pinfo.name); + if (pinfo.capability & SND_SEQ_PORT_CAP_IN) + printf("in "); + if (pinfo.capability & SND_SEQ_PORT_CAP_OUT) + printf("out "); + if (pinfo.capability & SND_SEQ_PORT_CAP_SUBSCRIPTION) + printf("sub "); + if (pinfo.capability & SND_SEQ_PORT_CAP_SYNC_IN) + printf("sync-in "); + if (pinfo.capability & SND_SEQ_PORT_CAP_SYNC_OUT) + printf("sync-out "); + if (pinfo.capability & SND_SEQ_PORT_CAP_DUPLEX) + printf("duplex "); + printf("\n"); + } + } +} + +/* + * Show a usage message + */ +static void +showusage() +{ +char **cpp; +static char *msg[] = { +N_("Usage: showseq"), +"", +}; + + for (cpp = msg; cpp < msg+NELEM(msg); cpp++) { + fprintf(stderr, "%s\n", _(*cpp)); + } +} diff -rNu melys-0.0.3/seq/.cvsignore melys-0.0.4/seq/.cvsignore --- melys-0.0.3/seq/.cvsignore Tue Jul 20 23:07:27 1999 +++ melys-0.0.4/seq/.cvsignore Fri Jul 30 00:43:11 1999 @@ -1,5 +1,6 @@ seqlib.c seqmidi.c +sequtil.c Makefile *.mdml *.mid diff -rNu melys-0.0.3/seq/Makefile melys-0.0.4/seq/Makefile --- melys-0.0.3/seq/Makefile Tue Jul 20 23:07:27 1999 +++ melys-0.0.4/seq/Makefile Fri Jul 30 00:43:11 1999 @@ -5,9 +5,11 @@ TARGETS = OBJS = seqlib.o \ - seqmidi.o + seqmidi.o \ + sequtil.o GENCFILES = seqlib.c \ - seqmidi.c + seqmidi.c \ + sequtil.c GENHFILES = ../include/seqlib.h \ seqpriv.h @@ -22,16 +24,16 @@ # Remove all object files and exectutables # clean: - rm -f $(OBJS) core a.out + rm -f $(TARGETS) $(OBJS) core a.out # Remove all generated and built files. # clobber: clean - rm -f $(TARGETS) $(GENCFILES) $(GENHFILES) Makefile + rm -f $(GENCFILES) $(GENHFILES) Makefile cfiles: $(GENCFILES) -headers: +hfiles headers: mcode -f header *.m .SUFFIXES: .m diff -rNu melys-0.0.3/seq/seqlib.c melys-0.0.4/seq/seqlib.c --- melys-0.0.3/seq/seqlib.c Tue Jul 20 23:07:35 1999 +++ melys-0.0.4/seq/seqlib.c Fri Jul 30 00:43:16 1999 @@ -34,21 +34,25 @@ #include "seqpriv.h" #include "intl.h" +static GArray *get_addr_list(seq_context_t *ctxp, int inout); /* * Create a main client for an application. A queue is * allocated and a client is created. + * Arguments: + * name - Name of the client. */ seq_context_t * -seq_context_new() +seq_context_new(char *name) { seq_context_t *ctxp; snd_seq_queue_client_t qclient; int q; - ctxp = g_new(seq_context_t, 1); + ctxp = g_new0(seq_context_t, 1); ctxp->main = ctxp; /* This is the main context */ + ctxp->next = NULL; /* Allocate client */ if (snd_seq_open(&ctxp->handle, SND_SEQ_OPEN) < 0) @@ -57,6 +61,7 @@ ctxp->client = snd_seq_client_id(ctxp->handle); ctxp->destlist = g_array_new(0, 0, sizeof(snd_seq_addr_t)); + ctxp->srclist = g_array_new(0, 0, sizeof(snd_seq_addr_t)); /* Fill in source address */ ctxp->source.client = ctxp->client; @@ -83,9 +88,14 @@ snd_seq_get_queue_client(ctxp->control->handle, q, &qclient); snd_seq_set_queue_client(ctxp->handle, q, &qclient); + ctxp->inconnected = 0; + ctxp->outconnected = 0; + /* Always need at least one port */ seq_new_port(ctxp); + seq_set_client_name(ctxp, name); + return ctxp; } @@ -93,13 +103,12 @@ * Create another client context based on the specified * context. The same queue will be used for both clients. * - * Arguments: - * ctxp - */ seq_context_t * seq_add_subcontext(seq_context_t *ctxp) { seq_context_t *nctxp; + snd_seq_queue_client_t qclient; nctxp = g_new(seq_context_t, 1); @@ -116,7 +125,13 @@ ethrow(ioError, _("Could not open sequencer: %s"), snd_strerror(errno)); nctxp->client = snd_seq_client_id(nctxp->handle); - nctxp->source.client = ctxp->client; + nctxp->source.client = nctxp->client; + + /* Get qclient info from control and set it on the new client */ + if (ctxp->control) { + snd_seq_get_queue_client(ctxp->control->handle, ctxp->queue, &qclient); + snd_seq_set_queue_client(nctxp->handle, ctxp->queue, &qclient); + } seq_new_port(nctxp); @@ -127,28 +142,36 @@ * Free a context and any associated data and resources. If the * main context is freed then the sequencer is closed. TODO: * link all together so can all be closed at once. - * Arguments: - * cxtp - */ void -seq_context_free(seq_context_t *cxtp) +seq_context_free(seq_context_t *ctxp) { seq_context_t *ncp; - snd_seq_close(cxtp->handle); + if (ctxp == NULL) + return; + + /* Freeing a sub-context just closes the seq connection */ + snd_seq_close(ctxp->handle); - if (cxtp->main == cxtp) { + if (ctxp->main == ctxp) { /* This is the main context */ - snd_seq_free_queue(cxtp->handle, cxtp->queue); + snd_seq_free_queue(ctxp->control->handle, ctxp->queue); - g_array_free(cxtp->destlist, 1); + g_array_free(ctxp->destlist, 1); + g_array_free(ctxp->srclist, 1); + ctxp->destlist = NULL; + ctxp->srclist = NULL; /* Free all subcontext's */ - while ((ncp = cxtp->next) != NULL) { - seq_context_free(ncp); - g_free(cxtp); - cxtp = ncp; + for (ctxp = ctxp->next; ctxp; ctxp = ncp) { + ncp = ctxp->next; + + seq_context_free(ctxp); + g_free(ctxp); } + + g_free(ctxp); } } @@ -186,62 +209,202 @@ } void -seq_destroy_port(seq_context_t *cxtp, int port) +seq_destroy_port(seq_context_t *ctxp, int port) { + + g_warning("seq_destroy_port is not implemented yet"); } /* - * Set up the context so that all subsequent events will be sent - * to the specified client and port combination. A - * subscription is made to the client/port combination. + * The name of the directly associated client on the context is + * set. * * Arguments: - * ctxp - Context to modify - * client - Client to send subsequent events to - * port - Port on the client to send events to + * name - The client name to set + */ +void +seq_set_client_name(seq_context_t *ctxp, char *name) +{ + snd_seq_client_info_t info; +#define INFO_NAME_LEN 64 /* Hard coded in the header file */ + + if (name == NULL) + return; + + snd_seq_get_client_info(ctxp->handle, &info); + memset(info.name, '\0', INFO_NAME_LEN); + strncpy(info.name, name, INFO_NAME_LEN-1); + snd_seq_set_client_info(ctxp->handle, &info); + + if (ctxp->main == ctxp) { + gchar *ctlname; + + ctlname = g_strconcat(name, " (control)", NULL); + seq_set_client_name(ctxp->control, ctlname); + g_free(ctlname); + } +} + +/* + * Set one of the address lists on the context. This will define + * the logical devices for this context. In other words the + * first address in the list is logical device 0. A copy is made + * of the list. + * + * Arguments: + * inout - Whether in or out + * addrlist - The list of addresses + * n - The size of the list + */ +void +seq_set_addresses(seq_context_t *ctxp, enum addrtype inout, + snd_seq_addr_t *addrlist, int n) +{ + GArray *list; + int i; + + list = get_addr_list(ctxp, inout); + if (!list) + return; + + for (i = 0; i < n; i++) { + addrlist[i].queue = ctxp->queue; + } + + g_array_set_size(list, 0); + g_array_append_vals(list, addrlist, n); +} + +/* + * Actually connect the addresses in one of the address lists. + * Its not esential to connect the output list, but has the + * advantage that disconnecting will disable the device. + * + * Arguments: + * inout - Whether in or out */ int -seq_connect_add(seq_context_t *ctxp, int client, int port) +seq_connect_addresses(seq_context_t *ctxp, int inout) { snd_seq_port_subscribe_t subs; snd_seq_addr_t addr; - int ret; - - addr.queue = ctxp->queue; - addr.client = client; - addr.port = port; - addr.channel = 0; - - g_array_append_val(ctxp->destlist, addr); - - subs.sender = ctxp->source; - subs.dest = addr; - subs.realtime = 0; /* XXX */ - subs.exclusive = 0; - ret = snd_seq_subscribe_port(ctxp->handle, &subs); + GArray *list; + int ret = 0; + int i; + + list = get_addr_list(ctxp, inout); + if (!list) + return -EINVAL; + + if (inout == SEQ_ADDR_INPUT && ctxp->inconnected) + return 0; + if (inout == SEQ_ADDR_OUTPUT && ctxp->outconnected) + return 0; + + memset(&subs, 0, sizeof(subs)); + for (i = 0; i < list->len; i++) { + + addr = g_array_index(list, snd_seq_addr_t, i); + + addr.queue = ctxp->queue; + + if (inout == SEQ_ADDR_INPUT) { + ctxp->inconnected = 1; + subs.dest = ctxp->source; + subs.sender = addr; + } else { + ctxp->outconnected = 1; + subs.sender = ctxp->source; + subs.dest = addr; + } +#if 0 +printf("Connect from %s to %s\n", + seq_addr_string(&subs.sender), + seq_addr_string(&subs.dest)); +#endif + + subs.realtime = 0; /* XXX */ + subs.exclusive = 0; + ret = snd_seq_subscribe_port(ctxp->handle, &subs); + if (ret < 0) + g_warning("subscribe failed %s", snd_strerror(ret)); + } return ret; } /* - * Set up the context so that all subsequent events will be sent - * to all subscribed clients. + * Disconnect either input or output. For input this means + * that no more events will be received from those addresses. + * * Arguments: - * ctxp - Context to modify + * inout - Whether in or out */ int -seq_server_add(seq_context_t *ctxp) +seq_disconnect_addresses(seq_context_t *ctxp, int inout) { + snd_seq_port_subscribe_t subs; snd_seq_addr_t addr; + GArray *list; + int ret = 0; + int i; + + list = get_addr_list(ctxp, inout); + if (!list) + return -EINVAL; + + for (i = 0; i < list->len; i++) { + + addr = g_array_index(list, snd_seq_addr_t, i); + + addr.queue = ctxp->queue; + + if (inout == SEQ_ADDR_INPUT) { + ctxp->inconnected = 0; + subs.dest = ctxp->source; + subs.sender = addr; + } else { + ctxp->outconnected = 0; + subs.sender = ctxp->source; + subs.dest = addr; + } - addr.queue = SND_SEQ_ADDRESS_SUBSCRIBERS; - addr.client = 43; - addr.port = 0; - addr.channel = 0; +#if 0 +printf("disconnect from %s to %s\n", + seq_addr_string(&subs.sender), + seq_addr_string(&subs.dest)); +#endif + + subs.realtime = 0; /* XXX */ + subs.exclusive = 0; + ret = snd_seq_unsubscribe_port(ctxp->handle, &subs); + } - g_array_append_val(ctxp->destlist, addr); + return ret; +} + +/* + * Return the address corresponding to the specified logical + * device. + * + * Arguments: + * dev - Device to get the address of. + * inout - Input or output device + */ +snd_seq_addr_t * +seq_dev_addr(seq_context_t *ctxp, int dev, int inout) +{ + GArray *list; + snd_seq_addr_t *addr; - return 0; + list = get_addr_list(ctxp, inout); + + if (dev >= list->len) + return NULL; + + addr = &g_array_index(list, snd_seq_addr_t, dev); + + return addr; } /* @@ -295,28 +458,53 @@ * * Arguments: * ctxp - Client context - * ev - Event to send - * client - Client to send the event to - * port - Port to send the event to + * ep - Event to send + * dev - Logical device to send to + * chan - Channel on device */ int -seq_sendto(seq_context_t *ctxp, snd_seq_event_t *ev, int client, int port) +seq_sendto(seq_context_t *ctxp, snd_seq_event_t *ep, int dev, int chan) { - ev->source = ctxp->source; - ev->dest.queue = ctxp->queue; - ev->dest.client = client; - ev->dest.port = port; - seq_write(ctxp, ev); + ep->source = ctxp->source; + ep->dest = *seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); + ep->dest.channel = chan; +#if 0 + printf("send from %s to %s, event type %d time %d", + seq_addr_string(&ep->source), seq_addr_string(&ep->dest), + ep->type, ep->time.tick); + if (ep->flags & SND_SEQ_TIME_STAMP_REAL) + printf(" real"); + if (ep->flags & SND_SEQ_TIME_MODE_REL) + printf(" rel"); + printf("\n"); +#endif + return seq_write(ctxp, ep); +} + +/* + * Just like seq_sendto but zeros the time field first so that + * the event will be processed straight away even if the timer + * is stopped. As long as the file descriptor is not blocked + * that is... Queue is flushed out. + * Arguments: + * ctxp - Client context + * ep - Event to send + * dev - Logical device to send to + * chan - Channel on device + */ +int +seq_sendto_now(seq_context_t *ctxp, snd_seq_event_t *ep, int dev, int chan) +{ - return 0; + ep->time.tick = 0; + (void) seq_sendto(ctxp, ep, dev, chan); + return snd_seq_flush_output(ctxp->handle); } /* * Start the timer. (What about timers other than the system * one?) - * Arguments: - * ctxp - */ void seq_timer_start(seq_context_t *ctxp) @@ -328,8 +516,6 @@ /* * Stop the timer. (What about timers other than the system * one?) - * Arguments: - * ctxp - */ void seq_timer_stop(seq_context_t *ctxp) @@ -340,8 +526,6 @@ /* * Continue the timer after pausing. - * Arguments: - * ctxp - */ void seq_timer_continue(seq_context_t *ctxp) @@ -371,6 +555,19 @@ } /* + * Get the current song time in ticks. + */ +unsigned long +seq_get_time(seq_context_t *ctxp) +{ + + snd_seq_queue_status_t qstatus; + snd_seq_get_queue_status(ctxp->handle, ctxp->queue, &qstatus); + + return qstatus.tick; +} + +/* * Write out the event. Returns zero if the event could be * written without any blocking. Non zero if there is a queue * inside the library. @@ -450,12 +647,39 @@ } /* + * Flush the output queue so that there are no events left in it. + * + */ +void +seq_drain_output(seq_context_t *ctxp) +{ + snd_seq_queue_client_t qclient; + + /* Since there is not yet a proper flush call we will just + * close and re-open. Not ideal... + */ + snd_seq_close(ctxp->handle); + snd_seq_open(&ctxp->handle, SND_SEQ_OPEN); + ctxp->client = snd_seq_client_id(ctxp->handle); + snd_seq_block_mode(ctxp->handle, 0); /* XXX */ + + if (ctxp->inconnected) + seq_connect_addresses(ctxp, SEQ_ADDR_INPUT); + if (ctxp->outconnected) + seq_connect_addresses(ctxp, SEQ_ADDR_OUTPUT); + + snd_seq_get_queue_client(ctxp->control->handle, ctxp->queue, &qclient); + snd_seq_set_queue_client(ctxp->handle, ctxp->queue, &qclient); + + /* Always need at least one port */ + seq_new_port(ctxp); +} + +/* * Free any variable length extension data that may be on the * event. The event itself is not freed. Assume data allocated * with g_malloc. * - * Arguments: - * ep - */ void seq_event_data_free(snd_seq_event_t *ep) @@ -494,4 +718,40 @@ { return snd_seq_file_descriptor(ctxp->handle); +} + +/* + * Convert an address to a string. The string should be freed + * after use. + * + * Arguments: + * addr - Address to convert to string + */ +char * +seq_addr_string(snd_seq_addr_t *addr) +{ + char *str; + + str = g_strdup_printf("%d:%d:%d:%d", addr->queue, addr->client, + addr->port, addr->channel); + + return str; +} + +/* + * Get the correct list to use from the type. + */ +static GArray * +get_addr_list(seq_context_t *ctxp, int inout) +{ + GArray *list = NULL; + + if (inout == SEQ_ADDR_INPUT) + list = ctxp->srclist; + else if (inout == SEQ_ADDR_OUTPUT) + list = ctxp->destlist; + else + ethrow(debugError, "Unrecognised type to get_addr_list"); + + return list; } diff -rNu melys-0.0.3/seq/seqmidi.c melys-0.0.4/seq/seqmidi.c --- melys-0.0.3/seq/seqmidi.c Tue Jul 20 23:07:36 1999 +++ melys-0.0.4/seq/seqmidi.c Fri Jul 30 00:43:16 1999 @@ -56,14 +56,14 @@ * just scale the device back to fit in the correct range. This * is not necessarily what you want. */ - if (ctxp->ctxndest && dev >= ctxp->ctxndest) - dev = dev % ctxp->ctxndest; + if (ctxp->destlist && dev >= ctxp->destlist->len) + dev = dev % ctxp->destlist->len; memset(ep, '\0', sizeof(*ep)); ep->flags = SND_SEQ_TIME_STAMP_TICK | SND_SEQ_TIME_MODE_ABS; ep->time.tick = time; ep->source = ctxp->source; - if (ctxp->ctxndest > 0) + if (ctxp->destlist->len > 0) ep->dest = g_array_index(ctxp->destlist, snd_seq_addr_t, dev); ep->dest.channel = channel; } @@ -73,9 +73,6 @@ * Arguments: * ctxp - Client context * ep - Event template - * note - - * vel - - * length - */ void seq_midi_note(seq_context_t *ctxp, snd_seq_event_t *ep, int note, int vel, @@ -94,9 +91,6 @@ * Arguments: * ctxp - Client context * ep - Event template - * note - - * vel - - * length - */ void seq_midi_note_on(seq_context_t *ctxp, snd_seq_event_t *ep, int note, int vel, @@ -115,9 +109,6 @@ * Arguments: * ctxp - Client context * ep - Event template - * note - - * vel - - * length - */ void seq_midi_note_off(seq_context_t *ctxp, snd_seq_event_t *ep, int note, int vel, @@ -236,7 +227,7 @@ } /* - * Send a sysex event. The status byte is to distiguish + * Prepare a sysex event. The status byte is to distiguish * continuation sysex messages. * Arguments: * ctxp - Application context @@ -290,9 +281,5 @@ ev.data.raw32.d[0] = type; n = seq_write(ctxp, &ev); - if (n < 0) - printf("OO echo failed\n"); n = snd_seq_flush_output(ctxp->handle); - if (n < 0) - printf("OO2 echo failed\n"); } diff -rNu melys-0.0.3/seq/seqpriv.h melys-0.0.4/seq/seqpriv.h --- melys-0.0.3/seq/seqpriv.h Tue Jul 20 23:07:33 1999 +++ melys-0.0.4/seq/seqpriv.h Fri Jul 30 00:43:13 1999 @@ -28,10 +28,9 @@ int client;/* The client associated with this context */ int queue; /* The queue to use for all operations */ snd_seq_addr_t source; /* Source for events */ - //snd_seq_addr_t dest; /* Destination for events */ + GArray *destlist; /* Destination list */ -#define ctxndest destlist->len -#define ctxdest destlist->data + GArray *srclist; /* Source address list */ char timer_started; /* True if timer is running */ int port_count; /* Ports allocated */ @@ -40,5 +39,10 @@ struct seq_context *control; /* Pointer to the control context */ struct seq_context *next; /* Next context in chain */ + + /* Flags */ + unsigned int inconnected:1, + outconnected:1 + ; }; diff -rNu melys-0.0.3/seq/sequtil.c melys-0.0.4/seq/sequtil.c --- melys-0.0.3/seq/sequtil.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.4/seq/sequtil.c Fri Jul 30 00:43:17 1999 @@ -0,0 +1,98 @@ +/* + * + * 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 +#include +#include +#include "elements.h" +#include "seqlib.h" +#include "intl.h" + +#define ADDR_PARTS 4 /* Number of parts in an address */ +#define SEP " ,\t\n" /* Separators between addresses */ + + +/* + * Parse the client/port description given in portdesc and + * construct an array of addresses. The array is returned into + * the argument addrp and should be freed by the caller. The + * number of valid elements in the array is returned. + * + * Arguments: + * portdesc - String containing port descriptions + * addrp - Returned array + */ +int +seq_get_ports_from_desc(char *portdesc, snd_seq_addr_t **addrp) +{ + char *astr; + char *cp; + snd_seq_addr_t *addr; + snd_seq_addr_t *ap; + gchar **plist; + int a[ADDR_PARTS]; + int count, naddr; + int i; + + if (portdesc == NULL) + return 0; + + addr = g_new(snd_seq_addr_t, strlen(portdesc)); + naddr = 0; + ap = addr; + + /* + * Loop though all the ports given in portdesc. + */ + portdesc = g_strdelimit(portdesc, SEP, ' '); + plist = g_strsplit(portdesc, " ", 0); + for (i = 0, astr = plist[0]; astr; i++, astr = plist[i]) { + + for (cp = astr, count = 0; cp && *cp; cp++) { + if (count < ADDR_PARTS) + a[count++] = atoi(cp); + cp = strchr(cp, ':'); + if (cp == NULL) + break; + } + + /* Depending on how many colons were present, we split up the address */ + switch (count) { + case 1: + ap->client = a[0]; + ap->port = 0; + break; + 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++; + } + + g_strfreev(plist); + + *addrp = addr; + return naddr; +} diff -rNu melys-0.0.3/song/.cvsignore melys-0.0.4/song/.cvsignore --- melys-0.0.3/song/.cvsignore Thu Jan 1 00:00:00 1970 +++ melys-0.0.4/song/.cvsignore Fri Jul 30 00:43:11 1999 @@ -0,0 +1,5 @@ +song.c +Makefile +*.mdml +*.mid +.cvsignore diff -rNu melys-0.0.3/song/Makefile melys-0.0.4/song/Makefile --- melys-0.0.3/song/Makefile Thu Jan 1 00:00:00 1970 +++ melys-0.0.4/song/Makefile Fri Jul 30 00:43:11 1999 @@ -0,0 +1,37 @@ + + +TOP = .. +include $(TOP)/make.conf + +TARGETS = +OBJS = song.o +GENCFILES = song.c +GENHFILES = ../include/song.h + + + +# Build all the targets. +# +all: $(TARGETS) $(OBJS) + + + +# Remove all object files and exectutables +# +clean: + rm -f $(TARGETS) $(OBJS) core a.out + +# Remove all generated and built files. +# +clobber: clean + rm -f $(GENCFILES) $(GENHFILES) Makefile + +cfiles: $(GENCFILES) + +hfiles headers: + mcode -f header *.m + +.SUFFIXES: .m +.m.c: + mcode $(MCODEFLAGS) -o $@ $< + diff -rNu melys-0.0.3/song/song.c melys-0.0.4/song/song.c --- melys-0.0.3/song/song.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.4/song/song.c Fri Jul 30 00:43:16 1999 @@ -0,0 +1,268 @@ +/* + * + * 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 "gtk/gtkwidget.h" +#include "elements.h" +#include "md.h" +#include "melmidi.h" +#include "melreg.h" +#include "format.h" +#include +#include "mdrw.h" +#include "song.h" +#include "melgui.h" +#include "intl.h" + + + + +/* + * Open the file specified by filename and read it into the song + * structure as an MD tree. If filename is NULL, then an empty + * new song is created. + * + */ +void +song_open_file(struct song *song, char *filename) +{ + struct rootElement *root; + char *errmsg; + + if (filename) { + root = file_guess_read_with_msg(filename, &errmsg); + } else { + root = md_empty(); + filename = ""; + } + + if (root == NULL) { + char *msg; + + if (errmsg == NULL) + errmsg = ""; + + msg = g_strdup_printf(_("Could not read file %s\n" "%s\n"), + g_basename(filename), errmsg); + mel_ui_error(song, msg, NULL); + + g_free(msg); + return; + } + + song->mdroot = root; + play_set_mdroot(song->play, root); + record_set_mdroot(song->record, root); + + play_set_ports(song->play); + //play_set_ports(song->echo); + record_set_ports(song->record); + + song->newtrack = md_track_new(); + song->tracknum = MD_CONTAINER(root)->elements->len - 2; /* xxx temp */ +} + +/* + * Set up the midi echo to reflect the currently selected + * track. If the current track is associated with channel 6 on + * logical device 2, for example, then midi events must be + * echoed there. XXX shouldn't be here + * + */ +void +song_set_echo() +{ +} + +/* + * Disable the midi echo. This is usually done before + * switching to another track. XXX shouldn't be here + * + */ +void +song_reset_echo() +{ +} + +/* + * Start up audio and midi streams to start playing. + */ +void +song_play_start(struct song *song) +{ + + play_start(song->play); +} + +/* + * Pause the audio and midi streams. The next play will resume + * playing from the same point. + */ +void +song_play_pause(struct song *song) +{ + + play_pause(song->play); +} + +/* + * Stop and rewind the audio and midi streams. Also stop + * recording if recording is active. The next play will start + * playing from the beginning. + */ +void +song_play_stop(struct song *song) +{ + + record_stop(song->record); + + play_set_record(song->play, 0); + play_stop(song->play); + + /* + * This is all temporary. If events have been recorded on the + * newtrack then add the track to the song. + */ + if (MD_CONTAINER(song->newtrack)->elements->len) { + g_message("adding the new track"); + md_add(MD_CONTAINER(song->mdroot), MD_ELEMENT(song->newtrack)); + + song->newtrack = md_track_new(); + song->tracknum++; + } +} + +/* + * Start recording. This may be called while already playing, + * or while not playing, in which case playing must be started + * as well. + * + */ +void +song_record_start(struct song *song) +{ + + /* Depends on what kind of track we have selected audio/midi */ + /* Only midi exists at present... */ + play_set_record(song->play, 1); + play_start(song->play); + + record_set_track(song->record, song->newtrack, song->tracknum); + record_start(song->record); +} + +/* + * Stop recording only. If the song is playing (as it will be if + * not ended) then it will carry on playing. + * + */ +void +song_record_stop(struct song *song) +{ + + record_stop(song->record); + play_set_record(song->play, 0); +} + +/* + * Get the child info data from the specified child. If it does + * not exist then this is an error, you are meant to access it + * from the parent mdi first. + * Arguments: + * child - Child to get data from + */ +struct song * +song_get_data(GtkObject *child) +{ + struct song *sd; + + sd = gtk_object_get_data(child, MEL_SONG_DATA); + if (sd == NULL) + ethrow(debugError, "No child data in song_get_data"); + + return sd; +} + +/* + * Create and initialise the child data. The newly created + * data is returned. + * + * Arguments: + * mdi - The parent MDI + * child - Child on which to create the data + */ +struct song * +song_new(GtkObject *mdi, GtkObject *child) +{ + struct song *sd; + + sd = g_new0(struct song, 1); + sd->mdi = mdi; + sd->child = child; + sd->filename = NULL; + sd->mdroot = NULL; + sd->open_dialog = 0; + sd->save_dialog = 0; + sd->dialog = 0; + sd->play = play_new(); + //sd->echo = play_new(); + sd->record = record_new(play_get_context(sd->play)); + + gtk_object_set_data_full(GTK_OBJECT(child), MEL_SONG_DATA, + sd, song_destroy); + + return sd; +} + +/* + * Destroy the child data structure and any resourse + * allocated off it. This will be called automatically when + * the child is destroyed. + * + */ +void +song_destroy(gpointer data) +{ + struct song *sd; + GtkWidget *w; + + sd = data; + + /* Destroy all resources */ + if (sd->mdroot) { + md_free(MD_ELEMENT(sd->mdroot)); + sd->mdroot = NULL; + } + + if (sd->open_dialog) { + w = reg_get_widget(sd->open_dialog); + if (w) + gtk_widget_destroy(w); + } + if (sd->save_dialog) { + w = reg_get_widget(sd->save_dialog); + if (w) + gtk_widget_destroy(w); + } + + if (sd->play) + play_free(sd->play); + + /* Free the data itself */ + g_free(sd); +} diff -rNu melys-0.0.3/util/Makefile melys-0.0.4/util/Makefile --- melys-0.0.3/util/Makefile Tue Jul 20 23:07:28 1999 +++ melys-0.0.4/util/Makefile Fri Jul 30 00:43:12 1999 @@ -22,16 +22,16 @@ # Remove all object files and exectutables # clean: - rm -f $(OBJS) core a.out + rm -f $(TARGETS) $(OBJS) core a.out # Remove all generated and built files. # clobber: clean - rm -f $(TARGETS) $(GENCFILES) $(GENHFILES) Makefile + rm -f $(GENCFILES) $(GENHFILES) Makefile cfiles: $(GENCFILES) -headers: +hfiles headers: mcode -f header *.m .SUFFIXES: .m diff -rNu melys-0.0.3/widgets/Makefile melys-0.0.4/widgets/Makefile --- melys-0.0.3/widgets/Makefile Tue Jul 20 23:07:33 1999 +++ melys-0.0.4/widgets/Makefile Fri Jul 30 00:43:12 1999 @@ -19,16 +19,16 @@ # Remove all object files and exectutables # clean: - rm -f $(OBJS) core a.out + rm -f $(TARGETS) $(OBJS) core a.out # Remove all generated and built files. # clobber: clean - rm -f $(TARGETS) $(GENCFILES) $(GENHFILES) Makefile + rm -f $(GENCFILES) $(GENHFILES) Makefile cfiles: $(GENCFILES) -headers: +hfiles headers: mcode -f header *.m .SUFFIXES: .m