[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. 11e55fe01fcf85f9954577795b0517eac8373390

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  c2fa11e179eb65b09eb1a7629f01d97fe44273aa (commit)

- Log -----------------------------------------------------------------
11e55fe... add new remix= parameter to remap sink
fd5a1b1... remove trailing spaces
-----------------------------------------------------------------------

Summary of changes:
 acinclude.m4                    |   14 +++++++-------
 src/modules/module-remap-sink.c |   14 +++++++++++---
 2 files changed, 18 insertions(+), 10 deletions(-)

-----------------------------------------------------------------------

commit fd5a1b1722fd4200065b26f5548464637da74911
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 18 23:56:48 2008 +0200

    remove trailing spaces

diff --git a/acinclude.m4 b/acinclude.m4
index 723eb87..02c0518 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -45,7 +45,7 @@ dnl @category InstalledPackages
 dnl @author Steven G. Johnson <stevenj at alum.mit.edu>
 dnl @version 2006-05-29
 dnl @license GPLWithACException
-dnl 
+dnl
 dnl Checks for GCC shared/pthread inconsistency based on work by
 dnl Marcin Owsiany <marcin at owsiany.pl>
 
@@ -230,7 +230,7 @@ if test "x$acx_pthread_ok" = xyes; then
    # architectures and systems. The problem is that in certain
    # configurations, when -shared is specified, GCC "forgets" to
    # internally use various flags which are still necessary.
-   
+
    AC_MSG_CHECKING([whether to check for GCC pthread/shared inconsistencies])
    check_inconsistencies=yes
    case "${host_cpu}-${host_os}" in
@@ -270,13 +270,13 @@ if test "x$acx_pthread_ok" = xyes; then
          pthread_attr_init(0); pthread_cleanup_push(0, 0);
          pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
          [ok=yes])
-      
+
       if test "x$ok" = xyes; then
          AC_MSG_RESULT([yes])
       else
          AC_MSG_RESULT([no])
       fi
-   
+
       #
       # Linux gcc on some architectures such as mips/mipsel forgets
       # about -lpthread
@@ -289,7 +289,7 @@ if test "x$acx_pthread_ok" = xyes; then
             pthread_attr_init(0); pthread_cleanup_push(0, 0);
             pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
             [ok=yes])
-   
+
          if test "x$ok" = xyes; then
             AC_MSG_RESULT([yes])
             PTHREAD_LIBS="-lpthread $PTHREAD_LIBS"
@@ -308,7 +308,7 @@ if test "x$acx_pthread_ok" = xyes; then
               pthread_attr_init(0); pthread_cleanup_push(0, 0);
               pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
              [ok=yes])
-   
+
          if test "x$ok" = xyes; then
             AC_MSG_RESULT([yes])
             PTHREAD_LIBS="-lc_r $PTHREAD_LIBS"
@@ -371,7 +371,7 @@ AC_LANG_PROGRAM(
 #include <syslog.h>
 int allow_severity = LOG_INFO;
 int deny_severity = LOG_WARNING;],
-[struct request_info *req; 
+[struct request_info *req;
 return hosts_access (req);]),
 [AC_DEFINE(HAVE_LIBWRAP, [], [Have tcpwrap?])
 LIBWRAP_LIBS="-lwrap"

commit 11e55fe01fcf85f9954577795b0517eac8373390
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 19 19:23:14 2008 +0200

    add new remix= parameter to remap sink

diff --git a/src/modules/module-remap-sink.c b/src/modules/module-remap-sink.c
index 7cb516d..b9e7301 100644
--- a/src/modules/module-remap-sink.c
+++ b/src/modules/module-remap-sink.c
@@ -49,7 +49,8 @@ PA_MODULE_USAGE(
         "format=<sample format> "
         "channels=<number of channels> "
         "rate=<sample rate> "
-        "channel_map=<channel map>");
+        "channel_map=<channel map> "
+        "remix=<remix channels?>");
 
 struct userdata {
     pa_core *core;
@@ -67,6 +68,7 @@ static const char* const valid_modargs[] = {
     "format",
     "channels",
     "channel_map",
+    "remix",
     NULL
 };
 
@@ -258,6 +260,7 @@ int pa__init(pa_module*m) {
     pa_sink *master;
     pa_sink_input_new_data sink_input_data;
     pa_sink_new_data sink_data;
+    pa_bool_t remix = TRUE;
 
     pa_assert(m);
 
@@ -280,7 +283,7 @@ int pa__init(pa_module*m) {
 
     stream_map = sink_map;
     if (pa_modargs_get_channel_map(ma, "master_channel_map", &stream_map) < 0) {
-        pa_log("Invalid master hannel map");
+        pa_log("Invalid master channel map");
         goto fail;
     }
 
@@ -292,6 +295,11 @@ int pa__init(pa_module*m) {
     if (pa_channel_map_equal(&stream_map, &master->channel_map))
         pa_log_warn("No remapping configured, proceeding nonetheless!");
 
+    if (pa_modargs_get_value_boolean(ma, "remix", &remix) < 0) {
+        pa_log("Invalid boolean remix parameter");
+        goto fail;
+    }
+
     u = pa_xnew0(struct userdata, 1);
     u->core = m->core;
     u->module = m;
@@ -340,7 +348,7 @@ int pa__init(pa_module*m) {
     pa_sink_input_new_data_set_sample_spec(&sink_input_data, &ss);
     pa_sink_input_new_data_set_channel_map(&sink_input_data, &stream_map);
 
-    u->sink_input = pa_sink_input_new(m->core, &sink_input_data, PA_SINK_INPUT_DONT_MOVE);
+    u->sink_input = pa_sink_input_new(m->core, &sink_input_data, PA_SINK_INPUT_DONT_MOVE | (remix ? PA_SINK_INPUT_NO_REMIX : 0));
     pa_sink_input_new_data_done(&sink_input_data);
 
     if (!u->sink_input)

-- 
hooks/post-receive
PulseAudio Sound Server