diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2019-08-30 11:30:43 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2019-08-30 15:24:23 +0000 |
| commit | 217753bff6e40fbc8f6449f1b5e41f15ede2b89b (patch) | |
| tree | b04933f545106d9a6399acfaafa944857c3d6723 | |
| parent | 838d62ed32a6cd6d71c72a7b7b272d672bc7e674 (diff) | |
Fix master volume sliderhalibut_8.0.3halibut_8.0.2halibut_8.0.1halibut/8.0.3halibut/8.0.2halibut/8.0.18.0.38.0.28.0.1
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.qml | 2 | ||||
| -rw-r--r-- | 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); } } |