mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-05 13:29:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: Output prompt and welcome message only when requested by 'hello'

Browse source 
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
This commit is contained in:
Peter Meerwald 2013-07-29 22:13:40 +02:00 • committed by David Henningsson
parent e6051cdf8d
commit e729783331
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pulsecore/cli.c
View file

@ -55,6 +55,7 @@ struct pa_cli {
bool fail, kill_requested; bool fail, kill_requested;
int defer_kill; int defer_kill;
bool interactive;
char *last_line; char *last_line;
}; };
@ -93,11 +94,11 @@ pa_cli* pa_cli_new(pa_core *core, pa_iochannel *io, pa_module *m) {
c->client->userdata = c; c->client->userdata = c;
pa_ioline_set_callback(c->line, line_callback, c); pa_ioline_set_callback(c->line, line_callback, c);
pa_ioline_puts(c->line, "Welcome to PulseAudio! Use \"help\" for usage information.\n"PROMPT);
c->fail = c->kill_requested = false; c->fail = c->kill_requested = false;
c->defer_kill = 0; c->defer_kill = 0;
c->interactive = false;
c->last_line = NULL; c->last_line = NULL;
return c; return c;
@ -154,6 +155,12 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) {
pa_assert_se(buf = pa_strbuf_new()); pa_assert_se(buf = pa_strbuf_new());
c->defer_kill++; c->defer_kill++;
if (pa_streq(s, "hello")) {
pa_strbuf_printf(buf, "Welcome to PulseAudio %s! "
"Use \"help\" for usage information.\n", PACKAGE_VERSION);
c->interactive = true;
}
else
pa_cli_command_execute_line(c->core, s, buf, &c->fail); pa_cli_command_execute_line(c->core, s, buf, &c->fail);
c->defer_kill--; c->defer_kill--;
pa_ioline_puts(line, p = pa_strbuf_tostring_free(buf)); pa_ioline_puts(line, p = pa_strbuf_tostring_free(buf));
@ -162,7 +169,7 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) {
if (c->kill_requested) { if (c->kill_requested) {
if (c->eof_callback) if (c->eof_callback)
c->eof_callback(c, c->userdata); c->eof_callback(c, c->userdata);
} else } else if (c->interactive)
pa_ioline_puts(line, PROMPT); pa_ioline_puts(line, PROMPT);
} }