History

merge HEAD with PR-3281

Craig Hansen-Sturm committed 12 years ago

Commit e941e582 parents 47bc183 7a8a86834 files · +1891 −634Browse files

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

Unified · Split

interface/src/Application.cpp+1−8
@@ -1772,14 +1772,7 @@ void Application::init() { · 1771 unmodified lines
17721772 _lastTimeUpdated.start();
17731773
17741774 Menu::getInstance()->loadSettings();
1775− if (Menu::getInstance()->getAudioJitterBufferFrames() != 0) {
1776− _audio.setDynamicJitterBuffers(false);
1777− _audio.setStaticDesiredJitterBufferFrames(Menu::getInstance()->getAudioJitterBufferFrames());
1778− } else {
1779− _audio.setDynamicJitterBuffers(true);
1780− }
1781−
1782− _audio.setMaxFramesOverDesired(Menu::getInstance()->getMaxFramesOverDesired());
1775+ _audio.setReceivedAudioStreamSettings(Menu::getInstance()->getReceivedAudioStreamSettings());
17831776
17841777 qDebug("Loaded settings");
17851778

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