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

pacmd: Add unloading modules by name.

Browse source 
pacmd should allow unloading modules by name.
The command_unload() function was expanded to handle names while
unloading modules.

If there are multiple modules with the same name all
of them will be unloaded.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=48289
This commit is contained in:
poljar 2012-05-30 14:27:26 +02:00 • committed by Tanu Kaskinen
parent 48f4c8ab8f
commit 23432d39ee
2 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/pulsecore/cli-command.c
View file

@ -34,6 +34,7 @@
#include <dirent.h> #include <dirent.h>
#include <time.h> #include <time.h>
#include <fcntl.h> #include <fcntl.h>
#include <ctype.h>
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
#include <pulse/error.h> #include <pulse/error.h>
@ -152,7 +153,7 @@ static const struct command commands[] = {
{ "ls", pa_cli_command_info, NULL, 1 }, { "ls", pa_cli_command_info, NULL, 1 },
{ "list", pa_cli_command_info, NULL, 1 }, { "list", pa_cli_command_info, NULL, 1 },
{ "load-module", pa_cli_command_load, "Load a module (args: name, arguments)", 3}, { "load-module", pa_cli_command_load, "Load a module (args: name, arguments)", 3},
{ "unload-module", pa_cli_command_unload, "Unload a module (args: index)", 2}, { "unload-module", pa_cli_command_unload, "Unload a module (args: index|name)", 2},
{ "describe-module", pa_cli_command_describe, "Describe a module (arg: name)", 2}, { "describe-module", pa_cli_command_describe, "Describe a module (arg: name)", 2},
{ "set-sink-volume", pa_cli_command_sink_volume, "Set the volume of a sink (args: index|name, volume)", 3}, { "set-sink-volume", pa_cli_command_sink_volume, "Set the volume of a sink (args: index|name, volume)", 3},
{ "set-source-volume", pa_cli_command_source_volume, "Set the volume of a source (args: index|name, volume)", 3}, { "set-source-volume", pa_cli_command_source_volume, "Set the volume of a source (args: index|name, volume)", 3},
@ -447,7 +448,7 @@ static int pa_cli_command_unload(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa
pa_module *m; pa_module *m;
uint32_t idx; uint32_t idx;
const char *i; const char *i;
char *e; pa_bool_t unloaded = FALSE;
pa_core_assert_ref(c); pa_core_assert_ref(c);
pa_assert(t); pa_assert(t);
@ -455,17 +456,31 @@ static int pa_cli_command_unload(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa
pa_assert(fail); pa_assert(fail);
if (!(i = pa_tokenizer_get(t, 1))) { if (!(i = pa_tokenizer_get(t, 1))) {
pa_strbuf_puts(buf, "You need to specify the module index.\n"); pa_strbuf_puts(buf, "You need to specify the module index or name.\n");
return -1; return -1;
} }
idx = (uint32_t) strtoul(i, &e, 10); if (pa_atou(i, &idx) >= 0) {
if (*e || !(m = pa_idxset_get_by_index(c->modules, idx))) { if (!(m = pa_idxset_get_by_index(c->modules, idx))) {
pa_strbuf_puts(buf, "Invalid module index.\n"); pa_strbuf_puts(buf, "Invalid module index.\n");
return -1; return -1;
}
pa_module_unload_request(m, FALSE);
} else {
PA_IDXSET_FOREACH(m, c->modules, idx)
if (pa_streq(i, m->name)) {
unloaded = TRUE;
pa_module_unload_request(m, FALSE);
}
if (unloaded == FALSE) {
pa_strbuf_printf(buf, "Module %s not loaded.\n", i);
return -1;
}
} }
pa_module_unload_request(m, FALSE);
return 0; return 0;
} }

2
src/utils/pacmd.c
View file

@ -51,7 +51,7 @@ static void help(const char *argv0) {
printf("%s %s\n", argv0, "stat"); printf("%s %s\n", argv0, "stat");
printf("%s %s\n", argv0, "info"); printf("%s %s\n", argv0, "info");
printf("%s %s %s\n", argv0, "load-module", _("NAME [ARGS ...]")); printf("%s %s %s\n", argv0, "load-module", _("NAME [ARGS ...]"));
printf("%s %s %s\n", argv0, "unload-module", _("#N")); printf("%s %s %s\n", argv0, "unload-module", _("NAME|#N"));
printf("%s %s %s\n", argv0, "describe-module", _("NAME")); printf("%s %s %s\n", argv0, "describe-module", _("NAME"));
printf("%s %s %s\n", argv0, "set-(sink|source)-volume", _("NAME|#N VOLUME")); printf("%s %s %s\n", argv0, "set-(sink|source)-volume", _("NAME|#N VOLUME"));
printf("%s %s %s\n", argv0, "set-(sink-input|source-output)-volume", _("#N VOLUME")); printf("%s %s %s\n", argv0, "set-(sink-input|source-output)-volume", _("#N VOLUME"));