From a9df3eb09a85d479f26a14cd71a41e1de087c1ef Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 30 Aug 2019 11:30:43 -0400 Subject: Fix master volume slider The switch to using agl-service-audiomixer missed a scaling to 0.0 - 1.0 for the value requested when changing the master volume slider, add that to fix it. Also, change the displayed name back to "Master Volume" to match what it now represents with PipeWire. Bug-AGL: SPEC-2788 Signed-off-by: Scott Murray Change-Id: I2fb94d161499b759540105958bcb3d6f5da1884f --- homescreen/qml/MediaAreaBlank.qml | 2 +- homescreen/src/mastervolume.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/homescreen/qml/MediaAreaBlank.qml b/homescreen/qml/MediaAreaBlank.qml index 347c26a..ebddb0c 100644 --- a/homescreen/qml/MediaAreaBlank.qml +++ b/homescreen/qml/MediaAreaBlank.qml @@ -87,7 +87,7 @@ Image { font.pixelSize: 36 anchors.horizontalCenter: parent.horizontalCenter color: "white" - text: qsTr("Active Volume") + text: qsTr("Master Volume") } RowLayout { diff --git a/homescreen/src/mastervolume.cpp b/homescreen/src/mastervolume.cpp index 5a6dc9a..98b884d 100644 --- a/homescreen/src/mastervolume.cpp +++ b/homescreen/src/mastervolume.cpp @@ -47,7 +47,8 @@ void MasterVolume::setVolume(qint32 volume) m_volume = volume; QJsonObject arg; arg.insert("control", "Master"); - arg.insert("value", volume); + double v = (double) volume / 100.0; + arg.insert("value", v); m_client.call("audiomixer", "volume", arg); } } -- cgit 1.2.3-korg