support for esd arguments: -spawnpid and -spawnfd

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@231 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/polyp/Makefile.am b/polyp/Makefile.am
index 6e435156a83f65bb4979c24a6f53d6bc2a1f9c44..af324dd3eddb9c393e9b1b955c75c1ddcd3c61ba 100644 (file)
--- a/polyp/Makefile.am
+++ b/polyp/Makefile.am
@@ -103,7 +103,9 @@ modlib_LTLIBRARIES= \
                module-native-protocol-unix.la \
                module-native-protocol-fd.la \
                module-sine.la \
-               module-combine.la
+               module-combine.la \
+               module-esound-compat-spawnfd.la \
+               module-esound-compat-spawnpid.la
 
 lib_LTLIBRARIES= \
                libpolyp-@PA_MAJORMINOR@.la \
@@ -302,6 +304,14 @@ module_combine_la_SOURCES = module-combine.c
 module_combine_la_LDFLAGS = -module -avoid-version
 module_combine_la_LIBADD = $(AM_LIBADD)
 
+module_esound_compat_spawnfd_la_SOURCES = module-esound-compat-spawnfd.c
+module_esound_compat_spawnfd_la_LDFLAGS = -module -avoid-version
+module_esound_compat_spawnfd_la_LIBADD = $(AM_LIBADD)
+
+module_esound_compat_spawnpid_la_SOURCES = module-esound-compat-spawnpid.c
+module_esound_compat_spawnpid_la_LDFLAGS = -module -avoid-version
+module_esound_compat_spawnpid_la_LIBADD = $(AM_LIBADD)
+
 libpolyp_@PA_MAJORMINOR@_la_SOURCES = polyplib.h \
                polyplib-def.h \
                tagstruct.c tagstruct.h \

diff --git a/polyp/esdcompat.sh.in b/polyp/esdcompat.sh.in
index 8b9cbf94278e63af29c0cf6227ad51c37de9077b..d222e1ba2c9c4746ea674506dbdc24bc39ee38d2 100755 (executable)
--- a/polyp/esdcompat.sh.in
+++ b/polyp/esdcompat.sh.in
@@ -26,9 +26,13 @@ fail() {
     exit 1
 }
 
+ARGS=""
+
 for N in $(seq $#) ; do
 
     case "$1" in
+        "")
+            ;;
 
         -v|--version)
             echo "$VERSION_STRING"
@@ -62,6 +66,16 @@ Ignored directives:
 EOF
             exit 0
             ;;
+
+        -spawnpid)
+            shift
+            ARGS="$ARGS '-Lmodule-esound-compat-spawnpid pid=$1'"
+            ;;
+
+        -spawnfd)
+            shift
+            ARGS="$ARGS '-Lmodule-esound-compat-spawnfd fd=$1'"
+            ;;
         
         -unix|-b|-public|-terminate|-nobeeps|-trust|-tcp|-promiscuous)  
             # Ignore these commands
@@ -70,6 +84,7 @@ EOF
         -d|-r|-as|-port|-bind)
             # Ignore these commands and their arguments
             shift
+
             ;;
 
         *)
@@ -80,4 +95,4 @@ EOF
     shift
 done
 
-exec "@POLYPAUDIO_BINARY@"
+eval "exec '@POLYPAUDIO_BINARY@'$ARGS"

diff --git a/polyp/module-esound-compat-spawnfd.c b/polyp/module-esound-compat-spawnfd.c
new file mode 100644 (file)
index 0000000..514159f
--- /dev/null
+++ b/polyp/module-esound-compat-spawnfd.c
@@ -0,0 +1,79 @@
+/* $Id$ */
+
+/***
+  This file is part of polypaudio.
+ 
+  polypaudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published
+  by the Free Software Foundation; either version 2 of the License,
+  or (at your option) any later version.
+ 
+  polypaudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with polypaudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <unistd.h>
+#include <assert.h>
+#include <string.h>
+#include <errno.h>
+
+#include "module.h"
+#include "util.h"
+#include "modargs.h"
+#include "log.h"
+
+PA_MODULE_AUTHOR("Lennart Poettering")
+PA_MODULE_DESCRIPTION("ESOUND compatibility module: -spawnfd emulation")
+PA_MODULE_USAGE("fd=<file descriptor>")
+PA_MODULE_VERSION(PACKAGE_VERSION)
+
+static const char* const valid_modargs[] = {
+    "fd",
+    NULL,
+};
+
+int pa__init(struct pa_core *c, struct pa_module*m) {
+    struct pa_modargs *ma = NULL;
+    int ret = -1, fd = -1;
+    char x = 1;
+    assert(c && m);
+
+    if (!(ma = pa_modargs_new(m->argument, valid_modargs)) ||
+        pa_modargs_get_value_s32(ma, "fd", &fd) < 0 ||
+        fd < 0) {
+        pa_log(__FILE__": Failed to parse module arguments\n");
+        goto finish;
+    }
+
+    if (pa_loop_write(fd, &x, sizeof(x)) != sizeof(x))
+        pa_log(__FILE__": WARNING: write(%u, 1, 1) failed: %s\n", fd, strerror(errno));
+
+    close(fd);
+
+    pa_module_unload_request(m);
+
+    ret = 0;
+
+finish:
+    if (ma)
+        pa_modargs_free(ma);
+
+    return ret;
+}
+
+void pa__done(struct pa_core *c, struct pa_module*m) {
+    assert(c && m);
+}
+
+

diff --git a/polyp/module-esound-compat-spawnpid.c b/polyp/module-esound-compat-spawnpid.c
new file mode 100644 (file)
index 0000000..5583f07
--- /dev/null
+++ b/polyp/module-esound-compat-spawnpid.c
@@ -0,0 +1,77 @@
+
+/***
+  This file is part of polypaudio.
+ 
+  polypaudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published
+  by the Free Software Foundation; either version 2 of the License,
+  or (at your option) any later version.
+ 
+  polypaudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with polypaudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <unistd.h>
+#include <assert.h>
+#include <string.h>
+#include <errno.h>
+#include <signal.h>
+
+#include "module.h"
+#include "util.h"
+#include "modargs.h"
+#include "log.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)
+
+static const char* const valid_modargs[] = {
+    "pid",
+    NULL,
+};
+
+int pa__init(struct pa_core *c, struct pa_module*m) {
+    struct pa_modargs *ma = NULL;
+    int ret = -1;
+    uint32_t pid = 0;
+    assert(c && m);
+
+    if (!(ma = pa_modargs_new(m->argument, valid_modargs)) ||
+        pa_modargs_get_value_u32(ma, "pid", &pid) < 0 ||
+        !pid) {
+        pa_log(__FILE__": Failed to parse module arguments\n");
+        goto finish;
+    }
+
+    if (kill(pid, SIGUSR1) < 0)
+        pa_log(__FILE__": WARNING: kill(%u) failed: %s\n", pid, strerror(errno));
+
+    pa_module_unload_request(m);
+
+    ret = 0;
+
+finish:
+    if (ma)
+        pa_modargs_free(ma);
+
+    return ret;
+}
+
+void pa__done(struct pa_core *c, struct pa_module*m) {
+    assert(c && m);
+}
+
+