Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-08 02:58:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change menu and minor fixes

Browse source
This commit is contained in:
luiscuenca 2017-12-04 12:11:17 -08:00
parent 4030688e7a
commit 390c59b45c
3 changed files with 16 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/resources/qml/AudioScope.qml
View file

@ -376,7 +376,7 @@ Item {
anchors.leftMargin: 20; anchors.leftMargin: 20;
checked: AudioScope.getVisible(); checked: AudioScope.getVisible();
onCheckedChanged: { onCheckedChanged: {
AudioScope.setVisible(!AudioScope.getVisible()); AudioScope.setVisible(checked);
activelabel.text = AudioScope.getVisible() ? "On" : "Off" activelabel.text = AudioScope.getVisible() ? "On" : "Off"
} }
} }
@ -617,6 +617,10 @@ Item {
stopRecording(); stopRecording();
} }
AudioScope.setVisible(false); AudioScope.setVisible(false);
AudioScope.setLocalEcho(false);
AudioScope.setServerEcho(false);
AudioScope.selectAudioScopeFiveFrames();
console.log("Component Destroyed");
} }
Connections { Connections {

29
interface/src/Menu.cpp
View file

@ -679,43 +679,16 @@ Menu::Menu() {
}); });
auto audioIO = DependencyManager::get<AudioClient>(); auto audioIO = DependencyManager::get<AudioClient>();
addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoServerAudio, 0, false,
audioIO.data(), SLOT(toggleServerEcho()));
addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoLocalAudio, 0, false,
audioIO.data(), SLOT(toggleLocalEcho()));
addActionToQMenuAndActionHash(audioDebugMenu, MenuOption::MuteEnvironment, 0, addActionToQMenuAndActionHash(audioDebugMenu, MenuOption::MuteEnvironment, 0,
audioIO.data(), SLOT(sendMuteEnvironmentPacket())); audioIO.data(), SLOT(sendMuteEnvironmentPacket()));
auto scope = DependencyManager::get<AudioScope>(); action = addActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioScope);
MenuWrapper* audioScopeMenu = audioDebugMenu->addMenu("Audio Scope");
action = addActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScope);
connect(action, &QAction::triggered, [] { connect(action, &QAction::triggered, [] {
auto scriptEngines = DependencyManager::get<ScriptEngines>(); auto scriptEngines = DependencyManager::get<ScriptEngines>();
QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation(); QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/audio/audioScope.js"); defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/audio/audioScope.js");
scriptEngines->loadScript(defaultScriptsLoc.toString()); scriptEngines->loadScript(defaultScriptsLoc.toString());
}); });
addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopePause, Qt::CTRL | Qt::SHIFT | Qt::Key_F2, false,
scope.data(), SLOT(togglePause()));
addDisabledActionAndSeparator(audioScopeMenu, "Display Frames");
{
QAction* fiveFrames = addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopeFiveFrames,
0, true, scope.data(), SLOT(selectAudioScopeFiveFrames()));
QAction* twentyFrames = addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopeTwentyFrames,
0, false, scope.data(), SLOT(selectAudioScopeTwentyFrames()));
QAction* fiftyFrames = addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopeFiftyFrames,
0, false, scope.data(), SLOT(selectAudioScopeFiftyFrames()));
QActionGroup* audioScopeFramesGroup = new QActionGroup(audioScopeMenu);
audioScopeFramesGroup->addAction(fiveFrames);
audioScopeFramesGroup->addAction(twentyFrames);
audioScopeFramesGroup->addAction(fiftyFrames);
}
// Developer > Physics >>> // Developer > Physics >>>
MenuWrapper* physicsOptionsMenu = developerMenu->addMenu("Physics"); MenuWrapper* physicsOptionsMenu = developerMenu->addMenu("Physics");

13
scripts/developer/utilities/audio/audioScope.js
View file

@ -1,10 +1,17 @@
var qml = Script.resourcesPath() + '/qml/AudioScope.qml'; var qml = Script.resourcesPath() + '/qml/AudioScope.qml';
var viewdim = Controller.getViewportDimensions();
var window = new OverlayWindow({ var window = new OverlayWindow({
title: 'Audio Scope', title: 'Audio Scope',
source: qml, source: qml,
width: 1200, width: 1200,
height: 500 height: 500
}); });
//window.setPosition(0.1*viewdim, 0.2*viewdim); window.closed.connect(function () {
window.closed.connect(function () { Script.stop(); }); if (Audio.getRecording()) {
Audio.stopRecording();
}
AudioScope.setVisible(false);
AudioScope.setLocalEcho(false);
AudioScope.setServerEcho(false);
AudioScope.selectAudioScopeFiveFrames();
Script.stop();
});