socket-server: memory leak, free machine id after use

[pulseaudio] / src / pulsecore / module.h

diff --git a/src/pulsecore/module.h b/src/pulsecore/module.h
index 7a93a071aac7191f72beabadcccd15007d09a0f9..3f697348fedffa034e05969a64358147b2fad613 100644 (file)
--- a/src/pulsecore/module.h
+++ b/src/pulsecore/module.h
@@ -1,8 +1,6 @@
 #ifndef foomodulehfoo
 #define foomodulehfoo
 
 #ifndef foomodulehfoo
 #define foomodulehfoo
 

-/* $Id$ */
-

 /***
   This file is part of PulseAudio.
 
 /***
   This file is part of PulseAudio.
 


@@ -10,7 +8,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


@@ -29,8 +27,9 @@
 
 typedef struct pa_module pa_module;
 
 
 typedef struct pa_module pa_module;
 

+#include <pulse/proplist.h>
+

 #include <pulsecore/core.h>
 #include <pulsecore/core.h>

-#include <pulsecore/modinfo.h>

 
 struct pa_module {
     pa_core *core;
 
 struct pa_module {
     pa_core *core;


@@ -41,32 +40,46 @@ struct pa_module {
 
     int (*init)(pa_module*m);
     void (*done)(pa_module*m);
 
     int (*init)(pa_module*m);
     void (*done)(pa_module*m);

+    int (*get_n_used)(pa_module *m);

 
     void *userdata;
 
 
     void *userdata;
 

-    int n_used;
-    int auto_unload;
-    time_t last_used_time;
+    pa_bool_t load_once:1;
+    pa_bool_t unload_requested:1;

 
 

-    int unload_requested;
+    pa_proplist *proplist;

 };
 
 pa_module* pa_module_load(pa_core *c, const char *name, const char*argument);
 };
 
 pa_module* pa_module_load(pa_core *c, const char *name, const char*argument);

-void pa_module_unload(pa_core *c, pa_module *m);
-void pa_module_unload_by_index(pa_core *c, uint32_t idx);
+
+void pa_module_unload(pa_core *c, pa_module *m, pa_bool_t force);
+void pa_module_unload_by_index(pa_core *c, uint32_t idx, pa_bool_t force);
+
+void pa_module_unload_request(pa_module *m, pa_bool_t force);
+void pa_module_unload_request_by_index(pa_core *c, uint32_t idx, pa_bool_t force);

 
 void pa_module_unload_all(pa_core *c);
 
 void pa_module_unload_all(pa_core *c);

-void pa_module_unload_unused(pa_core *c);

 
 

-void pa_module_unload_request(pa_module *m);
+int pa_module_get_n_used(pa_module*m);
+
+#define PA_MODULE_AUTHOR(s)                                     \
+    const char *pa__get_author(void) { return s; }              \
+    struct __stupid_useless_struct_to_allow_trailing_semicolon
+
+#define PA_MODULE_DESCRIPTION(s)                                \
+    const char *pa__get_description(void) { return s; }         \
+    struct __stupid_useless_struct_to_allow_trailing_semicolon

 
 

-void pa_module_set_used(pa_module*m, int used);
+#define PA_MODULE_USAGE(s)                                      \
+    const char *pa__get_usage(void) { return s; }               \
+    struct __stupid_useless_struct_to_allow_trailing_semicolon

 
 

-#define PA_MODULE_AUTHOR(s) const char *pa__get_author(void) { return s; }
-#define PA_MODULE_DESCRIPTION(s) const char *pa__get_description(void) { return s; }
-#define PA_MODULE_USAGE(s) const char *pa__get_usage(void) { return s; }
-#define PA_MODULE_VERSION(s) const char * pa__get_version(void) { return s; }
+#define PA_MODULE_VERSION(s)                                    \
+    const char * pa__get_version(void) { return s; }            \
+    struct __stupid_useless_struct_to_allow_trailing_semicolon

 
 

-pa_modinfo *pa_module_get_info(pa_module *m);
+#define PA_MODULE_LOAD_ONCE(b)                                  \
+    pa_bool_t pa__load_once(void) { return b; }                 \
+    struct __stupid_useless_struct_to_allow_trailing_semicolon

 
 #endif
 
 #endif