-/* $Id$ */
-
/***
This file is part of PulseAudio.
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
#endif
#include <pulse/xmalloc.h>
+#include <pulse/i18n.h>
#include <pulsecore/core.h>
-#include <pulsecore/sink-input.h>
+#include <pulsecore/sink.h>
#include <pulsecore/modargs.h>
#include <pulsecore/log.h>
-#include <pulsecore/namereg.h>
#include <pulsecore/core-util.h>
#include "module-always-sink-symdef.h"
PA_MODULE_AUTHOR("Colin Guthrie");
-PA_MODULE_DESCRIPTION("Always keeps at least one sink loaded even if it's a null one");
+PA_MODULE_DESCRIPTION(_("Always keeps at least one sink loaded even if it's a null one"));
PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(TRUE);
PA_MODULE_USAGE(
struct userdata {
pa_hook_slot *put_slot, *unlink_slot;
- pa_module* null_module;
+ uint32_t null_module;
pa_bool_t ignore;
char *sink_name;
};
pa_sink *target;
uint32_t idx;
char *t;
+ pa_module *m;
pa_assert(c);
pa_assert(u);
- pa_assert(!u->null_module);
+ pa_assert(u->null_module == PA_INVALID_INDEX);
/* Loop through all sinks and check to see if we have *any*
* sinks. Ignore the sink passed in (if it's not null) */
u->ignore = TRUE;
- t = pa_sprintf_malloc("sink_name=%s", u->sink_name);
- u->null_module = pa_module_load(c, "module-null-sink", t);
+ t = pa_sprintf_malloc("sink_name=%s sink_properties='device.description=\"%s\"'", u->sink_name,
+ _("Dummy Output"));
+ m = pa_module_load(c, "module-null-sink", t);
+ u->null_module = m ? m->index : PA_INVALID_INDEX;
pa_xfree(t);
u->ignore = FALSE;
- if (!u->null_module)
+ if (!m)
pa_log_warn("Unable to load module-null-sink");
}
if (u->ignore)
return PA_HOOK_OK;
+ /* There's no point in doing anything if the core is shut down anyway */
+ if (c->state == PA_CORE_SHUTDOWN)
+ return PA_HOOK_OK;
+
/* Auto-loaded null-sink not active, so ignoring newly detected sink. */
- if (!u->null_module)
+ if (u->null_module == PA_INVALID_INDEX)
return PA_HOOK_OK;
/* This is us detecting ourselves on load in a different way... just ignore this too. */
- if (sink->module == u->null_module)
+ if (sink->module && sink->module->index == u->null_module)
return PA_HOOK_OK;
pa_log_info("A new sink has been discovered. Unloading null-sink.");
- pa_module_unload_request(u->null_module);
- u->null_module = NULL;
+ pa_module_unload_request_by_index(c, u->null_module, TRUE);
+ u->null_module = PA_INVALID_INDEX;
return PA_HOOK_OK;
}
pa_assert(u);
/* First check to see if it's our own null-sink that's been removed... */
- if (u->null_module && sink->module == u->null_module) {
+ if (u->null_module != PA_INVALID_INDEX && sink->module && sink->module->index == u->null_module) {
pa_log_debug("Autoloaded null-sink removed");
- u->null_module = NULL;
+ u->null_module = PA_INVALID_INDEX;
return PA_HOOK_OK;
}
+ /* There's no point in doing anything if the core is shut down anyway */
+ if (c->state == PA_CORE_SHUTDOWN)
+ return PA_HOOK_OK;
+
load_null_sink_if_needed(c, sink, u);
return PA_HOOK_OK;
u->sink_name = pa_xstrdup(pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME));
u->put_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_PUT], PA_HOOK_LATE, (pa_hook_cb_t) put_hook_callback, u);
u->unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_UNLINK], PA_HOOK_EARLY, (pa_hook_cb_t) unlink_hook_callback, u);
- u->null_module = NULL;
+ u->null_module = PA_INVALID_INDEX;
u->ignore = FALSE;
pa_modargs_free(ma);
pa_hook_slot_free(u->put_slot);
if (u->unlink_slot)
pa_hook_slot_free(u->unlink_slot);
- if (u->null_module)
- pa_module_unload_request(u->null_module);
+ if (u->null_module != PA_INVALID_INDEX && m->core->state != PA_CORE_SHUTDOWN)
+ pa_module_unload_request_by_index(m->core, u->null_module, TRUE);
pa_xfree(u->sink_name);
pa_xfree(u);