SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix more audio warnings and qml text

Browse Source
This commit is contained in:
Kung-vr
2019-10-13 19:53:31 +09:00
parent f05f6f7deb
commit 6f5d7504a9
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/res/qml/PlayspacePage.qml
+2 -1
View File
@@ -89,7 +89,8 @@ MyStackViewPage {
MyText { MyText {
id: seatedDisableWarningText id: seatedDisableWarningText
visible: false visible: false
text: "Settings Tab: 'Disable Motion in Seated Mode' checked" wrapMode: Text.WordWrap
text: "Settings Tab: 'Enable Motion Features in Seated Mode' not checked"
} }
ColumnLayout { ColumnLayout {
src/tabcontrollers/AudioTabController.cpp
+25 -22
View File
@@ -24,15 +24,16 @@ void AudioTabController::initStage1()
m_recordingDevices = audioManager->getRecordingDevices(); m_recordingDevices = audioManager->getRecordingDevices();
findPlaybackDeviceIndex( audioManager->getPlaybackDevId(), false ); findPlaybackDeviceIndex( audioManager->getPlaybackDevId(), false );
char deviceId[1024]; char deviceId[1024];
vr::VRSettings()->GetString( vr::k_pch_audio_Section, vr::VRSettings()->GetString(
vr::k_pch_audio_OnPlaybackMirrorDevice_String, vr::k_pch_audio_Section,
deviceId, k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
1024, deviceId,
&vrSettingsError ); 1024,
&vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None ) if ( vrSettingsError != vr::VRSettingsError_None )
{ {
LOG( WARNING ) << "Could not read \"" LOG( WARNING ) << "Could not read \""
<< vr::k_pch_audio_OnPlaybackMirrorDevice_String << k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
<< "\" setting: " << "\" setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum( << vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError ); vrSettingsError );
@@ -523,13 +524,13 @@ void AudioTabController::setMirrorDeviceIndex( int index, bool notify )
vr::EVRSettingsError vrSettingsError; vr::EVRSettingsError vrSettingsError;
vr::VRSettings()->RemoveKeyInSection( vr::VRSettings()->RemoveKeyInSection(
vr::k_pch_audio_Section, vr::k_pch_audio_Section,
vr::k_pch_audio_OnPlaybackMirrorDevice_String, k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
&vrSettingsError ); &vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None ) if ( vrSettingsError != vr::VRSettingsError_None )
{ {
LOG( WARNING ) LOG( WARNING )
<< "Could not remove \"" << "Could not remove \""
<< vr::k_pch_audio_OnPlaybackMirrorDevice_String << k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
<< "\" setting: " << "\" setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum( << vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError ); vrSettingsError );
@@ -548,14 +549,14 @@ void AudioTabController::setMirrorDeviceIndex( int index, bool notify )
vr::EVRSettingsError vrSettingsError; vr::EVRSettingsError vrSettingsError;
vr::VRSettings()->SetString( vr::VRSettings()->SetString(
vr::k_pch_audio_Section, vr::k_pch_audio_Section,
vr::k_pch_audio_OnPlaybackMirrorDevice_String, k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
m_playbackDevices[static_cast<size_t>( index )].first.c_str(), m_playbackDevices[static_cast<size_t>( index )].first.c_str(),
&vrSettingsError ); &vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None ) if ( vrSettingsError != vr::VRSettingsError_None )
{ {
LOG( WARNING ) LOG( WARNING )
<< "Could not write \"" << "Could not write \""
<< vr::k_pch_audio_OnPlaybackMirrorDevice_String << k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
<< "\" setting: " << "\" setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum( << vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError ); vrSettingsError );
@@ -1102,15 +1103,16 @@ void AudioTabController::setDefaultMirror( int index, bool notify )
vr::EVRSettingsError vrSettingsError; vr::EVRSettingsError vrSettingsError;
vr::VRSettings()->RemoveKeyInSection( vr::VRSettings()->RemoveKeyInSection(
vr::k_pch_audio_Section, vr::k_pch_audio_Section,
vr::k_pch_audio_OnPlaybackMirrorDevice_String, k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
&vrSettingsError ); &vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None ) if ( vrSettingsError != vr::VRSettingsError_None )
{ {
LOG( WARNING ) << "Could not remove \"" LOG( WARNING )
<< vr::k_pch_audio_OnPlaybackMirrorDevice_String << "Could not remove \""
<< "\" setting: " << k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
<< vr::VRSettings()->GetSettingsErrorNameFromEnum( << "\" setting: "
vrSettingsError ); << vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
} }
else else
{ {
@@ -1123,16 +1125,17 @@ void AudioTabController::setDefaultMirror( int index, bool notify )
vr::EVRSettingsError vrSettingsError; vr::EVRSettingsError vrSettingsError;
vr::VRSettings()->SetString( vr::VRSettings()->SetString(
vr::k_pch_audio_Section, vr::k_pch_audio_Section,
vr::k_pch_audio_OnPlaybackMirrorDevice_String, k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
m_playbackDevices[static_cast<size_t>( index )].first.c_str(), m_playbackDevices[static_cast<size_t>( index )].first.c_str(),
&vrSettingsError ); &vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None ) if ( vrSettingsError != vr::VRSettingsError_None )
{ {
LOG( WARNING ) << "Could not write \"" LOG( WARNING )
<< vr::k_pch_audio_OnPlaybackMirrorDevice_String << "Could not write \""
<< "\" setting: " << k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
<< vr::VRSettings()->GetSettingsErrorNameFromEnum( << "\" setting: "
vrSettingsError ); << vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
} }
else else
{ {