smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 00:34:59 +01:00
Code Issues Projects Releases Wiki Activity

Use llabs (rather than std::abs) for compatibility with MSVC

Browse source 
MSVC doesn't offer an override which accepts int64_t (at least, the 32-bit compiler doesn't)
This commit is contained in:
John Emmas 2015-07-31 13:43:22 +01:00
parent 0428f2e4c9
commit f3d3082872
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/backends/portaudio/portaudio_backend.cc
View file

@ -1421,9 +1421,9 @@ PortAudioBackend::main_process_thread ()
uint64_t cycle_diff_us = (m_cycle_timer.get_start () - m_last_cycle_start); uint64_t cycle_diff_us = (m_cycle_timer.get_start () - m_last_cycle_start);
int64_t deviation_us = (cycle_diff_us - m_cycle_timer.get_length_us()); int64_t deviation_us = (cycle_diff_us - m_cycle_timer.get_length_us());
m_total_deviation_us += std::abs(deviation_us); m_total_deviation_us += ::llabs(deviation_us);
m_max_deviation_us = m_max_deviation_us =
std::max (m_max_deviation_us, (uint64_t)std::abs (deviation_us)); std::max (m_max_deviation_us, (uint64_t)::llabs (deviation_us));
if ((m_cycle_count % 1000) == 0) { if ((m_cycle_count % 1000) == 0) {
uint64_t mean_deviation_us = m_total_deviation_us / m_cycle_count; uint64_t mean_deviation_us = m_total_deviation_us / m_cycle_count;
@ -1433,7 +1433,7 @@ PortAudioBackend::main_process_thread ()
m_max_deviation_us * 1e-3)); m_max_deviation_us * 1e-3));
} }
if (std::abs(deviation_us) > m_cycle_timer.get_length_us()) { if (::llabs(deviation_us) > m_cycle_timer.get_length_us()) {
DEBUG_TIMING (string_compose ( DEBUG_TIMING (string_compose (
"time between process(ms): %1, Est(ms): %2, Dev(ms): %3\n", "time between process(ms): %1, Est(ms): %2, Dev(ms): %3\n",
cycle_diff_us * 1e-3, cycle_diff_us * 1e-3,