gst-launch: rename new --no-play command line option to --no-sigusr-handler

--no-play seems a bit confusing.

Fixes #621867.
This commit is contained in:
Tim-Philipp Müller 2010-06-24 17:22:13 +01:00
parent c8d68a7643
commit 1210e4a006
2 changed files with 8 additions and 7 deletions

View file

@ -42,11 +42,11 @@ Output tags (also known as metadata)
.B \-o FILE, \-\-output=FILE
Save XML representation of pipeline to FILE and exit
.TP 8
.B \-f, \-\-no_fault
.B \-f, \-\-no\-fault
Do not install a fault handler
.TP 8
.B \-p, \-\-no_play
Do not install a playback handler (SIGUSR1/2)
.B \-p, \-\-no\-sigusr-handler
Do not install signal handlers for SIGUSR1 (play) and SIGUSR2 (stop)
.TP 8
.B \-T, \-\-trace
Print memory allocation traces. The feature must be enabled at compile time to

View file

@ -375,6 +375,7 @@ sigint_restore (void)
sigaction (SIGINT, &action, NULL);
}
/* FIXME 0.11: remove SIGUSR handling (also from man page) */
static void
play_handler (int signum)
{
@ -685,7 +686,7 @@ main (int argc, char *argv[])
/* options */
gboolean verbose = FALSE;
gboolean no_fault = FALSE;
gboolean no_play = FALSE;
gboolean no_sigusr_handler = FALSE;
gboolean trace = FALSE;
gboolean eos_on_shutdown = FALSE;
gchar *savefile = NULL;
@ -708,8 +709,8 @@ main (int argc, char *argv[])
#endif
{"no-fault", 'f', 0, G_OPTION_ARG_NONE, &no_fault,
N_("Do not install a fault handler"), NULL},
{"no-play", 'p', 0, G_OPTION_ARG_NONE, &no_play,
N_("Do not install a play handler"), NULL},
{"no-sigusr-handler", 'p', 0, G_OPTION_ARG_NONE, &no_sigusr_handler,
N_("Do not install signal handlers for SIGUSR1 and SIGUSR2"), NULL},
{"trace", 'T', 0, G_OPTION_ARG_NONE, &trace,
N_("Print alloc trace (if enabled at compile time)"), NULL},
{"eos-on-shutdown", 'e', 0, G_OPTION_ARG_NONE, &eos_on_shutdown,
@ -760,7 +761,7 @@ main (int argc, char *argv[])
sigint_setup ();
if (!no_play)
if (!no_sigusr_handler)
play_signal_setup ();
#endif