various bug-fixes, maxmode, toxy .#args

svn path=/trunk/externals/miXed/; revision=2360

1 files changed, 85 insertions, 72 deletions

diff --git a/shared/common/mifi.h b/shared/common/mifi.h
index 5524993..1163a5d 100644
--- a/shared/common/mifi.h
+++ b/shared/common/mifi.h
@@ -1,84 +1,97 @@
-/* Copyright (c) 2001-2003 krzYszcz and others.
+/* Copyright (c) 2004 krzYszcz and others.
  * For information on usage and redistribution, and for a DISCLAIMER OF ALL
  * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */
 
-/* reading/writing midifiles, a prototype version */
-
 #ifndef __MIFI_H__
 #define __MIFI_H__
 
-/* event types, as returned by mifi_read_event() */
-#define MIFI_READ_FATAL  -3  /* unexpected eof, error in last track, or file error */
-#define MIFI_READ_EOF    -2  /* regular eof */
-#define MIFI_READ_SKIP   -1  /* error and successful skip to the next track */
-#define MIFI_META_SEQNUM         0
-#define MIFI_META_TEXT           1
-#define MIFI_META_COPYRIGHT      2
-#define MIFI_META_TRACKNAME      3
-#define MIFI_META_INSTRUMENT     4
-#define MIFI_META_LYRIC          5
-#define MIFI_META_MARKER         6
-#define MIFI_META_CUE            7
-#define MIFI_META_MAXPRINTABLE  15  /* 1..15 are various text meta-events */
-#define MIFI_META_CHANNEL     0x20  /* channel prefix */
-#define MIFI_META_EOT         0x2f  /* end of track */
-#define MIFI_META_TEMPO       0x51
-#define MIFI_META_SMPTE       0x54  /* SMPTE offset */
-#define MIFI_META_TIMESIG     0x58  /* time signature */
-#define MIFI_META_KEYSIG      0x59  /* key signature */
+EXTERN_STRUCT _mifiread;
+#define t_mifiread  struct _mifiread
+EXTERN_STRUCT _mifiwrite;
+#define t_mifiwrite  struct _mifiwrite
+
+typedef int (*t_mifireadhook)(t_mifiread *mf, void *hookdata, int evtype);
+
+#define MIFI_MAXTRACKS     0x7fff
+#define MIFI_MAXBEATTICKS  0x7fff
+
+/* event types, as returned by mifiread_nextevent(), ... */
+
+#define MIFIREAD_FATAL  -3  /* unexpected eof, last track's or file error */
+#define MIFIREAD_EOF    -2  /* regular eof */
+#define MIFIREAD_SKIP   -1  /* error and successful skip to the next track */
+
+#define MIFIMETA_SEQNUM         0
+#define MIFIMETA_TEXT           1
+#define MIFIMETA_COPYRIGHT      2
+#define MIFIMETA_TRACKNAME      3
+#define MIFIMETA_INSTRUMENT     4
+#define MIFIMETA_LYRIC          5
+#define MIFIMETA_MARKER         6
+#define MIFIMETA_CUE            7
+#define MIFIMETA_MAXPRINTABLE  15  /* 1..15 are various text meta-events */
+#define MIFIMETA_CHANNEL     0x20  /* channel prefix */
+#define MIFIMETA_EOT         0x2f  /* end of track */
+#define MIFIMETA_TEMPO       0x51
+#define MIFIMETA_SMPTE       0x54  /* SMPTE offset */
+#define MIFIMETA_TIMESIG     0x58  /* time signature */
+#define MIFIMETA_KEYSIG      0x59  /* key signature */
+
 /* ...channel status codes go here, too obvious to #define... */
-#define MIFI_SYSEX_FIRST      0xf0
-#define MIFI_SYSEX_NEXT       0xf7
-/* this code is not returned as an event type, but in e_status of t_mifi_event */
-#define MIFI_EVENT_META       0xff
+
+#define MIFISYSEX_FIRST      0xf0
+#define MIFISYSEX_NEXT       0xf7
+
+/* this code is not returned as an event type, but in e_status of t_mifievent */
+#define MIFIEVENT_META       0xff
 
 /* true if one of channel messages */
-#define MIFI_IS_CHANNEL(status)    (((status) & 0x80) && (status) < 0xf0)
+#define MIFI_ISCHANNEL(status)    (((status) & 0x80) && (status) < 0xf0)
 /* true if one of the two shorter channel messages */
-#define MIFI_ONE_DATABYTE(status)  (((status) & 0xe0) == 0xc0)
-
-/* derived from t_squeve */
-typedef struct _mifi_event
-{
-    uint32  e_length;
-    uchar  *e_data;
-    size_t  e_bufsize;
-    uint32  e_delay;
-    uchar   e_status;
-    uchar   e_channel;
-    uchar   e_meta;      /* meta-event type */
-} t_mifi_event;
-
-/* This structure holds midi data stream properties, i.e. both the info stored
-   in midifile header, and the current state according to position in a stream. */
-/* LATER clean up t_sq and derive t_mifi_stream */
-typedef struct _sq t_mifi_stream;
-
-/* prototypes of public interface routines */
-
-t_mifi_event *mifi_event_new(void);
-void mifi_event_free(t_mifi_event *ep);
-int mifi_event_settext(t_mifi_event *ep, int type, char *text);
-void mifi_event_printmeta(t_mifi_event *ep);
-
-t_mifi_stream *mifi_stream_new(void);
-void mifi_stream_reset(t_mifi_stream *sp);
-void mifi_stream_free(t_mifi_stream *sp);
-
-t_mifi_stream *mifi_read_start(t_mifi_stream *sp,
-			       const char *filename, const char *dirname,
-			       int complain);
-int mifi_read_restart(t_mifi_stream *sp);
-void mifi_read_end(t_mifi_stream *sp);
-int mifi_read_event(t_mifi_stream *sp, t_mifi_event *ep);
-int mifi_read_analyse(t_mifi_stream *sp);
-int mifi_read_doit(t_mifi_stream *sp);
-
-t_mifi_stream *mifi_write_start(t_mifi_stream *sp,
-				const char *filename, const char *dirname);
-void mifi_write_end(t_mifi_stream *sp);
-int mifi_write_start_track(t_mifi_stream *sp);
-int mifi_write_adjust_track(t_mifi_stream *sp, uint32 eotdelay);
-int mifi_write_event(t_mifi_stream *sp, t_mifi_event *ep);
+#define MIFI_ONEDATABYTE(status)  (((status) & 0xe0) == 0xc0)
+
+int mifiread_getnevents(t_mifiread *mr);
+int mifiread_getntempi(t_mifiread *mr);
+int mifiread_gethdtracks(t_mifiread *mr);
+int mifiread_getformat(t_mifiread *mr);
+int mifiread_getnframes(t_mifiread *mr);
+int mifiread_getbeatticks(t_mifiread *mr);
+double mifiread_getdeftempo(t_mifiread *mr);
+
+int mifiread_getbarindex(t_mifiread *mr);
+double mifiread_getbarspan(t_mifiread *mr);
+double mifiread_gettick(t_mifiread *mr);
+double mifiread_getscoretime(t_mifiread *mr);
+double mifiread_gettempo(t_mifiread *mr);
+double mifiread_getmscoef(t_mifiread *mr);
+t_symbol *mifiread_gettrackname(t_mifiread *mr);
+unsigned mifiread_getstatus(t_mifiread *mr);
+unsigned mifiread_getdata1(t_mifiread *mr);
+unsigned mifiread_getdata2(t_mifiread *mr);
+unsigned mifiread_getchannel(t_mifiread *mr);
+t_pd *mifiread_getowner(t_mifiread *mr);
+
+t_mifiread *mifiread_new(t_pd *owner);
+void mifiread_setuserticks(t_mifiread *mr, double wholeticks);
+int mifiread_open(t_mifiread *mr, const char *filename,
+		  const char *dirname, int complain);
+int mifiread_doit(t_mifiread *mr, t_mifireadhook hook, void *hookdata);
+void mifiread_close(t_mifiread *mr);
+void mifiread_free(t_mifiread *mr);
+
+t_mifiwrite *mifiwrite_new(t_pd *owner);
+void mifiwrite_sethardticks(t_mifiwrite *mw, int beatticks);
+void mifiwrite_setuserticks(t_mifiwrite *mw, double wholeticks);
+void mifiwrite_setusertempo(t_mifiwrite *mw, double tickspersec);
+int mifiwrite_open(t_mifiwrite *mw, const char *filename,
+		   const char *dirname, int ntracks, int complain);
+int mifiwrite_opentrack(t_mifiwrite *mw, char *trackname, int complain);
+int mifiwrite_textevent(t_mifiwrite *mw, double delay,
+			unsigned type, char *text);
+int mifiwrite_channelevent(t_mifiwrite *mw, double delay, unsigned status,
+			   unsigned channel, unsigned data1, unsigned data2);
+int mifiwrite_closetrack(t_mifiwrite *mw, double enddelay, int complain);
+void mifiwrite_close(t_mifiwrite *mw);
+void mifiwrite_free(t_mifiwrite *mw);
 
 #endif