Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 16:14:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

wire up audio show level meter menu

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-01-14 13:11:11 -08:00
parent 58668654d0
commit 2177765b09
5 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/AvatarInputs.qml
View file

@ -86,7 +86,7 @@ Hifi.AvatarInputs {
id: controls id: controls
width: root.mirrorWidth width: root.mirrorWidth
height: 44 height: 44
visible: !root.isHMD visible: root.showAudioTools
anchors.top: mirror.bottom anchors.top: mirror.bottom
Rectangle { Rectangle {

5
interface/src/Menu.cpp
View file

@ -156,9 +156,8 @@ Menu::Menu() {
addCheckableActionToQMenuAndActionHash(audioMenu, MenuOption::MuteAudio, Qt::CTRL | Qt::Key_M, false, addCheckableActionToQMenuAndActionHash(audioMenu, MenuOption::MuteAudio, Qt::CTRL | Qt::Key_M, false,
audioIO.data(), SLOT(toggleMute())); audioIO.data(), SLOT(toggleMute()));
// Audio > Level Meter [advanced] -- FIXME: needs implementation // Audio > Show Level Meter
auto levelMeterAction = addCheckableActionToQMenuAndActionHash(audioMenu, "Level Meter", 0, false, NULL, NULL, UNSPECIFIED_POSITION, "Advanced"); addCheckableActionToQMenuAndActionHash(audioMenu, MenuOption::AudioTools, 0, true);
levelMeterAction->setDisabled(true);
// Avatar menu ---------------------------------- // Avatar menu ----------------------------------

3
interface/src/Menu.h
View file

@ -156,6 +156,7 @@ namespace MenuOption {
const QString AssetMigration = "ATP Asset Migration"; const QString AssetMigration = "ATP Asset Migration";
const QString Atmosphere = "Atmosphere"; const QString Atmosphere = "Atmosphere";
const QString Attachments = "Attachments..."; const QString Attachments = "Attachments...";
const QString AudioNetworkStats = "Audio Network Stats";
const QString AudioNoiseReduction = "Audio Noise Reduction"; const QString AudioNoiseReduction = "Audio Noise Reduction";
const QString AudioScope = "Show Scope"; const QString AudioScope = "Show Scope";
const QString AudioScopeFiftyFrames = "Fifty"; const QString AudioScopeFiftyFrames = "Fifty";
@ -163,8 +164,8 @@ namespace MenuOption {
const QString AudioScopeFrames = "Display Frames"; const QString AudioScopeFrames = "Display Frames";
const QString AudioScopePause = "Pause Scope"; const QString AudioScopePause = "Pause Scope";
const QString AudioScopeTwentyFrames = "Twenty"; const QString AudioScopeTwentyFrames = "Twenty";
const QString AudioNetworkStats = "Audio Network Stats";
const QString AudioStatsShowInjectedStreams = "Audio Stats Show Injected Streams"; const QString AudioStatsShowInjectedStreams = "Audio Stats Show Injected Streams";
const QString AudioTools = "Show Level Meter";
const QString AutoMuteAudio = "Auto Mute Microphone"; const QString AutoMuteAudio = "Auto Mute Microphone";
const QString AvatarReceiveStats = "Show Receive Stats"; const QString AvatarReceiveStats = "Show Receive Stats";
const QString Back = "Back"; const QString Back = "Back";

1
interface/src/ui/AvatarInputs.cpp
View file

@ -67,6 +67,7 @@ void AvatarInputs::update() {
AI_UPDATE(cameraEnabled, !Menu::getInstance()->isOptionChecked(MenuOption::NoFaceTracking)); AI_UPDATE(cameraEnabled, !Menu::getInstance()->isOptionChecked(MenuOption::NoFaceTracking));
AI_UPDATE(cameraMuted, Menu::getInstance()->isOptionChecked(MenuOption::MuteFaceTracking)); AI_UPDATE(cameraMuted, Menu::getInstance()->isOptionChecked(MenuOption::MuteFaceTracking));
AI_UPDATE(isHMD, qApp->isHMDMode()); AI_UPDATE(isHMD, qApp->isHMDMode());
AI_UPDATE(showAudioTools, Menu::getInstance()->isOptionChecked(MenuOption::AudioTools));
auto audioIO = DependencyManager::get<AudioClient>(); auto audioIO = DependencyManager::get<AudioClient>();
const float AUDIO_METER_AVERAGING = 0.5; const float AUDIO_METER_AVERAGING = 0.5;

4
interface/src/ui/AvatarInputs.h
View file

@ -17,7 +17,7 @@
public: \ public: \
type name() { return _##name; }; \ type name() { return _##name; }; \
private: \ private: \
type _##name{ initialValue }; type _##name{ initialValue };
class AvatarInputs : public QQuickItem { class AvatarInputs : public QQuickItem {
Q_OBJECT Q_OBJECT
@ -31,6 +31,7 @@ class AvatarInputs : public QQuickItem {
AI_PROPERTY(bool, mirrorVisible, false) AI_PROPERTY(bool, mirrorVisible, false)
AI_PROPERTY(bool, mirrorZoomed, true) AI_PROPERTY(bool, mirrorZoomed, true)
AI_PROPERTY(bool, isHMD, false) AI_PROPERTY(bool, isHMD, false)
AI_PROPERTY(bool, showAudioTools, true)
public: public:
static AvatarInputs* getInstance(); static AvatarInputs* getInstance();
@ -46,6 +47,7 @@ signals:
void mirrorVisibleChanged(); void mirrorVisibleChanged();
void mirrorZoomedChanged(); void mirrorZoomedChanged();
void isHMDChanged(); void isHMDChanged();
void showAudioToolsChanged();
protected: protected:
Q_INVOKABLE void resetSensors(); Q_INVOKABLE void resetSensors();