ardour/livetrax
13
0
Fork 0
Code

possible fix for DSP load calculation on windows

Browse Source
This commit is contained in:
Robin Gareus 2014-11-06 17:24:32 +01:00
parent c9c4a5c29d
commit 6cda13fad4
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/backends/dummy/dummy_audiobackend.cc
View File

@ -49,6 +49,7 @@ static int64_t _x_get_monotonic_usec() {
if (QueryPerformanceCounter (&Count)) { if (QueryPerformanceCounter (&Count)) {
return (int64_t) (Count.QuadPart * _win_pc_rate); return (int64_t) (Count.QuadPart * _win_pc_rate);
} }
return -1;
} }
#endif #endif
return g_get_monotonic_time(); return g_get_monotonic_time();
@ -1167,9 +1168,21 @@ DummyAudioBackend::main_process_thread ()
if (!_freewheeling) { if (!_freewheeling) {
clock2 = _x_get_monotonic_usec(); clock2 = _x_get_monotonic_usec();
#ifdef PLATFORM_WINDOWS
// querying the performance counter can fail occasionally
if (clock1 < 0 || clock2 < 0) {
clock2 = clock1 = 0;
}
#endif
const int64_t elapsed_time = clock2 - clock1; const int64_t elapsed_time = clock2 - clock1;
const int64_t nomial_time = 1e6 * _samples_per_period / _samplerate; const int64_t nomial_time = 1e6 * _samples_per_period / _samplerate;
_dsp_load = _dsp_load + .05 * ((elapsed_time / (float) nomial_time) - _dsp_load) + 1e-12; #ifdef PLATFORM_WINDOWS
if (clock1 >= 0 && clock2 >= 0)
#endif
{ // low pass filter
_dsp_load = _dsp_load + .05 * ((elapsed_time / (float) nomial_time) - _dsp_load) + 1e-12;
}
if (elapsed_time < nomial_time) { if (elapsed_time < nomial_time) {
Glib::usleep (nomial_time - elapsed_time); Glib::usleep (nomial_time - elapsed_time);
} else { } else {