[pulseaudio-commits] r1244 - in /trunk/src: Makefile.am modules/module-rescue-streams.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Sun Aug 13 19:34:36 2006
New Revision: 1244

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1244&root=pulseaudio&view=rev
Log:
implement new module "module-rescue-streams" which moves sink inputs away when their sink is removed.

Added:
    trunk/src/modules/module-rescue-streams.c   (with props)
Modified:
    trunk/src/Makefile.am

Modified: trunk/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/Makefile.am?rev=1244&root=pulseaudio&r1=1243&r2=1244&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Sun Aug 13 19:34:36 2006
@@ -812,7 +812,8 @@
 		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 @@
 		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
 
@@ -1172,6 +1174,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

Added: trunk/src/modules/module-rescue-streams.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-rescue-streams.c?rev=1244&root=pulseaudio&view=auto
==============================================================================
--- trunk/src/modules/module-rescue-streams.c (added)
+++ trunk/src/modules/module-rescue-streams.c Sun Aug 13 19:34:36 2006
@@ -1,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);
+}

Propchange: trunk/src/modules/module-rescue-streams.c
------------------------------------------------------------------------------
    svn:keywords = Id