projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Don't use get_active_view() to determine active session
[pulseview.git]
/
pv
/
data
/
segment.hpp
diff --git
a/pv/data/segment.hpp
b/pv/data/segment.hpp
index a754eab2604eb4918a1b20c2efb1ac2700f462a9..5d0a242aaf00f0634339eb25eb9f48644381f3e5 100644
(file)
--- a/
pv/data/segment.hpp
+++ b/
pv/data/segment.hpp
@@
-18,8
+18,10
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_DATA_SNAPSHOT_H
-#define PULSEVIEW_PV_DATA_SNAPSHOT_H
+#ifndef PULSEVIEW_PV_DATA_SEGMENT_HPP
+#define PULSEVIEW_PV_DATA_SEGMENT_HPP
+
+#include "pv/util.hpp"
#include <thread>
#include <mutex>
#include <thread>
#include <mutex>
@@
-37,7
+39,7
@@
public:
uint64_t get_sample_count() const;
uint64_t get_sample_count() const;
-
double
start_time() const;
+
const pv::util::Timestamp&
start_time() const;
double samplerate() const;
void set_samplerate(double samplerate);
double samplerate() const;
void set_samplerate(double samplerate);
@@
-78,7
+80,7
@@
protected:
mutable std::recursive_mutex mutex_;
std::vector<uint8_t> data_;
uint64_t sample_count_;
mutable std::recursive_mutex mutex_;
std::vector<uint8_t> data_;
uint64_t sample_count_;
-
double
start_time_;
+
pv::util::Timestamp
start_time_;
double samplerate_;
uint64_t capacity_;
unsigned int unit_size_;
double samplerate_;
uint64_t capacity_;
unsigned int unit_size_;
@@
-87,4
+89,4
@@
protected:
} // namespace data
} // namespace pv
} // namespace data
} // namespace pv
-#endif // PULSEVIEW_PV_DATA_S
NAPSHOT_H
+#endif // PULSEVIEW_PV_DATA_S
EGMENT_HPP