pw-cat: fix remote name option

This commit is contained in:
Wim Taymans 2020-02-12 13:39:47 +01:00
parent 454e743d1a
commit df65e0bcd3

View file

@ -873,7 +873,7 @@ static void show_usage(const char *name, bool is_error)
"\n"); "\n");
fprintf(fp, fprintf(fp,
" -r, --remote Remote daemon name\n" " -R, --remote Remote daemon name\n"
" --media-type Set media type (default %s)\n" " --media-type Set media type (default %s)\n"
" --media-category Set media category (default %s)\n" " --media-category Set media category (default %s)\n"
" --media-role Set media role (default %s)\n" " --media-role Set media role (default %s)\n"
@ -901,7 +901,7 @@ static void show_usage(const char *name, bool is_error)
"\n", "\n",
DEFAULT_RATE, DEFAULT_CHANNELS, STR_FMTS, DEFAULT_FORMAT, DEFAULT_VOLUME); DEFAULT_RATE, DEFAULT_CHANNELS, STR_FMTS, DEFAULT_FORMAT, DEFAULT_VOLUME);
if (!strcmp(name, "pwcat")) { if (!strcmp(name, "pw-cat")) {
fprintf(fp, fprintf(fp,
" -p, --playback Playback mode\n" " -p, --playback Playback mode\n"
" -r, --record Recording mode\n" " -r, --record Recording mode\n"
@ -1251,15 +1251,19 @@ int main(int argc, char *argv[])
PW_KEY_MEDIA_NAME, data.filename, PW_KEY_MEDIA_NAME, data.filename,
PW_KEY_NODE_NAME, prog, PW_KEY_NODE_NAME, prog,
NULL); NULL);
if (!props) { if (!props) {
fprintf(stderr, "error: pw_properties_new() failed: %m\n"); fprintf(stderr, "error: pw_properties_new() failed: %m\n");
goto error_no_props; goto error_no_props;
} }
if (nom) if (nom)
pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%u/%u", nom, data.rate); pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%u/%u", nom, data.rate);
data.core = pw_context_connect(data.context, NULL, 0); data.core = pw_context_connect(data.context,
pw_properties_new(
PW_KEY_REMOTE_NAME, data.remote_name,
NULL),
0);
if (!data.core) { if (!data.core) {
fprintf(stderr, "error: pw_context_connect() failed: %m\n"); fprintf(stderr, "error: pw_context_connect() failed: %m\n");
goto error_ctx_connect_failed; goto error_ctx_connect_failed;