mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pw-link: improve help and error messages

Browse source 
See #2089
This commit is contained in:
Wim Taymans 2022-02-03 16:39:52 +01:00
parent a947faeaa0
commit 7ac809618e
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/tools/pw-link.c
View file

@ -563,7 +563,7 @@ static void show_help(struct data *data, const char *name)
" -o, --output List output ports\n" " -o, --output List output ports\n"
" -i, --input List input ports\n" " -i, --input List input ports\n"
" -l, --links List links\n" " -l, --links List links\n"
" -m, --monitor Monitor links\n" " -m, --monitor Monitor links and ports\n"
" -I, --id List IDs\n" " -I, --id List IDs\n"
" -v, --verbose Verbose port properties\n" " -v, --verbose Verbose port properties\n"
"Connect: %1$s [options] output input\n" "Connect: %1$s [options] output input\n"
@ -662,6 +662,11 @@ int main(int argc, char *argv[])
if (argc == 1) if (argc == 1)
show_help(&data, argv[0]); show_help(&data, argv[0]);
if (data.opt_id && (data.opt_mode & MODE_LIST) == 0) {
fprintf(stderr, "-I option needs one or more of -l, -i or -o\n");
return -1;
}
if ((data.opt_mode & MODE_MONITOR) == 0) if ((data.opt_mode & MODE_MONITOR) == 0)
pw_properties_set(data.props, PW_KEY_OBJECT_LINGER, "true"); pw_properties_set(data.props, PW_KEY_OBJECT_LINGER, "true");
@ -729,7 +734,7 @@ int main(int argc, char *argv[])
do_list(&data); do_list(&data);
} else if (data.opt_mode & MODE_DISCONNECT) { } else if (data.opt_mode & MODE_DISCONNECT) {
if (data.opt_output == NULL) { if (data.opt_output == NULL) {
fprintf(stderr, "missing link-id or output and input port names\n"); fprintf(stderr, "missing link-id or output and input port names to disconnect\n");
return -1; return -1;
} }
if ((res = do_unlink_ports(&data)) < 0) { if ((res = do_unlink_ports(&data)) < 0) {
@ -739,7 +744,7 @@ int main(int argc, char *argv[])
} else { } else {
if (data.opt_output == NULL || if (data.opt_output == NULL ||
data.opt_input == NULL) { data.opt_input == NULL) {
fprintf(stderr, "missing output and input port names\n"); fprintf(stderr, "missing output and input port names to connect\n");
return -1; return -1;
} }
if ((res = do_link_ports(&data)) < 0) { if ((res = do_link_ports(&data)) < 0) {