git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@356
fefdeb5f-60dc-0310-8127-
8f9354f1896f
struct pa_memblock_stat *memblock_stat;
- int disallow_module_loading;
+ int disallow_module_loading, running_as_daemon;
int exit_idle_time, module_idle_time, scache_idle_time;
struct pa_time_event *quit_event;
c = pa_core_new(pa_mainloop_get_api(mainloop));
assert(c);
+ if (conf->daemonize)
+ c->running_as_daemon = 1;
pa_signal_new(SIGUSR1, signal_callback, c);
pa_signal_new(SIGUSR2, signal_callback, c);
struct pa_iochannel *io;
assert(c && m);
+ if (c->running_as_daemon) {
+ pa_log_info(__FILE__": Running as daemon so won't load this module.\n");
+ return 0;
+ }
+
if (m->argument) {
pa_log(__FILE__": module doesn't accept arguments.\n");
return -1;
void pa__done(struct pa_core *c, struct pa_module*m) {
assert(c && m);
- pa_cli_free(m->userdata);
- pa_stdio_release();
+ if (c->running_as_daemon == 0) {
+ pa_cli_free(m->userdata);
+ pa_stdio_release();
+ }
}