mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 18:13:05 +02:00
Mute mute slot out of Menu
This commit is contained in:
parent
90c3c7955a
commit
bac448af5d
4 changed files with 11 additions and 10 deletions
|
@ -97,10 +97,18 @@ Audio::Audio() :
|
||||||
|
|
||||||
connect(&_receivedAudioStream, &MixedProcessedAudioStream::processSamples, this, &Audio::processReceivedSamples, Qt::DirectConnection);
|
connect(&_receivedAudioStream, &MixedProcessedAudioStream::processSamples, this, &Audio::processReceivedSamples, Qt::DirectConnection);
|
||||||
|
|
||||||
|
connect(this, SIGNAL(muteToggled()), this, SLOT(audioMuteToggled()));
|
||||||
|
|
||||||
// Initialize GVerb
|
// Initialize GVerb
|
||||||
initGverb();
|
initGverb();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Audio::audioMuteToggled() {
|
||||||
|
QAction* muteAction = Menu::getInstance()->getActionForOption(MenuOption::MuteAudio);
|
||||||
|
Q_CHECK_PTR(muteAction);
|
||||||
|
muteAction->setChecked(isMuted());
|
||||||
|
}
|
||||||
|
|
||||||
void Audio::reset() {
|
void Audio::reset() {
|
||||||
_receivedAudioStream.reset();
|
_receivedAudioStream.reset();
|
||||||
_stats.reset();
|
_stats.reset();
|
||||||
|
|
|
@ -173,6 +173,9 @@ public slots:
|
||||||
|
|
||||||
void outputNotify();
|
void outputNotify();
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void audioMuteToggled();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
bool muteToggled();
|
bool muteToggled();
|
||||||
void inputReceived(const QByteArray& inputSamples);
|
void inputReceived(const QByteArray& inputSamples);
|
||||||
|
|
|
@ -569,8 +569,6 @@ Menu::Menu() {
|
||||||
statsRenderer.data(),
|
statsRenderer.data(),
|
||||||
SLOT(toggleShowInjectedStreams()));
|
SLOT(toggleShowInjectedStreams()));
|
||||||
|
|
||||||
connect(audioIO.data(), SIGNAL(muteToggled()), this, SLOT(audioMuteToggled()));
|
|
||||||
|
|
||||||
#ifndef Q_OS_MAC
|
#ifndef Q_OS_MAC
|
||||||
QMenu* helpMenu = addMenu("Help");
|
QMenu* helpMenu = addMenu("Help");
|
||||||
QAction* helpAction = helpMenu->addAction(MenuOption::AboutApp);
|
QAction* helpAction = helpMenu->addAction(MenuOption::AboutApp);
|
||||||
|
@ -1173,13 +1171,6 @@ void Menu::loadRSSDKFile() {
|
||||||
RealSense::getInstance()->loadRSSDKFile();
|
RealSense::getInstance()->loadRSSDKFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Menu::audioMuteToggled() {
|
|
||||||
QAction *muteAction = _actionHash.value(MenuOption::MuteAudio);
|
|
||||||
if (muteAction) {
|
|
||||||
muteAction->setChecked(DependencyManager::get<Audio>()->isMuted());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void Menu::runTests() {
|
void Menu::runTests() {
|
||||||
runTimingTests();
|
runTimingTests();
|
||||||
}
|
}
|
||||||
|
|
|
@ -159,7 +159,6 @@ private slots:
|
||||||
void bumpSettings();
|
void bumpSettings();
|
||||||
void changePrivateKey();
|
void changePrivateKey();
|
||||||
void runTests();
|
void runTests();
|
||||||
void audioMuteToggled();
|
|
||||||
void displayNameLocationResponse(const QString& errorString);
|
void displayNameLocationResponse(const QString& errorString);
|
||||||
void changeVSync();
|
void changeVSync();
|
||||||
void loadRSSDKFile();
|
void loadRSSDKFile();
|
||||||
|
|
Loading…
Reference in a new issue