summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-08-13 17:34:36 +0000
committerLennart Poettering <lennart@poettering.net>2006-08-13 17:34:36 +0000
commitdd8706115378193c8f8889526c108a2b49653619 (patch)
treee2e2f99950e14e66e3c0df25a8c5142bc35fb58e /src
parent818083289882e8739bbfaefd1edb252ed5629771 (diff)
implement new module "module-rescue-streams" which moves sink inputs away when their sink is removed.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1244 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am10
-rw-r--r--src/modules/module-rescue-streams.c98
2 files changed, 107 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 3cf3168c..0ab0436b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -812,7 +812,8 @@ modlibexec_LTLIBRARIES += \
module-esound-sink.la \
module-http-protocol-tcp.la \
module-detect.la \
- module-volume-restore.la
+ module-volume-restore.la \
+ module-rescue-streams.la
# See comment at librtp.la above
if !OS_IS_WIN32
@@ -955,6 +956,7 @@ SYMDEF_FILES = \
modules/module-jack-sink-symdef.h \
modules/module-jack-source-symdef.h \
modules/module-volume-restore-symdef.h \
+ modules/module-rescue-streams-symdef.h \
modules/module-hal-detect-symdef.h \
modules/gconf/module-gconf-symdef.h
@@ -1173,6 +1175,12 @@ module_volume_restore_la_LDFLAGS = -module -avoid-version
module_volume_restore_la_LIBADD = $(AM_LIBADD) libpulsecore.la
module_volume_restore_la_CFLAGS = $(AM_CFLAGS)
+# Rescue streams module
+module_rescue_streams_la_SOURCES = modules/module-rescue-streams.c
+module_rescue_streams_la_LDFLAGS = -module -avoid-version
+module_rescue_streams_la_LIBADD = $(AM_LIBADD) libpulsecore.la
+module_rescue_streams_la_CFLAGS = $(AM_CFLAGS)
+
# RTP modules
module_rtp_send_la_SOURCES = modules/rtp/module-rtp-send.c
module_rtp_send_la_LDFLAGS = -module -avoid-version
diff --git a/src/modules/module-rescue-streams.c b/src/modules/module-rescue-streams.c
new file mode 100644
index 00000000..0e3946b1
--- /dev/null
+++ b/src/modules/module-rescue-streams.c
@@ -0,0 +1,98 @@
+/* $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,
+ or (at your option) any later version.
+
+ PulseAudio 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 Lesser General Public License
+ along with PulseAudio; 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 <pulse/xmalloc.h>
+
+#include <pulsecore/core.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
+#include <pulsecore/namereg.h>
+
+#include "module-rescue-streams-symdef.h"
+
+PA_MODULE_AUTHOR("Lennart Poettering")
+PA_MODULE_DESCRIPTION("When a sink/source is removed, try to move their streams to the default sink/source")
+PA_MODULE_VERSION(PACKAGE_VERSION)
+
+static const char* const valid_modargs[] = {
+ NULL,
+};
+
+static pa_hook_result_t hook_callback(pa_core *c, pa_sink *sink, void* userdata) {
+ pa_sink_input *i;
+ pa_sink *target;
+
+ assert(c);
+ assert(sink);
+
+ if (!pa_idxset_size(sink->inputs)) {
+ pa_log_debug(__FILE__": No sink inputs to move away.");
+ return PA_HOOK_OK;
+ }
+
+ if (!(target = pa_namereg_get(c, NULL, PA_NAMEREG_SINK, 0))) {
+ pa_log_info(__FILE__": No evacuation sink found.");
+ return PA_HOOK_OK;
+ }
+
+ assert(target != sink);
+
+ while ((i = pa_idxset_first(sink->inputs, NULL))) {
+ if (pa_sink_input_move_to(i, target, 1) < 0) {
+ pa_log_warn(__FILE__": Failed to move sink input %u \"%s\" to %s.", i->index, i->name, target->name);
+ return PA_HOOK_OK;
+ }
+
+ pa_log_info(__FILE__": Sucessfully moved sink input %u \"%s\" to %s.", i->index, i->name, target->name);
+ }
+
+
+ return PA_HOOK_OK;
+}
+
+int pa__init(pa_core *c, pa_module*m) {
+ pa_modargs *ma = NULL;
+
+ assert(c);
+ assert(m);
+
+ if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
+ pa_log(__FILE__": Failed to parse module arguments");
+ return -1;
+ }
+
+ m->userdata = pa_hook_connect(&c->hook_sink_disconnect, (pa_hook_cb_t) hook_callback, NULL);
+
+ pa_modargs_free(ma);
+ return 0;
+}
+
+void pa__done(pa_core *c, pa_module*m) {
+ assert(c);
+ assert(m);
+
+ if (m->userdata)
+ pa_hook_slot_free((pa_hook_slot*) m->userdata);
+}