Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 09:29:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10737 from vladest/fix_audio_qt59

Browse source 
Fix audio qt59
This commit is contained in:
druiz17 2017-06-20 09:41:58 -07:00 committed by GitHub
commit a5913af9b4
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/resources/qml/hifi/audio/Audio.qml
View file

@ -18,7 +18,7 @@ import QtQuick.Layouts 1.3
import "../../styles-uit" import "../../styles-uit"
import "../../controls-uit" as HifiControls import "../../controls-uit" as HifiControls
import "../../windows" import "../../windows"
import "./" as Audio import "./" as AudioControls
Rectangle { Rectangle {
id: root; id: root;
@ -57,7 +57,7 @@ Rectangle {
x: 16; // padding does not work x: 16; // padding does not work
spacing: 16; spacing: 16;
Audio.CheckBox { AudioControls.CheckBox {
text: qsTr("Mute microphone"); text: qsTr("Mute microphone");
checked: Audio.muted; checked: Audio.muted;
onClicked: { onClicked: {
@ -65,7 +65,7 @@ Rectangle {
checked = Qt.binding(function() { return Audio.muted; }); // restore binding checked = Qt.binding(function() { return Audio.muted; }); // restore binding
} }
} }
Audio.CheckBox { AudioControls.CheckBox {
text: qsTr("Enable noise reduction"); text: qsTr("Enable noise reduction");
checked: Audio.noiseReduction; checked: Audio.noiseReduction;
onClicked: { onClicked: {
@ -73,7 +73,7 @@ Rectangle {
checked = Qt.binding(function() { return Audio.noiseReduction; }); // restore binding checked = Qt.binding(function() { return Audio.noiseReduction; }); // restore binding
} }
} }
Audio.CheckBox { AudioControls.CheckBox {
text: qsTr("Show audio level meter"); text: qsTr("Show audio level meter");
checked: AvatarInputs.showAudioTools; checked: AvatarInputs.showAudioTools;
onClicked: { onClicked: {
@ -110,7 +110,7 @@ Rectangle {
delegate: Item { delegate: Item {
width: parent.width; width: parent.width;
height: 36; height: 36;
Audio.CheckBox { AudioControls.CheckBox {
text: display; text: display;
checked: selected; checked: selected;
onClicked: { onClicked: {
@ -148,7 +148,7 @@ Rectangle {
delegate: Item { delegate: Item {
width: parent.width; width: parent.width;
height: 36; height: 36;
Audio.CheckBox { AudioControls.CheckBox {
text: display; text: display;
checked: selected; checked: selected;
onClicked: { onClicked: {