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

Initial implementation (deadlocks still occurring in Audio.cpp)

Browse source
This commit is contained in:
r3tk0n 2019-03-05 17:09:54 -08:00 committed by Wayne Chen
parent 3b274c2b6e
commit 88a125aff0
4 changed files with 71 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -152,6 +152,25 @@ Rectangle {
checked = Qt.binding(function() { return AudioScriptingInterface.noiseReduction; }); // restore binding
}
}
AudioControls.CheckBox {
spacing: muteMic.spacing
text: qsTr("Push To Talk");
checked: isVR ? AudioScriptingInterface.pushToTalkHMD : AudioScriptingInterface.pushToTalkDesktop;
onClicked: {
if (isVR) {
AudioScriptingInterface.pushToTalkHMD = checked;
} else {
AudioScriptingInterface.pushToTalkDesktop = checked;
}
checked = Qt.binding(function() {
if (isVR) {
return AudioScriptingInterface.pushToTalkHMD;
} else {
return AudioScriptingInterface.pushToTalkDesktop;
}
}); // restore binding
}
}
AudioControls.CheckBox {
spacing: muteMic.spacing
text: qsTr("Show audio level meter");

2
interface/resources/qml/hifi/audio/MicBar.qml
View file

@ -138,7 +138,7 @@ Rectangle {
Item {
id: status;
readonly property string color: AudioScriptingInterface.muted ? colors.muted : colors.unmuted;
readonly property string color: (AudioScriptingInterface.pushingToTalk && AudioScriptingInterface.muted) ? hifi.colors.blueHighlight : AudioScriptingInterface.muted ? colors.muted : colors.unmuted;
visible: (AudioScriptingInterface.pushToTalk && !AudioScriptingInterface.pushingToTalk) || AudioScriptingInterface.muted;

20
interface/src/scripting/Audio.cpp
View file

@ -231,6 +231,26 @@ void Audio::loadData() {
_pttHMD = _pttHMDSetting.get();
}
bool Audio::getPTTHMD() const {
return resultWithReadLock<bool>([&] {
return _pttHMD;
});
}
void Audio::saveData() {
_desktopMutedSetting.set(getMutedDesktop());
_hmdMutedSetting.set(getMutedHMD());
_pttDesktopSetting.set(getPTTDesktop());
_pttHMDSetting.set(getPTTHMD());
}
void Audio::loadData() {
_desktopMuted = _desktopMutedSetting.get();
_hmdMuted = _hmdMutedSetting.get();
_pttDesktop = _pttDesktopSetting.get();
_pttHMD = _pttHMDSetting.get();
}
bool Audio::noiseReductionEnabled() const {
return resultWithReadLock<bool>([&] {
return _enableNoiseReduction;