summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Mayberry <mojofunk@gmail.com>2015-09-11 22:13:50 +1000
committerTim Mayberry <mojofunk@gmail.com>2015-09-16 11:22:16 +1000
commitb2a73935531fc1e0bab0fef8d8ce7868589af8c1 (patch)
tree3ceb3704e0176fb3ebc377862f96f94f7e74e27f
parenta974659504b5d0797e62d2d115812be17a1ea5a0 (diff)
Change types in DSPLoadCalculator to signed integer after change in utils::get_microsecond
-rw-r--r--libs/ardour/ardour/dsp_load_calculator.h14
-rw-r--r--libs/ardour/dsp_load_calculator.cc2
-rw-r--r--libs/backends/portaudio/portaudio_backend.cc4
3 files changed, 10 insertions, 10 deletions
diff --git a/libs/ardour/ardour/dsp_load_calculator.h b/libs/ardour/ardour/dsp_load_calculator.h
index b1944cc27e..6e1ac25cb0 100644
--- a/libs/ardour/ardour/dsp_load_calculator.h
+++ b/libs/ardour/ardour/dsp_load_calculator.h
@@ -56,16 +56,16 @@ public:
}
- uint64_t get_max_time_us() const { return m_max_time_us; }
+ int64_t get_max_time_us() const { return m_max_time_us; }
- void set_start_timestamp_us(uint64_t start_timestamp_us)
+ void set_start_timestamp_us(int64_t start_timestamp_us)
{
m_start_timestamp_us = start_timestamp_us;
}
- void set_stop_timestamp_us(uint64_t stop_timestamp_us);
+ void set_stop_timestamp_us(int64_t stop_timestamp_us);
- uint64_t elapsed_time_us()
+ int64_t elapsed_time_us()
{
return m_stop_timestamp_us - m_start_timestamp_us;
}
@@ -89,9 +89,9 @@ private: // methods
static uint32_t max_value_history () { return 16; }
private: // data
- uint64_t m_max_time_us;
- uint64_t m_start_timestamp_us;
- uint64_t m_stop_timestamp_us;
+ int64_t m_max_time_us;
+ int64_t m_start_timestamp_us;
+ int64_t m_stop_timestamp_us;
float m_dsp_load;
RingBuffer<float> m_value_history;
uint32_t m_num_values;
diff --git a/libs/ardour/dsp_load_calculator.cc b/libs/ardour/dsp_load_calculator.cc
index d30b417ad5..99147c6a14 100644
--- a/libs/ardour/dsp_load_calculator.cc
+++ b/libs/ardour/dsp_load_calculator.cc
@@ -21,7 +21,7 @@
namespace ARDOUR {
void
-DSPLoadCalculator::set_stop_timestamp_us(uint64_t stop_timestamp_us)
+DSPLoadCalculator::set_stop_timestamp_us(int64_t stop_timestamp_us)
{
// We could only bother with calculations if a certain amount of time
// has passed, or the Raw DSP value is > X% different than last calc
diff --git a/libs/backends/portaudio/portaudio_backend.cc b/libs/backends/portaudio/portaudio_backend.cc
index 60cd94c694..dcdb0d168d 100644
--- a/libs/backends/portaudio/portaudio_backend.cc
+++ b/libs/backends/portaudio/portaudio_backend.cc
@@ -1522,8 +1522,8 @@ PortAudioBackend::blocking_process_main(const float* interleaved_input_data,
float* interleaved_output_data)
{
uint32_t i = 0;
- uint64_t min_elapsed_us = 1000000;
- uint64_t max_elapsed_us = 0;
+ int64_t min_elapsed_us = 1000000;
+ int64_t max_elapsed_us = 0;
m_dsp_calc.set_start_timestamp_us (utils::get_microseconds());