Modified header guards to match file names

[pulseview.git] / pv / data / signaldata.hpp

diff --git a/pv/data/signaldata.hpp b/pv/data/signaldata.hpp
index 885f843556a70c90f2df6aaebdf0fceeea0ee8e9..11768f69beab1e96d05fdcf02f7cd9a5f03eb2e9 100644 (file)
--- a/pv/data/signaldata.hpp
+++ b/pv/data/signaldata.hpp
@@ -18,14 +18,18 @@
  * 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_HPP
+#define PULSEVIEW_PV_DATA_SIGNALDATA_HPP

 
 

-#include <stdint.h>
+#include <cstdint>
+#include <memory>
+#include <vector>

 
 namespace pv {
 namespace data {
 
 
 namespace pv {
 namespace data {
 

+class Segment;
+

 class SignalData
 {
 public:
 class SignalData
 {
 public:


@@ -33,21 +37,14 @@ public:
        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<Segment> > segments() const = 0;

 
        virtual void clear() = 0;
 
        virtual uint64_t get_max_sample_count() const = 0;
 
        virtual void clear() = 0;
 
        virtual uint64_t get_max_sample_count() const = 0;

-
-protected:
-       double start_time_;
-       double samplerate_;

 };
 
 } // namespace data
 } // namespace pv
 
 };
 
 } // namespace data
 } // namespace pv
 

-#endif // PULSEVIEW_PV_DATA_SIGNALDATA_H
+#endif // PULSEVIEW_PV_DATA_SIGNALDATA_HPP