summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
d009b2e)
Volume sliders are now binded to the High Level 4a API.
Change-Id: I46c4d80a19cf2a9047a502d9faa8bec6f7bd173e
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
import Mixer 1.0
ApplicationWindow {
import Mixer 1.0
ApplicationWindow {
+ // ----- Signals
+
+ // ----- Properties
property Component volumeSlider
property Component volumeSlider
+ // ----- Signals
+ signal sliderVolumeChanged(string role, int value)
+
+ // ----- Properties
+
+ // ----- Setup
+
+ onSliderVolumeChanged: {
+ console.log("======role: " + role + ", volume: " + value);
+ mixer.setVolume(role, value);
+ }
+
Component.onCompleted: {
root.volumeSlider = Qt.createComponent("VolumeSlider.qml");
if (root.VolumeSlider.status !== Component.Ready) {
Component.onCompleted: {
root.volumeSlider = Qt.createComponent("VolumeSlider.qml");
if (root.VolumeSlider.status !== Component.Ready) {
}
mixer.open(bindingAddress);
}
}
mixer.open(bindingAddress);
}
onRolesChanged: {
// Remove existing sliders
for(var i = sliders.children.length; i > 0 ; --i) {
onRolesChanged: {
// Remove existing sliders
for(var i = sliders.children.length; i > 0 ; --i) {
+ console.log("onVolumeChanged(\"" + name + "\", " + value + ")");
for(var i = 0; i < sliders.children.length ; i++) {
for(var i = 0; i < sliders.children.length ; i++) {
- console.log("Slider found: " + i);
- //if (sliders[i].role === name) {
- // sliders[i].value = value;
- //}
+ var sld = sliders.children[i];
+ console.log(i + " - Slider found:" + sld + "[\"" + sld.role + "\"] = " + sld.value);
+ if (sld.role === name) {
+ sld.value = value;
+ }
function addSlider(name) {
function addSlider(name) {
- var sld = root.volumeSlider.createObject(sliders);
- sld.role = name;
+ var sld = root.volumeSlider.createObject(sliders)
+ sld.role = name
+ sld.onSliderValueChanged.connect(mixer.sliderVolumeChanged)
mixer.getVolume(name); // Update volume
}
mixer.getVolume(name); // Update volume
}
RowLayout {
property int value
property string role
RowLayout {
property int value
property string role
+ signal sliderValueChanged(string role, int value)
onRoleChanged: sliderName.text = role
onValueChanged: {
onRoleChanged: sliderName.text = role
onValueChanged: {
sliderControl.value = value;
}
sliderControl.value = value;
}
- //id: slider_" + name + "
Layout.minimumHeight: 75
Label {
id: sliderName
Layout.minimumHeight: 75
Label {
id: sliderName
}
Label {
id: sliderValue
}
Label {
id: sliderValue
- //id: slider_" + name + "_textvalue
font.pixelSize: 24
text: "0 %"
}
Slider {
id: sliderControl
font.pixelSize: 24
text: "0 %"
}
Slider {
id: sliderControl
- //id: slider_" + name + "_slider
Layout.fillWidth: true
from: 0
to: 100
stepSize: 1
snapMode: Slider.SnapOnRelease
onValueChanged: {
Layout.fillWidth: true
from: 0
to: 100
stepSize: 1
snapMode: Slider.SnapOnRelease
onValueChanged: {
- //slider_" + name + "_textvalue.text = value + \" %\"
- //mixer.setVolume(\"" + name + "\", value)
+ sliderValue.text = value + " %";
+ sliderValueChanged(role, value);
- //Component.onCompleted: {
- //mixer.getVolume(\"" + name + "\")
- //}
if (r && v.isObject())
{
// TODO: Success, update the slider
if (r && v.isObject())
{
// TODO: Success, update the slider
- int newVolume = v.toObject()["response"].toObject()["volnew"].toInt();
+ qDebug() << "Volume changed: " << v;
+ int newVolume = v.toObject()["response"].toObject()["response"].toObject()["volnew"].toInt();
auto currentVolume = volumes_.find(name);
if (currentVolume != volumes_.end() && *currentVolume == newVolume)
return;
auto currentVolume = volumes_.find(name);
if (currentVolume != volumes_.end() && *currentVolume == newVolume)
return;