update ovr to 1.8.19, audio key update (#314)
* added get/setters for override keys * adjusted QML for new overrides and proper initialized * replaced work-around key with proper key * removed workaround from header * updated OVR to 1.8.19 * changed other new audio variables * temporarily disabled audio profiles as required api keys are questionable use-ability atm
This commit is contained in:
@@ -14,7 +14,6 @@ MyStackViewPage {
|
||||
|
||||
content: ColumnLayout {
|
||||
spacing: 24
|
||||
|
||||
AudioDeviceSelector {
|
||||
}
|
||||
|
||||
|
||||
@@ -12,13 +12,24 @@ RowLayout {
|
||||
property alias deviceIndex: selector.currentIndex
|
||||
MyText {
|
||||
text: deviceText
|
||||
Layout.preferredWidth: 260
|
||||
Layout.preferredWidth: 200
|
||||
}
|
||||
|
||||
MyToggleButton {
|
||||
id: playbackOverrideToggle
|
||||
Layout.preferredWidth: 250
|
||||
text: "Toggle Override"
|
||||
onClicked: {
|
||||
AudioTabController.setPlaybackOverride(this.checked, false)
|
||||
}
|
||||
onCheckedChanged: {
|
||||
selector.enabled = this.checked
|
||||
}
|
||||
}
|
||||
|
||||
MyComboBox {
|
||||
id: selector
|
||||
Layout.maximumWidth: 850
|
||||
Layout.minimumWidth: 850
|
||||
Layout.preferredWidth: 850
|
||||
Layout.fillWidth: true
|
||||
onActivated: {
|
||||
if (deviceIndex >= 0) {
|
||||
AudioTabController.setPlaybackDeviceIndex(deviceIndex)
|
||||
@@ -28,6 +39,7 @@ RowLayout {
|
||||
Component.onCompleted: {
|
||||
audioPlaybackNameCombo.devices = getAudioDeviceList()
|
||||
setShownAudioDevice(AudioTabController.playbackDeviceIndex)
|
||||
playbackOverrideToggle.checked = AudioTabController.playbackOverride
|
||||
}
|
||||
|
||||
Connections {
|
||||
@@ -39,6 +51,9 @@ RowLayout {
|
||||
audioPlaybackNameCombo.devices = getAudioDeviceList()
|
||||
setShownAudioDevice(AudioTabController.playbackDeviceIndex)
|
||||
}
|
||||
onPlaybackOverrideChanged: {
|
||||
playbackOverrideToggle.value = AudioTabController.playbackOverride
|
||||
}
|
||||
}
|
||||
function getAudioDeviceList() {
|
||||
var devices = []
|
||||
|
||||
@@ -15,13 +15,22 @@ RowLayout {
|
||||
property alias deviceIndex: selector.currentIndex
|
||||
MyText {
|
||||
text: deviceText
|
||||
Layout.preferredWidth: 260
|
||||
Layout.preferredWidth: 200
|
||||
}
|
||||
MyToggleButton {
|
||||
id: recordingOverrideToggle
|
||||
Layout.preferredWidth: 250
|
||||
text: "Toggle Override"
|
||||
onClicked: {
|
||||
AudioTabController.setRecordingOverride(this.checked, false)
|
||||
}
|
||||
onCheckedChanged: {
|
||||
selector.enabled = this.checked
|
||||
}
|
||||
}
|
||||
MyComboBox {
|
||||
id: selector
|
||||
Layout.maximumWidth: 850
|
||||
Layout.minimumWidth: 850
|
||||
Layout.preferredWidth: 850
|
||||
Layout.fillWidth: true
|
||||
onActivated: {
|
||||
if (deviceIndex >= 0) {
|
||||
AudioTabController.setMicDeviceIndex(currentIndex)
|
||||
@@ -50,6 +59,7 @@ RowLayout {
|
||||
Component.onCompleted: {
|
||||
devices = getAudioDeviceList()
|
||||
setShownAudioDevice(AudioTabController.micDeviceIndex)
|
||||
recordingOverrideToggle.checked = AudioTabController.recordingOverride
|
||||
}
|
||||
Connections {
|
||||
target: AudioTabController
|
||||
@@ -60,5 +70,8 @@ RowLayout {
|
||||
devices = getAudioDeviceList()
|
||||
setShownAudioDevice(AudioTabController.micDeviceIndex)
|
||||
}
|
||||
onRecordingOverrideChanged: {
|
||||
recordingOverrideToggle.value = AudioTabController.recordingOverride
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,12 +58,6 @@ MyDialogOkCancelPopup {
|
||||
}
|
||||
}
|
||||
}
|
||||
Connections {
|
||||
target: AudioTabController
|
||||
onAudioProfileDefaultChanged: {
|
||||
defaultProfileToggle = AudioTabController.audioProfileDefault
|
||||
}
|
||||
}
|
||||
|
||||
function openPopup() {
|
||||
audioNewProfileName.text = ""
|
||||
|
||||
@@ -5,6 +5,7 @@ import ovras.advsettings 1.0
|
||||
import "../../common"
|
||||
import "../dialog_boxes"
|
||||
|
||||
//Audio Profiles temporarily disabled.
|
||||
ColumnLayout {
|
||||
AudioMessageDialog {
|
||||
id: audioMessageDialog
|
||||
@@ -30,6 +31,7 @@ ColumnLayout {
|
||||
id: audioProfileComboBox
|
||||
Layout.preferredWidth: 250
|
||||
model: [""]
|
||||
enabled: false
|
||||
onCurrentIndexChanged: {
|
||||
if (currentIndex > 0) {
|
||||
audioApplyProfileButton.enabled = true
|
||||
@@ -43,7 +45,7 @@ ColumnLayout {
|
||||
|
||||
MyPushButton {
|
||||
id: audioApplyProfileButton
|
||||
enabled: true
|
||||
enabled: false
|
||||
Layout.preferredWidth: 150
|
||||
text: "Apply"
|
||||
onClicked: {
|
||||
@@ -63,7 +65,7 @@ ColumnLayout {
|
||||
|
||||
MyPushButton {
|
||||
id: audioDeleteProfileButton
|
||||
enabled: true
|
||||
enabled: false
|
||||
Layout.preferredWidth: 200
|
||||
text: "Delete Profile"
|
||||
onClicked: {
|
||||
@@ -74,6 +76,7 @@ ColumnLayout {
|
||||
}
|
||||
}
|
||||
MyPushButton {
|
||||
enabled: false
|
||||
Layout.preferredWidth: 200
|
||||
text: "New Profile"
|
||||
onClicked: {
|
||||
@@ -86,7 +89,7 @@ ColumnLayout {
|
||||
}
|
||||
}
|
||||
Component.onCompleted: {
|
||||
reloadAudioProfiles()
|
||||
//reloadAudioProfiles()
|
||||
}
|
||||
Connections {
|
||||
target: AudioTabController
|
||||
|
||||
Reference in New Issue
Block a user