LogicSignal: Tidied up forward declarations

[pulseview.git] / pv / storesession.hpp

diff --git a/pv/storesession.hpp b/pv/storesession.hpp
index 62cf18958e251229e02b19abb29a189fd999dda1..9f31d59a7920c93d6252dba98acf0eee8fcef0d9 100644 (file)
--- a/pv/storesession.hpp
+++ b/pv/storesession.hpp
@@ -18,20 +18,26 @@
  * 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 {
 class Output;
+class OutputFormat;
 }
 
 namespace pv {
@@ -39,7 +45,7 @@ namespace pv {
 class Session;
 
 namespace data {
-class LogicSnapshot;
+class LogicSegment;
 }
 
 class StoreSession : public QObject
@@ -51,6 +57,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 Session &session);
 
        ~StoreSession();
@@ -66,16 +74,19 @@ public:
        void cancel();
 
 private:
-       void store_proc(std::shared_ptr<pv::data::LogicSnapshot> snapshot);
+       void store_proc(std::shared_ptr<pv::data::LogicSegment> segment);
 
 Q_SIGNALS:
        void progress_updated();
 
 private:
        const std::string file_name_;
+       const std::shared_ptr<sigrok::OutputFormat> output_format_;
+       const std::map<std::string, Glib::VariantBase> options_;
        const Session &session_;
 
        std::shared_ptr<sigrok::Output> output_;
+       std::ofstream output_stream_;
 
        std::thread thread_;
 
@@ -89,4 +100,4 @@ private:
 
 } // pv
 
-#endif // PULSEVIEW_PV_STORESESSION_H
+#endif // PULSEVIEW_PV_STORESESSION_HPP