Skip to contentSkip to conversation

aplaymidi2: Add initial version

PATCH New Takashi Iwai 1 participant 5 messages Jul 6, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 aplaymidi2: Add initial version

aplaymidi2 is a program similar like aplaymidi, but intended for playing back a MIDI Clip file that was introduced for handling UMP. MIDI Clip file contains UMP packets, and its structure is much simpler than SMF.

The options are mostly same as aplaymidi, but I omitted -l option for simplifying the code.

---
 configure.ac                |   2 +-
 seq/Makefile.am             |   2 +-
 seq/aplaymidi2/Makefile.am  |   5 +
 seq/aplaymidi2/aplaymidi2.1 |  71 ++++++
 seq/aplaymidi2/aplaymidi2.c | 447 ++++++++++++++++++++++++++++++++++++
 5 files changed, 525 insertions(+), 2 deletions(-)
 create mode 100644 seq/aplaymidi2/Makefile.am
 create mode 100644 seq/aplaymidi2/aplaymidi2.1
 create mode 100644 seq/aplaymidi2/aplaymidi2.c
configure.ac +1 -1
index 173b9ed1644c..708380cf31dc 100644
@@ -486,7 +486,7 @@ AC_OUTPUT(Makefile alsactl/Makefile alsactl/init/Makefile \
 	  bat/Makefile bat/tests/Makefile bat/tests/asound_state/Makefile \
 	  aplay/Makefile include/Makefile iecset/Makefile utils/Makefile \
 	  utils/alsa-utils.spec seq/Makefile seq/aconnect/Makefile \
-	  seq/aplaymidi/Makefile seq/aseqdump/Makefile seq/aseqnet/Makefile \
+	  seq/aplaymidi/Makefile seq/aplaymidi2/Makefile seq/aseqdump/Makefile seq/aseqnet/Makefile \
 	  seq/aseqsend/Makefile speaker-test/Makefile speaker-test/samples/Makefile \
 	  alsaloop/Makefile alsa-info/Makefile \
 	  axfer/Makefile axfer/test/Makefile \
seq/Makefile.am +1 -1
index b0f628aac4da..a6171268186b 100644
@@ -1 +1 @@
-SUBDIRS=aconnect aplaymidi aseqdump aseqnet aseqsend
+SUBDIRS=aconnect aplaymidi aplaymidi2 aseqdump aseqnet aseqsend
seq/aplaymidi2/Makefile.am new file +5 -0
new file mode 100644
index 000000000000..0c5c743f7eb8
@@ -0,0 +1,5 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include
+EXTRA_DIST = aplaymidi2.1
+
+bin_PROGRAMS = aplaymidi2
+man_MANS = aplaymidi2.1
seq/aplaymidi2/aplaymidi2.1 new file +71 -0

71 lines not on this page · raw message

seq/aplaymidi2/aplaymidi2.c new file +447 -0

447 lines not on this page · raw message

Signature · 1 line
2.43.0
#1 lore raw

PATCH 2/5 arecordmidi2: Add initial version

arecordmidi2 is a similar program like arecordmidi for recording the incoming MIDI events, but storing in a MIDI Clip file for MIDI 2.0.

Most options are kept from arecordmidi, but some are dropped: namely, the -l, -m and -f options are dropped for code simplicity. Also -s option is dropped as well, as there is no need for split for MIDI Clip file unlike SMF.

---
 seq/aplaymidi2/Makefile.am    |   6 +-
 seq/aplaymidi2/arecordmidi2.1 |  73 +++++
 seq/aplaymidi2/arecordmidi2.c | 512 ++++++++++++++++++++++++++++++++++
 3 files changed, 588 insertions(+), 3 deletions(-)
 create mode 100644 seq/aplaymidi2/arecordmidi2.1
 create mode 100644 seq/aplaymidi2/arecordmidi2.c
seq/aplaymidi2/Makefile.am +3 -3
index 0c5c743f7eb8..8985382efe82 100644
@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
-EXTRA_DIST = aplaymidi2.1
+EXTRA_DIST = aplaymidi2.1 arecordmidi2.1
 
-bin_PROGRAMS = aplaymidi2
-man_MANS = aplaymidi2.1
+bin_PROGRAMS = aplaymidi2 arecordmidi2
+man_MANS = aplaymidi2.1 arecordmidi2.1
seq/aplaymidi2/arecordmidi2.1 new file +73 -0

73 lines not on this page · raw message

seq/aplaymidi2/arecordmidi2.c new file +512 -0

512 lines not on this page · raw message

Signature · 1 line
2.43.0
#2 lore raw

PATCH 3/5 .gitignore: Add aplaymidi2 and arecordmidi2

In reply to Takashi Iwai
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)
.gitignore +2 -0
index b61e1df34b11..7a5817f253d7 100644
@@ -48,6 +48,8 @@ iecset/iecset
 seq/aconnect/aconnect
 seq/aplaymidi/aplaymidi
 seq/aplaymidi/arecordmidi
+seq/aplaymidi2/aplaymidi2
+seq/aplaymidi2/arecordmidi2
 seq/aseqdump/aseqdump
 seq/aseqsend/aseqsend
 seq/aseqnet/aseqnet
Signature · 1 line
2.43.0
#3 lore raw

PATCH 4/5 .gitignore: Add stale files for topology builds

In reply to Takashi Iwai
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)
.gitignore +2 -0
index 7a5817f253d7..1763f60a8376 100644
@@ -29,6 +29,8 @@ ABOUT-NLS
 *.o
 *~
 .deps
+.libs
+.dirstamp
 
 alsactl/alsactl
 alsactl/alsactl_init.7
Signature · 1 line
2.43.0
#4 lore raw

PATCH 5/5 arecordmidi2: Add passive mode and interactive mode

In reply to Takashi Iwai

Allow arecordmidi2 running without specifying the source ports via -p option. This will create a UMP Endpoint with the full 16 FBs, and simply reads from the input ports via subscribers. User needs to connect to the ports manually, though.

Also, add -r option to run in the interactive mode. In the interactive mode, arecordmidi2 waits for the RETURN key entered from the terminal to start the recording, and the recording ends after another RETURN key.

---
 seq/aplaymidi2/arecordmidi2.1 | 20 +++++++++-
 seq/aplaymidi2/arecordmidi2.c | 75 +++++++++++++++++++++++++++--------
 2 files changed, 77 insertions(+), 18 deletions(-)
seq/aplaymidi2/arecordmidi2.1 +19 -1
index 0e41a300b553..a9cfb00d0318 100644
@@ -5,7 +5,7 @@ arecordmidi2 \- record a MIDI Clip file
 
 .SH SYNOPSIS
 .B arecordmidi2
-\-p client:port[,...] [options] midi2file
+[options] midi2file
 
 .SH DESCRIPTION
 .B arecordmidi2
@@ -32,6 +32,16 @@ A client can be specified by its number, its name, or a prefix of its
 name. A port is specified by its number; for port 0 of a client, the
 ":0" part of the port specification can be omitted.
 
+\fBarecordmidi2\fP creates a UMP Endpoint containing the same number
+of Function Blocks as specified by this option, each of which is
+connected to the specified port as a source.
+
+When no source ports are specified with \fI\-p\fP option,
+\fBarecordmidi2\fP creates a UMP Endpoint with full 16 Function Blocks
+and records from those inputs.  User can connect the sequencer ports
+freely via \fBaconnect\fP, for example.  This mode can be used
+together with the interactive mode via \fI\-r\fP option.
+
 .TP
 .I \-b,\-\-bpm=beats
 Sets the musical tempo of the MIDI file, in beats per minute.
@@ -62,6 +72,14 @@ Sets the UMP MIDI protocol version. Either 1 or 2 has to be given for
 MIDI 1.0 and MIDI 2.0 protocol, respectively.
 Default is 1.
 
+.TP
+.I \-r,\-\-interactive
+Run in the interactive mode.  \fBarecordmidi2\fP waits for a RETURN
+key input from the terminal to start the recording.  After starting,
+the recording ends when another RETURN key is input from the
+terminal.  The received events before the start of recording are
+discarded.
+
 .SH SEE ALSO
 arecordmidi(1)
 .br
seq/aplaymidi2/arecordmidi2.c +58 -17

169 lines not on this page · raw message

Signature · 1 line
2.43.0