Merge pull request #4721 from ctrlaltdavid/20514

DO NOT MERGE - QA for 20514 - Move "Stereo Audio" option into developerMenu.js

examples/utilities/tools/developerMenuItems.js

@@ -13,6 +13,7 @@
 
 var createdRenderMenu = false;
 var createdGeneratedAudioMenu = false;
+var createdStereoInputMenuItem = false;
 
 var DEVELOPER_MENU = "Developer";
 
@@ -28,6 +29,7 @@ var AUDIO_SOURCE_INJECT = "Generated Audio";
 var AUDIO_SOURCE_MENU = AUDIO_MENU + " > Generated Audio Source";
 var AUDIO_SOURCE_PINK_NOISE = "Pink Noise";
 var AUDIO_SOURCE_SINE_440 = "Sine 440hz";
+var AUDIO_STEREO_INPUT = "Stereo Input";
 
 
 function setupMenus() {
@@ -78,6 +80,10 @@ function setupMenus() {
         Audio.selectPinkNoise();
         createdGeneratedAudioMenu = true;
     }
+    if (!Menu.menuItemExists(AUDIO_MENU, AUDIO_STEREO_INPUT)) {
+        Menu.addMenuItem({ menuName: AUDIO_MENU, menuItemName: AUDIO_STEREO_INPUT, isCheckable: true, isChecked: false });
+        createdStereoInputMenuItem = true;
+    }
 }
 
 Menu.menuItemEvent.connect(function (menuItem) {
@@ -99,6 +105,8 @@ Menu.menuItemEvent.connect(function (menuItem) {
    } else if (menuItem == AUDIO_SOURCE_SINE_440 && !createdGeneratedAudioMenu) {
        Audio.selectSine440();
        Menu.setIsOptionChecked(AUDIO_SOURCE_PINK_NOISE, false);
+   } else if (menuItem == AUDIO_STEREO_INPUT) {
+       Audio.setStereoInput(Menu.isOptionChecked(AUDIO_STEREO_INPUT))
    }
 });
 
@@ -125,6 +133,10 @@ function scriptEnding() {
         Menu.removeMenuItem(AUDIO_MENU, AUDIO_SOURCE_INJECT);
         Menu.removeMenu(AUDIO_SOURCE_MENU);
     }
+
+    if (createdStereoInputMenuItem) {
+        Menu.removeMenuItem(AUDIO_MENU, AUDIO_STEREO_INPUT);
+    }
 }
 
 setupMenus();

interface/src/Menu.cpp

@@ -484,8 +484,6 @@ Menu::Menu() {
                                            audioIO.data(), SLOT(toggleServerEcho()));
     addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoLocalAudio, 0, false,
                                            audioIO.data(), SLOT(toggleLocalEcho()));
-    addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::StereoAudio, 0, false,
-                                           audioIO.data(), SLOT(toggleStereoInput()));
     addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::MuteAudio,
                                            Qt::CTRL | Qt::Key_M,
                                            false,

interface/src/Menu.h

@@ -267,7 +267,6 @@ namespace MenuOption {
     const QString ShiftHipsForIdleAnimations = "Shift hips for idle animations";
     const QString Stars = "Stars";
     const QString Stats = "Stats";
-    const QString StereoAudio = "Stereo Audio (disables spatial sound)";
     const QString StopAllScripts = "Stop All Scripts";
     const QString SuppressShortTimings = "Suppress Timings Less than 10ms";
     const QString TestPing = "Test Ping";

libraries/audio-client/src/AudioClient.h

@@ -108,8 +108,6 @@ public:
     
     bool isMuted() { return _muted; }
     
-    void setIsStereoInput(bool isStereoInput);
-    
     const AudioIOStats& getStats() const { return _stats; }
 
     float getInputRingBufferMsecsAvailable() const;
@@ -146,14 +144,14 @@ public slots:
     virtual void enableAudioSourceInject(bool enable);
     virtual void selectAudioSourcePinkNoise();
     virtual void selectAudioSourceSine440();
-    
+
+    virtual void setIsStereoInput(bool stereo);
+
     void toggleAudioNoiseReduction() { _isNoiseGateEnabled = !_isNoiseGateEnabled; }
     
     void toggleLocalEcho() { _shouldEchoLocally = !_shouldEchoLocally; }
     void toggleServerEcho() { _shouldEchoToServer = !_shouldEchoToServer; }
     
-    void toggleStereoInput() { setIsStereoInput(!_isStereoInput); }
-  
     void processReceivedSamples(const QByteArray& inputBuffer, QByteArray& outputBuffer);
     void sendMuteEnvironmentPacket();
 

libraries/audio/src/AbstractAudioInterface.h

@@ -31,6 +31,8 @@ public slots:
     virtual void enableAudioSourceInject(bool enable) = 0;
     virtual void selectAudioSourcePinkNoise() = 0;
     virtual void selectAudioSourceSine440() = 0;
+
+    virtual void setIsStereoInput(bool stereo) = 0;
 };
 
 Q_DECLARE_METATYPE(AbstractAudioInterface*)

libraries/script-engine/src/AudioScriptingInterface.cpp

@@ -89,4 +89,8 @@ void AudioScriptingInterface::selectSine440() {
     }
 }
 
-
+void AudioScriptingInterface::setStereoInput(bool stereo) {
+    if (_localAudioInterface) {
+        _localAudioInterface->setIsStereoInput(stereo);
+    }
+}

libraries/script-engine/src/AudioScriptingInterface.h

@@ -32,6 +32,8 @@ protected:
     Q_INVOKABLE void injectGeneratedNoise(bool inject);
     Q_INVOKABLE void selectPinkNoise();
     Q_INVOKABLE void selectSine440();
+
+    Q_INVOKABLE void setStereoInput(bool stereo);
     
 signals:
     void mutedByMixer();