#include "storesession.hpp"
+#include <pv/devicemanager.hpp>
#include <pv/session.hpp>
#include <pv/data/logic.hpp>
#include <pv/data/logicsegment.hpp>
+#include <pv/devices/device.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;
using std::shared_ptr;
using std::string;
using std::thread;
+using std::unordered_set;
using std::vector;
+using Glib::VariantBase;
+
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 map<string, VariantBase> &options, const Session &session) :
file_name_(file_name),
+ output_format_(output_format),
+ options_(options),
session_(session),
interrupt_(false),
units_stored_(0),
session_.get_data();
shared_lock<shared_mutex> lock(session_.signals_mutex());
- const vector< shared_ptr<view::Signal> > &sigs(session_.signals());
+ const unordered_set< shared_ptr<view::Signal> > &sigs(
+ session_.signals());
// Check we have logic data
if (data_set.empty() || sigs.empty()) {
// 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_)}});
+ const auto context = session_.device_manager().context();
+ auto device = session_.device()->device();
+
+ map<string, Glib::VariantBase> options = 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())}});
size_t length = end_sample - start_sample;
try {
- auto context = session_.session()->context();
+ const auto context = session_.device_manager().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;
progress_updated();
output_.reset();
+ output_stream_.close();
delete[] data;
}