[pulseaudio-discuss] [PATCH 3/3] pactl: Add unloading modules by name

poljar poljarinho at gmail.com
Tue May 22 09:06:14 PDT 2012


pactl was updated to make use of the recently added support for
unloading modules by name.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=48289
---
 man/pactl.1.xml.in |    4 ++--
 src/utils/pactl.c  |   15 +++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/man/pactl.1.xml.in b/man/pactl.1.xml.in
index 86e7609..693a5c5 100644
--- a/man/pactl.1.xml.in
+++ b/man/pactl.1.xml.in
@@ -119,8 +119,8 @@ USA.
     </option>
 
     <option>
-      <p><opt>unload-module</opt> <arg>ID</arg></p>
-      <optdesc><p>Unload the module instance identified by the specified numeric index.</p></optdesc>
+      <p><opt>unload-module</opt> <arg>ID|NAME</arg></p>
+      <optdesc><p>Unload the module instance identified by the specified numeric index or unload all modules by the sepcified name.</p></optdesc>
     </option>
 
     <option>
diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index 05a1519..5af4563 100644
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
@@ -32,6 +32,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <locale.h>
+#include <ctype.h>
 
 #include <sndfile.h>
 
@@ -1152,7 +1153,10 @@ static void context_state_callback(pa_context *c, void *userdata) {
                     break;
 
                 case UNLOAD_MODULE:
-                    pa_operation_unref(pa_context_unload_module(c, module_index, simple_callback, NULL));
+                    if (module_name)
+                        pa_operation_unref(pa_context_unload_module_by_name(c, module_name, simple_callback, NULL));
+                    else
+                        pa_operation_unref(pa_context_unload_module_by_index(c, module_index, simple_callback, NULL));
                     break;
 
                 case SUSPEND_SINK:
@@ -1345,7 +1349,7 @@ static void help(const char *argv0) {
     printf("%s %s %s %s\n", argv0, _("[options]"), "play-sample ", _("NAME [SINK]"));
     printf("%s %s %s %s\n", argv0, _("[options]"), "remove-sample ", _("NAME"));
     printf("%s %s %s %s\n", argv0, _("[options]"), "load-module ", _("NAME [ARGS ...]"));
-    printf("%s %s %s %s\n", argv0, _("[options]"), "unload-module ", _("#N"));
+    printf("%s %s %s %s\n", argv0, _("[options]"), "unload-module ", _("NAME|#N"));
     printf("%s %s %s %s\n", argv0, _("[options]"), "move-(sink-input|source-output)", _("#N SINK|SOURCE"));
     printf("%s %s %s %s\n", argv0, _("[options]"), "suspend-(sink|source)", _("NAME|#N 1|0"));
     printf("%s %s %s %s\n", argv0, _("[options]"), "set-card-profile ", _("CARD PROFILE"));
@@ -1568,11 +1572,14 @@ int main(int argc, char *argv[]) {
             action = UNLOAD_MODULE;
 
             if (argc != optind+2) {
-                pa_log(_("You have to specify a module index"));
+                pa_log(_("You have to specify a module index or name"));
                 goto quit;
             }
 
-            module_index = (uint32_t) atoi(argv[optind+1]);
+            if (isdigit(argv[optind+1][0]))
+                module_index = (uint32_t) atoi(argv[optind+1]);
+            else
+                module_name = argv[optind+1];
 
         } else if (pa_streq(argv[optind], "suspend-sink")) {
             action = SUSPEND_SINK;
-- 
1.7.10.2



More information about the pulseaudio-discuss mailing list