Introduce pv::data::SignalBase

[pulseview.git] / pv / storesession.hpp

diff --git a/pv/storesession.hpp b/pv/storesession.hpp
index e6778b5ed94e37d03aeede26cdd4d60a9612bd06..07d3c2fa94270497f334dd58ccba98ec9f71e54d 100644 (file)
--- a/pv/storesession.hpp
+++ b/pv/storesession.hpp
@@ -18,18 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_STORESESSION_H
-#define PULSEVIEW_PV_STORESESSION_H
+#ifndef PULSEVIEW_PV_STORESESSION_HPP
+#define PULSEVIEW_PV_STORESESSION_HPP
 
 #include <stdint.h>
 
 #include <atomic>
 #include <fstream>
+#include <map>
 #include <memory>
 #include <mutex>
 #include <string>
 #include <thread>
 
+#include <glibmm/variant.h>
+
 #include <QObject>
 
 namespace sigrok {
@@ -42,6 +45,8 @@ namespace pv {
 class Session;
 
 namespace data {
+class SignalBase;
+class AnalogSegment;
 class LogicSegment;
 }
 
@@ -55,6 +60,8 @@ private:
 public:
        StoreSession(const std::string &file_name,
                const std::shared_ptr<sigrok::OutputFormat> &output_format,
+               const std::map<std::string, Glib::VariantBase> &options,
+               const std::pair<uint64_t, uint64_t> sample_range,
                const Session &session);
 
        ~StoreSession();
@@ -70,7 +77,9 @@ public:
        void cancel();
 
 private:
-       void store_proc(std::shared_ptr<pv::data::LogicSegment> segment);
+       void store_proc(std::vector< std::shared_ptr<data::SignalBase> > achannel_list,
+               std::vector< std::shared_ptr<pv::data::AnalogSegment> > asegment_list,
+               std::shared_ptr<pv::data::LogicSegment> lsegment);
 
 Q_SIGNALS:
        void progress_updated();
@@ -78,6 +87,8 @@ Q_SIGNALS:
 private:
        const std::string file_name_;
        const std::shared_ptr<sigrok::OutputFormat> output_format_;
+       const std::map<std::string, Glib::VariantBase> options_;
+       const std::pair<uint64_t, uint64_t> sample_range_;
        const Session &session_;
 
        std::shared_ptr<sigrok::Output> output_;
@@ -91,8 +102,10 @@ private:
 
        mutable std::mutex mutex_;
        QString error_;
+
+       uint64_t start_sample_, sample_count_;
 };
 
 } // pv
 
-#endif // PULSEVIEW_PV_STORESESSION_H
+#endif // PULSEVIEW_PV_STORESESSION_HPP