Showing the changes to interface/src/ui/PreferencesDialog.cpp (1 of 6 files). Show all
Unified · Split
| @@ -149,7 +149,7 @@ void PreferencesDialog::loadPreferences() { · 148 unmodified lines | |||
| 149 | ui.faceshiftEyeDeflectionSider->setValue(menuInstance->getFaceshiftEyeDeflection() * | 149 | ui.faceshiftEyeDeflectionSider->setValue(menuInstance->getFaceshiftEyeDeflection() * |
| 150 | ui.faceshiftEyeDeflectionSider->maximum()); | 150 | ui.faceshiftEyeDeflectionSider->maximum()); |
| 151 | 151 | ||
| 152 | ui.audioJitterSpin->setValue(menuInstance->getAudioJitterBufferSamples()); | 152 | ui.audioJitterSpin->setValue(menuInstance->getAudioJitterBufferFrames()); |
| 153 | 153 | ||
| 154 | ui.realWorldFieldOfViewSpin->setValue(menuInstance->getRealWorldFieldOfView()); | 154 | ui.realWorldFieldOfViewSpin->setValue(menuInstance->getRealWorldFieldOfView()); |
| 155 | 155 | ||
| @@ -239,8 +239,12 @@ void PreferencesDialog::savePreferences() { · 83 unmodified lines | |||
| 239 | 239 | ||
| 240 | Menu::getInstance()->setInvertSixenseButtons(ui.invertSixenseButtonsCheckBox->isChecked()); | 240 | Menu::getInstance()->setInvertSixenseButtons(ui.invertSixenseButtonsCheckBox->isChecked()); |
| 241 | 241 | ||
| 242 | Menu::getInstance()->setAudioJitterBufferSamples(ui.audioJitterSpin->value()); | 242 | Menu::getInstance()->setAudioJitterBufferFrames(ui.audioJitterSpin->value()); |
| 243 | Application::getInstance()->getAudio()->setJitterBufferSamples(ui.audioJitterSpin->value()); | 243 | if (Menu::getInstance()->getAudioJitterBufferFrames() != 0) { |
| 244 | Application::getInstance()->getAudio()->overrideDesiredJitterBufferFramesTo(ui.audioJitterSpin->value()); | ||
| 245 | } else { | ||
| 246 | Application::getInstance()->getAudio()->unoverrideDesiredJitterBufferFrames(); | ||
| 247 | } | ||
| 244 | 248 | ||
| 245 | Application::getInstance()->resizeGL(Application::getInstance()->getGLWidget()->width(), | 249 | Application::getInstance()->resizeGL(Application::getInstance()->getGLWidget()->width(), |
| 246 | Application::getInstance()->getGLWidget()->height()); | 250 | Application::getInstance()->getGLWidget()->height()); |