[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-test5-29-g0251078

[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  dfb3d2ec57f234d450076fdd9393a8e18dd57e45 (commit)

- Log -----------------------------------------------------------------
0251078 fix channel mapping for a52 devices. Closes #508
33a8f53 simply bluetooth nrec handling a bit
-----------------------------------------------------------------------

Summary of changes:
 src/modules/alsa/alsa-util.c                    |    6 +++---
 src/modules/bluetooth/module-bluetooth-device.c |    7 +------
 2 files changed, 4 insertions(+), 9 deletions(-)

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

commit 33a8f53ddfa9f3f9604d67130ea2cc66ea9202dc
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Mar 20 13:54:45 2009 +0100

    simply bluetooth nrec handling a bit

diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 8d066a9..3da69fc 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -77,8 +77,6 @@ PA_MODULE_USAGE(
 
 /* TODO: not close fd when entering suspend mode in a2dp */
 
-/* TODO: BT_PCM_FLAG_NREC */
-
 static const char* const valid_modargs[] = {
     "name",
     "card_name",
@@ -1500,10 +1498,7 @@ static int add_source(struct userdata *u) {
 /*     u->source->get_volume = source_get_volume_cb; */
 /*     u->source->set_volume = source_set_volume_cb; */
 
-    p = pa_proplist_new();
-    pa_proplist_sets(p, "bluetooth.nrec", pa_yes_no(u->hsp.pcm_capabilities.flags & BT_PCM_FLAG_NREC));
-    pa_proplist_update(u->source->proplist, PA_UPDATE_MERGE, p);
-    pa_proplist_free(p);
+    pa_proplist_sets(u->source->proplist, "bluetooth.nrec", (u->hsp.pcm_capabilities.flags & BT_PCM_FLAG_NREC) ? "1" : "0");
 
     return 0;
 }

commit 025107876c9ae9032bc9d87c19798ae154f54615
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Mar 20 14:15:18 2009 +0100

    fix channel mapping for a52 devices. Closes #508

diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
index 454cfd4..3f26aeb 100644
--- a/src/modules/alsa/alsa-util.c
+++ b/src/modules/alsa/alsa-util.c
@@ -587,9 +587,9 @@ static const struct pa_alsa_profile_info device_table[] = {
      "analog-surround-51",
      8 },
 
-    {{ 6, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_CENTER,
-            PA_CHANNEL_POSITION_FRONT_RIGHT, PA_CHANNEL_POSITION_REAR_LEFT,
-            PA_CHANNEL_POSITION_REAR_RIGHT, PA_CHANNEL_POSITION_LFE}},
+    {{ 6, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
+            PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
+            PA_CHANNEL_POSITION_FRONT_CENTER, PA_CHANNEL_POSITION_LFE}},
      "a52",
      N_("Digital Surround 5.1 (IEC958/AC3)"),
      "iec958-ac3-surround-51",

-- 
hooks/post-receive
PulseAudio Sound Server