From d88eb0f53b97e648048d55085725d549ae9e8fc5 Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Fri, 28 Feb 2020 13:05:24 +0100
Subject: [PATCH] Add push to mute icon when using push to mute feature

The PTM icon was quickly made in mspaint and (in my opinion) adequately
reflects push to mute.

Fixes
https://github.com/OpenVR-Advanced-Settings/OpenVR-AdvancedSettings/issues/342
---
 .../img/audio/microphone/ptm_notification.png | Bin 0 -> 4765 bytes
 src/tabcontrollers/AudioTabController.cpp     | 104 ++++++++++++------
 src/tabcontrollers/AudioTabController.h       |  10 +-
 3 files changed, 79 insertions(+), 35 deletions(-)
 create mode 100644 src/res/img/audio/microphone/ptm_notification.png

diff --git a/src/res/img/audio/microphone/ptm_notification.png b/src/res/img/audio/microphone/ptm_notification.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bfa181637c17c2359aee2af86cc17f7642600af
GIT binary patch
literal 4765
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

literal 0
HcmV?d00001

diff --git a/src/tabcontrollers/AudioTabController.cpp b/src/tabcontrollers/AudioTabController.cpp
index 6d216b4..5e08656 100644
--- a/src/tabcontrollers/AudioTabController.cpp
+++ b/src/tabcontrollers/AudioTabController.cpp
@@ -60,46 +60,73 @@ void AudioTabController::initStage1()
     eventLoopTick();
 }
 
+std::optional<std::string> verifyIconFilePath( std::string filename )
+{
+    const auto notifIconPath = paths::binaryDirectoryFindFile( filename );
+    if ( !notifIconPath.has_value() )
+    {
+        LOG( ERROR ) << "Could not find push to talk icon \"" << filename
+                     << "\"";
+    }
+
+    return notifIconPath;
+}
+
 void AudioTabController::initStage2()
 {
-    std::string notifKey = std::string( application_strings::applicationKey )
-                           + ".pptnotification";
+    const auto pushToTalkOverlayKey
+        = std::string( application_strings::applicationKey )
+          + ".pptnotification";
 
-    vr::VROverlayError overlayError = vr::VROverlay()->CreateOverlay(
-        notifKey.c_str(), notifKey.c_str(), &m_ulNotificationOverlayHandle );
-    if ( overlayError == vr::VROverlayError_None )
-    {
-        constexpr auto notificationIconFilename
-            = "/res/img/audio/microphone/ptt_notification.png";
-        const auto notifIconPath
-            = paths::binaryDirectoryFindFile( notificationIconFilename );
-        if ( notifIconPath.has_value() )
-        {
-            vr::VROverlay()->SetOverlayFromFile( m_ulNotificationOverlayHandle,
-                                                 notifIconPath->c_str() );
-            vr::VROverlay()->SetOverlayWidthInMeters(
-                m_ulNotificationOverlayHandle, 0.02f );
-            vr::HmdMatrix34_t notificationTransform
-                = { { { 1.0f, 0.0f, 0.0f, 0.12f },
-                      { 0.0f, 1.0f, 0.0f, 0.08f },
-                      { 0.0f, 0.0f, 1.0f, -0.3f } } };
-            vr::VROverlay()->SetOverlayTransformTrackedDeviceRelative(
-                m_ulNotificationOverlayHandle,
-                vr::k_unTrackedDeviceIndex_Hmd,
-                &notificationTransform );
-        }
-        else
-        {
-            LOG( ERROR ) << "Could not find notification icon \""
-                         << notificationIconFilename << "\"";
-        }
-    }
-    else
+    const auto overlayError
+        = vr::VROverlay()->CreateOverlay( pushToTalkOverlayKey.c_str(),
+                                          pushToTalkOverlayKey.c_str(),
+                                          &m_pushToTalkValues.overlayHandle );
+    if ( overlayError != vr::VROverlayError_None )
     {
         LOG( ERROR ) << "Could not create ptt notification overlay: "
                      << vr::VROverlay()->GetOverlayErrorNameFromEnum(
                             overlayError );
+
+        emit defaultProfileDisplay();
+
+        return;
     }
+
+    constexpr auto pushToTalkIconFilepath
+        = "/res/img/audio/microphone/ptt_notification.png";
+    constexpr auto pushToMuteIconFilepath
+        = "/res/img/audio/microphone/ptm_notification.png";
+
+    const auto pushToTalkIconFilePath
+        = verifyIconFilePath( pushToTalkIconFilepath );
+    const auto pushToMuteIconFilePath
+        = verifyIconFilePath( pushToMuteIconFilepath );
+
+    if ( !pushToTalkIconFilePath.has_value()
+         || !pushToMuteIconFilePath.has_value() )
+    {
+        emit defaultProfileDisplay();
+        return;
+    }
+
+    m_pushToTalkValues.pushToTalkPath = *pushToTalkIconFilePath;
+    m_pushToTalkValues.pushToMutePath = *pushToMuteIconFilePath;
+
+    vr::VROverlay()->SetOverlayFromFile(
+        m_pushToTalkValues.overlayHandle,
+        m_pushToTalkValues.pushToTalkPath.c_str() );
+    vr::VROverlay()->SetOverlayWidthInMeters( m_pushToTalkValues.overlayHandle,
+                                              0.02f );
+    vr::HmdMatrix34_t notificationTransform
+        = { { { 1.0f, 0.0f, 0.0f, 0.12f },
+              { 0.0f, 1.0f, 0.0f, 0.08f },
+              { 0.0f, 0.0f, 1.0f, -0.3f } } };
+    vr::VROverlay()->SetOverlayTransformTrackedDeviceRelative(
+        m_pushToTalkValues.overlayHandle,
+        vr::k_unTrackedDeviceIndex_Hmd,
+        &notificationTransform );
+
     emit defaultProfileDisplay();
 }
 
@@ -336,6 +363,19 @@ void AudioTabController::setMicReversePtt( bool value, bool notify )
 
     settings::setSetting( settings::BoolSetting::AUDIO_micReversePtt, value );
 
+    if ( value )
+    {
+        vr::VROverlay()->SetOverlayFromFile(
+            m_pushToTalkValues.overlayHandle,
+            m_pushToTalkValues.pushToMutePath.c_str() );
+    }
+    else
+    {
+        vr::VROverlay()->SetOverlayFromFile(
+            m_pushToTalkValues.overlayHandle,
+            m_pushToTalkValues.pushToTalkPath.c_str() );
+    }
+
     if ( pttEnabled() )
     {
         if ( m_pttActive )
diff --git a/src/tabcontrollers/AudioTabController.h b/src/tabcontrollers/AudioTabController.h
index b505eff..4fcb4bd 100644
--- a/src/tabcontrollers/AudioTabController.h
+++ b/src/tabcontrollers/AudioTabController.h
@@ -111,8 +111,12 @@ class AudioTabController : public QObject
                     setPttShowNotification NOTIFY pttShowNotificationChanged )
 
 private:
-    vr::VROverlayHandle_t m_ulNotificationOverlayHandle
-        = vr::k_ulOverlayHandleInvalid;
+    struct
+    {
+        vr::VROverlayHandle_t overlayHandle = vr::k_ulOverlayHandleInvalid;
+        std::string pushToTalkPath;
+        std::string pushToMutePath;
+    } m_pushToTalkValues;
 
     int m_playbackDeviceIndex = -1;
 
@@ -149,7 +153,7 @@ private:
 
     virtual vr::VROverlayHandle_t getNotificationOverlayHandle()
     {
-        return m_ulNotificationOverlayHandle;
+        return m_pushToTalkValues.overlayHandle;
     }
 
     void findPlaybackDeviceIndex( std::string id, bool notify = true );