Fixes Various Audio Bugs (#198)
* perf graph overlay/checkbox added * added toggle Chaperone action * toggle chaperone non-functional * fixed chaperone toggle action const to once * Added Proximity Sensor Action back-end, not implemented via logic Until fixed by valve * added default WMR controller profile * formated * formated steamvrtabcontroller.h * fixed un-intended change * fixed audio profile Bug w/ changed devices * fixed name being used as param instead of ID * fixed loop logic in saveAudioProfile * audio profile fix WIP defaults OVR integration * fixed profile Saves, delete logic and mirror logic needed * fixed QML format, added TODO message * Fixed Audio Profile Behavior * fixed qml reference error * audiodeviceselector changed qml * Removed some comments * changed Visibility slider Minimum to 30% (steamVR minimum allowed) * fixed mirror/playback same issue * fixed Audio device refresh bug, removed currently un-used proximity logic (commented out) * removed dead code
This commit is contained in:
@@ -247,13 +247,13 @@ MyStackViewPage {
|
|||||||
|
|
||||||
MySlider {
|
MySlider {
|
||||||
id: chaperoneVisibilitySlider
|
id: chaperoneVisibilitySlider
|
||||||
from: 0.5
|
from: 0.3
|
||||||
to: 1.0
|
to: 1.0
|
||||||
stepSize: 0.01
|
stepSize: 0.01
|
||||||
value: 0.6
|
value: 0.6
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
onPositionChanged: {
|
onPositionChanged: {
|
||||||
var val = (this.position * 100)/2 + 50
|
var val = (this.value * 100)
|
||||||
chaperoneVisibilityText.text = Math.round(val) + "%"
|
chaperoneVisibilityText.text = Math.round(val) + "%"
|
||||||
}
|
}
|
||||||
onValueChanged: {
|
onValueChanged: {
|
||||||
@@ -272,7 +272,7 @@ MyStackViewPage {
|
|||||||
|
|
||||||
MyTextField {
|
MyTextField {
|
||||||
id: chaperoneVisibilityText
|
id: chaperoneVisibilityText
|
||||||
text: "50.00"
|
text: "60.00"
|
||||||
keyBoardUID: 301
|
keyBoardUID: 301
|
||||||
Layout.preferredWidth: 100
|
Layout.preferredWidth: 100
|
||||||
Layout.leftMargin: 10
|
Layout.leftMargin: 10
|
||||||
@@ -280,11 +280,15 @@ MyStackViewPage {
|
|||||||
function onInputEvent(input) {
|
function onInputEvent(input) {
|
||||||
var val = parseFloat(input)
|
var val = parseFloat(input)
|
||||||
if (!isNaN(val)) {
|
if (!isNaN(val)) {
|
||||||
if (val < 50.0) {
|
if (val < 30.0) {
|
||||||
val = 50.0
|
val = 30.0
|
||||||
} else if (val > 100.0) {
|
} else if (val > 100.0) {
|
||||||
val = 100.0
|
val = 100.0
|
||||||
}
|
}
|
||||||
|
if(val>100){
|
||||||
|
val = 100.0
|
||||||
|
}
|
||||||
|
|
||||||
var v = (val/100).toFixed(2)
|
var v = (val/100).toFixed(2)
|
||||||
if (v <= chaperoneVisibilitySlider.to) {
|
if (v <= chaperoneVisibilitySlider.to) {
|
||||||
chaperoneVisibilitySlider.value = v
|
chaperoneVisibilitySlider.value = v
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ RowLayout {
|
|||||||
if (deviceIndex >= 0) {
|
if (deviceIndex >= 0) {
|
||||||
AudioTabController.setPlaybackDeviceIndex(deviceIndex)
|
AudioTabController.setPlaybackDeviceIndex(deviceIndex)
|
||||||
}
|
}
|
||||||
setShownAudioDevice(index)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ RowLayout {
|
|||||||
}
|
}
|
||||||
onPlaybackDeviceListChanged: {
|
onPlaybackDeviceListChanged: {
|
||||||
audioMirrorNameCombo.devices = getAudioDeviceList()
|
audioMirrorNameCombo.devices = getAudioDeviceList()
|
||||||
setShownAudioDevice(AudioTabController.playbackDeviceIndex)
|
setShownAudioDevice(AudioTabController.mirrorDeviceIndex)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function getAudioDeviceList() {
|
function getAudioDeviceList() {
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ Slider {
|
|||||||
snapMode: Slider.SnapAlways
|
snapMode: Slider.SnapAlways
|
||||||
wheelEnabled: true
|
wheelEnabled: true
|
||||||
hoverEnabled: true
|
hoverEnabled: true
|
||||||
|
to: 1.0
|
||||||
|
from: 0.0
|
||||||
|
|
||||||
background: Rectangle {
|
background: Rectangle {
|
||||||
x: parent.leftPadding
|
x: parent.leftPadding
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ void AudioTabController::initStage1()
|
|||||||
reloadPttProfiles();
|
reloadPttProfiles();
|
||||||
reloadPttConfig();
|
reloadPttConfig();
|
||||||
reloadAudioProfiles();
|
reloadAudioProfiles();
|
||||||
|
// TODO Verify new defaults working as intended befoere removing
|
||||||
// applyDefaultProfile();
|
// applyDefaultProfile();
|
||||||
reloadAudioSettings();
|
reloadAudioSettings();
|
||||||
|
|
||||||
@@ -171,6 +172,9 @@ void AudioTabController::eventLoopTick()
|
|||||||
|
|
||||||
if ( settingsUpdateCounter >= k_audioSettingsUpdateCounter )
|
if ( settingsUpdateCounter >= k_audioSettingsUpdateCounter )
|
||||||
{
|
{
|
||||||
|
// Not usable until OpenVR 1.4.x?
|
||||||
|
// Will require updates to action based system
|
||||||
|
/*
|
||||||
if ( m_micProximitySensorCanMute )
|
if ( m_micProximitySensorCanMute )
|
||||||
{
|
{
|
||||||
vr::VRControllerState_t controllerState;
|
vr::VRControllerState_t controllerState;
|
||||||
@@ -204,6 +208,7 @@ void AudioTabController::eventLoopTick()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
vr::EVRSettingsError vrSettingsError;
|
vr::EVRSettingsError vrSettingsError;
|
||||||
char mirrorDeviceId[1024];
|
char mirrorDeviceId[1024];
|
||||||
vr::VRSettings()->GetString(
|
vr::VRSettings()->GetString(
|
||||||
|
|||||||
@@ -759,9 +759,9 @@ void ChaperoneTabController::setBoundsVisibility( float value, bool notify )
|
|||||||
{
|
{
|
||||||
if ( m_visibility != value )
|
if ( m_visibility != value )
|
||||||
{
|
{
|
||||||
if ( value <= 0.5f )
|
if ( value <= 0.3f )
|
||||||
{
|
{
|
||||||
m_visibility = 0.5f;
|
m_visibility = 0.3f;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user