From 75f8b2249cad94708ddb5bfff7361ea996d0c82b Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 16 Feb 2006 13:00:42 +0000
Subject: Update to the new polypaudio API.

git-svn-id: file:///home/lennart/svn/public/paman/trunk@47 cdefa82f-4ce1-0310-97f5-ab6066f37c3c
---
 src/SinkInputWindow.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/SinkInputWindow.cc')

diff --git a/src/SinkInputWindow.cc b/src/SinkInputWindow.cc
index 784cb90..09d5433 100644
--- a/src/SinkInputWindow.cc
+++ b/src/SinkInputWindow.cc
@@ -91,8 +91,9 @@ void SinkInputWindow::updateInfo(const SinkInputInfo &i) {
         clientLabel->set_text(client->name);
     }
 
-    percent = pa_volume_to_user(i.volume) * 100;
-    db = pa_volume_to_dB(i.volume);
+    percent = pa_sw_volume_to_linear(pa_cvolume_avg(&i.volume)) * 100;
+    /* FIXME: Hardware volume doesn't translate well to dB. */
+    db = pa_sw_volume_to_dB(pa_cvolume_avg(&i.volume));
     scaleEnabled = false;
     volumeScale->set_value(percent);
     scaleEnabled = true;
@@ -134,7 +135,7 @@ void SinkInputWindow::onToClientButton() {
 
 void SinkInputWindow::onVolumeScaleValueChanged() {
     if (scaleEnabled)
-        serverInfoManager->setSinkInputVolume(index, pa_volume_from_user(volumeScale->get_value()/100));
+        serverInfoManager->setSinkInputVolume(index, pa_sw_volume_from_linear(volumeScale->get_value()/100));
 }
 
 void SinkInputWindow::onVolumeResetButton() {
-- 
cgit