Add pa_sample_format_valid()

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

diff --git a/src/modules/module-esound-compat-spawnfd.c b/src/modules/module-esound-compat-spawnfd.c
index 8eb4985b2bbcf4d861c81e04ec0e0157758d0a00..30776d7afaca0baab218c6e8b9276df5ce4c96cd 100644 (file)
--- a/src/modules/module-esound-compat-spawnfd.c
+++ b/src/modules/module-esound-compat-spawnfd.c
@@ -5,7 +5,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


@@ -24,7 +24,6 @@
 #endif
 
 #include <unistd.h>
 #endif
 
 #include <unistd.h>

-#include <string.h>

 #include <errno.h>
 
 #include <pulsecore/core-error.h>
 #include <errno.h>
 
 #include <pulsecore/core-error.h>


@@ -37,7 +36,7 @@
 
 PA_MODULE_AUTHOR("Lennart Poettering");
 PA_MODULE_DESCRIPTION("ESOUND compatibility module: -spawnfd emulation");
 
 PA_MODULE_AUTHOR("Lennart Poettering");
 PA_MODULE_DESCRIPTION("ESOUND compatibility module: -spawnfd emulation");

-PA_MODULE_LOAD_ONCE(TRUE);
+PA_MODULE_LOAD_ONCE(true);

 PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_USAGE("fd=<file descriptor>");
 
 PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_USAGE("fd=<file descriptor>");
 


@@ -48,7 +47,8 @@ static const char* const valid_modargs[] = {
 
 int pa__init(pa_module*m) {
     pa_modargs *ma = NULL;
 
 int pa__init(pa_module*m) {
     pa_modargs *ma = NULL;

-    int ret = -1, fd = -1;
+    int ret = -1;
+    int32_t fd = -1;

     char x = 1;
 
     pa_assert(m);
     char x = 1;
 
     pa_assert(m);


@@ -66,7 +66,7 @@ int pa__init(pa_module*m) {
 
     pa_assert_se(pa_close(fd) == 0);
 
 
     pa_assert_se(pa_close(fd) == 0);
 

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

 
     ret = 0;
 
 
     ret = 0;