diff -rNu melys-0.0.6/ChangeLog melys-0.0.7/ChangeLog --- melys-0.0.6/ChangeLog Mon Aug 9 19:27:07 1999 +++ melys-0.0.7/ChangeLog Wed Aug 11 14:45:03 1999 @@ -1,3 +1,78 @@ +1999-08-11 Steve Ratcliffe + + * ChangeLog: REL-0-0-7 + + * help/C/.cvsignore, help/C/menus.sgml: + Documentation split into separate files for each chapter + + * widgets/melystrackinfo.m: + Add an enter handler and a button press handler. + Button press does nothing yet. + + * song/song.m: When a track is added we now instantly update the view + + * gui/main.m, gui/menus.m: + Attempt to keep the focus in the main window where + it is more useful. + +1999-08-10 Steve Ratcliffe + + * files/.cvsignore, files/format.m, gui/main.m, + programs/.cvsignore, programs/melplay.m, programs/melys.m, + programs/showseq.m, seq/seqlib.m: Final tidy ups on the ethrow + and error handling is now quite nice. Dialogs appear on top + of the windows that they belong to and go away when they should + and everything is non-modal at present. + + * gui/menus.m: Added a 'New' menu item + + * files/file.m: This file is the new interface to the file functions. + It replaces format.m + + * gui/main.m, gui/menus.m, help/C/melys.sgml, + programs/mdmlconv.m, programs/melys.m, song/song.m, util/except.m, + widgets/melystrackinfo.m, files/.cvsignore, files/format.m, + files/mdmlread.m, files/mdmlwrite.m, files/midiread.m, + files/midiwrite.m: Massive tidy up of the file error handling. It + used to just exit if anything unexpected (like a file not + existing!) happend. Now not only does it carry on, but you + always get a nice error message box, that sometimes even says + what the problem was. + + * programs/melplay.m, programs/pmidi.m: + Pmidi is removed to stop confusion with the released pmidi. + Not to mention that it isn't working anyway. + Renamed to melplay.m which will be a command line Melys player. + It will be able to play any file that Melys can read. + +1999-08-09 Steve Ratcliffe + + * ChangeLog: REL-0-0-6 + + * song/song.m: + Warning about type 0 files (temporary) and now if can't read + file there is no view created for it. (and no crash when it + can't be displayed for that matter) + + * midi/play.m: Reset all controllers before starting a new piece. + + * seq/seqlib.m: Add a function for sending to all opened channels + intended for things like controller reset and the like. + + * po/FILES, po/melys.pot, po/zz.po: updated + + * gui/main.m, gui/menus.m: Create a warn routine (main) + If the file fails to load then don't create a view for it. + + * md/elements.m, md/mdutil.m: Track numbers now start internally at 0 + Add var to store program number + + * files/mdmlread.m, files/midiread.m, widgets/melystrack.m, + widgets/melystrackinfo.m: Improvements to the track view. + Can now see the track names and program numbers. + + * util/except.m: removed stack trace debug, which always seemed to hang + 1999-08-09 Steve Ratcliffe * song/song.m: diff -rNu melys-0.0.6/INSTALL melys-0.0.7/INSTALL --- melys-0.0.6/INSTALL Tue Jul 20 11:45:23 1999 +++ melys-0.0.7/INSTALL Wed Aug 11 14:54:38 1999 @@ -10,6 +10,18 @@ This should build everything. Nothing is installed anywhere yet. +Run +--- + +You will need to set up ALSA_INPUT_PORTS and ALSA_OUTPUT_PORTS variables. +The 'showseq' command in the programs directory can be used to find +out what ports are available. + +For example to use the AWE32/64 card with the internal synth, I use: + +export ALSA_INPUT_PORTS=64:0 +export ALSA_OUTPUT_PORTS='65:0 65:1 65:2 65:3' + Go to the programs directory and type: ./melys diff -rNu melys-0.0.6/README melys-0.0.7/README --- melys-0.0.6/README Fri Jul 30 00:33:37 1999 +++ melys-0.0.7/README Wed Aug 11 14:54:38 1999 @@ -36,11 +36,6 @@ 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. -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: diff -rNu melys-0.0.6/files/.cvsignore melys-0.0.7/files/.cvsignore --- melys-0.0.6/files/.cvsignore Mon Aug 9 19:46:16 1999 +++ melys-0.0.7/files/.cvsignore Wed Aug 11 15:40:57 1999 @@ -1,4 +1,4 @@ -format.c +file.c mdmlread.c mdmlwrite.c midiread.c diff -rNu melys-0.0.6/files/Makefile melys-0.0.7/files/Makefile --- melys-0.0.6/files/Makefile Mon Aug 9 19:46:16 1999 +++ melys-0.0.7/files/Makefile Wed Aug 11 15:40:57 1999 @@ -4,17 +4,17 @@ include $(TOP)/make.conf TARGETS = -OBJS = format.o \ +OBJS = file.o \ mdmlread.o \ mdmlwrite.o \ midiread.o \ midiwrite.o -GENCFILES = format.c \ +GENCFILES = file.c \ mdmlread.c \ mdmlwrite.c \ midiread.c \ midiwrite.c -GENHFILES = ../include/format.h \ +GENHFILES = ../include/melfile.h \ ../include/mdrw.h \ ../include/midi.h diff -rNu melys-0.0.6/files/file.c melys-0.0.7/files/file.c --- melys-0.0.6/files/file.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.7/files/file.c Wed Aug 11 15:41:04 1999 @@ -0,0 +1,364 @@ +/* + * + * 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. + * + * Manage reading and writing to the various file formats. + * The initially supported formats will be MIDI and MDML. + * + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "elements.h" +#include +#include "md.h" +#include "melfile.h" +#include "mdrw.h" +#include "midi.h" +#include "intl.h" + + +static struct extension_table { + char *ext; /* Extension */ + char *type; /* Type */ +} extension_table[] = { + {".mid", FILE_TYPE_MIDI}, + {".smf", FILE_TYPE_MIDI}, + {".mdml", FILE_TYPE_MDML}, + {".mdml.gz", FILE_TYPE_MDML_COMPRESSED}, + /* There is nothing to stop .mdml without .gz from being compressed */ +}; + +struct typefuncs { + char *type; /* Type of file */ + fileReadFunc read; /* Read function */ + fileWriteFunc write; /* Write function */ + int flags; /* Flags that apply to this type */ +}; +static struct typefuncs typefuncs[] = { + {FILE_TYPE_MIDI, midi_read_file, midi_write_file, 0}, + {FILE_TYPE_MDML, mdml_read_file, mdml_write_file, 0}, + {FILE_TYPE_MDML_COMPRESSED, mdml_read_file, mdml_write_file, + FILE_OPT_COMPRESSED}, +}; +static void guess_type(struct File *file); + + +struct File * +file_new(char *name) +{ + struct File *file; + + file = g_new0(struct File, 1); + file->type = NULL; + file->name = name; + file->status = FILE_STATUS_NONE; + + file->msg = NULL; + file->progress_cb = NULL; + + file->max = 0.0; + file->done = 0.0; + + file->read = NULL; + file->write = NULL; + + return file; +} + +/* + * Set the file type. This is useful for 'save-as' situations + * where the user gives the file type, or for when the file + * doesn't have the correct extension and can't be recognised + * automatically. Also used internally when the type is + * recognised. + * Arguments: + * type - File type FILE_TYPE_* + */ +void +file_set_type(struct File *file, char *type) +{ + struct typefuncs *tp; + + g_return_if_fail(type != NULL); + + for (tp = typefuncs; tp < typefuncs+NELEM(typefuncs); tp++) { + if (strcmp(tp->type, type) == 0) { + file->type = type; + file->read = tp->read; + file->write = tp->write; + if (tp->flags & FILE_OPT_COMPRESSED) + file_set_compressed(file, TRUE); + else + file_set_compressed(file, FALSE); + + file->status = 0; + return; + } + } + + file->status = FILE_STATUS_UNKNOWN; + file->msg = _("The file type was not recognised"); +} + +/* + * Set the flag to start using the compressed version of a + * format that supports compression. Supported for MDML. In + * general there is no need to set this flag for read, as the + * correct format will be worked out. + * Arguments: + * yesno - True to start using compressed format. + */ +void +file_set_compressed(struct File *file, gboolean yesno) +{ + + file->compressed = yesno; +} + +/* + * Returns the status of the last operation. + */ +int +file_get_status(struct File *file) +{ + return file->status; +} + +/* + * Returns the human readable message from the last + * operation. + */ +char * +file_get_message(struct File *file) +{ + return file->msg; +} + +/* + * Returns a number between 0 and 1 that is an indication of the + * progress of a read or write. The file should be completely + * processed when the return value reaches 1.0. + */ +double +file_get_progress(struct File *file) +{ + double res; + + if (file->max == 0) + return 1.0; + + res = file->done / file->max; + if (res > 0.999) + return 1.0; + else if (res <= 0.0001) + return 0.0; + else + return res; +} + +/* + * This function will be called from time to time during a long + * read or write. The called routine can use + * file_get_progress to see how things are going. + * Arguments: + * cb - Callback function + */ +void +file_set_progress_callback(struct File *file, + void (*cb)(struct File *, gpointer)) +{ + + file->progress_cb = cb; +} + +/* + * Set a successful status if there has been no error. + */ +void +file_set_success(struct File *file) +{ + + if (file->status == FILE_STATUS_NONE) { + file->status = FILE_SUCCESS; + file->msg = NULL; + } +} + +/* + * If no error has been set before then set the error status. You + * can't set success with this routine. It is printf like. + * + * Arguments: + * file - Users file handle + * code - The error code + * fmt - A error message format printf-like + */ +void +file_set_error(struct File *file, int code, char *fmt, ...) +{ + va_list args; + char *msg; + + if (code == FILE_STATUS_NONE || code == FILE_SUCCESS) + return; + + if (fmt == NULL) + fmt = _("No information available, sorry"); + + /* + * We don't overwrite existing errors as the first one is + * usually the most relevent. + */ + switch (file->status) { + case FILE_STATUS_NONE: + case FILE_SUCCESS: /* An error overrides success */ + va_start(args, fmt); + msg = g_strdup_vprintf(fmt, args); + va_end(args); + + file->status = code; + if (file->msg) /* Shouldn't really happen.. */ + g_free(file->msg); + file->msg = msg; + break; + default: + break; + } +} + +/* + * Bye Bye file. + */ +void +file_close(struct File *file) +{ + + g_return_if_fail(file != NULL); + + if (file->msg) + g_free(file->msg); + + g_free(file); +} + +/* + * File is read and converted into a MD tree, which is returned. + * + */ +struct rootElement * +file_read(struct File *file) +{ + struct rootElement *root; + + file->status = FILE_STATUS_NONE; + + /* If there is no filename the return a new, empty MD */ + if (file->name == NULL || file->name == "") { + root = md_empty(); + if (root) { + file->name = ""; + file_set_success(file); + } + return root; + } + + /* Try to determine the file type, if not already given */ + if (file->type == NULL) + guess_type(file); + + if (file->type == NULL) + return NULL; + + if (file->read == NULL) { + /* This should have been set along with type, so we + * do not expect it to be NULL at all */ + file_set_error(file, FILE_STATUS_INTERNAL, + _("Could not read file\n" + "This is probably a bug")); + return NULL; + } + + root = file->read(file); + if (root) + file_set_success(file); + + return root; +} + +/* + * The root is written to the specified file. + * + * Arguments: + * file - File to write + * root - Root to write out + */ +void +file_write(struct File *file, struct rootElement *root) +{ + + file->status = FILE_STATUS_NONE; + + /* Try to determine the file type, if not already given */ + if (file->type == NULL) + guess_type(file); + + if (file->type == NULL) + return; + + if (file->write == NULL) { + /* This should have been set along with type, so we + * do not expect it to be NULL at all */ + file_set_error(file, FILE_STATUS_INTERNAL, + _("Could not write file\n" + "This is probably a bug")); + return; + } + + file->write(file, root); + + /* Success is only set if there was no error */ + file_set_success(file); +} + +/* + * Take the filename and guess the type of the file. First will + * look at the extension and then may use magic numbers in the + * file to deduce the type. + * + */ +static void +guess_type(struct File *file) +{ + struct extension_table *ep; + int namelen; + + namelen = strlen(file->name); + for (ep = extension_table; ep < ENDOF(extension_table); ep++) { + int off; + + off = namelen - strlen(ep->ext); + if (off > 0) + if (strcmp(file->name+off, ep->ext) == 0) { + file_set_type(file, ep->type); + file->status = 0; + return; + } + } + + file->status = FILE_STATUS_UNKNOWN; + file->msg = _("The file type was not recognised"); +} diff -rNu melys-0.0.6/files/file.m melys-0.0.7/files/file.m --- melys-0.0.6/files/file.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.7/files/file.m Tue Aug 10 15:03:31 1999 @@ -0,0 +1,417 @@ +>>name file.m - XXX + +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. + +Manage reading and writing to the various file formats. +The initially supported formats will be MIDI and MDML. + +>>header +>>header md.h + +>>headerdef --decl melfile.h + +struct File; + +typedef struct rootElement *(*fileReadFunc)(struct File *); +typedef void (*fileWriteFunc)(struct File *, struct rootElement *); + +struct File { + char *type; /* Midi, MDML etc */ + char *name; /* File name */ + + /* Private stuff */ + + int status; /* Result code of operation */ + char *msg; /* Message for a failed operation */ + + gboolean compressed; /* T/F if compressed format */ + + /* Callback for long lasting operations */ + void (*progress_cb)(struct File *, gpointer); + + /* Variables to calculate progress, always use file_get_progress */ + double max; /* Estimate of total work to be done */ + double done; /* Estimate of work done */ + + fileReadFunc read; /* Read function */ + fileWriteFunc write; /* Write function */ +}; + + +/* + * Types of file. + */ +#define FILE_TYPE_MIDI "midi" +#define FILE_TYPE_MDML "mdml" +#define FILE_TYPE_MDML_COMPRESSED "gz-mdml" + +enum { + FILE_OPT_COMPRESSED = 0x001, + FILE_OPT_LAST +}; + +/* + * Variables that can appear in the status field. The message + * gives a more useful indication to the user. + */ +enum fileErrors { + FILE_SUCCESS, /* Successful status */ + FILE_STATUS_NONE,/* This just means that no status has been set yet */ + FILE_STATUS_CONFIRM, /* Do you really want to... kind of messages */ + FILE_STATUS_OPEN_FAIL, /* Could not open */ + FILE_STATUS_BAD_FORMAT, /* File had a format problem */ + FILE_STATUS_UNKNOWN, /* Could not recognise file type */ + FILE_STATUS_INTERNAL,/* Probably a Melys bug, rather than user error */ + FILE_STATUS_LAST +}; + +>>header mdrw.h +>>header midi.h + +>>extern + +static struct extension_table { + char *ext; /* Extension */ + char *type; /* Type */ +} extension_table[] = { + {".mid", FILE_TYPE_MIDI}, + {".smf", FILE_TYPE_MIDI}, + {".mdml", FILE_TYPE_MDML}, + {".mdml.gz", FILE_TYPE_MDML_COMPRESSED}, + /* There is nothing to stop .mdml without .gz from being compressed */ +}; + +struct typefuncs { + char *type; /* Type of file */ + fileReadFunc read; /* Read function */ + fileWriteFunc write; /* Write function */ + int flags; /* Flags that apply to this type */ +}; +static struct typefuncs typefuncs[] = { + {FILE_TYPE_MIDI, midi_read_file, midi_write_file, 0}, + {FILE_TYPE_MDML, mdml_read_file, mdml_write_file, 0}, + {FILE_TYPE_MDML_COMPRESSED, mdml_read_file, mdml_write_file, + FILE_OPT_COMPRESSED}, +}; + + +>>function file_new +struct File * +char *name; File name + +>>code + struct File *file; + + file = g_new0(struct File, 1); + file->type = NULL; + file->name = name; + file->status = FILE_STATUS_NONE; + + file->msg = NULL; + file->progress_cb = NULL; + + file->max = 0.0; + file->done = 0.0; + + file->read = NULL; + file->write = NULL; + + return file; + + +>>function file_set_type +void +struct File *file; +char *type; File type FILE_TYPE_* +>>description +Set the file type. +This is useful for 'save-as' situations where the user +gives the file type, or for when the file doesn't have the +correct extension and can't be recognised automatically. +Also used internally when the type is recognised. +>>code + struct typefuncs *tp; + + g_return_if_fail(type != NULL); + + for (tp = typefuncs; tp < typefuncs+NELEM(typefuncs); tp++) { + if (strcmp(tp->type, type) == 0) { + file->type = type; + file->read = tp->read; + file->write = tp->write; + if (tp->flags & FILE_OPT_COMPRESSED) + file_set_compressed(file, TRUE); + else + file_set_compressed(file, FALSE); + + file->status = 0; + return; + } + } + + file->status = FILE_STATUS_UNKNOWN; + file->msg = _("The file type was not recognised"); + + +>>function file_set_compressed +void +struct File *file; +gboolean yesno; True to start using compressed format. + +>>description +Set the flag to start using the compressed version of a format +that supports compression. +Supported for MDML. +In general there is no need to set this flag +for read, as the correct format will be worked out. +>>code + + file->compressed = yesno; + +>>function file_get_status +int +struct File *file; +>>description +Returns the status of the last operation. +>>code + return file->status; + +>>function file_get_message +char * +struct File *file; +>>description +Returns the human readable message from the last +operation. +>>code + return file->msg; + +>>function file_get_progress +double +struct File *file; +>>description +Returns a number between 0 and 1 that is an indication of +the progress of a read or write. +The file should be completely processed when the return value +reaches 1.0. +>>code + double res; + + if (file->max == 0) + return 1.0; + + res = file->done / file->max; + if (res > 0.999) + return 1.0; + else if (res <= 0.0001) + return 0.0; + else + return res; + +>>function file_set_progress_callback +void +struct File *file; +void (*cb)(struct File *, gpointer); Callback function + +>>description +This function will be called from time to time during a long +read or write. +The called routine can use +.F file_get_progress +to see how things are going. +>>code + + file->progress_cb = cb; + + +>>function file_set_success +void +struct File *file; +>>description +Set a successful status if there has been no error. +>>code + + if (file->status == FILE_STATUS_NONE) { + file->status = FILE_SUCCESS; + file->msg = NULL; + } + + +>>function file_set_error +void +struct File *file; Users file handle +int code; The error code +char *fmt; A error message format printf-like +... + +>>description +If no error has been set before then set the error +status. +You can't set success with this routine. +It is printf like. + +>>code + va_list args; + char *msg; + + if (code == FILE_STATUS_NONE || code == FILE_SUCCESS) + return; + + if (fmt == NULL) + fmt = _("No information available, sorry"); + + /* + * We don't overwrite existing errors as the first one is + * usually the most relevent. + */ + switch (file->status) { + case FILE_STATUS_NONE: + case FILE_SUCCESS: /* An error overrides success */ + va_start(args, fmt); + msg = g_strdup_vprintf(fmt, args); + va_end(args); + + file->status = code; + if (file->msg) /* Shouldn't really happen.. */ + g_free(file->msg); + file->msg = msg; + break; + default: + break; + } + + +>>function file_close +void +struct File *file; +>>description +Bye Bye file. +>>#The underlying file is closed and all resources are released. +>>code + + g_return_if_fail(file != NULL); + + if (file->msg) + g_free(file->msg); + + g_free(file); + + +>># #### The read/write operations. + +>>function file_read +struct rootElement * +struct File *file; +>>description +File is read and converted into a MD tree, which +is returned. + +>>code + struct rootElement *root; + + file->status = FILE_STATUS_NONE; + + /* If there is no filename the return a new, empty MD */ + if (file->name == NULL || file->name == "") { + root = md_empty(); + if (root) { + file->name = ""; + file_set_success(file); + } + return root; + } + + /* Try to determine the file type, if not already given */ + if (file->type == NULL) + guess_type(file); + + if (file->type == NULL) + return NULL; + + if (file->read == NULL) { + /* This should have been set along with type, so we + * do not expect it to be NULL at all */ + file_set_error(file, FILE_STATUS_INTERNAL, + _("Could not read file\n" + "This is probably a bug")); + return NULL; + } + + root = file->read(file); + if (root) + file_set_success(file); + + return root; + + +>>function file_write +void +struct File *file; File to write +struct rootElement *root; Root to write out +>>description +The root is written to the specified file. + +>>code + + file->status = FILE_STATUS_NONE; + + /* Try to determine the file type, if not already given */ + if (file->type == NULL) + guess_type(file); + + if (file->type == NULL) + return; + + if (file->write == NULL) { + /* This should have been set along with type, so we + * do not expect it to be NULL at all */ + file_set_error(file, FILE_STATUS_INTERNAL, + _("Could not write file\n" + "This is probably a bug")); + return; + } + + file->write(file, root); + + /* Success is only set if there was no error */ + file_set_success(file); + + + +>>function guess_type +static void +struct File *file; + +>>description +Take the filename and guess the type of the file. +First will look at the extension and then may use magic +numbers in the file to deduce the type. + +>>code + struct extension_table *ep; + int namelen; + + namelen = strlen(file->name); + for (ep = extension_table; ep < ENDOF(extension_table); ep++) { + int off; + + off = namelen - strlen(ep->ext); + if (off > 0) + if (strcmp(file->name+off, ep->ext) == 0) { + file_set_type(file, ep->type); + file->status = 0; + return; + } + } + + file->status = FILE_STATUS_UNKNOWN; + file->msg = _("The file type was not recognised"); + diff -rNu melys-0.0.6/files/format.c melys-0.0.7/files/format.c --- melys-0.0.6/files/format.c Mon Aug 9 19:46:23 1999 +++ melys-0.0.7/files/format.c Thu Jan 1 00:00:00 1970 @@ -1,178 +0,0 @@ -/* - * - * Copyright (C) 1999 Steve Ratcliffe - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ - - -#include "glib.h" -#include "except.h" -#include "util.h" -#include "elements.h" -#include -#include "mdrw.h" -#include "midi.h" -#include "format.h" -#include "intl.h" - - -struct typefuncs { - char *type; /* Type of file */ - fileReadFunc read; /* Read function */ - fileWriteFunc write; /* Write function */ -}; -struct typefuncs typefuncs[] = { - {"midi", midi_read_file, midi_write_file}, - {"mdml", mdml_read_file, mdml_write_file}, -}; - - -/* - * Take the filename and guess the type of the file. First will - * look at the extension and then may use magic numbers in the - * file to deduce the type. - * - * Arguments: - * filename - Filename to guess the type of - */ -char * -file_guess_type(char *filename) -{ - static struct exttable { - char *ext; /* Extension */ - char *type; /* Type */ - } exttable[] = { - {".mid", "midi"}, - {".smf", "midi"}, - {".mdml", "mdml"}, - {".mdml.gz", "mdml"}, - }; - struct exttable *ep; - - for (ep = exttable; ep < exttable+NELEM(exttable); ep++) { - int off; - - off = strlen(filename) - strlen(ep->ext); - if (off > 0) - if (strcmp(filename+off, ep->ext) == 0) - return ep->type; - } - - return NULL; -} - -/* - * Returns the function used to read the file of a specified - * type. - * Arguments: - * type - Type of file to be read - */ -fileReadFunc -file_get_read_func(char *type) -{ - struct typefuncs *tp; - - if (type == NULL) - return NULL; - - for (tp = typefuncs; tp < typefuncs+NELEM(typefuncs); tp++) { - if (strcmp(tp->type, type) == 0) - return tp->read; - } - return NULL; -} - -/* - * Return the function used to read the file of the specified - * type. - * Arguments: - * type - Type of file to be written - */ -fileWriteFunc -file_get_write_func(char *type) -{ - struct typefuncs *tp; - - if (type == NULL) - return NULL; - - for (tp = typefuncs; tp < typefuncs+NELEM(typefuncs); tp++) { - if (strcmp(tp->type, type) == 0) - return tp->write; - } - return NULL; -} - -/* - * Returns read function based on the filename. - * Arguments: - * filename - Filename to be read - */ -fileReadFunc -file_guess_read_func(char *filename) -{ - char *type; - - type = file_guess_type(filename); - return file_get_read_func(type); -} - -/* - * Returns write function based on the filename. - * Arguments: - * filename - Filename to be writen - */ -fileWriteFunc -file_guess_write_func(char *filename) -{ - char *type; - - 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.6/files/format.m melys-0.0.7/files/format.m --- melys-0.0.6/files/format.m Fri Aug 6 11:53:31 1999 +++ melys-0.0.7/files/format.m Thu Jan 1 00:00:00 1970 @@ -1,160 +0,0 @@ ->>name format.m - Routines to deal with different file formats - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. ->>header ->>header util.h ->>header mdrw.h ->>header midi.h ->>extern - -struct typefuncs { - char *type; /* Type of file */ - fileReadFunc read; /* Read function */ - fileWriteFunc write; /* Write function */ -}; -struct typefuncs typefuncs[] = { - {"midi", midi_read_file, midi_write_file}, - {"mdml", mdml_read_file, mdml_write_file}, -}; - ->>headerdef --decl format.h - -typedef struct rootElement *(*fileReadFunc)(char *name); -typedef void (*fileWriteFunc)(char *name, struct rootElement *root, int flags); - ->>function file_guess_type -char * -char *filename; Filename to guess the type of - ->>description -Take the filename and guess the type of the file. -First will look at the extension and then may use magic -numbers in the file to deduce the type. - ->>code - static struct exttable { - char *ext; /* Extension */ - char *type; /* Type */ - } exttable[] = { - {".mid", "midi"}, - {".smf", "midi"}, - {".mdml", "mdml"}, - {".mdml.gz", "mdml"}, - }; - struct exttable *ep; - - for (ep = exttable; ep < exttable+NELEM(exttable); ep++) { - int off; - - off = strlen(filename) - strlen(ep->ext); - if (off > 0) - if (strcmp(filename+off, ep->ext) == 0) - return ep->type; - } - - return NULL; - - - ->>function file_get_read_func -fileReadFunc -char *type; Type of file to be read ->>description -Returns the function used to read the file of a specified type. ->>code - struct typefuncs *tp; - - if (type == NULL) - return NULL; - - for (tp = typefuncs; tp < typefuncs+NELEM(typefuncs); tp++) { - if (strcmp(tp->type, type) == 0) - return tp->read; - } - return NULL; - ->>function file_get_write_func -fileWriteFunc -char *type; Type of file to be written ->>description -Return the function used to read the file of the specified type. ->>code - struct typefuncs *tp; - - if (type == NULL) - return NULL; - - for (tp = typefuncs; tp < typefuncs+NELEM(typefuncs); tp++) { - if (strcmp(tp->type, type) == 0) - return tp->write; - } - return NULL; - ->>function file_guess_read_func -fileReadFunc -char *filename; Filename to be read ->>description -Returns read function based on the filename. ->>code - char *type; - - type = file_guess_type(filename); - return file_get_read_func(type); - ->>function file_guess_write_func -fileWriteFunc -char *filename; Filename to be writen ->>description -Returns write function based on the filename. ->>code - char *type; - - type = file_guess_type(filename); - return file_get_write_func(type); - - ->>function file_guess_read_with_msg -struct rootElement * -char *filename; File to read -char **errmsg; An error message to be displayed. - ->>description -Read in the file -.A filename . -On error NULL is returned and a message is returned into -.A errmsg . - ->>code - 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.6/files/mdmlread.c melys-0.0.7/files/mdmlread.c --- melys-0.0.6/files/mdmlread.c Mon Aug 9 19:46:23 1999 +++ melys-0.0.7/files/mdmlread.c Wed Aug 11 15:41:04 1999 @@ -26,6 +26,7 @@ #include #include #include +#include "melfile.h" #include "md.h" #include "mdrw.h" #include @@ -36,6 +37,7 @@ xmlSAXHandler SAXhandler; struct mdmlstate { + struct File *file; /* Users file handle */ int currtime; /* Previous time */ int starttime; /* Start time for this sub-part */ int maxtime; /* Max time for this sub-part */ @@ -65,11 +67,9 @@ * tree which is simply thrown away, but not before it has * expanded the memory usage of the program beyond reasonable * bounds for large files. - * Arguments: - * filename - Filename to be read in */ struct rootElement * -mdml_read_file(char *filename) +mdml_read_file(struct File *file) { xmlDocPtr doc; struct rootElement *root; @@ -77,16 +77,22 @@ memset(&mstate, 0, sizeof(mstate)); mstate.toffsets = g_array_new(0, 0, sizeof(unsigned long)); + mstate.file = file; - init_sax_handler(); - doc = xmlSAXParseFile(NULL, filename, 0); + /* Will use later XXX */ init_sax_handler(); + doc = xmlSAXParseFile(NULL, file->name, 0); - if (doc == NULL) + if (doc == NULL) { + file_set_error(file, FILE_STATUS_BAD_FORMAT, _("Failed to read file")); return NULL; + } root = MD_ROOT(node_to_md(&mstate, doc->root)); xmlFreeDoc(doc); + if (root) + file_set_success(file); + return root; } @@ -262,7 +268,7 @@ off = xmlGetProp(node, "offset"); if (off == NULL) - ethrow(formatError, "No offset property for smpte element"); + off = "0:0:0:0:0"; sscanf(off, "%d:%d:%d:%d:%d", &hours, &minutes, &seconds, &frames, &subframes); diff -rNu melys-0.0.6/files/mdmlread.m melys-0.0.7/files/mdmlread.m --- melys-0.0.6/files/mdmlread.m Mon Aug 9 19:03:09 1999 +++ melys-0.0.7/files/mdmlread.m Tue Aug 10 15:02:51 1999 @@ -19,11 +19,13 @@ >>header >>header >>header +>>header melfile.h >>header md.h xmlSAXHandler SAXhandler; struct mdmlstate { + struct File *file; /* Users file handle */ int currtime; /* Previous time */ int starttime; /* Start time for this sub-part */ int maxtime; /* Max time for this sub-part */ @@ -41,7 +43,7 @@ >>function mdml_read_file struct rootElement * -char *filename; Filename to be read in +struct File *file; >>description Read in an mdml file given the filename. @@ -57,16 +59,22 @@ memset(&mstate, 0, sizeof(mstate)); mstate.toffsets = g_array_new(0, 0, sizeof(unsigned long)); + mstate.file = file; - init_sax_handler(); - doc = xmlSAXParseFile(NULL, filename, 0); + /* Will use later XXX */ init_sax_handler(); + doc = xmlSAXParseFile(NULL, file->name, 0); - if (doc == NULL) + if (doc == NULL) { + file_set_error(file, FILE_STATUS_BAD_FORMAT, _("Failed to read file")); return NULL; + } root = MD_ROOT(node_to_md(&mstate, doc->root)); xmlFreeDoc(doc); + if (root) + file_set_success(file); + return root; >>header @@ -242,7 +250,7 @@ off = xmlGetProp(node, "offset"); if (off == NULL) - ethrow(formatError, "No offset property for smpte element"); + off = "0:0:0:0:0"; sscanf(off, "%d:%d:%d:%d:%d", &hours, &minutes, &seconds, &frames, &subframes); diff -rNu melys-0.0.6/files/mdmlwrite.c melys-0.0.7/files/mdmlwrite.c --- melys-0.0.6/files/mdmlwrite.c Mon Aug 9 19:46:23 1999 +++ melys-0.0.7/files/mdmlwrite.c Wed Aug 11 15:41:04 1999 @@ -21,6 +21,7 @@ #include "util.h" #include "elements.h" #include +#include "melfile.h" #include "mdrw.h" #include "gnome-xml/tree.h" #include "intl.h" @@ -31,6 +32,7 @@ int devchan; /* Current device channel */ unsigned long starttime; /* Use to do relative times */ }; +static void mdml_write(struct File *file, FILE *fp, struct rootElement *root); static void build_section(struct mdmlstate *msp, xmlNodePtr base, struct containerElement *c); static void set_time_chan(struct mdmlstate *msp, xmlNodePtr node, @@ -41,15 +43,38 @@ /* + * Writes the MDML representation of the MD tree to the + * specified file name . + * Arguments: + * file - File name to write to + * root - Tree to write + */ +void +mdml_write_file(struct File *file, struct rootElement *root) +{ + FILE *fp; + + fp = fopen(file->name, "w"); + if (fp == NULL) { + file_set_error(file, FILE_STATUS_OPEN_FAIL, _("Could not open file")); + return; + } + + mdml_write(file, fp, root); + + fclose(fp); +} + +/* * Writes the MDML representation of the specified MD tree to * the specified file stream. * Arguments: + * file - Users file handle * fp - File stream to write to * root - Tree to write - * flags - Compressed etc. */ -void -mdml_write(FILE *fp, struct rootElement *root, int flags) +static void +mdml_write(struct File *file, FILE *fp, struct rootElement *root) { xmlDocPtr doc; xmlNodePtr node; @@ -119,7 +144,7 @@ build_section(&mstate, xtrack, MD_CONTAINER(el)); break; default: - ethrow(debugError, "Unknown element type (%d) in mdml_write", + g_warning("Unknown element type (%d) in mdml_write", el->type); break; } @@ -142,28 +167,6 @@ xmlDocDump(fp, doc); #endif xmlFreeDoc(doc); -} - -/* - * Writes the MDML representation of the MD tree to the - * specified file name . - * Arguments: - * name - File name to write to - * root - Tree to write - * flags - Flags to control write - */ -void -mdml_write_file(char *name, struct rootElement *root, int flags) -{ - FILE *fp; - - fp = fopen(name, "w"); - if (fp == NULL) - ethrow(ioError, _("Could not open file")); - - mdml_write(fp, root, flags); - - fclose(fp); } /* diff -rNu melys-0.0.6/files/mdmlwrite.m melys-0.0.7/files/mdmlwrite.m --- melys-0.0.6/files/mdmlwrite.m Fri Aug 6 11:53:31 1999 +++ melys-0.0.7/files/mdmlwrite.m Tue Aug 10 15:02:51 1999 @@ -21,14 +21,38 @@ }; >>header +>>header melfile.h >>headerdef --decl mdrw.h ->>function mdml_write +>>function mdml_write_file void + struct File *file; File name to write to + struct rootElement *root; Tree to write + +>>description +Writes the MDML representation of the MD tree to the +specified file +.A name . +>>code + FILE *fp; + + fp = fopen(file->name, "w"); + if (fp == NULL) { + file_set_error(file, FILE_STATUS_OPEN_FAIL, _("Could not open file")); + return; + } + + mdml_write(file, fp, root); + + fclose(fp); + + +>>function mdml_write +static void + struct File *file; Users file handle FILE *fp; // File stream to write to struct rootElement *root; // Tree to write - int flags; Compressed etc. >>description Writes the MDML representation of the specified MD tree to @@ -103,7 +127,7 @@ build_section(&mstate, xtrack, MD_CONTAINER(el)); break; default: - ethrow(debugError, "Unknown element type (%d) in @func_name", + g_warning("Unknown element type (%d) in @func_name", el->type); break; } @@ -126,27 +150,6 @@ xmlDocDump(fp, doc); #endif xmlFreeDoc(doc); - ->>function mdml_write_file -void - char *name; // File name to write to - struct rootElement *root; // Tree to write - int flags; Flags to control write ->>description -Writes the MDML representation of the MD tree to the -specified file -.A name . ->>code - FILE *fp; - - fp = fopen(name, "w"); - if (fp == NULL) - ethrow(ioError, _("Could not open file")); - - mdml_write(fp, root, flags); - - fclose(fp); - >>function build_section static void diff -rNu melys-0.0.6/files/midiread.c melys-0.0.7/files/midiread.c --- melys-0.0.6/files/midiread.c Mon Aug 9 19:46:24 1999 +++ melys-0.0.7/files/midiread.c Wed Aug 11 15:41:04 1999 @@ -22,6 +22,8 @@ #include "util.h" #include "elements.h" #include +#include +#include "melfile.h" #include "midi.h" #include "intl.h" @@ -33,6 +35,8 @@ * reading in a midi file. */ struct midistate { + struct File *file; /* Users file handle */ + FILE *fp; /* File being read */ int current_time; /* Current midi time */ int port; /* Midi port number */ @@ -53,7 +57,10 @@ int program; /* Track program applying to whole track */ int note_seen:1; /* Note has been seen for this track */ + + struct except error; /* For exceptional errors */ }; +static struct rootElement *midi_read(struct midistate *msp, FILE *fp); static struct rootElement *read_head(struct midistate *msp); static struct trackElement *read_track(struct midistate *msp); static void handle_status(struct midistate *msp, struct partElement *part, @@ -70,32 +77,88 @@ /* - * Read in a midi file from the specified open file pointer, fp - * and return an mtree structure tree representing the file. + * Read in a midi file from the specified file name. * - * Arguments: - * fp - Input file pointer */ struct rootElement * -midi_read(FILE *fp) +midi_read_file(struct File *file) { + FILE *fp; + char *name; + struct rootElement *root; struct midistate mState; struct midistate *msp; - struct rootElement *root; - struct element *el; - int i; + + + name = file->name; + fp = fopen(name, "rb"); + if (fp == NULL) { + file_set_error(file, + FILE_STATUS_OPEN_FAIL, + _("Could not open file\n\n%s"), g_strerror(errno)); + return NULL; + } msp = &mState; + msp->file = file; msp->fp = fp; msp->tempo_map = md_tempomap_new(); msp->notes = g_ptr_array_new(); msp->port = 0; + root = midi_read(msp, fp); + + fclose(fp); + g_ptr_array_free(msp->notes, 1); + + if (root) + file_set_success(file); + + return root; +} + +/* + * Read in a midi file from the specified open file pointer, fp + * and return an mtree structure tree representing the file. + * + * Arguments: + * fp - Input file pointer + */ +static struct rootElement * +midi_read(struct midistate *msp, FILE *fp) +{ + struct rootElement *root = NULL; + struct element *el; + int i; + root = read_head(msp); + if (root == NULL) + return NULL; + + /* + * Now that we know it is probably a midi file errors + * are caught here. + */ + if CATCH(&msp->error) { + + file_set_error(msp->file, + FILE_STATUS_BAD_FORMAT, + _("Could not read file\n\n%s"), msp->error.message); + + if (root) + md_free(MD_ELEMENT(root)); + + return NULL; + } + md_add(MD_CONTAINER(root), MD_ELEMENT(msp->tempo_map)); msp->root->tracks = 0; /* Is re-calculated when tracks are added */ + /* + * Read in each track and add it to the root. In a type 1 file + * the first track is a tempo map which we treat differently in MD. + */ for (i = 0; i < msp->num_chunks; i++) { el = MD_ELEMENT(read_track(msp)); @@ -109,33 +172,9 @@ md_add(MD_CONTAINER(root), el); } - //g_ptr_array_index(MD_CONTAINER(root)->elements, 1) = msp->tempo_map; msp->tempo_map = NULL; - g_ptr_array_free(msp->notes, 1); - - return root; -} - -/* - * Read in a midi file from the specified file name. - * - * Arguments: - * name - File name to read - */ -struct rootElement * -midi_read_file(char *name) -{ - FILE *fp; - struct rootElement *root; - - fp = fopen(name, "rb"); - if (fp == NULL) - return NULL; - - root = midi_read(fp); - - fclose(fp); + UNCATCH(&msp->error); return root; } @@ -155,22 +194,35 @@ struct headElement *head; root = md_root_new(); + 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 */ magic = read_int(msp, 4); - if (magic != MIDI_HEAD_MAGIC) - ethrow(formatError, _("Bad header (%x), probably not a real midi file"), - magic); + + if (magic != MIDI_HEAD_MAGIC) { + file_set_error(msp->file, FILE_STATUS_BAD_FORMAT, + _("Bad header (%x), probably not a real midi file"), magic); + + md_free(MD_ELEMENT(root)); + return NULL; + } /* The header chunk should be 6 bytes, (perhaps longer in the future) */ length = read_int(msp, 4); - if (length < 6) - ethrow(formatError, _("Bad header length, probably not a real midi file")); + + if (length < 6) { + file_set_error(msp->file, FILE_STATUS_BAD_FORMAT, + _("Bad header length, probably not a real midi file")); + + md_free(MD_ELEMENT(root)); + return NULL; + } head->format = read_int(msp, 2); msp->num_chunks = read_int(msp, 2); @@ -207,7 +259,7 @@ laststatus = 0; head = read_int(msp, 4); if (head != MIDI_TRACK_MAGIC) - ethrow(formatError, + ethrow(&msp->error, _("Bad track header (%x), probably not a midi file"), head); @@ -398,7 +450,7 @@ } break; default: - ethrow(formatError, _("Bad status type 0x%x"), type); + ethrow(&msp->error, _("Bad status type 0x%x"), type); /*NOTREACHED*/ } @@ -504,7 +556,7 @@ c = getc(msp->fp); msp->chunk_count++; if (c == -1) - ethrow(formatError, _("Unexpected end of file")); + ethrow(&msp->error, _("Unexpected end of file")); val |= c; } @@ -531,7 +583,7 @@ data[length] = '\0'; return data; } else { - ethrow(formatError, _("Unexpected end of file")); + ethrow(&msp->error, _("Unexpected end of file")); /*NOTREACHED*/ } return NULL; @@ -556,7 +608,7 @@ c = getc(msp->fp); msp->chunk_count++; if (c == -1) - ethrow(formatError, _("Unexpected end of file")); + ethrow(&msp->error, _("Unexpected end of file")); val <<= 7; val |= (c & 0x7f); } while ((c & 0x80) == 0x80); diff -rNu melys-0.0.6/files/midiread.m melys-0.0.7/files/midiread.m --- melys-0.0.6/files/midiread.m Mon Aug 9 19:03:09 1999 +++ melys-0.0.7/files/midiread.m Tue Aug 10 15:02:51 1999 @@ -16,6 +16,8 @@ >>extern >>header +>>header +>>header melfile.h >>headerdef --decl midi.h /* @@ -64,6 +66,8 @@ * reading in a midi file. */ struct midistate { + struct File *file; /* Users file handle */ + FILE *fp; /* File being read */ int current_time; /* Current midi time */ int port; /* Midi port number */ @@ -84,37 +88,96 @@ int program; /* Track program applying to whole track */ int note_seen:1; /* Note has been seen for this track */ + + struct except error; /* For exceptional errors */ }; ->>function midi_read +>>function midi_read_file struct rootElement * -FILE *fp; // Input file pointer +struct File *file; >>description -Read in a midi file from the specified open file pointer, -.A fp -and return an -.M mtree -structure tree representing the file. +Read in a midi file from the specified file name. >>code + FILE *fp; + char *name; + struct rootElement *root; struct midistate mState; struct midistate *msp; - struct rootElement *root; - struct element *el; - int i; + + + name = file->name; + fp = fopen(name, "rb"); + if (fp == NULL) { + file_set_error(file, + FILE_STATUS_OPEN_FAIL, + _("Could not open file\n\n%s"), g_strerror(errno)); + return NULL; + } msp = &mState; + msp->file = file; msp->fp = fp; msp->tempo_map = md_tempomap_new(); msp->notes = g_ptr_array_new(); msp->port = 0; + root = midi_read(msp, fp); + + fclose(fp); + g_ptr_array_free(msp->notes, 1); + + if (root) + file_set_success(file); + + return root; + +>>function midi_read +static struct rootElement * +struct midistate *msp; +FILE *fp; // Input file pointer + +>>description +Read in a midi file from the specified open file pointer, +.A fp +and return an +.M mtree +structure tree representing the file. + +>>code + struct rootElement *root = NULL; + struct element *el; + int i; + root = read_head(msp); + if (root == NULL) + return NULL; + + /* + * Now that we know it is probably a midi file errors + * are caught here. + */ + if CATCH(&msp->error) { + + file_set_error(msp->file, + FILE_STATUS_BAD_FORMAT, + _("Could not read file\n\n%s"), msp->error.message); + + if (root) + md_free(MD_ELEMENT(root)); + + return NULL; + } + md_add(MD_CONTAINER(root), MD_ELEMENT(msp->tempo_map)); msp->root->tracks = 0; /* Is re-calculated when tracks are added */ + /* + * Read in each track and add it to the root. In a type 1 file + * the first track is a tempo map which we treat differently in MD. + */ for (i = 0; i < msp->num_chunks; i++) { el = MD_ELEMENT(read_track(msp)); @@ -128,31 +191,9 @@ md_add(MD_CONTAINER(root), el); } - //g_ptr_array_index(MD_CONTAINER(root)->elements, 1) = msp->tempo_map; msp->tempo_map = NULL; - g_ptr_array_free(msp->notes, 1); - - return root; - ->>function midi_read_file -struct rootElement * -char *name; // File name to read - ->>description -Read in a midi file from the specified file name. - ->>code - FILE *fp; - struct rootElement *root; - - fp = fopen(name, "rb"); - if (fp == NULL) - return NULL; - - root = midi_read(fp); - - fclose(fp); + UNCATCH(&msp->error); return root; @@ -170,22 +211,35 @@ struct headElement *head; root = md_root_new(); + 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 */ magic = read_int(msp, 4); - if (magic != MIDI_HEAD_MAGIC) - ethrow(formatError, _("Bad header (%x), probably not a real midi file"), - magic); + + if (magic != MIDI_HEAD_MAGIC) { + file_set_error(msp->file, FILE_STATUS_BAD_FORMAT, + _("Bad header (%x), probably not a real midi file"), magic); + + md_free(MD_ELEMENT(root)); + return NULL; + } /* The header chunk should be 6 bytes, (perhaps longer in the future) */ length = read_int(msp, 4); - if (length < 6) - ethrow(formatError, _("Bad header length, probably not a real midi file")); + + if (length < 6) { + file_set_error(msp->file, FILE_STATUS_BAD_FORMAT, + _("Bad header length, probably not a real midi file")); + + md_free(MD_ELEMENT(root)); + return NULL; + } head->format = read_int(msp, 2); msp->num_chunks = read_int(msp, 2); @@ -221,7 +275,7 @@ laststatus = 0; head = read_int(msp, 4); if (head != MIDI_TRACK_MAGIC) - ethrow(formatError, + ethrow(&msp->error, _("Bad track header (%x), probably not a midi file"), head); @@ -411,7 +465,7 @@ } break; default: - ethrow(formatError, _("Bad status type 0x%x"), type); + ethrow(&msp->error, _("Bad status type 0x%x"), type); /*NOTREACHED*/ } @@ -514,7 +568,7 @@ c = getc(msp->fp); msp->chunk_count++; if (c == -1) - ethrow(formatError, _("Unexpected end of file")); + ethrow(&msp->error, _("Unexpected end of file")); val |= c; } @@ -539,7 +593,7 @@ data[length] = '\0'; return data; } else { - ethrow(formatError, _("Unexpected end of file")); + ethrow(&msp->error, _("Unexpected end of file")); /*NOTREACHED*/ } return NULL; @@ -561,7 +615,7 @@ c = getc(msp->fp); msp->chunk_count++; if (c == -1) - ethrow(formatError, _("Unexpected end of file")); + ethrow(&msp->error, _("Unexpected end of file")); val <<= 7; val |= (c & 0x7f); } while ((c & 0x80) == 0x80); diff -rNu melys-0.0.6/files/midiwrite.c melys-0.0.7/files/midiwrite.c --- melys-0.0.6/files/midiwrite.c Mon Aug 9 19:46:24 1999 +++ melys-0.0.7/files/midiwrite.c Wed Aug 11 15:41:05 1999 @@ -13,6 +13,7 @@ * GNU General Public License for more details. * * + * */ @@ -21,11 +22,14 @@ #include "util.h" #include "elements.h" #include +#include "melfile.h" #include "md.h" #include "midi.h" #include "intl.h" + struct midiwstate { + struct File *file; /* Users file handle */ FILE *fp; int track_start; /* Offset at the start of the track */ int out_offset; /* Current write offset */ @@ -38,6 +42,7 @@ GSList *notes; /* Pending off notes */ int inQ; /* Running through the notes queue */ }; +static void midi_write(struct File *file, FILE *fp, struct rootElement *root); static void write_elem(struct element *el, void *arg, int flags); static void put_int(struct midiwstate *msp, int n, int val); static void put_byte(struct midiwstate *msp, int val); @@ -54,20 +59,24 @@ /* * Write out the specified file. * Arguments: - * name - File name to write to + * file - File name to write to * root - the data to write - * flags - Write flags */ void -midi_write_file(char *name, struct rootElement *root, int flags) +midi_write_file(struct File *file, struct rootElement *root) { FILE *fp; + char *name; + + name = file->name; fp = fopen(name, "wb"); - if (fp == NULL) - ethrow(ioError, _("Can not open file %s"), name); + if (fp == NULL) { + file_set_error(file, FILE_STATUS_OPEN_FAIL, _("Can not open file")); + return; + } - midi_write(fp, root, flags); + midi_write(file, fp, root); fclose(fp); } @@ -77,20 +86,20 @@ * Arguments: * fp - File stream to write to * root - The data to write - * flags - Write flags */ -void -midi_write(FILE *fp, struct rootElement *root, int flags) +static void +midi_write(struct File *file, FILE *fp, struct rootElement *root) { struct midiwstate *msp; unsigned long inittime; msp = g_new0(struct midiwstate, 1); + msp->file = file; msp->fp = fp; msp->root = root; msp->out = g_byte_array_new(); msp->notes = NULL; - msp->flags = flags; + msp->flags = MIDI_FILE_RUNNING_STATUS; inittime = 0; md_walk(MD_CONTAINER(root), write_elem, msp, 0); @@ -290,7 +299,7 @@ case MD_TYPE_HEAD: break; default: - ethrow(formatError, "Unknown MD type %d", el->type); + g_warning("Unknown MD type %d", el->type); break; } } @@ -385,10 +394,12 @@ } delta_time = time - msp->prev_time; - if (delta_time < 0) - ethrow(formatError, "Negative time difference (%d) writing midi file", + if (delta_time < 0) { + g_warning(_("Negative time difference (%d) writing midi file"), delta_time); - + g_warning(_(" difference set to zero")); + delta_time = 0; + } put_var(msp, delta_time); msp->prev_time = time; diff -rNu melys-0.0.6/files/midiwrite.m melys-0.0.7/files/midiwrite.m --- melys-0.0.6/files/midiwrite.m Fri Jul 30 00:09:28 1999 +++ melys-0.0.7/files/midiwrite.m Tue Aug 10 15:02:51 1999 @@ -13,7 +13,9 @@ GNU General Public License for more details. >>header +>>header melfile.h >>header md.h + >>headerdef --decl midi.h /* Flags for writing midi files */ @@ -21,7 +23,9 @@ #define MIDI_FILE_COMPRESSED 0x002 >>extern + struct midiwstate { + struct File *file; /* Users file handle */ FILE *fp; int track_start; /* Offset at the start of the track */ int out_offset; /* Current write offset */ @@ -38,28 +42,34 @@ >>function midi_write_file void -char *name; File name to write to +struct File *file; File name to write to struct rootElement *root; the data to write -int flags; Write flags + >>description Write out the specified file. >>code FILE *fp; + char *name; + + name = file->name; fp = fopen(name, "wb"); - if (fp == NULL) - ethrow(ioError, _("Can not open file %s"), name); + if (fp == NULL) { + file_set_error(file, FILE_STATUS_OPEN_FAIL, _("Can not open file")); + return; + } - midi_write(fp, root, flags); + midi_write(file, fp, root); fclose(fp); >>function midi_write -void +static void +struct File *file; FILE *fp; File stream to write to struct rootElement *root; The data to write -int flags; Write flags + >>description Write the md tree as a midi file to the specified file stream. >>code @@ -67,11 +77,12 @@ unsigned long inittime; msp = g_new0(struct midiwstate, 1); + msp->file = file; msp->fp = fp; msp->root = root; msp->out = g_byte_array_new(); msp->notes = NULL; - msp->flags = flags; + msp->flags = MIDI_FILE_RUNNING_STATUS; inittime = 0; md_walk(MD_CONTAINER(root), write_elem, msp, 0); @@ -270,7 +281,7 @@ case MD_TYPE_HEAD: break; default: - ethrow(formatError, "Unknown MD type %d", el->type); + g_warning("Unknown MD type %d", el->type); break; } @@ -366,10 +377,12 @@ } delta_time = time - msp->prev_time; - if (delta_time < 0) - ethrow(formatError, "Negative time difference (%d) writing midi file", + if (delta_time < 0) { + g_warning(_("Negative time difference (%d) writing midi file"), delta_time); - + g_warning(_(" difference set to zero")); + delta_time = 0; + } put_var(msp, delta_time); msp->prev_time = time; diff -rNu melys-0.0.6/gui/Makefile melys-0.0.7/gui/Makefile --- melys-0.0.6/gui/Makefile Mon Aug 9 19:46:17 1999 +++ melys-0.0.7/gui/Makefile Wed Aug 11 15:40:58 1999 @@ -9,6 +9,7 @@ GENCFILES = main.c \ menus.c GENHFILES = ../include/melgui.h \ + ../include/melmsg.h \ ../include/menus.h diff -rNu melys-0.0.6/gui/main.c melys-0.0.7/gui/main.c --- melys-0.0.6/gui/main.c Mon Aug 9 19:46:25 1999 +++ melys-0.0.7/gui/main.c Wed Aug 11 15:41:06 1999 @@ -12,6 +12,7 @@ * GNU General Public License for more details. * * + * */ @@ -19,20 +20,26 @@ #include "except.h" #include "util.h" #include "gnome.h" +#include #include "menus.h" #include "elements.h" #include "melreg.h" +#include "melfile.h" #include "melmidi.h" #include "song.h" #include "melys.h" #include "melystrackinfo.h" #include "melystrackdisplay.h" #include "melystrack.h" +#include "md.h" #include "melgui.h" +#include "melmsg.h" #include "intl.h" static GtkWidget *create_view(GnomeMDIChild *child, gpointer data); static int add_view_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data); +static void view_changed_cb(GtkObject *mdi, GtkWidget *widget, + gpointer user_data); /* @@ -62,12 +69,14 @@ gtk_signal_connect(GTK_OBJECT(mdi), "add-view" , GTK_SIGNAL_FUNC(add_view_cb), NULL); + gtk_signal_connect(GTK_OBJECT(mdi), "view-changed" + , GTK_SIGNAL_FUNC(view_changed_cb), NULL); /* Create the first child */ child = gnome_mdi_generic_child_new(_("Untitled")); song = song_new(GTK_OBJECT(mdi), GTK_OBJECT(child)); - song_open_file(song, NULL); + song_setup(song, NULL, md_empty()); gnome_mdi_add_child(mdi, GNOME_MDI_CHILD(child)); @@ -135,33 +144,66 @@ } /* - * 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. - * + * Put up an error box. If song is supplied then there will 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. The + * routine is printf like. * Arguments: - * msg - The message to place in the dialog box * parent - The parent that the dialog 'belongs' to + * _type - The type of message + * fmt - The message to place in the dialog box */ void -mel_ui_error(struct song *sd, char *msg, GtkObject *parent) +mel_song_display(struct song *sd, GtkObject *parent, int _type, char *fmt, + ...) { - GtkWidget *dialog; + va_list ap; + enum message_type type = _type; + GtkWidget *dialog = NULL; + GtkWindow *parent_win; + int d_id = 0; + char *msg; + + va_start(ap, fmt); + msg = g_strdup_vprintf(fmt, ap); + va_end(ap); + + /* The gnome idea of parent only includes windows */ + parent_win = NULL; + if (parent && GTK_IS_WINDOW(parent)) + parent_win = GTK_WINDOW(parent); /* Destroy any old one */ - reg_destroy(sd->dialog); + if (sd) + reg_destroy(sd->dialog); /* Create the gnome dialog */ - dialog = gnome_error_dialog(msg); + switch (type) { + case MEL_MSG_LAST: + case MEL_MSG_ERROR: + dialog = gnome_error_dialog_parented(msg, parent_win); + break; + case MEL_MSG_WARNING: + dialog = gnome_warning_dialog_parented(msg, parent_win); + break; + case MEL_MSG_INFO: + dialog = gnome_ok_dialog_parented(msg, parent_win); + break; + } - sd->dialog = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); + if (dialog) + d_id = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); + if (sd) + sd->dialog = d_id; /* 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)); + + g_free(msg); } /* @@ -228,6 +270,7 @@ gboolean toplevel) { GtkWidget *w; + struct song *song = song_get_data(child); /* Our initial view is the track based view */ w = melys_track_new(root); @@ -243,6 +286,8 @@ gtk_main_iteration(); gnome_mdi_set_active_view(GNOME_MDI(mdi), w); + + song->trackview = w; } /* @@ -270,6 +315,38 @@ } /* + * Check the file status and take any action. Put up an error or + * warning message. If the status is to confirm then a dialog is + * put up for the user. Returns TRUE if there is an error that + * should stop further processing. False if there is no error + * and things can carry on. + * + * Arguments: + * file - File status to check + */ +gboolean +mel_file_error(struct song *song, struct File *file, GtkObject *parent) +{ + int code = file_get_status(file); + + if (code == FILE_SUCCESS) + return FALSE; + + if (code == FILE_STATUS_CONFIRM) { + printf("mel_file_error: confirm not implemented yet\n"); + return FALSE; + } + + switch (code) { + default: + mel_song_error(song, parent, file_get_message(file)); + break; + } + + return TRUE; /* True, there is an error */ +} + +/* * Called when a view is added to a child of the mdi. XXX doesn't * work anyway. * @@ -285,6 +362,29 @@ dprintf1("add_view_cb: View Added (NOT IMPLEMENTED)"); return TRUE; +} + +/* + * Called when the view is changed. XXX not needed. + * + * Arguments: + * mdi - The mdi object + * widget - The newly added view + * user_data - User data + */ +static void +view_changed_cb(GtkObject *mdi, GtkWidget *widget, gpointer user_data) +{ + + dprintf1("view_changed_cb"); + + if (widget == NULL) + return; + + mel_debug_print_type("hello", widget); + gtk_widget_grab_focus(widget); + + return; } /* diff -rNu melys-0.0.6/gui/main.m melys-0.0.7/gui/main.m --- melys-0.0.6/gui/main.m Mon Aug 9 19:07:15 1999 +++ melys-0.0.7/gui/main.m Wed Aug 11 14:37:56 1999 @@ -11,17 +11,50 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +>>header >>header menus.h >>header elements.h >>header melreg.h +>>header melfile.h >>header melmidi.h >>header song.h >>header melys.h >>header melystrackinfo.h >>header melystrackdisplay.h >>header melystrack.h +>>header md.h + >>headerdef --decl melgui.h +>>headerdef melmsg.h + +enum message_type { + MEL_MSG_ERROR, + MEL_MSG_WARNING, + MEL_MSG_INFO, + + MEL_MSG_LAST +}; + +/* Yes this is GNUC extension -- patches accepted */ +#define mel_song_error(s, p, f...) \ + mel_song_display((s), (p), MEL_MSG_ERROR, (f), ##f) +#define mel_song_warning(s, p, f...) \ + mel_song_display((s), (p), MEL_MSG_WARNING, (f), ##f) +#define mel_song_info(s, p, f...) \ + mel_song_display((s), (p), MEL_MSG_INFO, (f), ##f) + +#define mel_error(f...) \ + mel_song_display(NULL, NULL, MEL_MSG_ERROR, (f), ##f) +#define mel_warning(f...) \ + mel_song_display(NULL, NULL, MEL_MSG_WARNING, (f), ##f) +#define mel_info(f...) \ + mel_song_display(NULL, NULL, MEL_MSG_INFO, (f), ##f) + +struct song; +extern void mel_song_display(struct song *sd, struct _GtkObject *parent, + int _type, char *fmt, ...); + >>function melys_app int int argc; The program argument count @@ -48,12 +81,14 @@ gtk_signal_connect(GTK_OBJECT(mdi), "add-view" , GTK_SIGNAL_FUNC(add_view_cb), NULL); + gtk_signal_connect(GTK_OBJECT(mdi), "view-changed" + , GTK_SIGNAL_FUNC(view_changed_cb), NULL); /* Create the first child */ child = gnome_mdi_generic_child_new(_("Untitled")); song = song_new(GTK_OBJECT(mdi), GTK_OBJECT(child)); - song_open_file(song, NULL); + song_setup(song, NULL, md_empty()); gnome_mdi_add_child(mdi, GNOME_MDI_CHILD(child)); @@ -114,38 +149,70 @@ MEL_MDI_CHILD_COUNT, GINT_TO_POINTER(count)); ->>function mel_ui_error +>>function mel_song_display void struct song *sd; -char *msg; The message to place in the dialog box GtkObject *parent; The parent that the dialog 'belongs' to +int _type; The type of message +char *fmt; The message to place in the dialog box +... >>description Put up an error box. -There can only be one error box active for a file at once although they -are not modal. +If song is supplied then there will only be one error box active +for a file at once, although they are not modal. Another message will just cause the original to go away. If .A parent is supplied then when that object is destroyed or unmapped the dialog will be destroyed to. - +The routine is printf like. >>code - GtkWidget *dialog; + va_list ap; + enum message_type type = _type; + GtkWidget *dialog = NULL; + GtkWindow *parent_win; + int d_id = 0; + char *msg; + + va_start(ap, fmt); + msg = g_strdup_vprintf(fmt, ap); + va_end(ap); + + /* The gnome idea of parent only includes windows */ + parent_win = NULL; + if (parent && GTK_IS_WINDOW(parent)) + parent_win = GTK_WINDOW(parent); /* Destroy any old one */ - reg_destroy(sd->dialog); + if (sd) + reg_destroy(sd->dialog); /* Create the gnome dialog */ - dialog = gnome_error_dialog(msg); + switch (type) { + case MEL_MSG_LAST: + case MEL_MSG_ERROR: + dialog = gnome_error_dialog_parented(msg, parent_win); + break; + case MEL_MSG_WARNING: + dialog = gnome_warning_dialog_parented(msg, parent_win); + break; + case MEL_MSG_INFO: + dialog = gnome_ok_dialog_parented(msg, parent_win); + break; + } - sd->dialog = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); + if (dialog) + d_id = reg_object(GTK_OBJECT(dialog), (GtkObject*)parent); + if (sd) + sd->dialog = d_id; /* 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)); + g_free(msg); >>function mel_ui_warn @@ -215,6 +282,7 @@ >>code GtkWidget *w; + struct song *song = song_get_data(child); /* Our initial view is the track based view */ w = melys_track_new(root); @@ -231,6 +299,8 @@ gnome_mdi_set_active_view(GNOME_MDI(mdi), w); + song->trackview = w; + >>function create_view static GtkWidget * GnomeMDIChild *child; @@ -258,9 +328,43 @@ return w; +>>function mel_file_error +gboolean +struct song *song; +struct File *file; File status to check +GtkObject *parent; + +>>description +Check the file status and take any action. +Put up an error or warning message. +If the status is to confirm then a dialog is put +up for the user. +Returns TRUE if there is an error that should stop further +processing. +False if there is no error and things can carry on. + +>>code + int code = file_get_status(file); + + if (code == FILE_SUCCESS) + return FALSE; + + if (code == FILE_STATUS_CONFIRM) { + printf("@func_name: confirm not implemented yet\n"); + return FALSE; + } + + switch (code) { + default: + mel_song_error(song, parent, file_get_message(file)); + break; + } + + return TRUE; /* True, there is an error */ + >>function add_view_cb static int -GtkObject *mdi; The mdi object +GtkObject *mdi; The mdi object GtkWidget *widget; The newly added view gpointer user_data; User data @@ -274,6 +378,27 @@ return TRUE; +>>function view_changed_cb +static void +GtkObject *mdi; The mdi object +GtkWidget *widget; The newly added view +gpointer user_data; User data + +>>description +Called when the view is changed. +XXX not needed. + +>>code + + dprintf1("@func_name"); + + if (widget == NULL) + return; + + mel_debug_print_type("hello", widget); + gtk_widget_grab_focus(widget); + + return; >>function mel_debug_print_type void @@ -284,3 +409,5 @@ >>code g_message("%s: %s\n", msg, gtk_type_name(GTK_OBJECT_TYPE(o))); + + diff -rNu melys-0.0.6/gui/menus.c melys-0.0.7/gui/menus.c --- melys-0.0.6/gui/menus.c Mon Aug 9 19:46:25 1999 +++ melys-0.0.7/gui/menus.c Wed Aug 11 15:41:06 1999 @@ -19,17 +19,18 @@ #include "except.h" #include "util.h" #include "gnome.h" -#include "format.h" #include "melreg.h" #include "seqlib.h" #include "elements.h" -#include "melmidi.h" #include "song.h" #include "melys.h" +#include "melfile.h" +#include "melmidi.h" #include "melgui.h" #include "menus.h" #include "intl.h" +static void new_cb(GtkWidget *wid, gpointer data); static void open_cb(GtkWidget *wid, gpointer data); static void open_ok_cb(GtkWidget *button, gpointer data); static void save_as_cb(GtkWidget *mi, gpointer data); @@ -48,6 +49,8 @@ /* The file menu */ GnomeUIInfo filemenu[] = { + GNOMEUIINFO_MENU_NEW_ITEM(N_("New"), + "Start a new arrangement", new_cb, NULL), GNOMEUIINFO_MENU_OPEN_ITEM(open_cb, NULL), GNOMEUIINFO_MENU_CLOSE_ITEM(close_cb, NULL), GNOMEUIINFO_MENU_SAVE_AS_ITEM(save_as_cb, NULL), @@ -138,6 +141,62 @@ } /* + * Starts a new empty song. + * + * Arguments: + * data - The mdi widget + */ +static void +new_cb(GtkWidget *wid, gpointer data) +{ + GtkObject *mdi = data; + GtkObject *child; + struct song *sd; + struct File *file; + struct rootElement *root; + gchar *basename; + char *filename; + //int open_id; + int count; + + //sd = get_song_from_mdi(mdi); + //open_id = sd->open_id; + + /* Get the filename that the user selected */ + file = file_new(NULL); + root = file_read(file); + if (mel_file_error(NULL, file, NULL)) + return; + + filename = _("Untitled"); + + /* + * Create a new child. If the current one has not been + * used, then it could be destroyed. + */ + basename = g_basename(filename); + child = (GtkObject*)gnome_mdi_generic_child_new(basename); + + sd = song_new(GTK_OBJECT(mdi), GTK_OBJECT(child)); + sd->filename = ""; + + /* Want to use the same open dialog, but not same save */ + //sd->open_dialog = open_id; + + /* Set up the song for this file */ + song_setup(sd, filename, root); + + /* Add child and increase count */ + gnome_mdi_add_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); + + count = get_child_count(mdi); + set_child_count(mdi, ++count); + + /* Create a track view (or users first choice view) of the song */ + mel_initial_view(mdi, child, sd->mdroot, FALSE); +} + +/* * Bring up a file dialog. It is either re-used or created from * scratch. This function is called when the user selects open * from the menu. @@ -194,7 +253,8 @@ GtkObject *child = GTK_OBJECT(data); struct song *sd = song_get_data(child); GtkFileSelection *sel; - fileReadFunc readfn; + struct File *file; + struct rootElement *root; gchar *basename; char *filename; int open_id; @@ -209,24 +269,10 @@ } filename = gtk_file_selection_get_filename(sel); - /* Try to guess its type */ - readfn = file_guess_read_func(filename); - if (readfn == 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); - + file = file_new(filename); + root = file_read(file); + if (mel_file_error(sd, file, (GtkObject*)sel)) return; - } gtk_widget_hide(GTK_WIDGET(sel)); @@ -245,10 +291,8 @@ /* Want to use the same open dialog, but not same save */ sd->open_dialog = open_id; - /* read in the file */ - song_open_file(sd, filename); - if (sd->mdroot == NULL) - return; + /* Set up the song for this file */ + song_setup(sd, filename, root); /* Add child and increase count */ gnome_mdi_add_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); @@ -312,10 +356,12 @@ GtkObject *child = GTK_OBJECT(data); struct song *sd = song_get_data(child); GtkFileSelection *sel; - fileWriteFunc writefn; + struct File *file; char *filename; int save_id; + mdi = sd->mdi; + /* Get the filename that the user selected */ save_id = sd->save_dialog; sel = (GtkFileSelection*)reg_get(save_id); @@ -325,31 +371,12 @@ } 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); - + file = file_new(filename); + file_write(file, sd->mdroot); + if (mel_file_error(sd, file, (GtkObject*)sel)) return; - } - - mdi = sd->mdi; gtk_widget_hide(GTK_WIDGET(sel)); - - /* write out the file */ - writefn(filename, sd->mdroot, 0); } /* diff -rNu melys-0.0.6/gui/menus.m melys-0.0.7/gui/menus.m --- melys-0.0.6/gui/menus.m Mon Aug 9 19:07:15 1999 +++ melys-0.0.7/gui/menus.m Wed Aug 11 14:37:56 1999 @@ -11,13 +11,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ->>header format.h >>header melreg.h >>header seqlib.h >>header elements.h ->>header melmidi.h >>header song.h >>header melys.h +>>header melfile.h +>>header melmidi.h >>header melgui.h >>headerdef --decl menus.h @@ -25,6 +25,8 @@ /* The file menu */ GnomeUIInfo filemenu[] = { + GNOMEUIINFO_MENU_NEW_ITEM(N_("New"), + "Start a new arrangement", new_cb, NULL), GNOMEUIINFO_MENU_OPEN_ITEM(open_cb, NULL), GNOMEUIINFO_MENU_CLOSE_ITEM(close_cb, NULL), GNOMEUIINFO_MENU_SAVE_AS_ITEM(save_as_cb, NULL), @@ -115,6 +117,62 @@ >># Callback functions. +>>function new_cb +static void +GtkWidget *wid; +gpointer data; The mdi widget + +>>description +Starts a new empty song. + +>>code + GtkObject *mdi = data; + GtkObject *child; + struct song *sd; + struct File *file; + struct rootElement *root; + gchar *basename; + char *filename; + //int open_id; + int count; + + //sd = get_song_from_mdi(mdi); + //open_id = sd->open_id; + + /* Get the filename that the user selected */ + file = file_new(NULL); + root = file_read(file); + if (mel_file_error(NULL, file, NULL)) + return; + + filename = _("Untitled"); + + /* + * Create a new child. If the current one has not been + * used, then it could be destroyed. + */ + basename = g_basename(filename); + child = (GtkObject*)gnome_mdi_generic_child_new(basename); + + sd = song_new(GTK_OBJECT(mdi), GTK_OBJECT(child)); + sd->filename = ""; + + /* Want to use the same open dialog, but not same save */ + //sd->open_dialog = open_id; + + /* Set up the song for this file */ + song_setup(sd, filename, root); + + /* Add child and increase count */ + gnome_mdi_add_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); + + count = get_child_count(mdi); + set_child_count(mdi, ++count); + + /* Create a track view (or users first choice view) of the song */ + mel_initial_view(mdi, child, sd->mdroot, FALSE); + + >>function open_cb static void GtkWidget *wid; widget event received on @@ -175,7 +233,8 @@ GtkObject *child = GTK_OBJECT(data); struct song *sd = song_get_data(child); GtkFileSelection *sel; - fileReadFunc readfn; + struct File *file; + struct rootElement *root; gchar *basename; char *filename; int open_id; @@ -190,24 +249,10 @@ } filename = gtk_file_selection_get_filename(sel); - /* Try to guess its type */ - readfn = file_guess_read_func(filename); - if (readfn == 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); - + file = file_new(filename); + root = file_read(file); + if (mel_file_error(sd, file, (GtkObject*)sel)) return; - } gtk_widget_hide(GTK_WIDGET(sel)); @@ -226,10 +271,8 @@ /* Want to use the same open dialog, but not same save */ sd->open_dialog = open_id; - /* read in the file */ - song_open_file(sd, filename); - if (sd->mdroot == NULL) - return; + /* Set up the song for this file */ + song_setup(sd, filename, root); /* Add child and increase count */ gnome_mdi_add_child(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); @@ -294,10 +337,12 @@ GtkObject *child = GTK_OBJECT(data); struct song *sd = song_get_data(child); GtkFileSelection *sel; - fileWriteFunc writefn; + struct File *file; char *filename; int save_id; + mdi = sd->mdi; + /* Get the filename that the user selected */ save_id = sd->save_dialog; sel = (GtkFileSelection*)reg_get(save_id); @@ -307,33 +352,12 @@ } 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); - + file = file_new(filename); + file_write(file, sd->mdroot); + if (mel_file_error(sd, file, (GtkObject*)sel)) return; - } - - mdi = sd->mdi; gtk_widget_hide(GTK_WIDGET(sel)); - - /* write out the file */ - writefn(filename, sd->mdroot, 0); - - >>function file_cancel_cb diff -rNu melys-0.0.6/help/C/.cvsignore melys-0.0.7/help/C/.cvsignore --- melys-0.0.6/help/C/.cvsignore Thu Jan 1 00:00:00 1970 +++ melys-0.0.7/help/C/.cvsignore Wed Aug 11 14:42:13 1999 @@ -0,0 +1 @@ +melys.junk melys.ps melys diff -rNu melys-0.0.6/help/C/melys.sgml melys-0.0.7/help/C/melys.sgml --- melys-0.0.6/help/C/melys.sgml Sat Aug 7 01:04:16 1999 +++ melys-0.0.7/help/C/melys.sgml Tue Aug 10 15:02:55 1999 @@ -1,7 +1,14 @@ -] > + + + + + +] > @@ -17,8 +24,8 @@ -This document can be freely redistributed according to the -terms of the GNU General Public License. + This document can be freely redistributed according to the + terms of the GNU General Public License. @@ -35,149 +42,6 @@ - -Menus - - - This section deals with all the title bar menus - that can be used in Melys. - Many of the features can also be driven by the keyboard - and in most cases this is the best way to work. - Keyboard short-cuts are shown to the right on each - menu entry. - -Title bar menus -<sect2><title><GUImenu/File/ -<para> - This is the standard file menu that allows you to open and - save files and exit the application. - -<variablelist> - -<varlistentry> -<term><GUImenuItem/Open/ -<listitem> -<para> - This will bring up a dialog box that will allow you to - select a file to read. - You may select any file type that &mel; knows how to read. - At the current time this includes MIDI files ending - in <filename/.mid/ or <filename/.smf/ and &mdml; files - ending in <filename/.mdml/. - It will also read compressed &mdml;, files that are compressed - with gzip and have a <filename/.mdml.gz/ ending. - - <para> - - You can have several files open at once, unlike many sequencer - programs. - They appear in a notebook format and you can select the current - file by clicking on the notebook tabs. - It is also possible to drag the notebook tabs off the - the application window, this will create a new top level - window, containing that file. - -<varlistentry> -<term><GUImenuitem/Close/ -<listitem><para> - This will close the current file. - If the file is playing it will stop. -</para> -<warning> -<para> - There are currently no warnings if it has not been saved. -</warning> - -<!-- -<varlistentry> -<term><GUImenuitem/New/ -<listitem><para> ---> - -<varlistentry> -<term><GUImenuitem/Save as.../ -<listitem><para> - Save the current file with a specified filename. - A dialog box is brought up to allow the name to be specified. - -<varlistentry> -<term><GUImenuitem/Exit/ -<listitem><para> - Exits &mel;. - <warning><para>There is currently no warning if files are not saved. - </warning> - -</variablelist> - -<sect2><title><GUImenu/Actions/ -<variablelist> - -<varlistentry> -<term><GUImenuitem/Play/ -<listitem><para> - Starts the current file playing. - Has no effect if the file is already playing. - It is (currently) possible to start another file at the same - time that another is playing. - This will probably be disallowed or modified in future. - -<varlistentry> -<term><GUImenuitem/Pause/ -<listitem><para> - The playing file is stopped temporarily. - If <GUImenuitem/play/ is later selected the song - will continue from the same point that it stopped at. - -<varlistentry> -<term><GUImenuitem/Stop/ -<listitem><para> - The playing file is stopped. - If the file is re started it will begin playing from the beginning. - -<varlistentry> -<term><GUImenuitem/Record/ -<listitem><para> - Recording starts. - If the file is not already playing, then it will start to play. - A new part will be created that contains all midi events received - until <GUImenuitem/Record stop/ or <GUImenuitem/Stop/ is selected. - <para> - Currently you can only record to a new track. - The new track can have several parts though. - -<varlistentry> -<term><GUImenuitem/Record stop/ -<listitem><para> - Recording is stopped. - The song will continue playing if it has not already - finished and recording will be restarted by selecting - <GUImenuitem/Record/ again. - -</variablelist> - -<sect2><title><GUImenu/Windows/ -<para> - This menu contains an entry for each open file. - Any file can be selected from this menu and it will be brought - to the front. - This will work even if the file is in another window. - - <para> - - In addition there are the following entries. - -<variablelist> -<varlistentry> -<term><GUImenuitem/Close all/ -<listitem><para> - This will close all open windows. - Not currently useful - next operation will exit the sequencer. - -</variablelist> - -<sect2><title><GUImenu/Help/ -<para> -This menu contains the usual useless information. +&MENUS-CHAPTER; -</chapter> </book> diff -rNu melys-0.0.6/help/C/menus.sgml melys-0.0.7/help/C/menus.sgml --- melys-0.0.6/help/C/menus.sgml Thu Jan 1 00:00:00 1970 +++ melys-0.0.7/help/C/menus.sgml Wed Aug 11 14:42:13 1999 @@ -0,0 +1,147 @@ +<chapter id="menus"> +<title>Menus + + + This section deals with all the title bar menus + that can be used in Melys. + Many of the features can also be driven by the keyboard + and in most cases this is the best way to work. + Keyboard short-cuts are shown to the right on each + menu entry. + +Title bar menus +<sect2><title><GUImenu/File/ +<para> + This is the standard file menu that allows you to open and + save files and exit the application. + +<variablelist> + +<varlistentry> +<term><GUImenuItem/Open/ +<listitem> +<para> + This will bring up a dialog box that will allow you to + select a file to read. + You may select any file type that &mel; knows how to read. + At the current time this includes MIDI files ending + in <filename/.mid/ or <filename/.smf/ and &mdml; files + ending in <filename/.mdml/. + It will also read compressed &mdml;, files that are compressed + with gzip and have a <filename/.mdml.gz/ ending. + + <para> + + You can have several files open at once. + The limit is the number of queues that the sequencer is configured + with (currently 8). + They appear in a notebook format and you can select the current + file by clicking on the notebook tabs. + It is also possible to drag the notebook tabs off the + the application window, this will create a new top level + window containing that file. + +<varlistentry> +<term><GUImenuitem/Close/ +<listitem><para> + This will close the current file. + If the file is playing it will stop. +</para> +<warning> +<para> + There are currently no warnings if it has not been saved. +</warning> + +<!-- +<varlistentry> +<term><GUImenuitem/New/ +<listitem><para> +--> + +<varlistentry> +<term><GUImenuitem/Save as.../ +<listitem><para> + Save the current file with a specified filename. + A dialog box is brought up to allow the name to be specified. + +<varlistentry> +<term><GUImenuitem/Exit/ +<listitem><para> + Exits &mel;. + <warning> + <para>There is currently no warning if files are not saved. + </warning> + +</variablelist> + +<sect2><title><GUImenu/Actions/ +<variablelist> + +<varlistentry> +<term><GUImenuitem/Play/ +<listitem><para> + Starts the current file playing. + Has no effect if the file is already playing. + It is (currently) possible to start another file at the same + time that another is playing. + This will probably be disallowed or modified in future. + +<varlistentry> +<term><GUImenuitem/Pause/ +<listitem><para> + The playing file is stopped temporarily. + If <GUImenuitem/play/ is later selected the song + will continue from the same point that it stopped at. + +<varlistentry> +<term><GUImenuitem/Stop/ +<listitem><para> + The playing file is stopped. + If the file is re started it will begin playing from the beginning. + +<varlistentry> +<term><GUImenuitem/Record/ +<listitem><para> + Recording starts. + If the file is not already playing, then it will start to play. + A new part will be created that contains all midi events received + until <GUImenuitem/Record stop/ or <GUImenuitem/Stop/ is selected. + <para> + Currently you can only record to a new track. + The new track can have several parts though. + +<varlistentry> +<term><GUImenuitem/Record stop/ +<listitem><para> + Recording is stopped. + The song will continue playing if it has not already + finished and recording will be restarted by selecting + <GUImenuitem/Record/ again. + +</variablelist> + +<sect2><title><GUImenu/Windows/ +<para> + This menu contains an entry for each open file. + Any file can be selected from this menu and it will be brought + to the front. + This will work even if the file is in another window. + + <para> + + In addition there are the following entries. + +<variablelist> +<varlistentry> +<term><GUImenuitem/Close all/ +<listitem><para> + This will close all open windows. + Not currently useful - next operation will exit the sequencer. + +</variablelist> + +<sect2><title><GUImenu/Help/ +<para> +This menu contains the usual useless information. + +</chapter> diff -rNu melys-0.0.6/include/except.h melys-0.0.7/include/except.h --- melys-0.0.6/include/except.h Mon Aug 9 19:46:20 1999 +++ melys-0.0.7/include/except.h Wed Aug 11 15:41:01 1999 @@ -18,14 +18,33 @@ #include <setjmp.h> +/* + * Some macros and routines to emulate exceptions. + * Do not use this too much... + * Take care to consider memory freeing issues and re-entrency. + * Should only be used where errors are really not expected, certainly + * not for user input, where errors are to be expected and should be + * dealt with properly. + */ struct except { - int set; - sigjmp_buf buf; + int set; /* Flag to say if set up correctly */ + sigjmp_buf buf; /* The return point */ + char *message; /* The error message */ + gpointer private; /* Pointer for application use */ }; -extern struct except *formatError; /* Bad file format */ -extern struct except *ioError; /* Error reading/writing file */ -extern struct except *valueError; /* Value error */ +/* Usage: if CATCH(&xError) { .. } */ +#define CATCH(e) (ethrow_setup(e), setjmp((e)->buf)) +#define UNCATCH(e) ethrow_unsetup(e) + +/* + * This is available from everywhere, it is for errors that + * can only happen because of a bug in the program, such as + * an assumption that turns out to be wrong. + */ extern struct except *debugError; /* Debugging 'shouldn't happen' errors */ -void ethrow(struct except *e, char *message, ...); + +void ethrow(struct except *e, char *fmt, ...); +void ethrow_setup(struct except *ep); +void ethrow_unsetup(struct except *ep); diff -rNu melys-0.0.6/include/format.h melys-0.0.7/include/format.h --- melys-0.0.6/include/format.h Mon Aug 9 19:46:19 1999 +++ melys-0.0.7/include/format.h Thu Jan 1 00:00:00 1970 @@ -1,24 +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. - * - */ - -typedef struct rootElement *(*fileReadFunc)(char *name); -typedef void (*fileWriteFunc)(char *name, struct rootElement *root, int flags); - -char *file_guess_type(char *filename); -fileReadFunc file_get_read_func(char *type); -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.6/include/mdrw.h melys-0.0.7/include/mdrw.h --- melys-0.0.6/include/mdrw.h Mon Aug 9 19:46:19 1999 +++ melys-0.0.7/include/mdrw.h Wed Aug 11 15:41:00 1999 @@ -17,7 +17,6 @@ * */ -struct rootElement *mdml_read_file(char *filename); +struct rootElement *mdml_read_file(struct File *file); -void mdml_write(FILE *fp, struct rootElement *root, int flags); -void mdml_write_file(char *name, struct rootElement *root, int flags); +void mdml_write_file(struct File *file, struct rootElement *root); diff -rNu melys-0.0.6/include/melfile.h melys-0.0.7/include/melfile.h --- melys-0.0.6/include/melfile.h Thu Jan 1 00:00:00 1970 +++ melys-0.0.7/include/melfile.h Wed Aug 11 15:41:00 1999 @@ -0,0 +1,89 @@ +/* + * + * 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. + * + * Manage reading and writing to the various file formats. + * The initially supported formats will be MIDI and MDML. + * + * + * + */ + +struct File; + +typedef struct rootElement *(*fileReadFunc)(struct File *); +typedef void (*fileWriteFunc)(struct File *, struct rootElement *); + +struct File { + char *type; /* Midi, MDML etc */ + char *name; /* File name */ + + /* Private stuff */ + + int status; /* Result code of operation */ + char *msg; /* Message for a failed operation */ + + gboolean compressed; /* T/F if compressed format */ + + /* Callback for long lasting operations */ + void (*progress_cb)(struct File *, gpointer); + + /* Variables to calculate progress, always use file_get_progress */ + double max; /* Estimate of total work to be done */ + double done; /* Estimate of work done */ + + fileReadFunc read; /* Read function */ + fileWriteFunc write; /* Write function */ +}; + + +/* + * Types of file. + */ +#define FILE_TYPE_MIDI "midi" +#define FILE_TYPE_MDML "mdml" +#define FILE_TYPE_MDML_COMPRESSED "gz-mdml" + +enum { + FILE_OPT_COMPRESSED = 0x001, + FILE_OPT_LAST +}; + +/* + * Variables that can appear in the status field. The message + * gives a more useful indication to the user. + */ +enum fileErrors { + FILE_SUCCESS, /* Successful status */ + FILE_STATUS_NONE,/* This just means that no status has been set yet */ + FILE_STATUS_CONFIRM, /* Do you really want to... kind of messages */ + FILE_STATUS_OPEN_FAIL, /* Could not open */ + FILE_STATUS_BAD_FORMAT, /* File had a format problem */ + FILE_STATUS_UNKNOWN, /* Could not recognise file type */ + FILE_STATUS_INTERNAL,/* Probably a Melys bug, rather than user error */ + FILE_STATUS_LAST +}; + + +struct File *file_new(char *name); +void file_set_type(struct File *file, char *type); +void file_set_compressed(struct File *file, gboolean yesno); +int file_get_status(struct File *file); +char *file_get_message(struct File *file); +double file_get_progress(struct File *file); +void file_set_progress_callback(struct File *file, + void (*cb)(struct File *, gpointer)); +void file_set_success(struct File *file); +void file_set_error(struct File *file, int code, char *fmt, ...); +void file_close(struct File *file); +struct rootElement *file_read(struct File *file); +void file_write(struct File *file, struct rootElement *root); diff -rNu melys-0.0.6/include/melgui.h melys-0.0.7/include/melgui.h --- melys-0.0.6/include/melgui.h Mon Aug 9 19:46:20 1999 +++ melys-0.0.7/include/melgui.h Wed Aug 11 15:41:01 1999 @@ -12,16 +12,20 @@ * GNU General Public License for more details. * * + * */ int melys_app(int argc, char **argv); 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); +void mel_song_display(struct song *sd, GtkObject *parent, int _type, + char *fmt, ...); void mel_ui_warn(struct song *sd, char *msg, GtkObject *parent); void mel_add_view(GtkObject *mdi, GtkObject *child, GtkWidget *view, gboolean toplevel); void mel_initial_view(GtkObject *mdi, GtkObject *child, struct rootElement *root, gboolean toplevel); +gboolean mel_file_error(struct song *song, struct File *file, + GtkObject *parent); void mel_debug_print_type(char *msg, GtkObject *o); diff -rNu melys-0.0.6/include/melmsg.h melys-0.0.7/include/melmsg.h --- melys-0.0.6/include/melmsg.h Thu Jan 1 00:00:00 1970 +++ melys-0.0.7/include/melmsg.h Wed Aug 11 15:41:01 1999 @@ -0,0 +1,44 @@ +/* + * + * 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. + * + * + * + */ + +enum message_type { + MEL_MSG_ERROR, + MEL_MSG_WARNING, + MEL_MSG_INFO, + + MEL_MSG_LAST +}; + +/* Yes this is GNUC extension -- patches accepted */ +#define mel_song_error(s, p, f...) \ + mel_song_display((s), (p), MEL_MSG_ERROR, (f), ##f) +#define mel_song_warning(s, p, f...) \ + mel_song_display((s), (p), MEL_MSG_WARNING, (f), ##f) +#define mel_song_info(s, p, f...) \ + mel_song_display((s), (p), MEL_MSG_INFO, (f), ##f) + +#define mel_error(f...) \ + mel_song_display(NULL, NULL, MEL_MSG_ERROR, (f), ##f) +#define mel_warning(f...) \ + mel_song_display(NULL, NULL, MEL_MSG_WARNING, (f), ##f) +#define mel_info(f...) \ + mel_song_display(NULL, NULL, MEL_MSG_INFO, (f), ##f) + +struct song; +extern void mel_song_display(struct song *sd, struct _GtkObject *parent, + int _type, char *fmt, ...); + diff -rNu melys-0.0.6/include/midi.h melys-0.0.7/include/midi.h --- melys-0.0.6/include/midi.h Mon Aug 9 19:46:19 1999 +++ melys-0.0.7/include/midi.h Wed Aug 11 15:41:00 1999 @@ -54,12 +54,10 @@ #define MIDI_HEAD_MAGIC 0x4d546864 #define MIDI_TRACK_MAGIC 0x4d54726b -struct rootElement *midi_read(FILE *fp); -struct rootElement *midi_read_file(char *name); +struct rootElement *midi_read_file(struct File *file); /* Flags for writing midi files */ #define MIDI_FILE_RUNNING_STATUS 0x001 #define MIDI_FILE_COMPRESSED 0x002 -void midi_write_file(char *name, struct rootElement *root, int flags); -void midi_write(FILE *fp, struct rootElement *root, int flags); +void midi_write_file(struct File *file, struct rootElement *root); diff -rNu melys-0.0.6/include/song.h melys-0.0.7/include/song.h --- melys-0.0.6/include/song.h Mon Aug 9 19:46:18 1999 +++ melys-0.0.7/include/song.h Wed Aug 11 15:40:59 1999 @@ -41,17 +41,20 @@ 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 */ + + /* Here are all the views on this file */ + GtkWidget *trackview; + }; -void song_open_file(struct song *song, char *filename); +void song_setup(struct song *song, char *filename, struct rootElement *root); void song_set_echo(void); void song_reset_echo(void); void song_play_start(struct song *song); Binary files melys-0.0.6/mlib/PROJECT/__init__.pyo and melys-0.0.7/mlib/PROJECT/__init__.pyo differ Binary files melys-0.0.6/mlib/PROJECT/base.pyo and melys-0.0.7/mlib/PROJECT/base.pyo differ Binary files melys-0.0.6/mlib/PROJECT/cmds.pyo and melys-0.0.7/mlib/PROJECT/cmds.pyo differ Binary files melys-0.0.6/mlib/PROJECT/code.pyo and melys-0.0.7/mlib/PROJECT/code.pyo differ Binary files melys-0.0.6/mlib/PROJECT/header.pyo and melys-0.0.7/mlib/PROJECT/header.pyo differ Binary files melys-0.0.6/mlib/PROJECT/make.pyo and melys-0.0.7/mlib/PROJECT/make.pyo differ Binary files melys-0.0.6/mlib/PROJECT/mgtk.pyo and melys-0.0.7/mlib/PROJECT/mgtk.pyo differ diff -rNu melys-0.0.6/programs/.cvsignore melys-0.0.7/programs/.cvsignore --- melys-0.0.6/programs/.cvsignore Mon Aug 9 19:46:18 1999 +++ melys-0.0.7/programs/.cvsignore Wed Aug 11 15:40:59 1999 @@ -1,10 +1,10 @@ mdmlconv.c +melplay.c melys.c -pmidi.c showseq.c mdmlconv +melplay melys -pmidi showseq Makefile *.mdml *.mdml.gz *.mid diff -rNu melys-0.0.6/programs/Makefile melys-0.0.7/programs/Makefile --- melys-0.0.6/programs/Makefile Mon Aug 9 19:46:18 1999 +++ melys-0.0.7/programs/Makefile Wed Aug 11 15:40:59 1999 @@ -4,30 +4,38 @@ include $(TOP)/make.conf TARGETS = mdmlconv \ + melplay \ melys \ - pmidi \ showseq OBJS = mdmlconv.o \ + melplay.o \ melys.o \ - pmidi.o \ showseq.o GENCFILES = mdmlconv.c \ + melplay.c \ melys.c \ - pmidi.c \ showseq.c GENHFILES = ../include/melys.h MDMLCONVOBJS = \ mdmlconv.o \ ../files/midiread.o ../files/midiwrite.o ../files/mdmlread.o \ - ../files/mdmlwrite.o ../files/format.o ../md/elements.o \ + ../files/mdmlwrite.o ../files/file.o ../md/elements.o \ ../md/mdutil.o ../util/except.o +MELPLAYOBJS = \ + melplay.o \ + ../files/midiread.o ../files/midiwrite.o \ + ../files/mdmlread.o ../files/mdmlwrite.o \ + ../seq/seqlib.o ../seq/seqmidi.o \ + ../util/except.o ../md/elements.o ../md/mdutil.o \ + ../files/file.o + MELYSOBJS = \ melys.o \ ../files/midiread.o ../files/midiwrite.o \ ../files/mdmlread.o ../files/mdmlwrite.o \ - ../files/format.o \ + ../files/file.o \ ../seq/seqlib.o ../seq/seqmidi.o ../seq/sequtil.o \ ../util/except.o ../util/util.o \ ../md/elements.o ../md/mdutil.o \ @@ -39,11 +47,6 @@ ../widgets/melystrack.o ../widgets/melystrackinfo.o \ ../widgets/melystrackdisplay.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 \ @@ -57,12 +60,12 @@ $(CC) $(CFLAGS) -o mdmlconv $(MDMLCONVOBJS) $(LIBS) -melys: $(MELYSOBJS) - $(CC) $(CFLAGS) -o melys $(MELYSOBJS) $(LIBS) +melplay: $(MELPLAYOBJS) + $(CC) $(CFLAGS) -o melplay $(MELPLAYOBJS) $(LIBS) -pmidi: $(PMIDIOBJS) - $(CC) $(CFLAGS) -o pmidi $(PMIDIOBJS) $(LIBS) +melys: $(MELYSOBJS) + $(CC) $(CFLAGS) -o melys $(MELYSOBJS) $(LIBS) showseq: $(SHOWSEQOBJS) diff -rNu melys-0.0.6/programs/mdmlconv.c melys-0.0.7/programs/mdmlconv.c --- melys-0.0.6/programs/mdmlconv.c Mon Aug 9 19:46:27 1999 +++ melys-0.0.7/programs/mdmlconv.c Wed Aug 11 15:41:08 1999 @@ -25,7 +25,7 @@ #include <stdlib.h> #include <unistd.h> #include <getopt.h> -#include "format.h" +#include "melfile.h" #include "elements.h" #include <stdio.h> #include "intl.h" @@ -70,9 +70,9 @@ char *inputfile = NULL; char *inputtype = NULL; char *outputtype = NULL; + struct File *fin = NULL; + struct File *fout = NULL; struct rootElement *root; - fileReadFunc readfn; - fileWriteFunc writefn; /* Build up the short option string */ cp = opts; @@ -116,33 +116,29 @@ inputfile = argv[optind]; - if (inputtype == NULL) - inputtype = file_guess_type(inputfile); - if (outputtype == NULL) - outputtype = file_guess_type(outputfile); - - if (inputtype == NULL || outputtype == NULL) { - fprintf(stderr, "Could not determine input and output types\n"); - fprintf(stderr, " Use the -O and -I options to specify types\n"); - exit(1); - } + fin = file_new(inputfile); + fout = file_new(outputfile); - /* Get and call function to read in the file */ - readfn = file_get_read_func(inputtype); - if (!readfn) { - fprintf(stderr, "Do not know how to read %s\n", inputfile); - exit(1); + if (inputtype) + file_set_type(fin, inputtype); + if (outputtype) + file_set_type(fout, outputtype); + + /* Read in the file */ + root = file_read(fin); + if (file_get_status(fin) != FILE_SUCCESS) { + fprintf(stderr, _("Reading %s: %s\n"), + inputfile, file_get_message(fin)); + return 1; } - root = readfn(inputfile); /* Get and call function to write out file */ - writefn = file_get_write_func(outputtype); - if (!writefn) { - fprintf(stderr, "Do not know how to write %s (type %s)\n", - outputfile, outputtype); - exit(1); + file_write(fout, root); + if (file_get_status(fout) != FILE_SUCCESS) { + fprintf(stderr, _("Reading %s: %s\n"), + inputfile, file_get_message(fout)); + return 1; } - writefn(outputfile, root, 0); md_free(MD_ELEMENT(root)); diff -rNu melys-0.0.6/programs/mdmlconv.m melys-0.0.7/programs/mdmlconv.m --- melys-0.0.6/programs/mdmlconv.m Tue Jul 20 11:42:16 1999 +++ melys-0.0.7/programs/mdmlconv.m Tue Aug 10 15:02:55 1999 @@ -15,10 +15,9 @@ Program to convert between midi and MDML files. >>target mdmlconv ->># TEMP >>make --objects mdmlconv.o >>make --objects ../files/midiread.o ../files/midiwrite.o ../files/mdmlread.o ->>make --objects ../files/mdmlwrite.o ../files/format.o ../md/elements.o +>>make --objects ../files/mdmlwrite.o ../files/file.o ../md/elements.o >>make --objects ../md/mdutil.o ../util/except.o >>extern @@ -26,7 +25,7 @@ >>header <unistd.h> >>header <getopt.h> >>header util.h ->>header format.h +>>header melfile.h >>header elements.h /* Options for the command */ @@ -66,9 +65,9 @@ char *inputfile = NULL; char *inputtype = NULL; char *outputtype = NULL; + struct File *fin = NULL; + struct File *fout = NULL; struct rootElement *root; - fileReadFunc readfn; - fileWriteFunc writefn; /* Build up the short option string */ cp = opts; @@ -112,33 +111,29 @@ inputfile = argv[optind]; - if (inputtype == NULL) - inputtype = file_guess_type(inputfile); - if (outputtype == NULL) - outputtype = file_guess_type(outputfile); - - if (inputtype == NULL || outputtype == NULL) { - fprintf(stderr, "Could not determine input and output types\n"); - fprintf(stderr, " Use the -O and -I options to specify types\n"); - exit(1); - } + fin = file_new(inputfile); + fout = file_new(outputfile); - /* Get and call function to read in the file */ - readfn = file_get_read_func(inputtype); - if (!readfn) { - fprintf(stderr, "Do not know how to read %s\n", inputfile); - exit(1); + if (inputtype) + file_set_type(fin, inputtype); + if (outputtype) + file_set_type(fout, outputtype); + + /* Read in the file */ + root = file_read(fin); + if (file_get_status(fin) != FILE_SUCCESS) { + fprintf(stderr, _("Reading %s: %s\n"), + inputfile, file_get_message(fin)); + return 1; } - root = readfn(inputfile); /* Get and call function to write out file */ - writefn = file_get_write_func(outputtype); - if (!writefn) { - fprintf(stderr, "Do not know how to write %s (type %s)\n", - outputfile, outputtype); - exit(1); + file_write(fout, root); + if (file_get_status(fout) != FILE_SUCCESS) { + fprintf(stderr, _("Reading %s: %s\n"), + inputfile, file_get_message(fout)); + return 1; } - writefn(outputfile, root, 0); md_free(MD_ELEMENT(root)); diff -rNu melys-0.0.6/programs/melplay.c melys-0.0.7/programs/melplay.c --- melys-0.0.6/programs/melplay.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.7/programs/melplay.c Wed Aug 11 15:41:08 1999 @@ -0,0 +1,384 @@ +/* + * + * Copyright (C) 1999 Steve Ratcliffe + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include <stdlib.h> +#include <stdio.h> +#include <unistd.h> +#include <getopt.h> +#include <sys/asoundlib.h> +#include "seqlib.h" +#include "elements.h" +#include "melfile.h" +#include "midi.h" +#include "md.h" +#include <string.h> +#include <errno.h> +#include "intl.h" + +/* + * Play a midi file + * melplay [-p client:port,... ] [-l] [-d delay] file ... + * + * -p client:port - A alsa client and port number to send midi to + * -l - List possible output ports that could be used + * -d delay - Delay after song ends (default 2 sec) + */ + +/* Options for the command */ +#define HAS_ARG 1 +static struct option long_opts[] = { + {"port", HAS_ARG, NULL, 'p'}, + {"list", 0, NULL, 'l'}, + {"delay", HAS_ARG, NULL, 'd'}, + {0, 0, 0, 0}, +}; + +/* Delay at the end of a song */ +static int delay = 2; + +#define ADDR_PARTS 4 /* Number of part in a port description addr 1:2:3:4 */ +#define SEP ", \t" /* Separators for port description */ +static seq_context_t *openports(char *portdesc); +static void playfile(seq_context_t *ctxp, char *filename); +static void showlist(void); +static void showusage(void); +static void play(void *arg, struct element *el); + + +/* + * Play a midi file + * melplay [-p client:port ...] [-l] [-d delay] file ... + + * -p, --port=client:port - An ALSA client and port number to use + * -l, --list - List possible output ports that could be used + * -d, --delay=SECS - Delay after song ends (default 2 sec) + * Arguments: + * argc - arg count + * argv - arg vector + */ +int +main(int argc, char **argv) +{ + char opts[NELEM(long_opts) * 2 + 1]; + char *portdesc; + seq_context_t *ctxp; + 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 'p': + portdesc = optarg; + break; + case 'd': + delay = atoi(optarg); + break; + case 'l': + showlist(); + exit(0); + break; + case '?': + showusage(); + exit(1); + } + } + + if (portdesc == NULL) { + portdesc = getenv("ALSA_OUT_PORT"); + if (portdesc == NULL) { + fprintf(stderr, "No client/port specified.\n" + "You must supply one with the -p option or with the\n" + "environment variable ALSA_OUT_PORT\n" + ); + exit(1); + } + } + + ctxp = openports(portdesc); + if (ctxp == NULL) + return 1; + + /* Now play all the files */ + for (; optind < argc; optind++) + playfile(ctxp, argv[optind]); + + seq_context_free(ctxp); + return 0; +} + +/* + * Read a list of client/port specifications and return an + * array of snd_seq_addr_t that describes them. + * + */ +static seq_context_t * +openports(char *portdesc) +{ + char *astr; + char *cp; + seq_context_t *ctxp; + snd_seq_addr_t *addr; + snd_seq_addr_t *ap; + int a[ADDR_PARTS]; + int count, naddr; + int i; + + if (portdesc == NULL) + return NULL; + + ctxp = seq_context_new("melplay"); + + addr = g_new(snd_seq_addr_t, strlen(portdesc)); + + naddr = 0; + ap = addr; + + for (astr = strtok(portdesc, SEP); astr; astr = strtok(NULL, SEP)) { + for (cp = astr, count = 0; cp && *cp; cp++) { + if (count < ADDR_PARTS) + a[count++] = atoi(cp); + cp = strchr(cp, ':'); + if (cp == NULL) + break; + } + + switch (count) { + case 2: + ap->client = a[0]; + ap->port = a[1]; + break; + default: + printf("Addresses in %d parts not supported yet\n", count); + break; + } + ap++; + naddr++; + } + + count = 0; + for (i = 0; i < naddr; i++) { + int err = 0; + + //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); + } else + count++; + } + + g_free(addr); + + if (count == 0) { + seq_context_free(ctxp); + return NULL; + } + + return ctxp; +} + +/* + * Play a single file. + */ +static void +playfile(seq_context_t *ctxp, char *filename) +{ + struct rootElement *root; + struct sequenceState *seq; + struct element *el; + unsigned long end; + snd_seq_event_t *ep; + struct File *file; + + file = file_new(filename); + root = file_read(file); + if (file_get_status(file) != FILE_SUCCESS) { + fprintf(stderr, "%s\n", file_get_message(file)); + return; + } + if (!root) + return; + + /* Loop through all the elements in the song and play them */ + seq = md_sequence_init(root); + while ((el = md_sequence_next(seq)) != NULL) { + play(ctxp, el); + } + + /* Get the end time for the tracks and echo an event to + * wake us up at that time + */ + end = md_sequence_duration(seq); + seq_midi_send_echo(ctxp, end, 0); + + /* Wait for all the events to be played */ + snd_seq_event_input(seq_handle(ctxp), &ep); + + /* Wait some extra time to allow for note to decay etc */ + sleep(delay); + seq_timer_stop(ctxp); + + md_free(MD_ELEMENT(root)); +} + +/* + * Show a list of possible output ports that midi could be sent + * to. + * + */ +static void +showlist(void) +{ + snd_seq_client_info_t cinfo; + snd_seq_port_info_t pinfo; + snd_seq_system_info_t sysinfo; + int client; + int port; + int err; + snd_seq_t *handle; + + err = snd_seq_open(&handle, SND_SEQ_OPEN); + if (err < 0) { + fprintf(stderr, _("Could not open sequencer %s"), snd_strerror(errno)); + exit(1); + } + + err = snd_seq_system_info(handle, &sysinfo); + if (err < 0) { + fprintf(stderr, _("Could not get sequencer information %s"), + snd_strerror(err)); + exit(1); + } + + printf(_(" Port %-30.30s %s\n"), _("Client name"), _("Port name")); + for (client = 0; client < sysinfo.clients; client++) { + err = snd_seq_get_any_client_info(handle, client, &cinfo); + if (err < 0) + continue; + + for (port = 0; port < sysinfo.ports; port++) { + int cap; + + err = snd_seq_get_any_port_info(handle, client, port, &pinfo); + if (err < 0) + continue; + + cap = (SND_SEQ_PORT_CAP_SUBSCRIPTION|SND_SEQ_PORT_CAP_OUT); + if ((pinfo.capability & cap) == cap) { + printf("%3d:%-3d %-30.30s %s\n", + pinfo.client, pinfo.port, cinfo.name, pinfo.name); + } + } + } +} + +/* + * Show a usage message + */ +static void +showusage(void) +{ +char **cpp; +static char *msg[] = { +N_("Usage: melplay [-p client:port ...] [-l] [-d delay] file ..."), +"", +N_(" -p client:port - A alsa client and port number to send midi to"), +N_(" -l - List possible output ports that could be used"), +N_(" -d delay - Delay after song ends (default 2 sec)"), +}; + + for (cpp = msg; cpp < msg+NELEM(msg); cpp++) { + fprintf(stderr, "%s\n", _(*cpp)); + } +} + +static void +play(void *arg, struct element *el) +{ + seq_context_t *ctxp = arg; + snd_seq_event_t ev; + + seq_midi_event_init(ctxp, &ev, el->element_time, el->device_channel); + switch (el->type) { + case MD_TYPE_HEAD: + seq_init_tempo(ctxp, MD_HEAD(el)->time_base, 120, 1); + seq_timer_start(ctxp); + return; + case MD_TYPE_NOTE: + seq_midi_note(ctxp, &ev, MD_NOTE(el)->note, MD_NOTE(el)->vel, + MD_NOTE(el)->length); + break; + case MD_TYPE_CONTROL: + seq_midi_control(ctxp, &ev, MD_CONTROL(el)->control, + MD_CONTROL(el)->value); + break; + case MD_TYPE_PROGRAM: + seq_midi_program(ctxp, &ev, MD_PROGRAM(el)->program); + break; + case MD_TYPE_TEMPO: + seq_midi_tempo(ctxp, &ev, MD_TEMPO(el)->micro_tempo); + break; + case MD_TYPE_PITCH: + seq_midi_pitchbend(ctxp, &ev, MD_PITCH(el)->pitch); + break; + case MD_TYPE_PRESSURE: + seq_midi_chanpress(ctxp, &ev, MD_PRESSURE(el)->velocity); + break; + case MD_TYPE_KEYTOUCH: + seq_midi_keypress(ctxp, &ev, MD_KEYTOUCH(el)->note, + MD_KEYTOUCH(el)->velocity); + break; + case MD_TYPE_SYSEX: + seq_midi_sysex(ctxp, &ev, MD_SYSEX(el)->status, MD_SYSEX(el)->data, + MD_SYSEX(el)->length); + break; + + case MD_TYPE_ROOT: + case MD_TYPE_TEXT: + case MD_TYPE_KEYSIG: + case MD_TYPE_TIMESIG: + case MD_TYPE_SMPTEOFFSET: + case MD_TYPE_PART: + /* Ones that have no sequencer action */ + return; + default: + printf("WARNING: play: not implemented yet %d\n", el->type); + return; + } + + seq_write(ctxp, &ev); +} diff -rNu melys-0.0.6/programs/melplay.m melys-0.0.7/programs/melplay.m --- melys-0.0.6/programs/melplay.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.7/programs/melplay.m Tue Aug 10 16:56:39 1999 @@ -0,0 +1,379 @@ +>>name melplay.m A play midi program + +Copyright (C) 1999 Steve Ratcliffe + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. +>>target melplay +>>make --objects melplay.o +>>make --objects ../files/midiread.o ../files/midiwrite.o +>>make --objects ../files/mdmlread.o ../files/mdmlwrite.o +>>make --objects ../seq/seqlib.o ../seq/seqmidi.o +>>make --objects ../util/except.o ../md/elements.o ../md/mdutil.o +>>make --objects ../files/file.o + +>>extern +/* + * Play a midi file + * melplay [-p client:port,... ] [-l] [-d delay] file ... + * + * -p client:port - A alsa client and port number to send midi to + * -l - List possible output ports that could be used + * -d delay - Delay after song ends (default 2 sec) + */ +>>header <stdlib.h> +>>header <stdio.h> +>>header <unistd.h> +>>header <getopt.h> +>>header <sys/asoundlib.h> +>>header seqlib.h +>>header elements.h +>>header melfile.h +>>header midi.h +>>header md.h + +/* Options for the command */ +#define HAS_ARG 1 +static struct option long_opts[] = { + {"port", HAS_ARG, NULL, 'p'}, + {"list", 0, NULL, 'l'}, + {"delay", HAS_ARG, NULL, 'd'}, + {0, 0, 0, 0}, +}; + +/* Delay at the end of a song */ +static int delay = 2; + +#define ADDR_PARTS 4 /* Number of part in a port description addr 1:2:3:4 */ +#define SEP ", \t" /* Separators for port description */ + +>>function main +int +int argc; arg count +char **argv; arg vector + +>>description +Play a midi file + melplay [-p client:port ...] [-l] [-d delay] file ... + + -p, --port=client:port - An ALSA client and port number to use + -l, --list - List possible output ports that could be used + -d, --delay=SECS - Delay after song ends (default 2 sec) +>>code + char opts[NELEM(long_opts) * 2 + 1]; + char *portdesc; + seq_context_t *ctxp; + 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 'p': + portdesc = optarg; + break; + case 'd': + delay = atoi(optarg); + break; + case 'l': + showlist(); + exit(0); + break; + case '?': + showusage(); + exit(1); + } + } + + if (portdesc == NULL) { + portdesc = getenv("ALSA_OUT_PORT"); + if (portdesc == NULL) { + fprintf(stderr, "No client/port specified.\n" + "You must supply one with the -p option or with the\n" + "environment variable ALSA_OUT_PORT\n" + ); + exit(1); + } + } + + ctxp = openports(portdesc); + if (ctxp == NULL) + return 1; + + /* Now play all the files */ + for (; optind < argc; optind++) + playfile(ctxp, argv[optind]); + + seq_context_free(ctxp); + return 0; + +>>header <string.h> +>>function openports +static seq_context_t * +char *portdesc; + +>>description +Read a list of client/port specifications and return an array of +.M snd_seq_addr_t +that describes them. + +>>code + 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("melplay"); + + addr = g_new(snd_seq_addr_t, strlen(portdesc)); + + naddr = 0; + ap = addr; + + for (astr = strtok(portdesc, SEP); astr; astr = strtok(NULL, SEP)) { + for (cp = astr, count = 0; cp && *cp; cp++) { + if (count < ADDR_PARTS) + a[count++] = atoi(cp); + cp = strchr(cp, ':'); + if (cp == NULL) + break; + } + + switch (count) { + case 2: + ap->client = a[0]; + ap->port = a[1]; + break; + default: + printf("Addresses in %d parts not supported yet\n", count); + break; + } + ap++; + naddr++; + } + + count = 0; + for (i = 0; i < naddr; i++) { + int err = 0; + + //XXX err = seq_connect_add(ctxp, addr[i].client, addr[i].port); + printf("@func_name need seq_connect_add\n"); + 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; + +>>function playfile +static void +seq_context_t *ctxp; +char *filename; +>>description +Play a single file. +>>code + struct rootElement *root; + struct sequenceState *seq; + struct element *el; + unsigned long end; + snd_seq_event_t *ep; + struct File *file; + + file = file_new(filename); + root = file_read(file); + if (file_get_status(file) != FILE_SUCCESS) { + fprintf(stderr, "%s\n", file_get_message(file)); + return; + } + if (!root) + return; + + /* Loop through all the elements in the song and play them */ + seq = md_sequence_init(root); + while ((el = md_sequence_next(seq)) != NULL) { + play(ctxp, el); + } + + /* Get the end time for the tracks and echo an event to + * wake us up at that time + */ + end = md_sequence_duration(seq); + seq_midi_send_echo(ctxp, end, 0); + + /* Wait for all the events to be played */ + snd_seq_event_input(seq_handle(ctxp), &ep); + + /* Wait some extra time to allow for note to decay etc */ + sleep(delay); + seq_timer_stop(ctxp); + + md_free(MD_ELEMENT(root)); + + +>>function showlist +static void + +>>description +Show a list of possible output ports that midi could +be sent to. + +>>header <errno.h> +>>code + snd_seq_client_info_t cinfo; + snd_seq_port_info_t pinfo; + snd_seq_system_info_t sysinfo; + int client; + int port; + int err; + snd_seq_t *handle; + + err = snd_seq_open(&handle, SND_SEQ_OPEN); + if (err < 0) { + fprintf(stderr, _("Could not open sequencer %s"), snd_strerror(errno)); + exit(1); + } + + err = snd_seq_system_info(handle, &sysinfo); + if (err < 0) { + fprintf(stderr, _("Could not get sequencer information %s"), + snd_strerror(err)); + exit(1); + } + + printf(_(" Port %-30.30s %s\n"), _("Client name"), _("Port name")); + for (client = 0; client < sysinfo.clients; client++) { + err = snd_seq_get_any_client_info(handle, client, &cinfo); + if (err < 0) + continue; + + for (port = 0; port < sysinfo.ports; port++) { + int cap; + + err = snd_seq_get_any_port_info(handle, client, port, &pinfo); + if (err < 0) + continue; + + cap = (SND_SEQ_PORT_CAP_SUBSCRIPTION|SND_SEQ_PORT_CAP_OUT); + if ((pinfo.capability & cap) == cap) { + printf("%3d:%-3d %-30.30s %s\n", + pinfo.client, pinfo.port, cinfo.name, pinfo.name); + } + } + } + + +>>function showusage +static void +>>description +Show a usage message +>>code +>>header <stdio.h> +char **cpp; +static char *msg[] = { +N_("Usage: melplay [-p client:port ...] [-l] [-d delay] file ..."), +"", +N_(" -p client:port - A alsa client and port number to send midi to"), +N_(" -l - List possible output ports that could be used"), +N_(" -d delay - Delay after song ends (default 2 sec)"), +}; + + for (cpp = msg; cpp < msg+NELEM(msg); cpp++) { + fprintf(stderr, "%s\n", _(*cpp)); + } + + +>>function play +static void +void *arg; +struct element *el; + +>>code + seq_context_t *ctxp = arg; + snd_seq_event_t ev; + + seq_midi_event_init(ctxp, &ev, el->element_time, el->device_channel); + switch (el->type) { + case MD_TYPE_HEAD: + seq_init_tempo(ctxp, MD_HEAD(el)->time_base, 120, 1); + seq_timer_start(ctxp); + return; + case MD_TYPE_NOTE: + seq_midi_note(ctxp, &ev, MD_NOTE(el)->note, MD_NOTE(el)->vel, + MD_NOTE(el)->length); + break; + case MD_TYPE_CONTROL: + seq_midi_control(ctxp, &ev, MD_CONTROL(el)->control, + MD_CONTROL(el)->value); + break; + case MD_TYPE_PROGRAM: + seq_midi_program(ctxp, &ev, MD_PROGRAM(el)->program); + break; + case MD_TYPE_TEMPO: + seq_midi_tempo(ctxp, &ev, MD_TEMPO(el)->micro_tempo); + break; + case MD_TYPE_PITCH: + seq_midi_pitchbend(ctxp, &ev, MD_PITCH(el)->pitch); + break; + case MD_TYPE_PRESSURE: + seq_midi_chanpress(ctxp, &ev, MD_PRESSURE(el)->velocity); + break; + case MD_TYPE_KEYTOUCH: + seq_midi_keypress(ctxp, &ev, MD_KEYTOUCH(el)->note, + MD_KEYTOUCH(el)->velocity); + break; + case MD_TYPE_SYSEX: + seq_midi_sysex(ctxp, &ev, MD_SYSEX(el)->status, MD_SYSEX(el)->data, + MD_SYSEX(el)->length); + break; + + case MD_TYPE_ROOT: + case MD_TYPE_TEXT: + case MD_TYPE_KEYSIG: + case MD_TYPE_TIMESIG: + case MD_TYPE_SMPTEOFFSET: + case MD_TYPE_PART: + /* Ones that have no sequencer action */ + return; + default: + printf("WARNING: play: not implemented yet %d\n", el->type); + return; + } + + seq_write(ctxp, &ev); diff -rNu melys-0.0.6/programs/melys.c melys-0.0.7/programs/melys.c --- melys-0.0.6/programs/melys.c Mon Aug 9 19:46:27 1999 +++ melys-0.0.7/programs/melys.c Wed Aug 11 15:41:09 1999 @@ -25,6 +25,7 @@ #include <getopt.h> #include <locale.h> #include "gtk/gtkmain.h" +#include "melmsg.h" #include "melys.h" #include "intl.h" @@ -89,6 +90,21 @@ melys_app(argc, argv); + if CATCH(debugError) { + + /* + * It may or may not be safe to resume. Lets try anyway. + * If you see the message things are probably alright... + */ + mel_error( + _("A debugging error occurred\n" + "Melys may now crash unexpectedly\n" + "Please save your work and exit\n" + "the application as soon as possible\n" + "MESSAGE: %s" + ), debugError->message); + } + gtk_main(); { @@ -97,6 +113,8 @@ p = malloc(1); /* Only used to get db malloc package linked in */ free(p); } + + UNCATCH(debugError); return 0; } diff -rNu melys-0.0.6/programs/melys.m melys-0.0.7/programs/melys.m --- melys-0.0.6/programs/melys.m Mon Aug 9 00:05:59 1999 +++ melys-0.0.7/programs/melys.m Tue Aug 10 16:56:39 1999 @@ -14,7 +14,7 @@ >>make --objects melys.o >>make --objects ../files/midiread.o ../files/midiwrite.o >>make --objects ../files/mdmlread.o ../files/mdmlwrite.o ->>make --objects ../files/format.o +>>make --objects ../files/file.o >>make --objects ../seq/seqlib.o ../seq/seqmidi.o ../seq/sequtil.o >>make --objects ../util/except.o ../util/util.o >>make --objects ../md/elements.o ../md/mdutil.o @@ -32,6 +32,7 @@ >>header <getopt.h> >>header <locale.h> >>header gtk/gtkmain.h +>>header melmsg.h >>headerdef melys.h @@ -98,6 +99,21 @@ melys_app(argc, argv); + if CATCH(debugError) { + + /* + * It may or may not be safe to resume. Lets try anyway. + * If you see the message things are probably alright... + */ + mel_error( + _("A debugging error occurred\n" + "Melys may now crash unexpectedly\n" + "Please save your work and exit\n" + "the application as soon as possible\n" + "MESSAGE: %s" + ), debugError->message); + } + gtk_main(); { @@ -106,6 +122,8 @@ p = malloc(1); /* Only used to get db malloc package linked in */ free(p); } + + UNCATCH(debugError); return 0; diff -rNu melys-0.0.6/programs/pmidi.c melys-0.0.7/programs/pmidi.c --- melys-0.0.6/programs/pmidi.c Mon Aug 9 19:46:28 1999 +++ melys-0.0.7/programs/pmidi.c Thu Jan 1 00:00:00 1970 @@ -1,373 +0,0 @@ -/* - * - * Copyright (C) 1999 Steve Ratcliffe - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * - */ - - -#include "glib.h" -#include "except.h" -#include "util.h" -#include <stdlib.h> -#include <stdio.h> -#include <unistd.h> -#include <getopt.h> -#include <sys/asoundlib.h> -#include "seqlib.h" -#include "elements.h" -#include "midi.h" -#include "md.h" -#include <string.h> -#include <errno.h> -#include "intl.h" - -/* - * Play a midi file - * pmidi [-p client:port,... ] [-l] [-d delay] file ... - * - * -p client:port - A alsa client and port number to send midi to - * -l - List possible output ports that could be used - * -d delay - Delay after song ends (default 2 sec) - */ - -/* Options for the command */ -#define HAS_ARG 1 -static struct option long_opts[] = { - {"port", HAS_ARG, NULL, 'p'}, - {"list", 0, NULL, 'l'}, - {"delay", HAS_ARG, NULL, 'd'}, - {0, 0, 0, 0}, -}; - -/* Delay at the end of a song */ -static int delay = 2; - -#define ADDR_PARTS 4 /* Number of part in a port description addr 1:2:3:4 */ -#define SEP ", \t" /* Separators for port description */ -static seq_context_t *openports(char *portdesc); -static void playfile(seq_context_t *ctxp, char *filename); -static void showlist(void); -static void showusage(void); -static void play(void *arg, struct element *el); - - -/* - * Play a midi file - * pmidi [-p client:port ...] [-l] [-d delay] file ... - - * -p, --port=client:port - An ALSA client and port number to use - * -l, --list - List possible output ports that could be used - * -d, --delay=SECS - Delay after song ends (default 2 sec) - * Arguments: - * argc - arg count - * argv - arg vector - */ -int -main(int argc, char **argv) -{ - char opts[NELEM(long_opts) * 2 + 1]; - char *portdesc; - seq_context_t *ctxp; - 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 'p': - portdesc = optarg; - break; - case 'd': - delay = atoi(optarg); - break; - case 'l': - showlist(); - exit(0); - break; - case '?': - showusage(); - exit(1); - } - } - - if (portdesc == NULL) { - portdesc = getenv("ALSA_OUT_PORT"); - if (portdesc == NULL) { - fprintf(stderr, "No client/port specified.\n" - "You must supply one with the -p option or with the\n" - "environment variable ALSA_OUT_PORT\n" - ); - exit(1); - } - } - - ctxp = openports(portdesc); - if (ctxp == NULL) - return 1; - - /* Now play all the files */ - for (; optind < argc; optind++) - playfile(ctxp, argv[optind]); - - seq_context_free(ctxp); - return 0; -} - -/* - * Read a list of client/port specifications and return an - * array of snd_seq_addr_t that describes them. - * - */ -static seq_context_t * -openports(char *portdesc) -{ - char *astr; - char *cp; - seq_context_t *ctxp; - snd_seq_addr_t *addr; - snd_seq_addr_t *ap; - int a[ADDR_PARTS]; - int count, naddr; - int i; - - if (portdesc == NULL) - return NULL; - - ctxp = seq_context_new("pmidi"); - - addr = g_new(snd_seq_addr_t, strlen(portdesc)); - - naddr = 0; - ap = addr; - - for (astr = strtok(portdesc, SEP); astr; astr = strtok(NULL, SEP)) { - for (cp = astr, count = 0; cp && *cp; cp++) { - if (count < ADDR_PARTS) - a[count++] = atoi(cp); - cp = strchr(cp, ':'); - if (cp == NULL) - break; - } - - switch (count) { - case 2: - ap->client = a[0]; - ap->port = a[1]; - break; - default: - printf("Addresses in %d parts not supported yet\n", count); - break; - } - ap++; - naddr++; - } - - count = 0; - for (i = 0; i < naddr; i++) { - int err = 0; - - //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); - } else - count++; - } - - g_free(addr); - - if (count == 0) { - seq_context_free(ctxp); - return NULL; - } - - return ctxp; -} - -/* - * Play a single file. - */ -static void -playfile(seq_context_t *ctxp, char *filename) -{ - struct rootElement *root; - struct sequenceState *seq; - struct element *el; - unsigned long end; - snd_seq_event_t *ep; - - root = midi_read_file(filename); - if (!root) - return; - - /* Loop through all the elements in the song and play them */ - seq = md_sequence_init(root); - while ((el = md_sequence_next(seq)) != NULL) { - play(ctxp, el); - } - - /* Get the end time for the tracks and echo an event to - * wake us up at that time - */ - end = md_sequence_duration(seq); - seq_midi_send_echo(ctxp, end, 0); - - /* Wait for all the events to be played */ - snd_seq_event_input(seq_handle(ctxp), &ep); - - /* Wait some extra time to allow for note to decay etc */ - sleep(delay); - seq_timer_stop(ctxp); - - md_free(MD_ELEMENT(root)); -} - -/* - * Show a list of possible output ports that midi could be sent - * to. - * - */ -static void -showlist(void) -{ - snd_seq_client_info_t cinfo; - snd_seq_port_info_t pinfo; - snd_seq_system_info_t sysinfo; - int client; - int port; - int err; - snd_seq_t *handle; - - err = snd_seq_open(&handle, SND_SEQ_OPEN); - if (err < 0) - 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(_(" Port %-30.30s %s\n"), _("Client name"), _("Port name")); - for (client = 0; client < sysinfo.clients; client++) { - err = snd_seq_get_any_client_info(handle, client, &cinfo); - if (err < 0) - continue; - - for (port = 0; port < sysinfo.ports; port++) { - int cap; - - err = snd_seq_get_any_port_info(handle, client, port, &pinfo); - if (err < 0) - continue; - - cap = (SND_SEQ_PORT_CAP_SUBSCRIPTION|SND_SEQ_PORT_CAP_OUT); - if ((pinfo.capability & cap) == cap) { - printf("%3d:%-3d %-30.30s %s\n", - pinfo.client, pinfo.port, cinfo.name, pinfo.name); - } - } - } -} - -/* - * Show a usage message - */ -static void -showusage(void) -{ -char **cpp; -static char *msg[] = { -N_("Usage: pmidi [-p client:port ...] [-l] [-d delay] file ..."), -"", -N_(" -p client:port - A alsa client and port number to send midi to"), -N_(" -l - List possible output ports that could be used"), -N_(" -d delay - Delay after song ends (default 2 sec)"), -}; - - for (cpp = msg; cpp < msg+NELEM(msg); cpp++) { - fprintf(stderr, "%s\n", _(*cpp)); - } -} - -static void -play(void *arg, struct element *el) -{ - seq_context_t *ctxp = arg; - snd_seq_event_t ev; - - seq_midi_event_init(ctxp, &ev, el->element_time, el->device_channel); - switch (el->type) { - case MD_TYPE_HEAD: - seq_init_tempo(ctxp, MD_HEAD(el)->time_base, 120, 1); - seq_timer_start(ctxp); - return; - case MD_TYPE_NOTE: - seq_midi_note(ctxp, &ev, MD_NOTE(el)->note, MD_NOTE(el)->vel, - MD_NOTE(el)->length); - break; - case MD_TYPE_CONTROL: - seq_midi_control(ctxp, &ev, MD_CONTROL(el)->control, - MD_CONTROL(el)->value); - break; - case MD_TYPE_PROGRAM: - seq_midi_program(ctxp, &ev, MD_PROGRAM(el)->program); - break; - case MD_TYPE_TEMPO: - seq_midi_tempo(ctxp, &ev, MD_TEMPO(el)->micro_tempo); - break; - case MD_TYPE_PITCH: - seq_midi_pitchbend(ctxp, &ev, MD_PITCH(el)->pitch); - break; - case MD_TYPE_PRESSURE: - seq_midi_chanpress(ctxp, &ev, MD_PRESSURE(el)->velocity); - break; - case MD_TYPE_KEYTOUCH: - seq_midi_keypress(ctxp, &ev, MD_KEYTOUCH(el)->note, - MD_KEYTOUCH(el)->velocity); - break; - case MD_TYPE_SYSEX: - seq_midi_sysex(ctxp, &ev, MD_SYSEX(el)->status, MD_SYSEX(el)->data, - MD_SYSEX(el)->length); - break; - - case MD_TYPE_ROOT: - case MD_TYPE_TEXT: - case MD_TYPE_KEYSIG: - case MD_TYPE_TIMESIG: - case MD_TYPE_SMPTEOFFSET: - case MD_TYPE_PART: - /* Ones that have no sequencer action */ - return; - default: - printf("WARNING: play: not implemented yet %d\n", el->type); - return; - } - - seq_write(ctxp, &ev); -} diff -rNu melys-0.0.6/programs/pmidi.m melys-0.0.7/programs/pmidi.m --- melys-0.0.6/programs/pmidi.m Thu Jul 29 14:21:42 1999 +++ melys-0.0.7/programs/pmidi.m Thu Jan 1 00:00:00 1970 @@ -1,365 +0,0 @@ ->>name pmidi.m A play midi program - -Copyright (C) 1999 Steve Ratcliffe - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. ->>target pmidi ->>make --objects pmidi.o ->>make --objects ../files/midiread.o ../seq/seqlib.o ../seq/seqmidi.o ->>make --objects ../util/except.o ../md/elements.o ../md/mdutil.o - ->>extern -/* - * Play a midi file - * pmidi [-p client:port,... ] [-l] [-d delay] file ... - * - * -p client:port - A alsa client and port number to send midi to - * -l - List possible output ports that could be used - * -d delay - Delay after song ends (default 2 sec) - */ ->>header <stdlib.h> ->>header <stdio.h> ->>header <unistd.h> ->>header <getopt.h> ->>header <sys/asoundlib.h> ->>header seqlib.h ->>header elements.h ->>header midi.h ->>header md.h - -/* Options for the command */ -#define HAS_ARG 1 -static struct option long_opts[] = { - {"port", HAS_ARG, NULL, 'p'}, - {"list", 0, NULL, 'l'}, - {"delay", HAS_ARG, NULL, 'd'}, - {0, 0, 0, 0}, -}; - -/* Delay at the end of a song */ -static int delay = 2; - -#define ADDR_PARTS 4 /* Number of part in a port description addr 1:2:3:4 */ -#define SEP ", \t" /* Separators for port description */ - ->>function main -int -int argc; arg count -char **argv; arg vector - ->>description -Play a midi file - pmidi [-p client:port ...] [-l] [-d delay] file ... - - -p, --port=client:port - An ALSA client and port number to use - -l, --list - List possible output ports that could be used - -d, --delay=SECS - Delay after song ends (default 2 sec) ->>code - char opts[NELEM(long_opts) * 2 + 1]; - char *portdesc; - seq_context_t *ctxp; - 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 'p': - portdesc = optarg; - break; - case 'd': - delay = atoi(optarg); - break; - case 'l': - showlist(); - exit(0); - break; - case '?': - showusage(); - exit(1); - } - } - - if (portdesc == NULL) { - portdesc = getenv("ALSA_OUT_PORT"); - if (portdesc == NULL) { - fprintf(stderr, "No client/port specified.\n" - "You must supply one with the -p option or with the\n" - "environment variable ALSA_OUT_PORT\n" - ); - exit(1); - } - } - - ctxp = openports(portdesc); - if (ctxp == NULL) - return 1; - - /* Now play all the files */ - for (; optind < argc; optind++) - playfile(ctxp, argv[optind]); - - seq_context_free(ctxp); - return 0; - ->>header <string.h> ->>function openports -static seq_context_t * -char *portdesc; - ->>description -Read a list of client/port specifications and return an array of -.M snd_seq_addr_t -that describes them. - ->>code - 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("pmidi"); - - addr = g_new(snd_seq_addr_t, strlen(portdesc)); - - naddr = 0; - ap = addr; - - for (astr = strtok(portdesc, SEP); astr; astr = strtok(NULL, SEP)) { - for (cp = astr, count = 0; cp && *cp; cp++) { - if (count < ADDR_PARTS) - a[count++] = atoi(cp); - cp = strchr(cp, ':'); - if (cp == NULL) - break; - } - - switch (count) { - case 2: - ap->client = a[0]; - ap->port = a[1]; - break; - default: - printf("Addresses in %d parts not supported yet\n", count); - break; - } - ap++; - naddr++; - } - - count = 0; - for (i = 0; i < naddr; i++) { - int err = 0; - - //XXX err = seq_connect_add(ctxp, addr[i].client, addr[i].port); - printf("@func_name need seq_connect_add\n"); - 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; - ->>function playfile -static void -seq_context_t *ctxp; -char *filename; ->>description -Play a single file. ->>code - struct rootElement *root; - struct sequenceState *seq; - struct element *el; - unsigned long end; - snd_seq_event_t *ep; - - root = midi_read_file(filename); - if (!root) - return; - - /* Loop through all the elements in the song and play them */ - seq = md_sequence_init(root); - while ((el = md_sequence_next(seq)) != NULL) { - play(ctxp, el); - } - - /* Get the end time for the tracks and echo an event to - * wake us up at that time - */ - end = md_sequence_duration(seq); - seq_midi_send_echo(ctxp, end, 0); - - /* Wait for all the events to be played */ - snd_seq_event_input(seq_handle(ctxp), &ep); - - /* Wait some extra time to allow for note to decay etc */ - sleep(delay); - seq_timer_stop(ctxp); - - md_free(MD_ELEMENT(root)); - - ->>function showlist -static void - ->>description -Show a list of possible output ports that midi could -be sent to. - ->>header <errno.h> ->>code - 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(_(" Port %-30.30s %s\n"), _("Client name"), _("Port name")); - for (client = 0; client < sysinfo.clients; client++) { - err = snd_seq_get_any_client_info(handle, client, &cinfo); - if (err < 0) - continue; - - for (port = 0; port < sysinfo.ports; port++) { - int cap; - - err = snd_seq_get_any_port_info(handle, client, port, &pinfo); - if (err < 0) - continue; - - cap = (SND_SEQ_PORT_CAP_SUBSCRIPTION|SND_SEQ_PORT_CAP_OUT); - if ((pinfo.capability & cap) == cap) { - printf("%3d:%-3d %-30.30s %s\n", - pinfo.client, pinfo.port, cinfo.name, pinfo.name); - } - } - } - - ->>function showusage -static void ->>description -Show a usage message ->>code ->>header <stdio.h> -char **cpp; -static char *msg[] = { -N_("Usage: pmidi [-p client:port ...] [-l] [-d delay] file ..."), -"", -N_(" -p client:port - A alsa client and port number to send midi to"), -N_(" -l - List possible output ports that could be used"), -N_(" -d delay - Delay after song ends (default 2 sec)"), -}; - - for (cpp = msg; cpp < msg+NELEM(msg); cpp++) { - fprintf(stderr, "%s\n", _(*cpp)); - } - - ->>function play -static void -void *arg; -struct element *el; - ->>code - seq_context_t *ctxp = arg; - snd_seq_event_t ev; - - seq_midi_event_init(ctxp, &ev, el->element_time, el->device_channel); - switch (el->type) { - case MD_TYPE_HEAD: - seq_init_tempo(ctxp, MD_HEAD(el)->time_base, 120, 1); - seq_timer_start(ctxp); - return; - case MD_TYPE_NOTE: - seq_midi_note(ctxp, &ev, MD_NOTE(el)->note, MD_NOTE(el)->vel, - MD_NOTE(el)->length); - break; - case MD_TYPE_CONTROL: - seq_midi_control(ctxp, &ev, MD_CONTROL(el)->control, - MD_CONTROL(el)->value); - break; - case MD_TYPE_PROGRAM: - seq_midi_program(ctxp, &ev, MD_PROGRAM(el)->program); - break; - case MD_TYPE_TEMPO: - seq_midi_tempo(ctxp, &ev, MD_TEMPO(el)->micro_tempo); - break; - case MD_TYPE_PITCH: - seq_midi_pitchbend(ctxp, &ev, MD_PITCH(el)->pitch); - break; - case MD_TYPE_PRESSURE: - seq_midi_chanpress(ctxp, &ev, MD_PRESSURE(el)->velocity); - break; - case MD_TYPE_KEYTOUCH: - seq_midi_keypress(ctxp, &ev, MD_KEYTOUCH(el)->note, - MD_KEYTOUCH(el)->velocity); - break; - case MD_TYPE_SYSEX: - seq_midi_sysex(ctxp, &ev, MD_SYSEX(el)->status, MD_SYSEX(el)->data, - MD_SYSEX(el)->length); - break; - - case MD_TYPE_ROOT: - case MD_TYPE_TEXT: - case MD_TYPE_KEYSIG: - case MD_TYPE_TIMESIG: - case MD_TYPE_SMPTEOFFSET: - case MD_TYPE_PART: - /* Ones that have no sequencer action */ - return; - default: - printf("WARNING: play: not implemented yet %d\n", el->type); - return; - } - - seq_write(ctxp, &ev); diff -rNu melys-0.0.6/programs/showseq.c melys-0.0.7/programs/showseq.c --- melys-0.0.6/programs/showseq.c Mon Aug 9 19:46:28 1999 +++ melys-0.0.7/programs/showseq.c Wed Aug 11 15:41:09 1999 @@ -102,13 +102,17 @@ 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)); + if (err < 0) { + fprintf(stderr, _("Could not open sequencer %s"), snd_strerror(errno)); + exit(1); + } err = snd_seq_system_info(handle, &sysinfo); - if (err < 0) - ethrow(ioError, _("Could not get sequencer information %s"), + if (err < 0) { + fprintf(stderr, _("Could not get sequencer information %s"), snd_strerror(err)); + exit(1); + } printf(_(" %4s %-30.30s\n"), _("Port"), _("Port name")); for (client = 0; client < sysinfo.clients; client++) { diff -rNu melys-0.0.6/programs/showseq.m melys-0.0.7/programs/showseq.m --- melys-0.0.6/programs/showseq.m Fri Jul 30 00:10:30 1999 +++ melys-0.0.7/programs/showseq.m Tue Aug 10 16:56:39 1999 @@ -94,13 +94,17 @@ 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)); + if (err < 0) { + fprintf(stderr, _("Could not open sequencer %s"), snd_strerror(errno)); + exit(1); + } err = snd_seq_system_info(handle, &sysinfo); - if (err < 0) - ethrow(ioError, _("Could not get sequencer information %s"), + if (err < 0) { + fprintf(stderr, _("Could not get sequencer information %s"), snd_strerror(err)); + exit(1); + } printf(_(" %4s %-30.30s\n"), _("Port"), _("Port name")); for (client = 0; client < sysinfo.clients; client++) { diff -rNu melys-0.0.6/seq/seqlib.c melys-0.0.7/seq/seqlib.c --- melys-0.0.6/seq/seqlib.c Mon Aug 9 19:46:22 1999 +++ melys-0.0.7/seq/seqlib.c Wed Aug 11 15:41:03 1999 @@ -34,6 +34,9 @@ #include "seqpriv.h" #include "intl.h" + +#define save_msg +static char *lastmsg; static GArray *get_addr_list(seq_context_t *ctxp, int inout); @@ -48,6 +51,7 @@ { seq_context_t *ctxp; snd_seq_queue_client_t qclient; + int err; int q; ctxp = g_new0(seq_context_t, 1); @@ -55,8 +59,11 @@ ctxp->next = NULL; /* Allocate client */ - if (snd_seq_open(&ctxp->handle, SND_SEQ_OPEN) < 0) - ethrow(ioError, _("Could not open sequencer: %s"), snd_strerror(errno)); + if (snd_seq_open(&ctxp->handle, SND_SEQ_OPEN) < 0) { + save_msg(_("Could not open sequencer: %s"), snd_strerror(errno)); + g_free(ctxp); + return NULL; + } ctxp->client = snd_seq_client_id(ctxp->handle); @@ -115,15 +122,17 @@ /* Most members need to be copied */ *nctxp = *ctxp; - nctxp->main = ctxp; /* Back link to the main context */ + if (snd_seq_open(&nctxp->handle, SND_SEQ_OPEN) < 0) { + save_msg(_("Could not open sequencer: %s"), snd_strerror(errno)); + g_free(nctxp); + return NULL; + } /* Link in */ + nctxp->main = ctxp; /* Back link to the main context */ nctxp->next = ctxp->next; ctxp->next = nctxp; - if (snd_seq_open(&nctxp->handle, SND_SEQ_OPEN) < 0) - ethrow(ioError, _("Could not open sequencer: %s"), snd_strerror(errno)); - nctxp->client = snd_seq_client_id(nctxp->handle); nctxp->source.client = nctxp->client; @@ -200,14 +209,14 @@ ret = snd_seq_create_port(ctxp->handle, &info); if (ret < 0) { - ethrow(ioError, _("Error (%s) creating sequencer port\n"), + save_msg(_("Error (%s) creating sequencer port\n"), snd_strerror(errno)); return -1; } ctxp->port_count++; ctxp->source.port = info.port; - return info.port;/*XXX*/ + return info.port; } void @@ -467,9 +476,14 @@ int seq_sendto(seq_context_t *ctxp, snd_seq_event_t *ep, int dev, int chan) { + snd_seq_addr_t *addr; ep->source = ctxp->source; - ep->dest = *seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); + addr = seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); + if (!addr) + return -EINVAL; + + ep->dest = *addr; ep->dest.channel = chan; return seq_write(ctxp, ep); } diff -rNu melys-0.0.6/seq/seqlib.m melys-0.0.7/seq/seqlib.m --- melys-0.0.6/seq/seqlib.m Mon Aug 9 19:08:07 1999 +++ melys-0.0.7/seq/seqlib.m Wed Aug 11 15:40:23 1999 @@ -53,6 +53,11 @@ ; }; +>>extern + +#define save_msg +static char *lastmsg; + >>function seq_context_new seq_context_t * char *name; Name of the client. @@ -62,6 +67,7 @@ >>code seq_context_t *ctxp; snd_seq_queue_client_t qclient; + int err; int q; ctxp = g_new0(seq_context_t, 1); @@ -69,8 +75,11 @@ ctxp->next = NULL; /* Allocate client */ - if (snd_seq_open(&ctxp->handle, SND_SEQ_OPEN) < 0) - ethrow(ioError, _("Could not open sequencer: %s"), snd_strerror(errno)); + if (snd_seq_open(&ctxp->handle, SND_SEQ_OPEN) < 0) { + save_msg(_("Could not open sequencer: %s"), snd_strerror(errno)); + g_free(ctxp); + return NULL; + } ctxp->client = snd_seq_client_id(ctxp->handle); @@ -130,15 +139,17 @@ /* Most members need to be copied */ *nctxp = *ctxp; - nctxp->main = ctxp; /* Back link to the main context */ + if (snd_seq_open(&nctxp->handle, SND_SEQ_OPEN) < 0) { + save_msg(_("Could not open sequencer: %s"), snd_strerror(errno)); + g_free(nctxp); + return NULL; + } /* Link in */ + nctxp->main = ctxp; /* Back link to the main context */ nctxp->next = ctxp->next; ctxp->next = nctxp; - if (snd_seq_open(&nctxp->handle, SND_SEQ_OPEN) < 0) - ethrow(ioError, _("Could not open sequencer: %s"), snd_strerror(errno)); - nctxp->client = snd_seq_client_id(nctxp->handle); nctxp->source.client = nctxp->client; @@ -214,14 +225,14 @@ ret = snd_seq_create_port(ctxp->handle, &info); if (ret < 0) { - ethrow(ioError, _("Error (%s) creating sequencer port\n"), + save_msg(_("Error (%s) creating sequencer port\n"), snd_strerror(errno)); return -1; } ctxp->port_count++; ctxp->source.port = info.port; - return info.port;/*XXX*/ + return info.port; >>function seq_destroy_port @@ -493,9 +504,14 @@ Send the event to the specified client and port. >>code + snd_seq_addr_t *addr; ep->source = ctxp->source; - ep->dest = *seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); + addr = seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); + if (!addr) + return -EINVAL; + + ep->dest = *addr; ep->dest.channel = chan; return seq_write(ctxp, ep); diff -rNu melys-0.0.6/seq/seqmidi.c melys-0.0.7/seq/seqmidi.c --- melys-0.0.6/seq/seqmidi.c Mon Aug 9 19:46:23 1999 +++ melys-0.0.7/seq/seqmidi.c Wed Aug 11 15:41:03 1999 @@ -56,7 +56,7 @@ * just scale the device back to fit in the correct range. This * is not necessarily what you want. */ - if (ctxp->destlist && dev >= ctxp->destlist->len) + if (ctxp->destlist && ctxp->destlist->len && dev >= ctxp->destlist->len) dev = dev % ctxp->destlist->len; memset(ep, '\0', sizeof(*ep)); diff -rNu melys-0.0.6/seq/seqmidi.m melys-0.0.7/seq/seqmidi.m --- melys-0.0.6/seq/seqmidi.m Thu Jul 29 14:21:42 1999 +++ melys-0.0.7/seq/seqmidi.m Wed Aug 11 15:30:31 1999 @@ -45,7 +45,7 @@ * just scale the device back to fit in the correct range. This * is not necessarily what you want. */ - if (ctxp->destlist && dev >= ctxp->destlist->len) + if (ctxp->destlist && ctxp->destlist->len && dev >= ctxp->destlist->len) dev = dev % ctxp->destlist->len; memset(ep, '\0', sizeof(*ep)); diff -rNu melys-0.0.6/song/song.c melys-0.0.7/song/song.c --- melys-0.0.6/song/song.c Mon Aug 9 19:46:22 1999 +++ melys-0.0.7/song/song.c Wed Aug 11 15:41:03 1999 @@ -22,8 +22,8 @@ #include "md.h" #include "melmidi.h" #include "melreg.h" -#include "format.h" #include <stdio.h> +#include "melfile.h" #include "mdrw.h" #include "song.h" #include "melgui.h" @@ -39,35 +39,23 @@ * */ void -song_open_file(struct song *song, char *filename) +song_setup(struct song *song, char *filename, struct rootElement *root) { - struct rootElement *root; - char *errmsg; - if (filename) { - root = file_guess_read_with_msg(filename, &errmsg); - } else { - root = md_empty(); - filename = ""; - } + g_return_if_fail(root != NULL); if (song->mdroot) md_free(MD_ELEMENT(song->mdroot)); song->mdroot = root; - if (root == NULL) { - char *msg; - - if (errmsg == NULL) - errmsg = ""; + play_set_mdroot(song->play, root); + record_set_mdroot(song->record, root); - msg = g_strdup_printf(_("Open of file %s failed\n" "%s\n"), - g_basename(filename), errmsg); - mel_ui_error(song, msg, NULL); + play_set_ports(song->play); + record_set_ports(song->record); - g_free(msg); - return; - } + song->newtrack = md_track_new(); + song->tracknum = MD_CONTAINER(root)->elements->len - 2; /* xxx temp */ /* Temporary warning message */ if (root->head->format == 0) @@ -76,16 +64,6 @@ "at the current time, but should play.\n" "It is easy enough to fix given the right encouragement...\n"), NULL); - - song->mdroot = root; - play_set_mdroot(song->play, root); - record_set_mdroot(song->record, root); - - play_set_ports(song->play); - record_set_ports(song->record); - - song->newtrack = md_track_new(); - song->tracknum = MD_CONTAINER(root)->elements->len - 2; /* xxx temp */ } /* @@ -155,6 +133,8 @@ song->newtrack = md_track_new(); song->tracknum++; + + gtk_widget_queue_draw(song->trackview); } } @@ -187,7 +167,6 @@ { record_stop(song->record); - play_set_record(song->play, 0); } /* @@ -231,7 +210,6 @@ 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, diff -rNu melys-0.0.6/song/song.m melys-0.0.7/song/song.m --- melys-0.0.6/song/song.m Mon Aug 9 19:18:37 1999 +++ melys-0.0.7/song/song.m Wed Aug 11 14:38:57 1999 @@ -17,9 +17,9 @@ >>header md.h >>header melmidi.h >>header melreg.h ->>header format.h >>header <stdio.h> +>>header melfile.h >>header mdrw.h >>headerdef --decl song.h @@ -52,21 +52,25 @@ 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 */ + + /* Here are all the views on this file */ + GtkWidget *trackview; + }; >>header melgui.h ->>function song_open_file +>>function song_setup void struct song *song; char *filename; +struct rootElement *root; >>description Open the file specified by @@ -75,33 +79,21 @@ If filename is NULL, then an empty new song is created. >>code - struct rootElement *root; - char *errmsg; - if (filename) { - root = file_guess_read_with_msg(filename, &errmsg); - } else { - root = md_empty(); - filename = ""; - } + g_return_if_fail(root != NULL); if (song->mdroot) md_free(MD_ELEMENT(song->mdroot)); song->mdroot = root; - if (root == NULL) { - char *msg; - - if (errmsg == NULL) - errmsg = ""; + play_set_mdroot(song->play, root); + record_set_mdroot(song->record, root); - msg = g_strdup_printf(_("Open of file %s failed\n" "%s\n"), - g_basename(filename), errmsg); - mel_ui_error(song, msg, NULL); + play_set_ports(song->play); + record_set_ports(song->record); - g_free(msg); - return; - } + song->newtrack = md_track_new(); + song->tracknum = MD_CONTAINER(root)->elements->len - 2; /* xxx temp */ /* Temporary warning message */ if (root->head->format == 0) @@ -111,17 +103,6 @@ "It is easy enough to fix given the right encouragement...\n"), NULL); - song->mdroot = root; - play_set_mdroot(song->play, root); - record_set_mdroot(song->record, root); - - play_set_ports(song->play); - record_set_ports(song->record); - - song->newtrack = md_track_new(); - song->tracknum = MD_CONTAINER(root)->elements->len - 2; /* xxx temp */ - - >>function song_set_echo void >>description @@ -183,6 +164,8 @@ song->newtrack = md_track_new(); song->tracknum++; + + gtk_widget_queue_draw(song->trackview); } @@ -218,7 +201,6 @@ >>code record_stop(song->record); - play_set_record(song->play, 0); >>function song_get_data @@ -259,7 +241,6 @@ 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, diff -rNu melys-0.0.6/util/except.c melys-0.0.7/util/except.c --- melys-0.0.6/util/except.c Mon Aug 9 19:46:25 1999 +++ melys-0.0.7/util/except.c Wed Aug 11 15:41:06 1999 @@ -31,29 +31,74 @@ static struct except value; static struct except debug; +/* Do not use these */ struct except *formatError = &format; /* Bad file format */ struct except *ioError = &io; /* I/o error to file */ struct except *valueError = &value; /* Value type error */ struct except *debugError = &debug; /* Debugging 'shouldn't happen' errors */ +#define ETHROW_MAGIC 0x671299AB + /* - * Deal with errors. At present just exit, will allow error - * recovery in the future. + * This routine was a bad idea. It allows a limited emulation of + * exceptions, but if not used with care it is going to leave + * memory unfree'd all over the place. + * + * Use it only for debugging situations where you don't want to + * continue because you don't know how you got there, or for + * well defined cases that are not expected to happen often. + * * Arguments: * e - Exception thrown - * message - Reason message - * - Takes variable number of arguments + * fmt - Reason message format + * - Takes variable number of arguments printf like */ void -ethrow(struct except *e, char *message, ...) +ethrow(struct except *e, char *fmt, ...) { va_list ap; + char *msg; - va_start(ap, message); - vfprintf(stderr, message, ap); + va_start(ap, fmt); + msg = g_strdup_vprintf(fmt, ap); va_end(ap); - putc('\n', stderr); - exit(1); + e->message = msg; + if (e->set == ETHROW_MAGIC) { + longjmp(e->buf, 1); + } else { + g_warning(_("ethrow called without being set up")); + g_warning(msg); + if (debugError->set == ETHROW_MAGIC) { + debugError->message = msg; + longjmp(debugError->buf, 1); + } + } + + g_free(msg); +} + +/* + * Setup for catching from ethrow. + * + */ +void +ethrow_setup(struct except *ep) +{ + + if (ep->set == ETHROW_MAGIC) + g_warning(_("ethrow_setup called when allready set up")); + + ep->set = ETHROW_MAGIC; + ep->message = NULL; +} + +void +ethrow_unsetup(struct except *ep) +{ + + ep->set = 0; + if (ep->message) + g_free(ep->message); } diff -rNu melys-0.0.6/util/except.m melys-0.0.7/util/except.m --- melys-0.0.6/util/except.m Mon Aug 9 19:02:02 1999 +++ melys-0.0.7/util/except.m Tue Aug 10 15:02:55 1999 @@ -21,16 +21,33 @@ #include <setjmp.h> +/* + * Some macros and routines to emulate exceptions. + * Do not use this too much... + * Take care to consider memory freeing issues and re-entrency. + * Should only be used where errors are really not expected, certainly + * not for user input, where errors are to be expected and should be + * dealt with properly. + */ struct except { - int set; - sigjmp_buf buf; + int set; /* Flag to say if set up correctly */ + sigjmp_buf buf; /* The return point */ + char *message; /* The error message */ + gpointer private; /* Pointer for application use */ }; -extern struct except *formatError; /* Bad file format */ -extern struct except *ioError; /* Error reading/writing file */ -extern struct except *valueError; /* Value error */ +/* Usage: if CATCH(&xError) { .. } */ +#define CATCH(e) (ethrow_setup(e), setjmp((e)->buf)) +#define UNCATCH(e) ethrow_unsetup(e) + +/* + * This is available from everywhere, it is for errors that + * can only happen because of a bug in the program, such as + * an assumption that turns out to be wrong. + */ extern struct except *debugError; /* Debugging 'shouldn't happen' errors */ + >>extern static struct except format; @@ -38,26 +55,73 @@ static struct except value; static struct except debug; +/* Do not use these */ struct except *formatError = &format; /* Bad file format */ struct except *ioError = &io; /* I/o error to file */ struct except *valueError = &value; /* Value type error */ struct except *debugError = &debug; /* Debugging 'shouldn't happen' errors */ +#define ETHROW_MAGIC 0x671299AB + >>function ethrow void struct except *e; // Exception thrown -char *message; // Reason message -... // Takes variable number of arguments +char *fmt; // Reason message format +... // Takes variable number of arguments printf like >>description -Deal with errors. -At present just exit, will allow error recovery in the future. +This routine was a bad idea. +It allows a limited emulation of exceptions, but if not used +with care it is going to leave memory unfree'd all over the place. + +Use it only for debugging situations where you don't want to +continue because you don't know how you got there, or +for well defined cases that are not expected to happen often. + >>code va_list ap; + char *msg; - va_start(ap, message); - vfprintf(stderr, message, ap); + va_start(ap, fmt); + msg = g_strdup_vprintf(fmt, ap); va_end(ap); - putc('\n', stderr); - exit(1); + e->message = msg; + if (e->set == ETHROW_MAGIC) { + longjmp(e->buf, 1); + } else { + g_warning(_("@func_name called without being set up")); + g_warning(msg); + if (debugError->set == ETHROW_MAGIC) { + debugError->message = msg; + longjmp(debugError->buf, 1); + } + } + + g_free(msg); + + +>>function ethrow_setup +void +struct except *ep; + +>>description +Setup for catching from ethrow. + +>>code + + if (ep->set == ETHROW_MAGIC) + g_warning(_("@func_name called when allready set up")); + + ep->set = ETHROW_MAGIC; + ep->message = NULL; + +>>function ethrow_unsetup +void +struct except *ep; + +>>code + + ep->set = 0; + if (ep->message) + g_free(ep->message); diff -rNu melys-0.0.6/widgets/melystrackinfo.c melys-0.0.7/widgets/melystrackinfo.c --- melys-0.0.6/widgets/melystrackinfo.c Mon Aug 9 19:46:26 1999 +++ melys-0.0.7/widgets/melystrackinfo.c Wed Aug 11 15:41:07 1999 @@ -76,6 +76,8 @@ GtkAllocation *allocation); static void track_info_draw(GtkWidget *widget, GdkRectangle *area); static int track_info_expose(GtkWidget *widget, GdkEventExpose *event); +static void track_info_enter(GtkWidget *widget, gpointer data); +static int track_info_button_press(GtkWidget *widget, GdkEventButton *event); static int track_to_y(MelysTrackInfo *minfo, int n); static void track_info_scroll(GtkAdjustment *adj, gpointer data); @@ -145,6 +147,8 @@ int used; struct col_info *cinfo; + GTK_WIDGET_SET_FLAGS(minfo, GTK_CAN_FOCUS); + minfo->vadj = NULL; minfo->title_window = NULL; @@ -208,6 +212,8 @@ widget_class->unrealize = track_info_unrealise; widget_class->draw = track_info_draw; widget_class->expose_event = track_info_expose; + widget_class->enter_notify_event = track_info_enter; + widget_class->button_press_event = track_info_button_press; // XXX Our functions } @@ -293,7 +299,9 @@ attributes.event_mask = gtk_widget_get_events(widget); attributes.event_mask |= (GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK + GDK_BUTTON_RELEASE_MASK | + GDK_ENTER_NOTIFY_MASK | + 0 ); attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; @@ -308,7 +316,7 @@ /* The title window */ attributes.x = 0; attributes.y = 0; - attributes.height = 12; + attributes.height = minfo->vtitle; minfo->title_window = gdk_window_new(widget->window, &attributes, attributes_mask); @@ -519,7 +527,7 @@ return; /* Nothing more to do */ start = y_to_track(minfo, area->y); - end = y_to_track(minfo, area->y + area->height); + end = y_to_track(minfo, area->y + area->height) + 1; if (end > minfo->mdroot->tracks) end = minfo->mdroot->tracks; @@ -575,6 +583,43 @@ event->area.width, event->area.height); return FALSE; /* XXX what does this mean */ +} + +static void +track_info_enter(GtkWidget *widget, gpointer data) +{ + + if (widget == NULL) + return; + mel_debug_print_type("enter", widget); + + //gtk_widget_grab_focus(widget); +} + +/* + * Button presses select tracks and bring up dialogs to modify + * the properties of tracks. The first button press on a track + * selects it. A button1 press on a track that is already + * selected will bring up the track properties dialog. If the + * click is in the patch column then the instrument selecter + * dialog will be displayed. A control click will allow the + * selection state on a column to be toggled. A shift click will + * select a range of tracks. A button3 click will bring up a menu + * of track actions -- add delete etc. + * + */ +static int +track_info_button_press(GtkWidget *widget, GdkEventButton *event) +{ + int n; + MelysTrackInfo *minfo; + + minfo = MELYS_TRACK_INFO(widget); + + n = y_to_track(minfo, event->y); + + dprintf1("Click on track %d", n); + return TRUE; } /* diff -rNu melys-0.0.6/widgets/melystrackinfo.m melys-0.0.7/widgets/melystrackinfo.m --- melys-0.0.6/widgets/melystrackinfo.m Mon Aug 9 19:03:07 1999 +++ melys-0.0.7/widgets/melystrackinfo.m Wed Aug 11 14:41:02 1999 @@ -139,6 +139,8 @@ int used; struct col_info *cinfo; + GTK_WIDGET_SET_FLAGS(minfo, GTK_CAN_FOCUS); + minfo->vadj = NULL; minfo->title_window = NULL; @@ -199,6 +201,8 @@ widget_class->unrealize = track_info_unrealise; widget_class->draw = track_info_draw; widget_class->expose_event = track_info_expose; + widget_class->enter_notify_event = track_info_enter; + widget_class->button_press_event = track_info_button_press; // XXX Our functions @@ -285,7 +289,9 @@ attributes.event_mask = gtk_widget_get_events(widget); attributes.event_mask |= (GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK + GDK_BUTTON_RELEASE_MASK | + GDK_ENTER_NOTIFY_MASK | + 0 ); attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; @@ -300,7 +306,7 @@ /* The title window */ attributes.x = 0; attributes.y = 0; - attributes.height = 12; + attributes.height = minfo->vtitle; minfo->title_window = gdk_window_new(widget->window, &attributes, attributes_mask); @@ -520,7 +526,7 @@ return; /* Nothing more to do */ start = y_to_track(minfo, area->y); - end = y_to_track(minfo, area->y + area->height); + end = y_to_track(minfo, area->y + area->height) + 1; if (end > minfo->mdroot->tracks) end = minfo->mdroot->tracks; @@ -582,6 +588,51 @@ return FALSE; /* XXX what does this mean */ +>>function track_info_enter +static void +GtkWidget *widget; +gpointer data; + +>>code + + if (widget == NULL) + return; + mel_debug_print_type("enter", widget); + + //gtk_widget_grab_focus(widget); + + +>>function track_info_button_press +static int +GtkWidget *widget; +GdkEventButton *event; + +>>description +Button presses select tracks and bring up dialogs to modify the +properties of tracks. +The first button press on a track selects it. +A button1 press on a track that is already selected will bring up +the track properties dialog. +If the click is in the patch column then the instrument selecter dialog +will be displayed. +A control click will allow the selection state on a column to be +toggled. +A shift click will select a range of tracks. +A button3 click will bring up a menu of track actions -- add delete etc. + +>>code + int n; + MelysTrackInfo *minfo; + + minfo = MELYS_TRACK_INFO(widget); + + n = y_to_track(minfo, event->y); + + dprintf1("Click on track %d", n); + return TRUE; + +>># ==== Utility routines + >>function y_to_track int MelysTrackInfo *minfo; The widget @@ -700,3 +751,4 @@ gtk_widget_queue_clear((GtkWidget*)minfo); gtk_widget_queue_draw((GtkWidget*)minfo); } +