diff options
| -rw-r--r-- | man/pactl.1.xml.in | 7 | ||||
| -rw-r--r-- | src/utils/pactl.c | 15 |
2 files changed, 15 insertions, 7 deletions
diff --git a/man/pactl.1.xml.in b/man/pactl.1.xml.in index bb366ea5..3a70fb64 100644 --- a/man/pactl.1.xml.in +++ b/man/pactl.1.xml.in @@ -66,8 +66,11 @@ USA. <section name="Commands"> <option> - <p><opt>stat</opt></p> - <optdesc><p>Dump a few statistics about the memory usage of the PulseAudio daemon.</p></optdesc> + <p><opt>stat</opt> [short]</p> + <optdesc><p>Dump a few statistics about the memory usage of the PulseAudio daemon. (Note: for backwards + compatibility, we also show the output of the <arg>info</arg> command. In order to only show + statistics, use the optional <arg>short</arg> argument. In a future version of PA we will + make this the default)</p></optdesc> </option> <option> diff --git a/src/utils/pactl.c b/src/utils/pactl.c index 83547a55..c95a38ce 100644 --- a/src/utils/pactl.c +++ b/src/utils/pactl.c @@ -1001,7 +1001,9 @@ static void context_state_callback(pa_context *c, void *userdata) { switch (action) { case STAT: pa_operation_unref(pa_context_stat(c, stat_callback, NULL)); - break; + if (short_list_format) + break; + actions++; case INFO: pa_operation_unref(pa_context_get_server_info(c, get_server_info_callback, NULL)); @@ -1251,9 +1253,9 @@ static int parse_volume(const char *vol_spec, pa_volume_t *vol, enum volume_flag static void help(const char *argv0) { - printf("%s %s %s\n", argv0, _("[options]"), "stat"); + printf("%s %s %s\n", argv0, _("[options]"), "stat [short]"); printf("%s %s %s\n", argv0, _("[options]"), "info"); - printf("%s %s %s %s\n", argv0, _("[options]"), "list", _("[short] [TYPE]")); + printf("%s %s %s %s\n", argv0, _("[options]"), "list [short]", _("[TYPE]")); printf("%s %s %s\n", argv0, _("[options]"), "exit"); printf("%s %s %s %s\n", argv0, _("[options]"), "upload-sample", _("FILENAME [NAME]")); printf("%s %s %s %s\n", argv0, _("[options]"), "play-sample ", _("NAME [SINK]")); @@ -1344,10 +1346,13 @@ int main(int argc, char *argv[]) { } if (optind < argc) { - if (pa_streq(argv[optind], "stat")) + if (pa_streq(argv[optind], "stat")) { action = STAT; + short_list_format = FALSE; + if (optind+1 < argc && pa_streq(argv[optind+1], "short")) + short_list_format = TRUE; - else if (pa_streq(argv[optind], "info")) + } else if (pa_streq(argv[optind], "info")) action = INFO; else if (pa_streq(argv[optind], "exit")) |