mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-netjack2: improve port names

Browse source 
Let the default port logic make the port names. For network nodes this
will be with a send/recv prefix.
This commit is contained in:
Wim Taymans 2024-07-19 11:42:51 +02:00
parent 842e620c1a
commit b5a7a1f224
2 changed files with 6 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/modules/module-netjack2-driver.c
View file

@ -393,7 +393,7 @@ static void make_stream_ports(struct stream *s)
struct impl *impl = s->impl;
uint32_t i;
struct pw_properties *props;
const char *str, *prefix;
const char *str;
char name[256];
bool is_midi;
uint8_t buffer[512];
@ -401,14 +401,6 @@ static void make_stream_ports(struct stream *s)
struct spa_latency_info latency;
const struct spa_pod *params[1];
if (s->direction == PW_DIRECTION_INPUT) {
/* sink */
prefix = "playback";
} else {
/* source */
prefix = "capture";
}
for (i = 0; i < s->n_ports; i++) {
struct port *port = s->ports[i];
@ -420,24 +412,18 @@ static void make_stream_ports(struct stream *s)
if (i < s->info.channels) {
str = spa_debug_type_find_short_name(spa_type_audio_channel,
s->info.position[i % SPA_AUDIO_MAX_CHANNELS]);
if (str)
snprintf(name, sizeof(name), "%s_%s", prefix, str);
else
snprintf(name, sizeof(name), "%s_%d", prefix, i);
props = pw_properties_new(
PW_KEY_FORMAT_DSP, "32 bit float mono audio",
PW_KEY_AUDIO_CHANNEL, str ? str : "UNK",
PW_KEY_PORT_PHYSICAL, "true",
PW_KEY_PORT_NAME, name,
NULL);
is_midi = false;
} else {
snprintf(name, sizeof(name), "%s_%d", prefix, i - s->info.channels);
snprintf(name, sizeof(name), "midi%d", i - s->info.channels);
props = pw_properties_new(
PW_KEY_FORMAT_DSP, "8 bit raw midi",
PW_KEY_PORT_NAME, name,
PW_KEY_AUDIO_CHANNEL, name,
PW_KEY_PORT_PHYSICAL, "true",
NULL);

19
src/modules/module-netjack2-manager.c
View file

@ -519,7 +519,7 @@ static void make_stream_ports(struct stream *s)
struct follower *follower = s->follower;
uint32_t i;
struct pw_properties *props;
const char *str, *prefix;
const char *str;
char name[256];
bool is_midi;
uint8_t buffer[512];
@ -527,14 +527,6 @@ static void make_stream_ports(struct stream *s)
struct spa_latency_info latency;
const struct spa_pod *params[1];
if (s->direction == PW_DIRECTION_INPUT) {
/* sink */
prefix = "playback";
} else {
/* source */
prefix = "capture";
}
for (i = 0; i < s->n_ports; i++) {
struct port *port = s->ports[i];
if (port != NULL) {
@ -545,25 +537,20 @@ static void make_stream_ports(struct stream *s)
if (i < s->info.channels) {
str = spa_debug_type_find_short_name(spa_type_audio_channel,
s->info.position[i]);
if (str)
snprintf(name, sizeof(name), "%s_%s", prefix, str);
else
snprintf(name, sizeof(name), "%s_%d", prefix, i);
props = pw_properties_new(
PW_KEY_FORMAT_DSP, "32 bit float mono audio",
PW_KEY_AUDIO_CHANNEL, str ? str : "UNK",
PW_KEY_PORT_PHYSICAL, "true",
PW_KEY_PORT_NAME, name,
NULL);
is_midi = false;
} else {
snprintf(name, sizeof(name), "%s_%d", prefix, i - s->info.channels);
snprintf(name, sizeof(name), "midi%d", i - s->info.channels);
props = pw_properties_new(
PW_KEY_FORMAT_DSP, "8 bit raw midi",
PW_KEY_PORT_NAME, name,
PW_KEY_PORT_PHYSICAL, "true",
PW_KEY_AUDIO_CHANNEL, name,
NULL);
is_midi = true;