#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 <libsigrokcxx/libsigrokcxx.hpp>
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;
const size_t StoreSession::BlockSize = 1024 * 1024;
StoreSession::StoreSession(const std::string &file_name,
- const shared_ptr<OutputFormat> &output_format, 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 device = session_.device();
-
- 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);
+ const auto context = session_.device_manager().context();
+ auto device = session_.device()->device();
+
+ map<string, Glib::VariantBase> options = options_;
+
+ output_stream_.open(file_name_, ios_base::binary |
+ ios_base::trunc | ios_base::out);
+
+ output_ = output_format_->create_output(file_name_, device, options);
auto meta = context->create_meta_packet(
{{ConfigKey::SAMPLERATE, Glib::Variant<guint64>::create(
segment->samplerate())}});
start_sample + samples_per_block, sample_count);
segment->get_samples(data, start_sample, end_sample);
- size_t length = end_sample - start_sample;
+ size_t length = (end_sample - start_sample) * unit_size;
try {
- auto context = session_.session()->context();
+ const auto context = session_.device_manager().context();
auto logic = context->create_logic_packet(data, length, unit_size);
const string data = output_->receive(logic);
if (output_stream_.is_open())