summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2019-08-30 11:30:43 -0400
committerScott Murray <scott.murray@konsulko.com>2019-08-30 15:24:23 +0000
commit217753bff6e40fbc8f6449f1b5e41f15ede2b89b (patch)
treeb04933f545106d9a6399acfaafa944857c3d6723
parent838d62ed32a6cd6d71c72a7b7b272d672bc7e674 (diff)
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 <scott.murray@konsulko.com> Change-Id: I2fb94d161499b759540105958bcb3d6f5da1884f
-rw-r--r--homescreen/qml/MediaAreaBlank.qml2
-rw-r--r--homescreen/src/mastervolume.cpp3
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);
}
}