History

got Preferences jitter buffer frames override working

wangyix committed 12 years ago

Commit 145b7f81 parent 6fc5c746 files · +18 −13Browse files

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

Unified · Split

interface/src/ui/PreferencesDialog.cpp+7−3
@@ -149,7 +149,7 @@ void PreferencesDialog::loadPreferences() { · 148 unmodified lines
149149 ui.faceshiftEyeDeflectionSider->setValue(menuInstance->getFaceshiftEyeDeflection() *
150150 ui.faceshiftEyeDeflectionSider->maximum());
151151
152− ui.audioJitterSpin->setValue(menuInstance->getAudioJitterBufferSamples());
152+ ui.audioJitterSpin->setValue(menuInstance->getAudioJitterBufferFrames());
153153
154154 ui.realWorldFieldOfViewSpin->setValue(menuInstance->getRealWorldFieldOfView());
155155
@@ -239,8 +239,12 @@ void PreferencesDialog::savePreferences() { · 83 unmodified lines
239239
240240 Menu::getInstance()->setInvertSixenseButtons(ui.invertSixenseButtonsCheckBox->isChecked());
241241
242− Menu::getInstance()->setAudioJitterBufferSamples(ui.audioJitterSpin->value());
243− Application::getInstance()->getAudio()->setJitterBufferSamples(ui.audioJitterSpin->value());
242+ Menu::getInstance()->setAudioJitterBufferFrames(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+ }
244248
245249 Application::getInstance()->resizeGL(Application::getInstance()->getGLWidget()->width(),
246250 Application::getInstance()->getGLWidget()->height());

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