Merge remote branch 'origin/master-tx'

[pulseaudio] / src / modules / module-esound-compat-spawnpid.c

diff --git a/src/modules/module-esound-compat-spawnpid.c b/src/modules/module-esound-compat-spawnpid.c
index 1cc86d20a3e52e471c6d7daf57e201e109ff8049..5925f591e0b35aeaa64ea76023769ecef54d49c4 100644 (file)
--- a/src/modules/module-esound-compat-spawnpid.c
+++ b/src/modules/module-esound-compat-spawnpid.c
@@ -6,7 +6,7 @@
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published

-  by the Free Software Foundation; either version 2 of the License,
+  by the Free Software Foundation; either version 2.1 of the License,

   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but
   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but


@@ -37,10 +37,11 @@
 
 #include "module-esound-compat-spawnpid-symdef.h"
 
 
 #include "module-esound-compat-spawnpid-symdef.h"
 

-PA_MODULE_AUTHOR("Lennart Poettering")
-PA_MODULE_DESCRIPTION("ESOUND compatibility module: -spawnpid emulation")
-PA_MODULE_USAGE("pid=<process id>")
-PA_MODULE_VERSION(PACKAGE_VERSION)
+PA_MODULE_AUTHOR("Lennart Poettering");
+PA_MODULE_DESCRIPTION("ESOUND compatibility module: -spawnpid emulation");
+PA_MODULE_VERSION(PACKAGE_VERSION);
+PA_MODULE_LOAD_ONCE(TRUE);
+PA_MODULE_USAGE("pid=<process id>");

 
 static const char* const valid_modargs[] = {
     "pid",
 
 static const char* const valid_modargs[] = {
     "pid",


@@ -51,7 +52,7 @@ int pa__init(pa_module*m) {
     pa_modargs *ma = NULL;
     int ret = -1;
     uint32_t pid = 0;
     pa_modargs *ma = NULL;
     int ret = -1;
     uint32_t pid = 0;

-    
+

     pa_assert(m);
 
     if (!(ma = pa_modargs_new(m->argument, valid_modargs)) ||
     pa_assert(m);
 
     if (!(ma = pa_modargs_new(m->argument, valid_modargs)) ||


@@ -61,10 +62,10 @@ int pa__init(pa_module*m) {
         goto finish;
     }
 
         goto finish;
     }
 

-    if (kill(pid, SIGUSR1) < 0)
-        pa_log_warn("WARNING: kill(%u) failed: %s", pid, pa_cstrerror(errno));
+    if (kill((pid_t) pid, SIGUSR1) < 0)
+        pa_log_warn("kill(%u) failed: %s", pid, pa_cstrerror(errno));

 
 

-    pa_module_unload_request(m);
+    pa_module_unload_request(m, TRUE);

 
     ret = 0;
 
 
     ret = 0;