projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow, View::View: Fix two memory errors reported by valgrind
[pulseview.git]
/
pv
/
data
/
signaldata.hpp
diff --git
a/pv/data/signaldata.hpp
b/pv/data/signaldata.hpp
index 35b1305fcfcf0a4d90b7890f1d829218d0a8c65f..4b356100e3642a966526e200db7497166a280355 100644
(file)
--- a/
pv/data/signaldata.hpp
+++ b/
pv/data/signaldata.hpp
@@
-18,8
+18,8
@@
* 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_SIGNALDATA_H
-#define PULSEVIEW_PV_DATA_SIGNALDATA_H
+#ifndef PULSEVIEW_PV_DATA_SIGNALDATA_H
PP
+#define PULSEVIEW_PV_DATA_SIGNALDATA_H
PP
#include <cstdint>
#include <memory>
#include <cstdint>
#include <memory>
@@
-28,32
+28,23
@@
namespace pv {
namespace data {
namespace pv {
namespace data {
-class S
napsho
t;
+class S
egmen
t;
class SignalData
{
public:
class SignalData
{
public:
- SignalData();
+ SignalData()
= default
;
virtual ~SignalData() {}
public:
virtual ~SignalData() {}
public:
- double samplerate() const;
- void set_samplerate(double samplerate);
-
- double get_start_time() const;
-
- virtual std::vector< std::shared_ptr<Snapshot> > snapshots() const = 0;
+ virtual std::vector< std::shared_ptr<Segment> > segments() const = 0;
virtual void clear() = 0;
virtual void clear() = 0;
- virtual uint64_t get_max_sample_count() const = 0;
-
-protected:
- double start_time_;
- double samplerate_;
+ virtual uint64_t max_sample_count() const = 0;
};
} // namespace data
} // namespace pv
};
} // namespace data
} // namespace pv
-#endif // PULSEVIEW_PV_DATA_SIGNALDATA_H
+#endif // PULSEVIEW_PV_DATA_SIGNALDATA_H
PP