History

intial removal of Audio to audio-client

Stephen Birarda committed 11 years ago

Commit 0eced091 parent 57743f128 files · +1048 −143Browse files

Showing the changes to interface/src/Menu.cpp (1 of 28 files). Show all

Unified · Split

interface/src/Menu.cpp+4−4
@@ -490,7 +490,7 @@ Menu::Menu() : · 489 unmodified lines
490 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::PipelineWarnings);490 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::PipelineWarnings);
491 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::SuppressShortTimings);491 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::SuppressShortTimings);
492 492
493 auto audioIO = DependencyManager::get<Audio>();493 auto audioIO = DependencyManager::get<AudioClient>();
494 QMenu* audioDebugMenu = developerMenu->addMenu("Audio");494 QMenu* audioDebugMenu = developerMenu->addMenu("Audio");
495 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioNoiseReduction,495 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioNoiseReduction,
496 0,496 0,
@@ -615,7 +615,7 @@ void Menu::loadSettings(QSettings* settings) { · 118 unmodified lines
615 _receivedAudioStreamSettings._windowSecondsForDesiredReduction = settings->value("windowSecondsForDesiredReduction", DEFAULT_WINDOW_SECONDS_FOR_DESIRED_REDUCTION).toInt();615 _receivedAudioStreamSettings._windowSecondsForDesiredReduction = settings->value("windowSecondsForDesiredReduction", DEFAULT_WINDOW_SECONDS_FOR_DESIRED_REDUCTION).toInt();
616 _receivedAudioStreamSettings._repetitionWithFade = settings->value("repetitionWithFade", DEFAULT_REPETITION_WITH_FADE).toBool();616 _receivedAudioStreamSettings._repetitionWithFade = settings->value("repetitionWithFade", DEFAULT_REPETITION_WITH_FADE).toBool();
617 617
618 auto audio = DependencyManager::get<Audio>();618 auto audio = DependencyManager::get<AudioClient>();
619 audio->setOutputStarveDetectionEnabled(settings->value("audioOutputStarveDetectionEnabled", DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_ENABLED).toBool());619 audio->setOutputStarveDetectionEnabled(settings->value("audioOutputStarveDetectionEnabled", DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_ENABLED).toBool());
620 audio->setOutputStarveDetectionThreshold(settings->value("audioOutputStarveDetectionThreshold", DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_THRESHOLD).toInt());620 audio->setOutputStarveDetectionThreshold(settings->value("audioOutputStarveDetectionThreshold", DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_THRESHOLD).toInt());
621 audio->setOutputStarveDetectionPeriod(settings->value("audioOutputStarveDetectionPeriod", DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_PERIOD).toInt());621 audio->setOutputStarveDetectionPeriod(settings->value("audioOutputStarveDetectionPeriod", DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_PERIOD).toInt());
@@ -680,7 +680,7 @@ void Menu::saveSettings(QSettings* settings) { · 58 unmodified lines
680 settings->setValue("windowSecondsForDesiredReduction", _receivedAudioStreamSettings._windowSecondsForDesiredReduction);680 settings->setValue("windowSecondsForDesiredReduction", _receivedAudioStreamSettings._windowSecondsForDesiredReduction);
681 settings->setValue("repetitionWithFade", _receivedAudioStreamSettings._repetitionWithFade);681 settings->setValue("repetitionWithFade", _receivedAudioStreamSettings._repetitionWithFade);
682 682
683 auto audio = DependencyManager::get<Audio>();683 auto audio = DependencyManager::get<AudioClient>();
684 settings->setValue("audioOutputStarveDetectionEnabled", audio->getOutputStarveDetectionEnabled());684 settings->setValue("audioOutputStarveDetectionEnabled", audio->getOutputStarveDetectionEnabled());
685 settings->setValue("audioOutputStarveDetectionThreshold", audio->getOutputStarveDetectionThreshold());685 settings->setValue("audioOutputStarveDetectionThreshold", audio->getOutputStarveDetectionThreshold());
686 settings->setValue("audioOutputStarveDetectionPeriod", audio->getOutputStarveDetectionPeriod());686 settings->setValue("audioOutputStarveDetectionPeriod", audio->getOutputStarveDetectionPeriod());
@@ -1297,7 +1297,7 @@ void Menu::toggleToolWindow() { · 610 unmodified lines
1297void Menu::audioMuteToggled() {1297void Menu::audioMuteToggled() {
1298 QAction *muteAction = _actionHash.value(MenuOption::MuteAudio);1298 QAction *muteAction = _actionHash.value(MenuOption::MuteAudio);
1299 if (muteAction) {1299 if (muteAction) {
1300 muteAction->setChecked(DependencyManager::get<Audio>()->isMuted());1300 muteAction->setChecked(DependencyManager::get<AudioClient>()->isMuted());
1301 }1301 }
1302}1302}
1303 1303

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t