Showing the changes to interface/src/Application.cpp (1 of 19 files). Show all
Unified · Split
| @@ -103,10 +103,6 @@ const int IDLE_SIMULATE_MSECS = 16; // How often should call simul · 102 unmodified lines | ||
| 103 | 103 | // in the idle loop? (60 FPS is default) |
| 104 | 104 | static QTimer* idleTimer = NULL; |
| 105 | 105 | |
| 106 | −const int STARTUP_JITTER_SAMPLES = NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL / 2; | |
| 107 | − // Startup optimistically with small jitter buffer that | |
| 108 | − // will start playback on the second received audio packet. | |
| 109 | − | |
| 110 | 106 | const QString CHECK_VERSION_URL = "https://highfidelity.io/latestVersion.xml"; |
| 111 | 107 | const QString SKIP_FILENAME = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/hifi.skipversion"; |
| 112 | 108 | |
| @@ -162,7 +158,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 49 unmodified lines | ||
| 162 | 158 | _touchAvgY(0.0f), |
| 163 | 159 | _isTouchPressed(false), |
| 164 | 160 | _mousePressed(false), |
| 165 | − _audio(STARTUP_JITTER_SAMPLES), | |
| 161 | + _audio(), | |
| 166 | 162 | _enableProcessVoxelsThread(true), |
| 167 | 163 | _octreeProcessor(), |
| 168 | 164 | _voxelHideShowThread(&_voxels), |
| @@ -1712,8 +1708,8 @@ void Application::init() { · 1543 unmodified lines | ||
| 1712 | 1708 | _lastTimeUpdated.start(); |
| 1713 | 1709 | |
| 1714 | 1710 | Menu::getInstance()->loadSettings(); |
| 1715 | − if (Menu::getInstance()->getAudioJitterBufferSamples() != 0) { | |
| 1716 | − _audio.setJitterBufferSamples(Menu::getInstance()->getAudioJitterBufferSamples()); | |
| 1711 | + if (Menu::getInstance()->getAudioJitterBufferFrames() != 0) { | |
| 1712 | + _audio.overrideDesiredJitterBufferFramesTo(Menu::getInstance()->getAudioJitterBufferFrames()); | |
| 1717 | 1713 | } |
| 1718 | 1714 | qDebug("Loaded settings"); |
| 1719 | 1715 | |