Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 09:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved Menu dependency out of audio

Browse source
This commit is contained in:
Atlante45 2015-01-27 01:21:59 -08:00
parent 71b565c33c
commit dbdb87a1a2
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Application.cpp
View file

@ -296,6 +296,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
auto audioIO = DependencyManager::get<Audio>(); auto audioIO = DependencyManager::get<Audio>();
audioIO->moveToThread(audioThread); audioIO->moveToThread(audioThread);
connect(audioThread, &QThread::started, audioIO.data(), &Audio::start); connect(audioThread, &QThread::started, audioIO.data(), &Audio::start);
connect(audioIO, SIGNAL(muteToggled()), this, SLOT(audioMuteToggled()));
audioThread->start(); audioThread->start();
@ -693,6 +694,12 @@ void Application::runTests() {
runTimingTests(); runTimingTests();
} }
void Application::audioMuteToggled() {
QAction* muteAction = Menu::getInstance()->getActionForOption(MenuOption::MuteAudio);
Q_CHECK_PTR(muteAction);
muteAction->setChecked(DependencyManager::get<Audio>()->isMuted());
}
void Application::aboutApp() { void Application::aboutApp() {
InfoView::forcedShow(INFO_HELP_PATH); InfoView::forcedShow(INFO_HELP_PATH);
} }

2
interface/src/Application.h
View file

@ -396,6 +396,8 @@ private slots:
void runTests(); void runTests();
void audioMuteToggled();
private: private:
void resetCamerasOnResizeGL(Camera& camera, int width, int height); void resetCamerasOnResizeGL(Camera& camera, int width, int height);
void updateProjectionMatrix(); void updateProjectionMatrix();

8
interface/src/Audio.cpp
View file

@ -104,18 +104,10 @@ 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();

3
interface/src/Audio.h
View file

@ -176,9 +176,6 @@ public slots:
void loadSettings(); void loadSettings();
void saveSettings(); void saveSettings();
private slots:
void audioMuteToggled();
signals: signals:
bool muteToggled(); bool muteToggled();
void inputReceived(const QByteArray& inputSamples); void inputReceived(const QByteArray& inputSamples);