From 6f5d7504a931cc77af94ac001e34cafeb130294a Mon Sep 17 00:00:00 2001
From: Kung-vr <kungfool@gmail.com>
Date: Sun, 13 Oct 2019 19:53:31 +0900
Subject: [PATCH] fix more audio warnings and qml text

---
 src/res/qml/PlayspacePage.qml             |  3 +-
 src/tabcontrollers/AudioTabController.cpp | 47 ++++++++++++-----------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/res/qml/PlayspacePage.qml b/src/res/qml/PlayspacePage.qml
index 90242a1..4349285 100644
--- a/src/res/qml/PlayspacePage.qml
+++ b/src/res/qml/PlayspacePage.qml
@@ -89,7 +89,8 @@ MyStackViewPage {
         MyText {
             id: seatedDisableWarningText
             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 {
diff --git a/src/tabcontrollers/AudioTabController.cpp b/src/tabcontrollers/AudioTabController.cpp
index eb1282a..d9e86db 100644
--- a/src/tabcontrollers/AudioTabController.cpp
+++ b/src/tabcontrollers/AudioTabController.cpp
@@ -24,15 +24,16 @@ void AudioTabController::initStage1()
     m_recordingDevices = audioManager->getRecordingDevices();
     findPlaybackDeviceIndex( audioManager->getPlaybackDevId(), false );
     char deviceId[1024];
-    vr::VRSettings()->GetString( vr::k_pch_audio_Section,
-                                 vr::k_pch_audio_OnPlaybackMirrorDevice_String,
-                                 deviceId,
-                                 1024,
-                                 &vrSettingsError );
+    vr::VRSettings()->GetString(
+        vr::k_pch_audio_Section,
+        k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
+        deviceId,
+        1024,
+        &vrSettingsError );
     if ( vrSettingsError != vr::VRSettingsError_None )
     {
         LOG( WARNING ) << "Could not read \""
-                       << vr::k_pch_audio_OnPlaybackMirrorDevice_String
+                       << k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
                        << "\" setting: "
                        << vr::VRSettings()->GetSettingsErrorNameFromEnum(
                               vrSettingsError );
@@ -523,13 +524,13 @@ void AudioTabController::setMirrorDeviceIndex( int index, bool notify )
             vr::EVRSettingsError vrSettingsError;
             vr::VRSettings()->RemoveKeyInSection(
                 vr::k_pch_audio_Section,
-                vr::k_pch_audio_OnPlaybackMirrorDevice_String,
+                k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
                 &vrSettingsError );
             if ( vrSettingsError != vr::VRSettingsError_None )
             {
                 LOG( WARNING )
                     << "Could not remove \""
-                    << vr::k_pch_audio_OnPlaybackMirrorDevice_String
+                    << k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
                     << "\" setting: "
                     << vr::VRSettings()->GetSettingsErrorNameFromEnum(
                            vrSettingsError );
@@ -548,14 +549,14 @@ void AudioTabController::setMirrorDeviceIndex( int index, bool notify )
             vr::EVRSettingsError vrSettingsError;
             vr::VRSettings()->SetString(
                 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(),
                 &vrSettingsError );
             if ( vrSettingsError != vr::VRSettingsError_None )
             {
                 LOG( WARNING )
                     << "Could not write \""
-                    << vr::k_pch_audio_OnPlaybackMirrorDevice_String
+                    << k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
                     << "\" setting: "
                     << vr::VRSettings()->GetSettingsErrorNameFromEnum(
                            vrSettingsError );
@@ -1102,15 +1103,16 @@ void AudioTabController::setDefaultMirror( int index, bool notify )
         vr::EVRSettingsError vrSettingsError;
         vr::VRSettings()->RemoveKeyInSection(
             vr::k_pch_audio_Section,
-            vr::k_pch_audio_OnPlaybackMirrorDevice_String,
+            k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
             &vrSettingsError );
         if ( vrSettingsError != vr::VRSettingsError_None )
         {
-            LOG( WARNING ) << "Could not remove \""
-                           << vr::k_pch_audio_OnPlaybackMirrorDevice_String
-                           << "\" setting: "
-                           << vr::VRSettings()->GetSettingsErrorNameFromEnum(
-                                  vrSettingsError );
+            LOG( WARNING )
+                << "Could not remove \""
+                << k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
+                << "\" setting: "
+                << vr::VRSettings()->GetSettingsErrorNameFromEnum(
+                       vrSettingsError );
         }
         else
         {
@@ -1123,16 +1125,17 @@ void AudioTabController::setDefaultMirror( int index, bool notify )
         vr::EVRSettingsError vrSettingsError;
         vr::VRSettings()->SetString(
             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(),
             &vrSettingsError );
         if ( vrSettingsError != vr::VRSettingsError_None )
         {
-            LOG( WARNING ) << "Could not write \""
-                           << vr::k_pch_audio_OnPlaybackMirrorDevice_String
-                           << "\" setting: "
-                           << vr::VRSettings()->GetSettingsErrorNameFromEnum(
-                                  vrSettingsError );
+            LOG( WARNING )
+                << "Could not write \""
+                << k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
+                << "\" setting: "
+                << vr::VRSettings()->GetSettingsErrorNameFromEnum(
+                       vrSettingsError );
         }
         else
         {