 @@ -1,14 +1,14 @@
-/*	$NetBSD: midirecord.c,v 1.6 2015/01/03 22:57:54 joerg Exp $	*/
+/*	$NetBSD: midirecord.c,v 1.7 2015/03/01 09:56:54 mrg Exp $	*/
 /*
  * Copyright (c) 2014 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -23,27 +23,27 @@
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * midirecord(1), similar to audiorecord(1).
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: midirecord.c,v 1.6 2015/01/03 22:57:54 joerg Exp $");
+__RCSID("$NetBSD: midirecord.c,v 1.7 2015/03/01 09:56:54 mrg Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/midiio.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <err.h>
 #include <errno.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <paths.h>
 @@ -64,26 +64,27 @@ static unsigned	*filt_chans = NULL;
 static unsigned num_filt_devnos, num_filt_chans;
 static char	*raw_output;
 static int	midifd;
 static int	aflag, qflag, oflag;
 static bool debug = false;
 int	verbose;
 static int	outfd, rawfd = -1;
 static ssize_t	data_size;
 static struct timeval record_time;
 static struct timeval start_time;
 static int	tempo = 120;
 static unsigned	notes_per_beat = 24;
 static bool ignore_timer_fail = false;
 static bool stdout_mode = false;
 static void debug_log(const char *, size_t, const char *, ...)
     __printflike(3, 4);
 static size_t midi_event_local_to_output(seq_event_t, u_char *, size_t);
 static size_t midi_event_timer_wait_abs_to_output(seq_event_t, u_char *,
 						  size_t);
 static size_t midi_event_timer_to_output(seq_event_t, u_char *, size_t);
 static size_t midi_event_chn_common_to_output(seq_event_t, u_char *, size_t);
 static size_t midi_event_chn_voice_to_output(seq_event_t, u_char *, size_t);
 static size_t midi_event_sysex_to_output(seq_event_t, u_char *, size_t);
 static size_t midi_event_fullsize_to_output(seq_event_t, u_char *, size_t);
 static size_t midi_event_to_output(seq_event_t, u_char *, size_t);
 static int timeleft(struct timeval *, struct timeval *);
 @@ -181,28 +182,30 @@ main(int argc, char *argv[])
 	if (midi_device == NULL && (midi_device = getenv("MIDIDEVICE")) == NULL)
 		midi_device = PATH_DEV_MUSIC;
 	midifd = open(midi_device, O_RDONLY);
 	if (midifd < 0)
 		err(1, "failed to open %s", midi_device);
 	/* open the output file */
 	if (argv[0][0] != '-' || argv[0][1] != '\0') {
 		int mode = O_CREAT|(aflag ? O_APPEND : O_TRUNC)|O_WRONLY;
 		outfd = open(*argv, mode, 0666);
 		if (outfd < 0)
 			err(1, "could not open %s", *argv);
-	} else
+	} else {
 		stdout_mode = true;
 		outfd = STDOUT_FILENO;
+	}
 	/* open the raw output file */
 	if (raw_output) {
 		int mode = O_CREAT|(aflag ? O_APPEND : O_TRUNC)|O_WRONLY;
 		rawfd = open(raw_output, mode, 0666);
 		if (rawfd < 0)
 			err(1, "could not open %s", raw_output);
+	}
 	/* start the midi timer */
 	if (ioctl(midifd, SEQUENCER_TMR_START, NULL) < 0) {
 		if (ignore_timer_fail)
 @@ -701,50 +704,50 @@ cleanup(int signo)
 	close(outfd);
 	close(midifd);
 	if (signo != 0)
 		(void)raise_default_signal(signo);
 	exit(0);
+}
 static void
 rewrite_header(void)
+{
 	/* can't do this here! */
-	if (outfd == STDOUT_FILENO)
+	if (stdout_mode)
 		return;
 	if (lseek(outfd, (off_t)0, SEEK_SET) == (off_t)-1)
 		err(1, "could not seek to start of file for header rewrite");
 	write_midi_header();
+}
 #define BYTE1(x)        ((x) & 0xff)
 #define BYTE2(x)        (((x) >> 8) & 0xff)
 #define BYTE3(x)        (((x) >> 16) & 0xff)
 #define BYTE4(x)        (((x) >> 24) & 0xff)
 static void
 write_midi_header(void)
+{
 	unsigned char header[] = {
 		'M', 'T', 'h', 'd',
 , 0, 0, 6,
 , 1,
 , 0, /* ntracks */
 , 0, /* notes per beat */
 	};
-	/* XXX only spport one track so far */
+	/* XXX only support one track so far */
 	unsigned ntracks = 1;
 	unsigned char track[] = {
 		'M', 'T', 'r', 'k',
 , 0, 0, 0,
 	};
 	unsigned char bpm[] = {
 , 0xff, 0x51, 0x3,
 , 0, 0, /* inverse tempo */
 	};
 	unsigned total_size = data_size + sizeof header + sizeof track + sizeof bpm;
 	header[10] = BYTE2(ntracks);
 	header[11] = BYTE1(ntracks);