From 18b86d550de3f71290b354e1e4ff602ba4dd03ff Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Thu, 7 Mar 2019 12:36:56 -0800
Subject: [PATCH] adding PushToTalk action

---
 interface/src/Application.cpp                         | 11 +++++++++++
 libraries/controllers/src/controllers/Actions.cpp     |  4 ++++
 libraries/controllers/src/controllers/Actions.h       |  1 +
 .../controllers/controllerModules/pushToTalk.js       |  2 +-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index dad86e748e..c0cacd4e40 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1601,12 +1601,23 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     connect(userInputMapper.data(), &UserInputMapper::actionEvent, [this](int action, float state) {
         using namespace controller;
         auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+        auto audioScriptingInterface = reinterpret_cast<scripting::Audio*>(DependencyManager::get<AudioScriptingInterface>().data());
         {
             auto actionEnum = static_cast<Action>(action);
             int key = Qt::Key_unknown;
             static int lastKey = Qt::Key_unknown;
             bool navAxis = false;
             switch (actionEnum) {
+                case Action::TOGGLE_PUSHTOTALK:
+                    if (audioScriptingInterface->getPTT()) {
+                        qDebug() << "State is " << state;
+                        if (state > 0.0f) {
+                            audioScriptingInterface->setPushingToTalk(false);
+                        } else if (state < 0.0f) {
+                            audioScriptingInterface->setPushingToTalk(true);
+                        }
+                    }
+
                 case Action::UI_NAV_VERTICAL:
                     navAxis = true;
                     if (state > 0.0f) {
diff --git a/libraries/controllers/src/controllers/Actions.cpp b/libraries/controllers/src/controllers/Actions.cpp
index 5a396231b6..57be2f788b 100644
--- a/libraries/controllers/src/controllers/Actions.cpp
+++ b/libraries/controllers/src/controllers/Actions.cpp
@@ -180,6 +180,7 @@ namespace controller {
      *       third person, to full screen mirror, then back to first person and repeat.</td></tr>
      *     <tr><td><code>ContextMenu</code></td><td>number</td><td>number</td><td>Show / hide the tablet.</td></tr>
      *     <tr><td><code>ToggleMute</code></td><td>number</td><td>number</td><td>Toggle the microphone mute.</td></tr>
+     *     <tr><td><code>TogglePushToTalk</code></td><td>number</td><td>number</td><td>Toggle push to talk.</td></tr>
      *     <tr><td><code>ToggleOverlay</code></td><td>number</td><td>number</td><td>Toggle the display of overlays.</td></tr>
      *     <tr><td><code>Sprint</code></td><td>number</td><td>number</td><td>Set avatar sprint mode.</td></tr>
      *     <tr><td><code>ReticleClick</code></td><td>number</td><td>number</td><td>Set mouse-pressed.</td></tr>
@@ -245,6 +246,8 @@ namespace controller {
      *       <code>ContextMenu</code> instead.</td></tr>
      *     <tr><td><code>TOGGLE_MUTE</code></td><td>number</td><td>number</td><td><strong>Deprecated:</strong> Use 
      *       <code>ToggleMute</code> instead.</td></tr>
+     *     <tr><td><code>TOGGLE_PUSHTOTALK</code></td><td>number</td><td>number</td><td><strong>Deprecated:</strong> Use 
+     *       <code>TogglePushToTalk</code> instead.</td></tr>
      *     <tr><td><code>SPRINT</code></td><td>number</td><td>number</td><td><strong>Deprecated:</strong> Use 
      *       <code>Sprint</code> instead.</td></tr>
      *     <tr><td><code>LONGITUDINAL_BACKWARD</code></td><td>number</td><td>number</td><td><strong>Deprecated:</strong> Use 
@@ -411,6 +414,7 @@ namespace controller {
             makeButtonPair(Action::ACTION2, "SecondaryAction"),
             makeButtonPair(Action::CONTEXT_MENU, "ContextMenu"),
             makeButtonPair(Action::TOGGLE_MUTE, "ToggleMute"),
+            makeButtonPair(Action::TOGGLE_PUSHTOTALK, "TogglePushToTalk"),
             makeButtonPair(Action::CYCLE_CAMERA, "CycleCamera"),
             makeButtonPair(Action::TOGGLE_OVERLAY, "ToggleOverlay"),
             makeButtonPair(Action::SPRINT, "Sprint"),
diff --git a/libraries/controllers/src/controllers/Actions.h b/libraries/controllers/src/controllers/Actions.h
index a12a3d60a9..3e99d8d147 100644
--- a/libraries/controllers/src/controllers/Actions.h
+++ b/libraries/controllers/src/controllers/Actions.h
@@ -60,6 +60,7 @@ enum class Action {
 
     CONTEXT_MENU,
     TOGGLE_MUTE,
+    TOGGLE_PUSHTOTALK,
     CYCLE_CAMERA,
     TOGGLE_OVERLAY,
 
diff --git a/scripts/system/controllers/controllerModules/pushToTalk.js b/scripts/system/controllers/controllerModules/pushToTalk.js
index dd959ae6fb..9d6435f497 100644
--- a/scripts/system/controllers/controllerModules/pushToTalk.js
+++ b/scripts/system/controllers/controllerModules/pushToTalk.js
@@ -72,4 +72,4 @@ Script.include("/~/system/libraries/controllers.js");
 	};
 	
 	Script.scriptEnding.connect(cleanup);
-}());				// END LOCAL_SCOPE
\ No newline at end of file
+}());				// END LOCAL_SCOPE