summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrncbc <rncbc@gamma.rncbc.lan>2016-04-24 18:59:07 +0100
committerPaul Davis <paul@linuxaudiosystems.com>2016-09-14 11:46:22 -0500
commit0b0953db926fc22f5cd93180461e7a98153628c5 (patch)
tree0d018babac4a47aa2566530829594aea21f4483f
parent0880dfaaf0509f4508c7ec47497793bf7f675f99 (diff)
downloadjack1-0b0953db926fc22f5cd93180461e7a98153628c5.tar.gz
- Swap alsa_midi slave driver port-name suffixes ("out" for capture, "in" for playback).
-rw-r--r--drivers/alsa_midi/port.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/alsa_midi/port.c b/drivers/alsa_midi/port.c
index 6f1cb04..d217310 100644
--- a/drivers/alsa_midi/port.c
+++ b/drivers/alsa_midi/port.c
@@ -111,34 +111,36 @@ a2j_port_fill_name (struct a2j_port * port_ptr, int dir, snd_seq_client_info_t *
/* entire client name is part of the port name so don't replicate it */
snprintf (port_ptr->name,
sizeof(port_ptr->name),
- "[%d] %s %s",
+ "[%d:%d] %s (%s)",
snd_seq_client_info_get_client (client_info_ptr),
+ snd_seq_port_info_get_port (port_info_ptr),
port_name,
- (dir == A2J_PORT_CAPTURE ? "in" : "out"));
+ (dir == A2J_PORT_CAPTURE ? "out" : "in"));
} else {
snprintf (port_ptr->name,
sizeof(port_ptr->name),
- "%s [%d] %s %s",
- client_name,
+ "[%d:%d] %s %s (%s)",
snd_seq_client_info_get_client (client_info_ptr),
+ snd_seq_port_info_get_port (port_info_ptr),
+ client_name,
port_name,
- (dir == A2J_PORT_CAPTURE ? "in" : "out"));
+ (dir == A2J_PORT_CAPTURE ? "out" : "in"));
}
} else {
if (strstr (port_name, client_name) == port_name) {
/* entire client name is part of the port name so don't replicate it */
snprintf (port_ptr->name,
sizeof(port_ptr->name),
- "%s %s",
+ "%s (%s)",
port_name,
- (dir == A2J_PORT_CAPTURE ? "in" : "out"));
+ (dir == A2J_PORT_CAPTURE ? "out" : "in"));
} else {
snprintf (port_ptr->name,
sizeof(port_ptr->name),
- "%s %s %s",
+ "%s %s (%s)",
client_name,
snd_seq_port_info_get_name (port_info_ptr),
- (dir == A2J_PORT_CAPTURE ? "in" : "out"));
+ (dir == A2J_PORT_CAPTURE ? "out" : "in"));
}
}