StoreSession: Support output formats other than srzip

[pulseview.git] / pv / storesession.hpp

diff --git a/pv/storesession.hpp b/pv/storesession.hpp
index 8eaddaa60f50ebb3138870a6463d5937973d5e54..e6778b5ed94e37d03aeede26cdd4d60a9612bd06 100644 (file)
--- a/pv/storesession.hpp
+++ b/pv/storesession.hpp
@@ -24,6 +24,8 @@
 #include <stdint.h>
 
 #include <atomic>
 #include <stdint.h>
 
 #include <atomic>

+#include <fstream>
+#include <memory>

 #include <mutex>
 #include <string>
 #include <thread>
 #include <mutex>
 #include <string>
 #include <thread>


@@ -32,14 +34,15 @@
 
 namespace sigrok {
 class Output;
 
 namespace sigrok {
 class Output;

+class OutputFormat;

 }
 
 namespace pv {
 
 }
 
 namespace pv {
 

-class SigSession;
+class Session;

 
 namespace data {
 
 namespace data {

-class LogicSnapshot;
+class LogicSegment;

 }
 
 class StoreSession : public QObject
 }
 
 class StoreSession : public QObject


@@ -51,7 +54,8 @@ private:
 
 public:
        StoreSession(const std::string &file_name,
 
 public:
        StoreSession(const std::string &file_name,

-               const SigSession &session);
+               const std::shared_ptr<sigrok::OutputFormat> &output_format,
+               const Session &session);

 
        ~StoreSession();
 
 
        ~StoreSession();
 


@@ -66,16 +70,18 @@ public:
        void cancel();
 
 private:
        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_;
 
 Q_SIGNALS:
        void progress_updated();
 
 private:
        const std::string file_name_;

-       const SigSession &session_;
+       const std::shared_ptr<sigrok::OutputFormat> output_format_;
+       const Session &session_;

 
        std::shared_ptr<sigrok::Output> output_;
 
        std::shared_ptr<sigrok::Output> output_;

+       std::ofstream output_stream_;

 
        std::thread thread_;
 
 
        std::thread thread_;