diff options
author | Colin Guthrie <pulse@colin.guthr.ie> | 2008-08-03 19:56:49 +0100 |
---|---|---|
committer | Colin Guthrie <pulse@colin.guthr.ie> | 2008-08-03 19:56:49 +0100 |
commit | 5744237a066186be305be9ea3ecb3ccccadcceca (patch) | |
tree | 6a08957a66fb308a8f1b37232d9b2d24a246e394 /src/pulsecore/cli.c | |
parent | b30a5d601eaffd98914ca0b9fdecd863eade0b4f (diff) | |
parent | 04ffac57a67eee9640f248b6fab33ee8367b0eab (diff) |
Merge branch 'master' of git://git.0pointer.de/pulseaudio
Diffstat (limited to 'src/pulsecore/cli.c')
-rw-r--r-- | src/pulsecore/cli.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/pulsecore/cli.c b/src/pulsecore/cli.c index b3c639f8..67bf1e73 100644 --- a/src/pulsecore/cli.c +++ b/src/pulsecore/cli.c @@ -52,7 +52,7 @@ struct pa_cli { pa_core *core; pa_ioline *line; - void (*eof_callback)(pa_cli *c, void *userdata); + pa_cli_eof_cb_t eof_callback; void *userdata; pa_client *client; @@ -107,12 +107,11 @@ static void client_kill(pa_client *client) { pa_assert_se(c = client->userdata); pa_log_debug("CLI client killed."); + if (c->defer_kill) c->kill_requested = TRUE; - else { - if (c->eof_callback) - c->eof_callback(c, c->userdata); - } + else if (c->eof_callback) + c->eof_callback(c, c->userdata); } static void line_callback(pa_ioline *line, const char *s, void *userdata) { @@ -125,6 +124,7 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) { if (!s) { pa_log_debug("CLI got EOF from user."); + if (c->eof_callback) c->eof_callback(c, c->userdata); @@ -145,9 +145,15 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) { pa_ioline_puts(line, PROMPT); } -void pa_cli_set_eof_callback(pa_cli *c, void (*cb)(pa_cli*c, void *userdata), void *userdata) { +void pa_cli_set_eof_callback(pa_cli *c, pa_cli_eof_cb_t cb, void *userdata) { pa_assert(c); c->eof_callback = cb; c->userdata = userdata; } + +pa_module *pa_cli_get_module(pa_cli *c) { + pa_assert(c); + + return c->client->module; +} |