diff options
| author | Peter Meerwald <p.meerwald@bct-electronic.com> | 2014-10-30 16:00:41 +0100 |
|---|---|---|
| committer | Peter Meerwald <pmeerw@pmeerw.net> | 2014-11-04 22:22:19 +0100 |
| commit | 6d1fd4d1aab38a18925972f11face92ea602adf0 (patch) | |
| tree | 0f888f0f3bdcb33501f6ebeaae8b1de37626e165 | |
| parent | 31d5acdc787051372d4a64e25b6e91dc9b2d1011 (diff) | |
pactl: Remove deprecated 'stat' behaviour
the stat command should only output statistics, not info
behaviour was deprecated anno 2011 in 8ace9185 "pactl: Make stat backwards
compatible" -- fix this now
v2: (thanks Tanu Kaskinen):
* adjust shell completion
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
| -rw-r--r-- | man/pactl.1.xml.in | 7 | ||||
| -rw-r--r-- | shell-completion/bash/pulseaudio | 2 | ||||
| -rw-r--r-- | shell-completion/zsh/_pulseaudio | 1 | ||||
| -rw-r--r-- | src/utils/pactl.c | 14 |
4 files changed, 4 insertions, 20 deletions
diff --git a/man/pactl.1.xml.in b/man/pactl.1.xml.in index a195b1d74..cf6570ef9 100644 --- a/man/pactl.1.xml.in +++ b/man/pactl.1.xml.in @@ -66,11 +66,8 @@ USA. <section name="Commands"> <option> - <p><opt>stat</opt> [<arg>short</arg>]</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> + <p><opt>stat</opt></p> + <optdesc><p>Dump a few statistics about the memory usage of the PulseAudio daemon.</p></optdesc> </option> <option> diff --git a/shell-completion/bash/pulseaudio b/shell-completion/bash/pulseaudio index 7775b0829..4d7e0b80f 100644 --- a/shell-completion/bash/pulseaudio +++ b/shell-completion/bash/pulseaudio @@ -179,8 +179,6 @@ _pactl() { case $prev in list) COMPREPLY=($(compgen -W '${list_types[*]}' -- "$cur")) ;; - stat) COMPREPLY=($(compgen -W 'short' -- "$cur")) ;; - upload-sample) _filedir ;; play-sample) ;; # TODO diff --git a/shell-completion/zsh/_pulseaudio b/shell-completion/zsh/_pulseaudio index cbccaf243..b8dd5935b 100644 --- a/shell-completion/zsh/_pulseaudio +++ b/shell-completion/zsh/_pulseaudio @@ -465,7 +465,6 @@ _pactl_completion() { _command=$words[1] case $_command in - stat) if ((CURRENT == 2)); then compadd short; fi;; list) _list_parameter;; upload-sample) if ((CURRENT == 2)); then _files; fi;; play-sample) _play_sample_parameter;; diff --git a/src/utils/pactl.c b/src/utils/pactl.c index 13ea64986..f6555b9c5 100644 --- a/src/utils/pactl.c +++ b/src/utils/pactl.c @@ -1201,14 +1201,7 @@ static void context_state_callback(pa_context *c, void *userdata) { switch (action) { case STAT: o = pa_context_stat(c, stat_callback, NULL); - if (short_list_format) - break; - - if (o) { - pa_operation_unref(o); - actions++; - } - /* Fall through */ + break; case INFO: o = pa_context_get_server_info(c, get_server_info_callback, NULL); @@ -1563,7 +1556,7 @@ static enum mute_flags parse_mute(const char *mute_text) { static void help(const char *argv0) { - printf("%s %s %s\n", argv0, _("[options]"), "stat [short]"); + printf("%s %s %s\n", argv0, _("[options]"), "stat"); printf("%s %s %s\n", argv0, _("[options]"), "info"); printf("%s %s %s %s\n", argv0, _("[options]"), "list [short]", _("[TYPE]")); printf("%s %s %s\n", argv0, _("[options]"), "exit"); @@ -1665,9 +1658,6 @@ int main(int argc, char *argv[]) { if (optind < argc) { 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")) action = INFO; |