Modified header guards to match file names

[pulseview.git] / pv / storesession.cpp

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 6ecde13aff92a5594eb3a0f931687e5fa7170d9d..d58fd4981d3f5830f8c3c64b92f95d7347da92a4 100644 (file)
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -27,15 +27,17 @@
 #include <pv/data/logicsegment.hpp>
 #include <pv/view/signal.hpp>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using boost::shared_lock;
 using boost::shared_mutex;
 
 using std::deque;
 using std::dynamic_pointer_cast;
+using std::ios_base;
 using std::lock_guard;
 using std::make_pair;
+using std::map;
 using std::min;
 using std::mutex;
 using std::pair;
@@ -47,14 +49,16 @@ using std::vector;
 
 using sigrok::ConfigKey;
 using sigrok::Error;
+using sigrok::OutputFormat;
 
 namespace pv {
 
 const size_t StoreSession::BlockSize = 1024 * 1024;
 
 StoreSession::StoreSession(const std::string &file_name,
-       const Session &session) :
+       const shared_ptr<OutputFormat> &output_format, const Session &session) :
        file_name_(file_name),
+       output_format_(output_format),
        session_(session),
        interrupt_(false),
        units_stored_(0),
@@ -121,11 +125,21 @@ bool StoreSession::start()
        // Begin storing
        try {
                auto context = session_.session()->context();
-               auto output_format = context->output_formats()["srzip"];
                auto device = session_.device();
-               output_ = output_format->create_output(device,
-                       {{"filename",
-                               Glib::Variant<Glib::ustring>::create(file_name_)}});
+
+               map<string, Glib::VariantBase> options;
+
+               // If the output has the capability to write files, use it.
+               // Otherwise, open the output stream.
+               const auto opt_list = output_format_->options();
+               if (opt_list.find("filename") != opt_list.end())
+                       options["filename"] =
+                               Glib::Variant<Glib::ustring>::create(file_name_);
+               else
+                       output_stream_.open(file_name_, ios_base::binary |
+                               ios_base::trunc | ios_base::out);
+
+               output_ = output_format_->create_output(device, options);
                auto meta = context->create_meta_packet(
                        {{ConfigKey::SAMPLERATE, Glib::Variant<guint64>::create(
                                segment->samplerate())}});
@@ -188,7 +202,9 @@ void StoreSession::store_proc(shared_ptr<data::LogicSegment> segment)
                try {
                        auto context = session_.session()->context();
                        auto logic = context->create_logic_packet(data, length, unit_size);
-                       output_->receive(logic);
+                       const string data = output_->receive(logic);
+                       if (output_stream_.is_open())
+                               output_stream_ << data;
                } catch (Error error) {
                        error_ = tr("Error while saving.");
                        break;
@@ -204,6 +220,7 @@ void StoreSession::store_proc(shared_ptr<data::LogicSegment> segment)
        progress_updated();
 
        output_.reset();
+       output_stream_.close();
 
        delete[] data;
 }