From 116488e5f2f1b897084bd151381ee254e1cc177d Mon Sep 17 00:00:00 2001

From: Jaroslav Kysela <perex@perex.cz>

Date: Fri, 18 Jan 2019 09:24:12 +0100

Subject: [PATCH 01/20] alsamixer: define _GNU_SOURCE to get exp10

Fixes Master, Headphones and Speaker stuck at -8 percentage after

building with Clang 7.0.1 and getting warned about implicit declaration

of exp10, which is behind _GNU_SOURCE as a non-standard feature. Thanks

Takashi Iwai for the CFLAGS suggestion on the mailing list. GCC build is

not affected, so not adding a compiler check to the configure script.

uClibc-ng has got exp10 since 1.0.12, so the fallback macro is no longer

needed. However, alsa-utils relies on gettext so might need further

patches to actually work on uClibc systems.

Signed-off-by: makepost <makepost@firemail.cc>

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

---

 alsamixer/Makefile.am      | 2 +-

 alsamixer/volume_mapping.c | 5 -----

 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/alsamixer/Makefile.am b/alsamixer/Makefile.am

index 259b29e..249e8f8 100644

--- a/alsamixer/Makefile.am

+++ b/alsamixer/Makefile.am

@@ -1,4 +1,4 @@

-AM_CFLAGS = @CURSES_CFLAGS@ -DCURSESINC="@CURSESINC@"

+AM_CFLAGS = -D_GNU_SOURCE @CURSES_CFLAGS@ -DCURSESINC="@CURSESINC@"

 LDADD = @CURSESLIB@

 bin_PROGRAMS = alsamixer

diff --git a/alsamixer/volume_mapping.c b/alsamixer/volume_mapping.c

index 94bd0fe..48cfbe2 100644

--- a/alsamixer/volume_mapping.c

+++ b/alsamixer/volume_mapping.c

@@ -36,11 +36,6 @@

 #include <stdbool.h>

 #include "volume_mapping.h"

-#ifdef __UCLIBC__

-/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */

-#define exp10(x) (exp((x) * log(10)))

-#endif /* __UCLIBC__ */

-

 #define MAX_LINEAR_DB_SCALE	24

 static inline bool use_linear_dB_scale(long dBmin, long dBmax)

-- 

2.20.1

From 83bce86c26be6c04bcef584fbe00f320b3582c92 Mon Sep 17 00:00:00 2001

From: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Date: Sun, 27 Jan 2019 14:27:11 +0900

Subject: [PATCH 02/20] axfer: add a section about unit test

Two unit tests are available to check internal implementation of axfer.

They perform file I/O for many times and take much time to finish.

This commit adds a section about it.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 axfer/axfer-transfer.1 | 16 ++++++++++++++++

 axfer/axfer.1          |  7 +++++++

 2 files changed, 23 insertions(+)

diff --git a/axfer/axfer-transfer.1 b/axfer/axfer-transfer.1

index 4ff6082..02e5b4c 100644

--- a/axfer/axfer-transfer.1

+++ b/axfer/axfer-transfer.1

@@ -971,6 +971,22 @@ some scenarios below, no copying occurs between modules.

  - xfer(mmap/interleaved), mapper(single), container(any)

  - xfer(mmap/non\-interleaved), mapper(multiple), containers(any)

+.SS Unit test

+

+For each of the

+.I mapper

+and

+.I container

+module, unit test is available. To run the tests, execute below command:

+

+.nf

+$ make test

+.fi

+

+Each test iterates writing to file and reading to the file for many times and it

+takes long time to finish. Please take care of the execution time if running on

+any CI environment.

+

 .SH SEE ALSO

 \fB

 axfer(1),

diff --git a/axfer/axfer.1 b/axfer/axfer.1

index bfcd15d..3ae9c8e 100644

--- a/axfer/axfer.1

+++ b/axfer/axfer.1

@@ -75,6 +75,13 @@ Operates for playback transmission.

 .I EXIT_FAILURE

 (1).

+.SH UNIT TEST

+

+This program has unit tests for internal implementation. Please refer to the

+manual of

+.I axfer-transfer

+for details.

+

 .SH COMPATIBILITY TO APLAY

 The

-- 

2.20.1

From b6142611c68a380644ce34f885e2d67da084b538 Mon Sep 17 00:00:00 2001

From: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Date: Sun, 27 Jan 2019 14:39:18 +0900

Subject: [PATCH 03/20] axfer: fulfill section for backward compatibitity for

 chmap option

At present, axfer losts backward compatibility to aplay in a point of

'chmap' option.

This commit filfills a section to describe lose of backward compatibility

of chmap option.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 axfer/axfer-transfer.1 | 9 +++++++++

 1 file changed, 9 insertions(+)

diff --git a/axfer/axfer-transfer.1 b/axfer/axfer-transfer.1

index 02e5b4c..1fdfc91 100644

--- a/axfer/axfer-transfer.1

+++ b/axfer/axfer-transfer.1

@@ -872,6 +872,15 @@ according to pushed enter key. However, this feature requires an additional

 input handling in main loop and leave bothersome operation to maintain PCM

 substream.

+.TP

+.I \-m, \-\-chmap=CH1,CH2,...

+ALSA PCM core and control core doesn't support this feature, therefore

+remapping should be done in userspace. This brings overhead to align audio

+data frames, especially for mmap operation. Furthermore, as of alsa-lib v1.1.8,

+some plugins don't support this feature expectedly, thus this option is a lack

+of transparent operation. At present, this option is not supported yet not to

+confuse users.

+

 .TP

 .I SIGTSTP, SIGCONT

 This performs suspend/resume of PCM substream. In aplay(1) implementation,

-- 

2.20.1

From 827ed7d1933ee9a0ce052d9eb2c0b1c79770dff2 Mon Sep 17 00:00:00 2001

From: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Date: Sun, 27 Jan 2019 14:48:33 +0900

Subject: [PATCH 04/20] axfer: correct description about snoop mode of libffado

The libffado library can listen to isochronous channels to which unit on

IEEE 1394 bus transfers packets as long as the unit allows software to

read the channel from its register.

This commit corrects description about snoop mode.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 axfer/axfer-transfer.1 | 5 +++--

 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/axfer/axfer-transfer.1 b/axfer/axfer-transfer.1

index 1fdfc91..89df3cc 100644

--- a/axfer/axfer-transfer.1

+++ b/axfer/axfer-transfer.1

@@ -560,8 +560,9 @@ audio data frame.

 .B \-\-snoop

 This option allows this program to run snoop mode. In this mode, libffado

-listens all isochronous channels. When isochronous communication starts

-by any unit on the same bus, the packets can be handled by this program.

+listens isochronous channels to which device transfers isochronous packet. When

+isochronous communication starts by any unit on the same bus, the packets can

+be handled by this program.

 .TP

 .B \-\-sched\-priority

-- 

2.20.1

From 1848b38ca94a52e4539e27526b2c028aa487053b Mon Sep 17 00:00:00 2001

From: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Date: Sun, 27 Jan 2019 14:49:43 +0900

Subject: [PATCH 05/20] axfer: correct message to notice that help text is

 implemented

Now help message is available to give help option to command line.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 axfer/axfer-transfer.1 | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/axfer/axfer-transfer.1 b/axfer/axfer-transfer.1

index 89df3cc..d631f72 100644

--- a/axfer/axfer-transfer.1

+++ b/axfer/axfer-transfer.1

@@ -100,7 +100,7 @@ is not allowed except for paths listed below:

 .TP

 .B \-h, \-\-help

-Print help messages and finish run time. Not yet implemented.

+Print help messages and finish run time.

 .TP

 .B \-q, \-\-quiet

-- 

2.20.1

From fb038252d49b31e77f56a9c62527bb108cc965ad Mon Sep 17 00:00:00 2001

From: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Date: Tue, 15 Jan 2019 08:49:58 +0900

Subject: [PATCH 06/20] axfer: supplement value of options for the manual of

 transfer subcommand

This commit supplements value of options for the manual of transfer

subcommand.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 axfer/axfer-transfer.1 | 40 ++++++++++++++++++++--------------------

 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/axfer/axfer-transfer.1 b/axfer/axfer-transfer.1

index d631f72..a8bf9c7 100644

--- a/axfer/axfer-transfer.1

+++ b/axfer/axfer-transfer.1

@@ -203,7 +203,7 @@ and

 is used as a default.

 .TP

-.B \-t, \-\-file\-type=TYPES

+.B \-t, \-\-file\-type=TYPE

 Indicate the type of file. This is required for capture transmission. Available

 types are listed below:

  - wav: Microsoft/IBM RIFF/Wave format

@@ -242,7 +242,7 @@ Select backend of transmission from a list below. The default is libasound.

 .SS Backend options for libasound

 .TP

-.B \-D, \-\-device

+.B \-D, \-\-device=NODE

 This option is used to select PCM node in libasound configuration space.

 Available nodes are listed by

@@ -271,7 +271,7 @@ This option implicitly uses

 option as well to prevent heavy consumption of CPU time.

 .TP

-.B \-F, \-\-period\-size

+.B \-F, \-\-period\-size=#

 This option configures given value to

 .I period_size

@@ -288,7 +288,7 @@ intervals of hardware interrupt, thus the same amount of audio data frame as

 the value is expected to be available for one I/O operation.

 .TP

-.B \-\-period\-time

+.B \-\-period\-time=#

 This option configures given value to

 .I period_time

@@ -297,7 +297,7 @@ hardware parameter of PCM substream. This option is similar to

 option, however its unit is micro\-second.

 .TP

-.B \-B, \-\-buffer\-size

+.B \-B, \-\-buffer\-size=#

 This option configures given value to

 .I buffer_size

@@ -311,7 +311,7 @@ the size of period. Actually, it is not, depending on implementation of the PCM

 plugins, in\-kernel driver and PCM I/O plugins.

 .TP

-.B \-\-buffer\-time

+.B \-\-buffer\-time=#

 This option configures given value to

 .I buffer_time

@@ -320,7 +320,7 @@ hardware parameter of PCM substream. This option is similar to

 option, however its unit is micro\-second.

 .TP

-.B \-\-waiter\-type

+.B \-\-waiter\-type=TYPE

 This option indicates the type of waiter for event notification. At present,

 four types are available;

@@ -355,7 +355,7 @@ Neither this option nor

 is available at the same time.

 .TP

-.B \-\-sched\-model

+.B \-\-sched\-model=MODEL

 This option selects scheduling model for process of this program. One of

 .I irq

@@ -368,7 +368,7 @@ When nothing specified,

 model is used.

 .TP

-.B \-A, \-\-avail\-min

+.B \-A, \-\-avail\-min=#

 This option configures given value to

 .I avail\-min

@@ -386,7 +386,7 @@ value of

 option is used.

 .TP

-.B \-R, \-\-start\-delay

+.B \-R, \-\-start\-delay=#

 This option configures given value to

 .I start_threshold

@@ -420,7 +420,7 @@ value of

 option is used.

 .TP

-.B \-T, \-\-stop\-delay

+.B \-T, \-\-stop\-delay=#

 This option configures given value to

 .I stop_threshold

@@ -500,7 +500,7 @@ This backend is automatically available when configure script detects

 symbol in libffado shared object.

 .TP

-.B \-p, \-\-port

+.B \-p, \-\-port=#

 This option uses given value to decide which 1394 OHCI controller is used to

 communicate. When Linux system has two 1394 OHCI controllers,

@@ -513,7 +513,7 @@ is available at the same time. If nothing specified, libffado performs to

 communicate to units on IEEE 1394 bus managed by all of 1394 OHCI controller available in Linux system.

 .TP

-.B \-n, \-\-node

+.B \-n, \-\-node=#

 This option uses given value to decide which unit is used to communicate. This

 option requires

@@ -522,7 +522,7 @@ option to indicate which 1394 OHCI controller is used to communicate to the

 specified unit.

 .TP

-.B \-g, \-\-guid

+.B \-g, \-\-guid=HEXADECIMAL

 This option uses given value to decide a target unit to communicate. The value

 should be prefixed with '0x' and consists of hexadecimal literal letters

@@ -533,7 +533,7 @@ communicate to units on IEEE 1394 bus managed by all of 1394 OHCI controller

 available in Linux system.

 .TP

-.B \-\-frames\-per\-period

+.B \-\-frames\-per\-period=#

 This option uses given value to decide the number of audio data frame in one

 read/write operation. The operation is blocked till the number of available

@@ -541,7 +541,7 @@ audio data frame exceeds the given value. As a default, 512 audio data frames

 is used.

 .TP

-.B \-\-periods\-per\-buffer

+.B \-\-periods\-per\-buffer=#

 This option uses given value to decide the size of intermediate buffer between

 this program and libffado. As a default, 2 periods per buffer is used.

@@ -565,7 +565,7 @@ isochronous communication starts by any unit on the same bus, the packets can

 be handled by this program.

 .TP

-.B \-\-sched\-priority

+.B \-\-sched\-priority=#

 This option executes

 .I pthread_setschedparam()

@@ -796,7 +796,7 @@ supports. As of 2018, PCM buffer of non\-interleaved order is hardly used by

 sound devices.

 .TP

-.I \-A, \-\-avail\-min

+.I \-A, \-\-avail\-min=#

 This option indicates threshold to wake up blocked process in a unit of

 audio data frame. Against aplay(1) implementation, this option has no effect

 with

@@ -808,7 +808,7 @@ of

 option.

 .TP

-.I \-R, \-\-start\-delay

+.I \-R, \-\-start\-delay=#

 This option indicates threshold to start prepared PCM substream in a unit of

 audio data frame. Against aplay(1) implementation, this option has no effect

 with

@@ -820,7 +820,7 @@ of

 option.

 .TP

-.I \-T, \-\-stop\-delay

+.I \-T, \-\-stop\-delay=#

 This option indicates threshold to stop running PCM substream in a unit of

 audio data frame. Against aplay(1) implementation, this option has no effect

 with

-- 

2.20.1

From 9ed5d7c876a1c11118f2524327c9eac65e7d66dd Mon Sep 17 00:00:00 2001

From: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Date: Sun, 27 Jan 2019 14:56:12 +0900

Subject: [PATCH 07/20] axfer: correct invalid usage of escape of itaric text

A dot sign is valid for a prefix of instruction.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 axfer/axfer-transfer.1 | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/axfer/axfer-transfer.1 b/axfer/axfer-transfer.1

index a8bf9c7..375678e 100644

--- a/axfer/axfer-transfer.1

+++ b/axfer/axfer-transfer.1

@@ -75,7 +75,7 @@ The standard input or output is used if filepath is not specified or given as

 \&.

 For playback transmission, container format of given

-\I filepath

+.I filepath

 is detected automatically and metadata is used for parameters of sample format,

 channels, rate, duration. If nothing detected, content of given file path is

 handled as raw data. In this case, the parameters should be indicated as

-- 

2.20.1

From 2ba2066008c0fbe98374cc22e8a2eaa4e4e1b2bd Mon Sep 17 00:00:00 2001

From: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Date: Sun, 27 Jan 2019 18:03:11 +0900

Subject: [PATCH 08/20] axfer: add an entry of axfer to README

Axfer has beed added as a rework of aplay with robust design to

support recent features of Linux sound subsystem.

This commit adds an entry to README.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 README.md | 1 +

 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md

index bee2e94..c28e2ea 100644

--- a/README.md

+++ b/README.md

@@ -11,6 +11,7 @@ alsaconf	| the ALSA driver configurator script

 alsa-info       | a script to gather information about ALSA subsystem

 alsactl		| an utility for soundcard settings management

 aplay/arecord	| an utility for the playback / capture of .wav,.voc,.au files

+axfer		| an utility to transfer audio data frame (enhancement of aplay)

 amixer		| a command line mixer

 alsamixer	| a ncurses mixer

 amidi		| a utility to send/receive sysex dumps or other MIDI data

-- 

2.20.1

From 257be19c47e62cd0553e740599802cec9182b37c Mon Sep 17 00:00:00 2001

From: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Date: Sun, 27 Jan 2019 17:36:22 +0900

Subject: [PATCH 09/20] axfer: allow to be compiled with glibc-2.11 or former

The program, axfer, was developed in userspace with glibc-2.28. This

userspace is mostly compliant to POSIX:2008 and some additional macros

for poll event are officially available. The glibc supports them as a

default since its v2.12 release. It will be failed to be compiled with

old glibc or the other libraries for C standard APIs.

One of the purpose of axfer is an better alternative of aplay. In a

point of the purpose, it's preferable to be compiled with the old

libraries.

This commit adds conditional macros to be compiled with libraries for

old compliance level of POSIX.

Reported-by: Jay Foster <jay@systech.com>

Fixes: fce16d9279b6 ('axfer: add an implementation of waiter for select(2)')

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 axfer/waiter-select.c | 13 +++++++++++--

 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/axfer/waiter-select.c b/axfer/waiter-select.c

index a35ea85..a2776e5 100644

--- a/axfer/waiter-select.c

+++ b/axfer/waiter-select.c

@@ -15,10 +15,19 @@

 #include <sys/select.h>

 // Except for POLLERR.

-#define POLLIN_SET	(POLLRDNORM | POLLRDBAND | POLLIN | POLLHUP)

-#define POLLOUT_SET	(POLLWRBAND | POLLWRNORM | POLLOUT)

+#ifdef POLLRDNORM

+// This program is for userspace compliant to POSIX 2008 (IEEE 1003.1:2008).

+// This is the default compliance level since glibc-2.12 or later.

+# define POLLIN_SET	(POLLRDNORM | POLLRDBAND | POLLIN | POLLHUP)

+# define POLLOUT_SET	(POLLWRBAND | POLLWRNORM | POLLOUT)

+#else

+// However it's allowed to be for old compliance levels.

+# define POLLIN_SET	(POLLIN | POLLHUP)

+# define POLLOUT_SET	(POLLOUT)

+#endif

 #define POLLEX_SET	(POLLPRI)

+

 struct select_state {

 	fd_set rfds_rd;

 	fd_set rfds_wr;

-- 

2.20.1

From 6fdaa0c52412205017a9a71872169c75f3d3a542 Mon Sep 17 00:00:00 2001

From: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Date: Sun, 27 Jan 2019 11:24:53 +0900

Subject: [PATCH 10/20] axfer: add missing header file of unit test to

 distribution

The file 'axfer/test/generator.h' is missing in distribution and brings

FTBFS for unit tests of axfer.

This commit fixes to add it.

Reported-by: Elimar Riesebieter <riesebie@lxtec.de>

Fixes: b878df1ff0b0: ('axfer: add unit test for container interface')

Fixes: 39d1ab8a0cb4: ('axfer: add a unit test for mapper interface')

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 axfer/test/Makefile.am | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/axfer/test/Makefile.am b/axfer/test/Makefile.am

index 76a93bf..6521134 100644

--- a/axfer/test/Makefile.am

+++ b/axfer/test/Makefile.am

@@ -14,6 +14,7 @@ container_test_SOURCES = \

 	../container-voc.c \

 	../container-raw.c \

 	generator.c \

+	generator.h \

 	container-test.c

 mapper_test_SOURCES = \

@@ -28,4 +29,5 @@ mapper_test_SOURCES = \

 	../mapper-single.c \

 	../mapper-multiple.c \

 	generator.c \

+	generator.h \

 	mapper-test.c

-- 

2.20.1

From 52c9cc9571659377800fea026cf31b24e2f31394 Mon Sep 17 00:00:00 2001

From: Prashant Malani <pmalani@chromium.org>

Date: Tue, 29 Jan 2019 01:58:26 -0800

Subject: [PATCH 11/20] seq: arecordmidi: Add num-events option

Add a command line option to automatically exit after recording a fixed

number of MIDI events. This allows a program using arecordmidi to expect

a MIDI file to be written automatically when the specified number of

events have been received, instead of having to send a SIGINT or SIGTERM

programmatically.

It also avoids the need to have the arecordmidi process running in the

background, and then constantly stat the output file to check if any

bytes have been written to it (this makes for less predictable and

longer-running tests).

This functionality finds use in Chrome OS functional testing, since

having to send SIGTERM/SIGINT programmatically and then wait for the

output file adds unpredictability and delay to the tests.

The addition of this command-line option should (hopefully) not break

any existing usage.

Signed-off-by: Prashant Malani <pmalani@chromium.org>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 seq/aplaymidi/arecordmidi.c | 47 ++++++++++++++++++++++++++++++++++---

 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/seq/aplaymidi/arecordmidi.c b/seq/aplaymidi/arecordmidi.c

index 19dbb7d..c0d0569 100644

--- a/seq/aplaymidi/arecordmidi.c

+++ b/seq/aplaymidi/arecordmidi.c

@@ -86,6 +86,25 @@ static int ts_num = 4; /* time signature: numerator */

 static int ts_div = 4; /* time signature: denominator */

 static int ts_dd = 2; /* time signature: denominator as a power of two */

+/* Parse a decimal number from a command line argument. */

+static long arg_parse_decimal_num(const char *str, int *err)

+{

+	long val;

+	char *endptr;

+

+	errno = 0;

+	val = strtol(str, &endptr, 0);

+	if (errno > 0) {

+		*err = -errno;

+		return 0;

+	}

+	if (*endptr != '\0') {

+		*err = -EINVAL;

+		return 0;

+	}

+

+	return val;

+}

 /* prints an error message to stderr, and dies */

 static void fatal(const char *msg, ...)

@@ -690,7 +709,8 @@ static void help(const char *argv0)

 		"  -t,--ticks=ticks           resolution in ticks per beat or frame\n"

 		"  -s,--split-channels        create a track for each channel\n"

 		"  -m,--metronome=client:port play a metronome signal\n"

-		"  -i,--timesig=nn:dd         time signature\n",

+		"  -i,--timesig=nn:dd         time signature\n"

+		"  -n,--num-events=events     fixed number of events to record, then exit\n",

 		argv0);

 }

@@ -706,7 +726,7 @@ static void sighandler(int sig)

 int main(int argc, char *argv[])

 {

-	static const char short_options[] = "hVlp:b:f:t:sdm:i:";

+	static const char short_options[] = "hVlp:b:f:t:sdm:i:n:";

 	static const struct option long_options[] = {

 		{"help", 0, NULL, 'h'},

 		{"version", 0, NULL, 'V'},

@@ -719,6 +739,7 @@ int main(int argc, char *argv[])

 		{"dump", 0, NULL, 'd'},

 		{"metronome", 1, NULL, 'm'},

 		{"timesig", 1, NULL, 'i'},

+		{"num-events", 1, NULL, 'n'},

 		{ }

 	};

@@ -727,6 +748,9 @@ int main(int argc, char *argv[])

 	struct pollfd *pfds;

 	int npfds;

 	int c, err;

+	/* If |num_events| isn't specified, leave it at 0. */

+	long num_events = 0;

+	long events_received = 0;

 	init_seq();

@@ -775,6 +799,16 @@ int main(int argc, char *argv[])

 		case 'i':

 			time_signature(optarg);

 			break;

+		case 'n':

+			err = 0;

+			num_events = arg_parse_decimal_num(optarg, &err;;

+			if (err != 0) {

+				fatal("Couldn't parse num_events argument: %s\n",

+					strerror(-err));

+			}

+			if (num_events <= 0)

+				fatal("num_events must be greater than 0");

+			break;

 		default:

 			help(argv[0]);

 			return 1;

@@ -864,13 +898,20 @@ int main(int argc, char *argv[])

 			err = snd_seq_event_input(seq, &event);

 			if (err < 0)

 				break;

-			if (event)

+			if (event) {

 				record_event(event);

+				events_received++;

+			}

 		} while (err > 0);

 		if (stop)

 			break;

+		if (num_events && (events_received == num_events))

+			break;

 	}

+	if (num_events && events_received < num_events)