[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.13-423-gdaf0612

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

- Log -----------------------------------------------------------------
daf0612... make things compile again
-----------------------------------------------------------------------

Summary of changes:
 src/modules/bluetooth/module-bluetooth-device.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

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

commit daf0612e372f66d70bc40655e637c00675e1b4c1
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jan 28 04:49:07 2009 +0100

    make things compile again

diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index e2f6d01..11ed7d3 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -851,15 +851,14 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *msg, void *
 
             if (pa_streq(value, "SpeakerGain")) {
                 pa_log("spk gain: %d", gain);
-                pa_cvolume_set(&u->sink->volume, 1, (pa_volume_t) (gain * PA_VOLUME_NORM / 15));
-                u->sink->virtual_volume = u->sink->volume;
+                pa_cvolume_set(&u->sink->virtual_volume, 1, (pa_volume_t) (gain * PA_VOLUME_NORM / 15));
                 pa_subscription_post(u->sink->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, u->sink->index);
             } else {
                 pa_log("mic gain: %d", gain);
                 if (!u->source)
                     goto done;
 
-                pa_cvolume_set(&u->source->volume, 1, (pa_volume_t) (gain * PA_VOLUME_NORM / 15));
+                pa_cvolume_set(&u->source->virtual_volume, 1, (pa_volume_t) (gain * PA_VOLUME_NORM / 15));
                 pa_subscription_post(u->source->core, PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIPTION_EVENT_CHANGE, u->source->index);
             }
         }
@@ -899,7 +898,7 @@ static int sink_set_volume_cb(pa_sink *s) {
 
     dbus_error_init(&e);
 
-    vol = ((float)pa_cvolume_max(&s->volume) / PA_VOLUME_NORM) * 15;
+    vol = ((float) pa_cvolume_max(&s->virtual_volume) / PA_VOLUME_NORM) * 15;
     pa_log_debug("set headset volume: %d", vol);
 
     pa_assert_se(m = dbus_message_new_method_call("org.bluez", u->path, "org.bluez.Headset", "SetProperty"));
@@ -927,7 +926,7 @@ static int source_set_volume_cb(pa_source *s) {
     struct userdata *u = s->userdata;
     pa_assert(u);
 
-    vol = ((float)pa_cvolume_max(&s->volume) / PA_VOLUME_NORM) * 15;
+    vol = ((float)pa_cvolume_max(&s->virtual_volume) / PA_VOLUME_NORM) * 15;
 
     pa_log_debug("set headset mic volume: %d (not implemented yet)", vol);
 

-- 
hooks/post-receive
PulseAudio Sound Server