From e45b13b536666034c9b6fe52a9321d749dae3c02 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sat, 28 Mar 2015 12:35:50 +0000 Subject: [PATCH] SignalData: Renamed get_max_sample_count --- pv/data/analog.cpp | 2 +- pv/data/analog.hpp | 2 +- pv/data/decoderstack.cpp | 2 +- pv/data/decoderstack.hpp | 2 +- pv/data/logic.cpp | 2 +- pv/data/logic.hpp | 2 +- pv/data/signaldata.hpp | 2 +- pv/view/view.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp index c95fffaf..ca2659b1 100644 --- a/pv/data/analog.cpp +++ b/pv/data/analog.cpp @@ -57,7 +57,7 @@ void Analog::clear() segments_.clear(); } -uint64_t Analog::get_max_sample_count() const +uint64_t Analog::max_sample_count() const { uint64_t l = 0; for (const std::shared_ptr s : segments_) { diff --git a/pv/data/analog.hpp b/pv/data/analog.hpp index 777deb6d..58f5f3f7 100644 --- a/pv/data/analog.hpp +++ b/pv/data/analog.hpp @@ -46,7 +46,7 @@ public: void clear(); - uint64_t get_max_sample_count() const; + uint64_t max_sample_count() const; private: std::deque< std::shared_ptr > segments_; diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index e9876d21..912d98c7 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -272,7 +272,7 @@ void DecoderStack::begin_decode() decode_thread_ = std::thread(&DecoderStack::decode_proc, this); } -uint64_t DecoderStack::get_max_sample_count() const +uint64_t DecoderStack::max_sample_count() const { uint64_t max_sample_count = 0; diff --git a/pv/data/decoderstack.hpp b/pv/data/decoderstack.hpp index cd380dfb..99df3887 100644 --- a/pv/data/decoderstack.hpp +++ b/pv/data/decoderstack.hpp @@ -107,7 +107,7 @@ public: void clear(); - uint64_t get_max_sample_count() const; + uint64_t max_sample_count() const; void begin_decode(); diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp index 3d7f2742..b3463531 100644 --- a/pv/data/logic.cpp +++ b/pv/data/logic.cpp @@ -65,7 +65,7 @@ void Logic::clear() segments_.clear(); } -uint64_t Logic::get_max_sample_count() const +uint64_t Logic::max_sample_count() const { uint64_t l = 0; for (std::shared_ptr s : segments_) { diff --git a/pv/data/logic.hpp b/pv/data/logic.hpp index 990ad3ff..a597027f 100644 --- a/pv/data/logic.hpp +++ b/pv/data/logic.hpp @@ -47,7 +47,7 @@ public: void clear(); - uint64_t get_max_sample_count() const; + uint64_t max_sample_count() const; private: const unsigned int num_channels_; diff --git a/pv/data/signaldata.hpp b/pv/data/signaldata.hpp index 11768f69..ff30cf1a 100644 --- a/pv/data/signaldata.hpp +++ b/pv/data/signaldata.hpp @@ -41,7 +41,7 @@ public: virtual void clear() = 0; - virtual uint64_t get_max_sample_count() const = 0; + virtual uint64_t max_sample_count() const = 0; }; } // namespace data diff --git a/pv/view/view.cpp b/pv/view/view.cpp index f6c41843..a05ac207 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -323,7 +323,7 @@ pair View::get_time_extents() const const double start_time = s->start_time(); left_time = min(left_time, start_time); right_time = max(right_time, start_time + - d->get_max_sample_count() / samplerate); + d->max_sample_count() / samplerate); } } -- 2.30.2