History

Took audio settings out of Menu

Hooked to actual settings in Audio class

Atlante45 committed 11 years ago

Commit 8f5f6341 parent 2eff7866 files · +34 −48Browse files

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

Unified · Split

interface/src/Menu.cpp+0−18
@@ -582,15 +582,6 @@ void Menu::loadSettings(QSettings* settings) { · 581 unmodified lines
582 lockedSettings = true;582 lockedSettings = true;
583 }583 }
584 584
585 _receivedAudioStreamSettings._dynamicJitterBuffers = settings->value("dynamicJitterBuffers", DEFAULT_DYNAMIC_JITTER_BUFFERS).toBool();
586 _receivedAudioStreamSettings._maxFramesOverDesired = settings->value("maxFramesOverDesired", DEFAULT_MAX_FRAMES_OVER_DESIRED).toInt();
587 _receivedAudioStreamSettings._staticDesiredJitterBufferFrames = settings->value("staticDesiredJitterBufferFrames", DEFAULT_STATIC_DESIRED_JITTER_BUFFER_FRAMES).toInt();
588 _receivedAudioStreamSettings._useStDevForJitterCalc = settings->value("useStDevForJitterCalc", DEFAULT_USE_STDEV_FOR_JITTER_CALC).toBool();
589 _receivedAudioStreamSettings._windowStarveThreshold = settings->value("windowStarveThreshold", DEFAULT_WINDOW_STARVE_THRESHOLD).toInt();
590 _receivedAudioStreamSettings._windowSecondsForDesiredCalcOnTooManyStarves = settings->value("windowSecondsForDesiredCalcOnTooManyStarves", DEFAULT_WINDOW_SECONDS_FOR_DESIRED_CALC_ON_TOO_MANY_STARVES).toInt();
591 _receivedAudioStreamSettings._windowSecondsForDesiredReduction = settings->value("windowSecondsForDesiredReduction", DEFAULT_WINDOW_SECONDS_FOR_DESIRED_REDUCTION).toInt();
592 _receivedAudioStreamSettings._repetitionWithFade = settings->value("repetitionWithFade", DEFAULT_REPETITION_WITH_FADE).toBool();
593
594 auto audio = DependencyManager::get<Audio>();585 auto audio = DependencyManager::get<Audio>();
595 audio->setOutputStarveDetectionEnabled(settings->value("audioOutputStarveDetectionEnabled", DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_ENABLED).toBool());586 audio->setOutputStarveDetectionEnabled(settings->value("audioOutputStarveDetectionEnabled", DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_ENABLED).toBool());
596 audio->setOutputStarveDetectionThreshold(settings->value("audioOutputStarveDetectionThreshold", DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_THRESHOLD).toInt());587 audio->setOutputStarveDetectionThreshold(settings->value("audioOutputStarveDetectionThreshold", DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_THRESHOLD).toInt());
@@ -640,15 +631,6 @@ void Menu::saveSettings(QSettings* settings) { · 43 unmodified lines
640 lockedSettings = true;631 lockedSettings = true;
641 }632 }
642 633
643 settings->setValue("dynamicJitterBuffers", _receivedAudioStreamSettings._dynamicJitterBuffers);
644 settings->setValue("maxFramesOverDesired", _receivedAudioStreamSettings._maxFramesOverDesired);
645 settings->setValue("staticDesiredJitterBufferFrames", _receivedAudioStreamSettings._staticDesiredJitterBufferFrames);
646 settings->setValue("useStDevForJitterCalc", _receivedAudioStreamSettings._useStDevForJitterCalc);
647 settings->setValue("windowStarveThreshold", _receivedAudioStreamSettings._windowStarveThreshold);
648 settings->setValue("windowSecondsForDesiredCalcOnTooManyStarves", _receivedAudioStreamSettings._windowSecondsForDesiredCalcOnTooManyStarves);
649 settings->setValue("windowSecondsForDesiredReduction", _receivedAudioStreamSettings._windowSecondsForDesiredReduction);
650 settings->setValue("repetitionWithFade", _receivedAudioStreamSettings._repetitionWithFade);
651
652 auto audio = DependencyManager::get<Audio>();634 auto audio = DependencyManager::get<Audio>();
653 settings->setValue("audioOutputStarveDetectionEnabled", audio->getOutputStarveDetectionEnabled());635 settings->setValue("audioOutputStarveDetectionEnabled", audio->getOutputStarveDetectionEnabled());
654 settings->setValue("audioOutputStarveDetectionThreshold", audio->getOutputStarveDetectionThreshold());636 settings->setValue("audioOutputStarveDetectionThreshold", audio->getOutputStarveDetectionThreshold());