Module Name: src
Committed By: christos
Date: Sun Aug 14 13:26:23 UTC 2011
Modified Files:
src/usr.bin/midiplay: Makefile midiplay.c
Log Message:
- add a SYSEX0 macro that does not override the initializers and use it
- fix whitespace
- make things static and eliminate unused functions
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/midiplay/Makefile
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/midiplay/midiplay.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/midiplay/Makefile
diff -u src/usr.bin/midiplay/Makefile:1.4 src/usr.bin/midiplay/Makefile:1.5
--- src/usr.bin/midiplay/Makefile:1.4 Tue Jun 21 22:49:44 2011
+++ src/usr.bin/midiplay/Makefile Sun Aug 14 09:26:23 2011
@@ -1,13 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2011/06/22 02:49:44 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/08/14 13:26:23 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= midiplay
-CWARNFLAGS.clang+= -Wno-format-extra-args -Wno-initializer-overrides
-
.include <bsd.prog.mk>
-
-# XXX
-.if ${HAVE_GCC} == 45
-COPTS.midiplay.c+= -Wno-error
-.endif
Index: src/usr.bin/midiplay/midiplay.c
diff -u src/usr.bin/midiplay/midiplay.c:1.27 src/usr.bin/midiplay/midiplay.c:1.28
--- src/usr.bin/midiplay/midiplay.c:1.27 Sun Apr 12 10:15:08 2009
+++ src/usr.bin/midiplay/midiplay.c Sun Aug 14 09:26:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: midiplay.c,v 1.27 2009/04/12 14:15:08 lukem Exp $ */
+/* $NetBSD: midiplay.c,v 1.28 2011/08/14 13:26:23 christos Exp $ */
/*
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: midiplay.c,v 1.27 2009/04/12 14:15:08 lukem Exp $");
+__RCSID("$NetBSD: midiplay.c,v 1.28 2011/08/14 13:26:23 christos Exp $");
#endif
@@ -72,45 +72,50 @@
#define META_SMPTE 0x54
#define META_TIMESIGN 0x58
-const char *metanames[] = {
- "", "Text", "Copyright", "Track", "Instrument",
+static const char *metanames[] = {
+ "", "Text", "Copyright", "Track", "Instrument",
"Lyric", "Marker", "Cue",
};
-static int midi_lengths[] = { 2,2,2,2,1,1,2,0 };
+static int midi_lengths[] = { 2, 2, 2, 2, 1, 1, 2, 0 };
/* Number of bytes in a MIDI command */
#define MIDI_LENGTH(d) (midi_lengths[((d) >> 4) & 7])
-void usage(void);
-void send_event(seq_event_t *);
-void dometa(u_int, u_char *, u_int);
-void midireset(void);
-void send_sysex(u_char *, u_int);
-u_long getvar(struct track *);
-u_long getlen(struct track *);
-void playfile(FILE *, const char *);
-void playdata(u_char *, u_int, const char *);
-int main(int argc, char **argv);
-
-void Heapify(struct track *, int, int);
-void BuildHeap(struct track *, int);
-int ShrinkHeap(struct track *, int);
+#define SEQ_MK_SYSEX0(_dev,...) \
+SEQ_MK_EVENT(sysex, 0x94, .device=(_dev), .buffer={__VA_ARGS__})
+
+
+static void usage(void);
+static void send_event(seq_event_t *);
+static void dometa(u_int, u_char *, u_int);
+#if 0
+static void midireset(void);
+#endif
+static void send_sysex(u_char *, u_int);
+static u_long getvar(struct track *);
+static u_long getlen(struct track *);
+static void playfile(FILE *, const char *);
+static void playdata(u_char *, u_int, const char *);
+
+static void Heapify(struct track *, int, int);
+static void BuildHeap(struct track *, int);
+static int ShrinkHeap(struct track *, int);
/*
* This sample plays at an apparent tempo of 120 bpm when the BASETEMPO is 150
* bpm, because the quavers are 5 divisions (4 on 1 off) rather than 4 total.
*/
-#define P(c) 1,0x90,c,0x7f,4,0x80,c,0
-#define PL(c) 1,0x90,c,0x7f,8,0x80,c,0
+#define P(c) 1, 0x90, c, 0x7f, 4, 0x80, c, 0
+#define PL(c) 1, 0x90, c, 0x7f, 8, 0x80, c, 0
#define C 0x3c
#define D 0x3e
#define E 0x40
#define F 0x41
-u_char sample[] = {
- 'M','T','h','d', 0,0,0,6, 0,1, 0,1, 0,8,
- 'M','T','r','k', 0,0,0,4+13*8,
- P(C), P(C), P(C), P(E), P(D), P(D), P(D),
+static u_char sample[] = {
+ 'M', 'T', 'h', 'd', 0, 0, 0, 6, 0, 1, 0, 1, 0, 8,
+ 'M', 'T', 'r', 'k', 0, 0, 0, 4+13*8,
+ P(C), P(C), P(C), P(E), P(D), P(D), P(D),
P(F), P(E), P(E), P(D), P(D), PL(C),
0, 0xff, 0x2f, 0
};
@@ -138,41 +143,41 @@
#define GET32(p) (((p)[0] << 24) | ((p)[1] << 16) | ((p)[2] << 8) | (p)[3])
#define GET32_LE(p) (((p)[3] << 24) | ((p)[2] << 16) | ((p)[1] << 8) | (p)[0])
-void
+static void __attribute__((__noreturn__))
usage(void)
{
- printf("usage: %s [-d unit] [-f file] [-l] [-m] [-p pgm] [-q] "
+ fprintf(stderr, "usage: %s [-d unit] [-f file] [-l] [-m] [-p pgm] [-q] "
"[-t %%tempo] [-v] [-x] [file ...]\n",
getprogname());
exit(1);
}
-int showmeta = 0;
-int verbose = 0;
+static int showmeta = 0;
+static int verbose = 0;
#define BASETEMPO 400000 /* us/beat(=24 clks or qn) (150 bpm) */
-u_int tempo_set = 0;
-u_int tempo_abs = 0;
-u_int ttempo = 100;
-int unit = 0;
-int play = 1;
-int fd = -1;
-int sameprogram = 0;
-int insysex = 0;
-int svsysex = 0; /* number of sysex bytes saved internally */
+static u_int tempo_set = 0;
+static u_int tempo_abs = 0;
+static u_int ttempo = 100;
+static int unit = 0;
+static int play = 1;
+static int fd = -1;
+static int sameprogram = 0;
+static int insysex = 0;
+static int svsysex = 0; /* number of sysex bytes saved internally */
-void
+static void
send_event(seq_event_t *ev)
{
/*
printf("%02x %02x %02x %02x %02x %02x %02x %02x\n",
- ev->arr[0], ev->arr[1], ev->arr[2], ev->arr[3],
+ ev->arr[0], ev->arr[1], ev->arr[2], ev->arr[3],
ev->arr[4], ev->arr[5], ev->arr[6], ev->arr[7]);
*/
if (play)
write(fd, ev, sizeof *ev);
}
-u_long
+static u_long
getvar(struct track *tp)
{
u_long r, c;
@@ -185,7 +190,7 @@
return r;
}
-u_long
+static u_long
getlen(struct track *tp)
{
u_long len;
@@ -195,7 +200,7 @@
return len;
}
-void
+static void
dometa(u_int meta, u_char *p, u_int len)
{
static char const * const keys[] = {
@@ -206,7 +211,7 @@
};
seq_event_t ev;
uint32_t usperbeat;
-
+
switch (meta) {
case META_TEXT:
case META_COPYRIGHT:
@@ -268,25 +273,27 @@
}
}
-void
+#if 0
+static void
midireset(void)
{
/* General MIDI reset sequence */
- send_event(&SEQ_MK_SYSEX(unit,[0]=0x7e, 0x7f, 0x09, 0x01, 0xf7));
+ send_event(&SEQ_MK_SYSEX0(unit, 0x7e, 0x7f, 0x09, 0x01, 0xf7, 0xff));
}
+#endif
#define SYSEX_CHUNK 6
-void
+static void
send_sysex(u_char *p, u_int l)
{
seq_event_t event;
static u_char bf[6];
-
- if ( 0 == l ) {
+
+ if (0 == l) {
warnx("zero-length system-exclusive event");
return;
}
-
+
/*
* This block is needed only to handle the possibility that a sysex
* message is broken into multiple events in a MIDI file that do not
@@ -298,19 +305,19 @@
* full six (or an end byte). Note bf/saved/insysex should be per-
* device, if we supported output to more than one device at a time.
*/
- if ( svsysex > 0 ) {
- if ( l > sizeof bf - svsysex ) {
+ if (svsysex > 0) {
+ if (l > sizeof bf - svsysex) {
memcpy(bf + svsysex, p, sizeof bf - svsysex);
l -= sizeof bf - svsysex;
p += sizeof bf - svsysex;
- send_event(&SEQ_MK_SYSEX(unit,[0]=
- bf[0],bf[1],bf[2],bf[3],bf[4],bf[5]));
+ send_event(&SEQ_MK_SYSEX0(unit,
+ bf[0], bf[1], bf[2], bf[3], bf[4], bf[5]));
svsysex = 0;
} else {
memcpy(bf + svsysex, p, l);
svsysex += l;
p += l;
- if ( MIDI_SYSEX_END == bf[svsysex-1] ) {
+ if (MIDI_SYSEX_END == bf[svsysex-1]) {
event = SEQ_MK_SYSEX(unit);
memcpy(event.sysex.buffer, bf, svsysex);
send_event(&event);
@@ -320,25 +327,24 @@
return;
}
}
-
+
/*
* l > 0. May as well test now whether we will be left 'insysex'
* after processing this event.
- */
- insysex = ( MIDI_SYSEX_END != p[l-1] );
-
+ */
+ insysex = (MIDI_SYSEX_END != p[l-1]);
+
/*
* If not for multi-event sysexes and chunk-size weirdness, this
* function could pretty much start here. :)
*/
- while ( l >= SYSEX_CHUNK ) {
- send_event(&SEQ_MK_SYSEX(unit,[0]=
- p[0],p[1],p[2],p[3],p[4],p[5]));
+ while (l >= SYSEX_CHUNK) {
+ send_event(&SEQ_MK_SYSEX0(unit, p[0], p[1], p[2], p[3], p[4], p[5]));
p += SYSEX_CHUNK;
l -= SYSEX_CHUNK;
}
- if ( l > 0 ) {
- if ( insysex ) {
+ if (l > 0) {
+ if (insysex) {
memcpy(bf, p, l);
svsysex = l;
} else { /* a <6 byte chunk is ok if it's REALLY the end */
@@ -349,13 +355,13 @@
}
}
-void
+static void
playfile(FILE *f, const char *name)
{
u_char *buf, *nbuf;
u_int tot, n, size, nread;
- /*
+ /*
* We need to read the whole file into memory for easy processing.
* Using mmap() would be nice, but some file systems do not support
* it, nor does reading from e.g. a pipe. The latter also precludes
@@ -384,7 +390,7 @@
free(buf);
}
-void
+static void
playdata(u_char *buf, u_int tot, const char *name)
{
int format, ntrks, divfmt, ticks, t;
@@ -505,7 +511,7 @@
tracks = malloc(ntrks * sizeof(struct track));
if (tracks == NULL)
errx(1, "malloc() tracks failed");
- for (t = 0; t < ntrks; ) {
+ for (t = 0; t < ntrks;) {
if (p >= end - MARK_LEN - SIZE_LEN) {
warnx("Cannot find track %d", t);
goto ret;
@@ -534,7 +540,7 @@
.channel=t, .program=sameprogram-1));
}
}
- /*
+ /*
* Play MIDI events by selecting the track with the lowest
* delta. Execute the event, update the delta and repeat.
*
@@ -584,7 +590,7 @@
if (mlen == 1)
printf("MIDI %02x (%d) %02x\n",
tp->status, mlen, msg[0]);
- else
+ else
printf("MIDI %02x (%d) %02x %02x\n",
tp->status, mlen, msg[0], msg[1]);
}
@@ -639,13 +645,13 @@
if (insysex) { /* CONTINUATION */
send_sysex(tp->start, mlen);
} else { /* ESCAPE */
- for ( ; mlen > 0 ; -- mlen ) {
+ for (; mlen > 0 ; -- mlen) {
send_event(
&SEQ_MK_EVENT(putc,
SEQOLD_MIDIPUTC,
.device=unit,
.byte=*(tp->start++)
- ));
+ ));
}
}
break;
@@ -724,7 +730,7 @@
}
argc -= optind;
argv += optind;
-
+
if (!play)
goto output;
@@ -778,29 +784,29 @@
* at first; they just go away as they end.
*/
-#define PARENT(i) ((i-1)>>1)
-#define LEFT(i) ((i<<1)+1)
-#define RIGHT(i) ((i+1)<<1)
+#define PARENT(i) ((i - 1) >> 1)
+#define LEFT(i) ((i << 1) + 1)
+#define RIGHT(i) ((i + 1) << 1)
#define DTIME(i) (t[i].indirect->delta)
-#define SWAP(i,j) do { \
+#define SWAP(i, j) do { \
struct track *_t = t[i].indirect; \
t[i].indirect = t[j].indirect; \
t[j].indirect = _t; \
- } while ( /*CONSTCOND*/ 0 )
+} while (/*CONSTCOND*/ 0)
-void
+static void
Heapify(struct track *t, int ntrks, int node)
{
int lc, rc, mn;
-
+
lc = LEFT(node);
rc = RIGHT(node);
-
+
if (rc >= ntrks) { /* no right child */
if (lc >= ntrks) /* node is a leaf */
return;
if (DTIME(node) > DTIME(lc))
- SWAP(node,lc);
+ SWAP(node, lc);
DTIME(lc) -= DTIME(node);
return; /* no rc ==> lc is a leaf */
}
@@ -813,19 +819,19 @@
DTIME(lc) -= DTIME(node);
return;
}
-
- SWAP(node,mn);
+
+ SWAP(node, mn);
DTIME(rc) -= DTIME(node);
DTIME(lc) -= DTIME(node);
Heapify(t, ntrks, mn); /* gcc groks tail recursion */
}
-void
+static void
BuildHeap(struct track *t, int ntrks)
{
int node;
-
- for ( node = PARENT(ntrks-1); node --> 0; )
+
+ for (node = PARENT(ntrks - 1); node --> 0;)
Heapify(t, ntrks, node);
}
@@ -834,13 +840,13 @@
* rightmost bottom-level leaf to the root and decrement ntrks. It remains to
* run Heapify, which the caller is expected to do. Returns the new ntrks.
*/
-int
+static int
ShrinkHeap(struct track *t, int ntrks)
{
int ancest;
-
- -- ntrks;
- for ( ancest = PARENT(ntrks); ancest > 0; ancest = PARENT(ancest) )
+
+ --ntrks;
+ for (ancest = PARENT(ntrks); ancest > 0; ancest = PARENT(ancest))
DTIME(ntrks) += DTIME(ancest);
t[0].indirect = t[ntrks].indirect;
return ntrks;
