X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=31ca328deca53bf1c9cfd90d426fb228da228af6;hp=34ed26b8fada81a4468868e94447610f78754a03;hb=8b9056d493c657e01fcea037eff6b477c1ec9253;hpb=aecae05c598b1fe914253b980aa6ad43b85f562b diff --git a/pv/session.cpp b/pv/session.cpp index 34ed26b8..31ca328d 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -14,17 +14,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ -#ifdef _WIN32 -// Windows: Avoid boost/thread namespace pollution (which includes windows.h). -#define NOGDI -#define NORESOURCE -#endif -#include -#include +#include #include #include @@ -32,18 +25,19 @@ #include -#include "session.hpp" #include "devicemanager.hpp" +#include "session.hpp" #include "data/analog.hpp" #include "data/analogsegment.hpp" +#include "data/decode/decoder.hpp" #include "data/decoderstack.hpp" #include "data/logic.hpp" #include "data/logicsegment.hpp" #include "data/signalbase.hpp" -#include "data/decode/decoder.hpp" #include "devices/hardwaredevice.hpp" +#include "devices/inputfile.hpp" #include "devices/sessionfile.hpp" #include "toolbars/mainbar.hpp" @@ -60,18 +54,21 @@ #include #endif -using boost::shared_lock; -using boost::shared_mutex; -using boost::unique_lock; - +using std::bad_alloc; using std::dynamic_pointer_cast; +using std::find_if; using std::function; using std::lock_guard; using std::list; +using std::make_pair; +using std::make_shared; using std::map; +using std::max; +using std::move; using std::mutex; +using std::pair; using std::recursive_mutex; -using std::set; +using std::runtime_error; using std::shared_ptr; using std::string; using std::unordered_set; @@ -79,27 +76,25 @@ using std::vector; using sigrok::Analog; using sigrok::Channel; -using sigrok::ChannelType; using sigrok::ConfigKey; using sigrok::DatafeedCallbackFunction; using sigrok::Error; -using sigrok::Header; +using sigrok::InputFormat; using sigrok::Logic; using sigrok::Meta; using sigrok::Packet; -using sigrok::PacketPayload; using sigrok::Session; -using sigrok::SessionDevice; using Glib::VariantBase; -using Glib::Variant; namespace pv { Session::Session(DeviceManager &device_manager, QString name) : device_manager_(device_manager), + default_name_(name), name_(name), capture_state_(Stopped), - cur_samplerate_(0) + cur_samplerate_(0), + data_saved_(true) { } @@ -146,12 +141,17 @@ void Session::set_name(QString name) name_changed(); } -std::shared_ptr Session::main_view() const +const list< shared_ptr > Session::views() const +{ + return views_; +} + +shared_ptr Session::main_view() const { return main_view_; } -void Session::set_main_bar(std::shared_ptr main_bar) +void Session::set_main_bar(shared_ptr main_bar) { main_bar_ = main_bar; } @@ -161,28 +161,53 @@ shared_ptr Session::main_bar() const return main_bar_; } +bool Session::data_saved() const +{ + return data_saved_; +} + void Session::save_settings(QSettings &settings) const { map dev_info; list key_list; - int stacks = 0; + int stacks = 0, views = 0; if (device_) { - settings.beginGroup("Device"); - key_list.push_back("vendor"); - key_list.push_back("model"); - key_list.push_back("version"); - key_list.push_back("serial_num"); - key_list.push_back("connection_id"); + shared_ptr hw_device = + dynamic_pointer_cast< devices::HardwareDevice >(device_); + + if (hw_device) { + settings.setValue("device_type", "hardware"); + settings.beginGroup("device"); + + key_list.emplace_back("vendor"); + key_list.emplace_back("model"); + key_list.emplace_back("version"); + key_list.emplace_back("serial_num"); + key_list.emplace_back("connection_id"); + + dev_info = device_manager_.get_device_info(device_); + + for (string key : key_list) { + if (dev_info.count(key)) + settings.setValue(QString::fromUtf8(key.c_str()), + QString::fromUtf8(dev_info.at(key).c_str())); + else + settings.remove(QString::fromUtf8(key.c_str())); + } - dev_info = device_manager_.get_device_info(device_); + settings.endGroup(); + } - for (string key : key_list) { - if (dev_info.count(key)) - settings.setValue(QString::fromUtf8(key.c_str()), - QString::fromUtf8(dev_info.at(key).c_str())); - else - settings.remove(QString::fromUtf8(key.c_str())); + shared_ptr sessionfile_device = + dynamic_pointer_cast< devices::SessionFile >(device_); + + if (sessionfile_device) { + settings.setValue("device_type", "sessionfile"); + settings.beginGroup("device"); + settings.setValue("filename", QString::fromStdString( + sessionfile_device->full_name())); + settings.endGroup(); } // Save channels and decoders @@ -191,7 +216,7 @@ void Session::save_settings(QSettings &settings) const if (base->is_decode_signal()) { shared_ptr decoder_stack = base->decoder_stack(); - std::shared_ptr top_decoder = + shared_ptr top_decoder = decoder_stack->stack().front(); settings.beginGroup("decoder_stack" + QString::number(stacks++)); @@ -202,54 +227,90 @@ void Session::save_settings(QSettings &settings) const #endif { settings.beginGroup(base->internal_name()); - settings.setValue("name", base->name()); - settings.setValue("enabled", base->enabled()); - settings.setValue("colour", base->colour()); + base->save_settings(settings); settings.endGroup(); } } settings.setValue("decoder_stacks", stacks); + + // Save view states and their signal settings + // Note: main_view must be saved as view0 + settings.beginGroup("view" + QString::number(views++)); + main_view_->save_settings(settings); settings.endGroup(); + + for (shared_ptr view : views_) { + if (view != main_view_) { + settings.beginGroup("view" + QString::number(views++)); + view->save_settings(settings); + settings.endGroup(); + } + } + + settings.setValue("views", views); } } void Session::restore_settings(QSettings &settings) { - map dev_info; - list key_list; - shared_ptr device; + shared_ptr device; + + QString device_type = settings.value("device_type").toString(); + + if (device_type == "hardware") { + map dev_info; + list key_list; + + // Re-select last used device if possible but only if it's not demo + settings.beginGroup("device"); + key_list.emplace_back("vendor"); + key_list.emplace_back("model"); + key_list.emplace_back("version"); + key_list.emplace_back("serial_num"); + key_list.emplace_back("connection_id"); - // Re-select last used device if possible but only if it's not demo - settings.beginGroup("Device"); - key_list.push_back("vendor"); - key_list.push_back("model"); - key_list.push_back("version"); - key_list.push_back("serial_num"); - key_list.push_back("connection_id"); + for (string key : key_list) { + const QString k = QString::fromStdString(key); + if (!settings.contains(k)) + continue; + + const string value = settings.value(k).toString().toStdString(); + if (!value.empty()) + dev_info.insert(make_pair(key, value)); + } + + if (dev_info.count("model") > 0) + device = device_manager_.find_device_from_info(dev_info); - for (string key : key_list) { - const QString k = QString::fromStdString(key); - if (!settings.contains(k)) - continue; + if (device) + set_device(device); - const string value = settings.value(k).toString().toStdString(); - if (!value.empty()) - dev_info.insert(std::make_pair(key, value)); + settings.endGroup(); } - if (dev_info.count("model") > 0) - device = device_manager_.find_device_from_info(dev_info); + if (device_type == "sessionfile") { + settings.beginGroup("device"); + QString filename = settings.value("filename").toString(); + settings.endGroup(); + + if (QFileInfo(filename).isReadable()) { + device = make_shared(device_manager_.context(), + filename.toStdString()); + set_device(device); - if (device) { - set_device(device); + // TODO Perform error handling + start_capture([](QString infoMessage) { (void)infoMessage; }); + set_name(QFileInfo(filename).fileName()); + } + } + + if (device) { // Restore channels for (shared_ptr base : signalbases_) { settings.beginGroup(base->internal_name()); - base->set_name(settings.value("name").toString()); - base->set_enabled(settings.value("enabled").toBool()); - base->set_colour(settings.value("colour").value()); + base->restore_settings(settings); settings.endGroup(); } @@ -266,9 +327,36 @@ void Session::restore_settings(QSettings &settings) settings.endGroup(); } #endif + + // Restore views + int views = settings.value("views").toInt(); + + for (int i = 0; i < views; i++) { + settings.beginGroup("view" + QString::number(i)); + + if (i > 0) { + views::ViewType type = (views::ViewType)settings.value("type").toInt(); + add_view(name_, type, this); + views_.back()->restore_settings(settings); + } else + main_view_->restore_settings(settings); + + settings.endGroup(); + } } +} - settings.endGroup(); +void Session::select_device(shared_ptr device) +{ + try { + if (device) + set_device(device); + else + set_default_device(); + } catch (const QString &e) { + main_bar_->session_error(tr("Failed to Select Device"), + tr("Failed to Select Device")); + } } void Session::set_device(shared_ptr device) @@ -283,15 +371,15 @@ void Session::set_device(shared_ptr device) device_.reset(); - // Revert name back to default name (e.g. "Untitled-1") as the data is gone + // Revert name back to default name (e.g. "Session 1") as the data is gone name_ = default_name_; name_changed(); // Remove all stored data - for (std::shared_ptr view : views_) { + for (shared_ptr view : views_) { view->clear_signals(); #ifdef ENABLE_DECODE - view->clear_decode_traces(); + view->clear_decode_signals(); #endif } for (const shared_ptr d : all_signal_data_) @@ -309,22 +397,23 @@ void Session::set_device(shared_ptr device) signals_changed(); - device_ = std::move(device); + device_ = move(device); try { device_->open(); } catch (const QString &e) { device_.reset(); - device_changed(); - throw; } - device_->session()->add_datafeed_callback([=] - (shared_ptr device, shared_ptr packet) { - data_feed_in(device, packet); - }); + if (device_) { + device_->session()->add_datafeed_callback([=] + (shared_ptr device, shared_ptr packet) { + data_feed_in(device, packet); + }); + + update_signals(); + } - update_signals(); device_changed(); } @@ -337,13 +426,68 @@ void Session::set_default_device() return; // Try and find the demo device and select that by default - const auto iter = std::find_if(devices.begin(), devices.end(), + const auto iter = find_if(devices.begin(), devices.end(), [] (const shared_ptr &d) { - return d->hardware_device()->driver()->name() == - "demo"; }); + return d->hardware_device()->driver()->name() == "demo"; }); set_device((iter == devices.end()) ? devices.front() : *iter); } +void Session::load_init_file(const string &file_name, const string &format) +{ + shared_ptr input_format; + + if (!format.empty()) { + const map > formats = + device_manager_.context()->input_formats(); + const auto iter = find_if(formats.begin(), formats.end(), + [&](const pair > f) { + return f.first == format; }); + if (iter == formats.end()) { + main_bar_->session_error(tr("Error"), + tr("Unexpected input format: %s").arg(QString::fromStdString(format))); + return; + } + + input_format = (*iter).second; + } + + load_file(QString::fromStdString(file_name), input_format); +} + +void Session::load_file(QString file_name, + shared_ptr format, + const map &options) +{ + const QString errorMessage( + QString("Failed to load file %1").arg(file_name)); + + try { + if (format) + set_device(shared_ptr( + new devices::InputFile( + device_manager_.context(), + file_name.toStdString(), + format, options))); + else + set_device(shared_ptr( + new devices::SessionFile( + device_manager_.context(), + file_name.toStdString()))); + } catch (Error e) { + main_bar_->session_error(tr("Failed to load ") + file_name, e.what()); + set_default_device(); + main_bar_->update_device_list(); + return; + } + + main_bar_->update_device_list(); + + start_capture([&, errorMessage](QString infoMessage) { + main_bar_->session_error(errorMessage, infoMessage); }); + + set_name(QFileInfo(file_name).fileName()); +} + Session::capture_state Session::get_capture_state() const { lock_guard lock(sampling_mutex_); @@ -363,7 +507,7 @@ void Session::start_capture(function error_handler) const shared_ptr sr_dev = device_->device(); if (sr_dev) { const auto channels = sr_dev->channels(); - if (!std::any_of(channels.begin(), channels.end(), + if (!any_of(channels.begin(), channels.end(), [](shared_ptr channel) { return channel->enabled(); })) { error_handler(tr("No channels enabled.")); @@ -375,9 +519,15 @@ void Session::start_capture(function error_handler) for (const shared_ptr d : all_signal_data_) d->clear(); - // Revert name back to default name (e.g. "Untitled-1") as the data is gone - name_ = default_name_; - name_changed(); + // Revert name back to default name (e.g. "Session 1") for real devices + // as the (possibly saved) data is gone. File devices keep their name. + shared_ptr hw_device = + dynamic_pointer_cast< devices::HardwareDevice >(device_); + + if (hw_device) { + name_ = default_name_; + name_changed(); + } // Begin the session sampling_thread_ = std::thread( @@ -394,18 +544,20 @@ void Session::stop_capture() sampling_thread_.join(); } -void Session::register_view(std::shared_ptr view) +void Session::register_view(shared_ptr view) { if (views_.empty()) { main_view_ = view; } - views_.insert(view); + views_.push_back(view); + + update_signals(); } -void Session::deregister_view(std::shared_ptr view) +void Session::deregister_view(shared_ptr view) { - views_.erase(view); + views_.remove_if([&](shared_ptr v) { return v == view; }); if (views_.empty()) { main_view_.reset(); @@ -415,9 +567,13 @@ void Session::deregister_view(std::shared_ptr view) } } -bool Session::has_view(std::shared_ptr view) +bool Session::has_view(shared_ptr view) { - return views_.find(view) != views_.end(); + for (shared_ptr v : views_) + if (v == view) + return true; + + return false; } double Session::get_samplerate() const @@ -429,7 +585,7 @@ double Session::get_samplerate() const const vector< shared_ptr > segments = d->segments(); for (const shared_ptr &s : segments) - samplerate = std::max(samplerate, s->samplerate()); + samplerate = max(samplerate, s->samplerate()); } // If there is no sample rate given we use samples as unit if (samplerate == 0.0) @@ -438,8 +594,7 @@ double Session::get_samplerate() const return samplerate; } -const std::unordered_set< std::shared_ptr > - Session::signalbases() const +const unordered_set< shared_ptr > Session::signalbases() const { return signalbases_; } @@ -447,16 +602,18 @@ const std::unordered_set< std::shared_ptr > #ifdef ENABLE_DECODE bool Session::add_decoder(srd_decoder *const dec) { + if (!dec) + return false; + map > channels; shared_ptr decoder_stack; try { // Create the decoder - decoder_stack = shared_ptr( - new data::DecoderStack(*this, dec)); + decoder_stack = make_shared(*this, dec); // Make a list of all the channels - std::vector all_channels; + vector all_channels; for (const GSList *i = dec->channels; i; i = i->next) all_channels.push_back((const srd_channel*)i->data); for (const GSList *i = dec->opt_channels; i; i = i->next) @@ -465,7 +622,7 @@ bool Session::add_decoder(srd_decoder *const dec) // Auto select the initial channels for (const srd_channel *pdch : all_channels) for (shared_ptr b : signalbases_) { - if (b->type() == ChannelType::LOGIC) { + if (b->logic_data()) { if (QString::fromUtf8(pdch->name).toLower(). contains(b->name().toLower())) channels[pdch] = b; @@ -479,14 +636,14 @@ bool Session::add_decoder(srd_decoder *const dec) // Create the decode signal shared_ptr signalbase = - shared_ptr(new data::SignalBase(nullptr)); + make_shared(nullptr, data::SignalBase::DecodeChannel); signalbase->set_decoder_stack(decoder_stack); signalbases_.insert(signalbase); - for (std::shared_ptr view : views_) - view->add_decode_trace(signalbase); - } catch (std::runtime_error e) { + for (shared_ptr view : views_) + view->add_decode_signal(signalbase); + } catch (runtime_error e) { return false; } @@ -500,8 +657,12 @@ bool Session::add_decoder(srd_decoder *const dec) void Session::remove_decode_signal(shared_ptr signalbase) { - for (std::shared_ptr view : views_) - view->remove_decode_trace(signalbase); + signalbases_.erase(signalbase); + + for (shared_ptr view : views_) + view->remove_decode_signal(signalbase); + + signals_changed(); } #endif @@ -524,10 +685,10 @@ void Session::update_signals() if (!device_) { signalbases_.clear(); logic_data_.reset(); - for (std::shared_ptr view : views_) { + for (shared_ptr view : views_) { view->clear_signals(); #ifdef ENABLE_DECODE - view->clear_decode_traces(); + view->clear_decode_signals(); #endif } return; @@ -539,10 +700,10 @@ void Session::update_signals() if (!sr_dev) { signalbases_.clear(); logic_data_.reset(); - for (std::shared_ptr view : views_) { + for (shared_ptr view : views_) { view->clear_signals(); #ifdef ENABLE_DECODE - view->clear_decode_traces(); + view->clear_decode_signals(); #endif } return; @@ -550,10 +711,10 @@ void Session::update_signals() // Detect what data types we will receive auto channels = sr_dev->channels(); - unsigned int logic_channel_count = std::count_if( + unsigned int logic_channel_count = count_if( channels.begin(), channels.end(), [] (shared_ptr channel) { - return channel->type() == ChannelType::LOGIC; }); + return channel->type() == sigrok::ChannelType::LOGIC; }); // Create data containers for the logic data segments { @@ -570,69 +731,82 @@ void Session::update_signals() } // Make the signals list - for (std::shared_ptr view : views_) { - unordered_set< shared_ptr > prev_sigs(view->signals()); - view->clear_signals(); - - for (auto channel : sr_dev->channels()) { - shared_ptr signalbase; - shared_ptr signal; - - // Find the channel in the old signals - const auto iter = std::find_if( - prev_sigs.cbegin(), prev_sigs.cend(), - [&](const shared_ptr &s) { - return s->base()->channel() == channel; - }); - if (iter != prev_sigs.end()) { - // Copy the signal from the old set to the new - signal = *iter; - } else { - // Find the signalbase for this channel if possible - signalbase.reset(); - for (const shared_ptr b : signalbases_) - if (b->channel() == channel) - signalbase = b; - - switch(channel->type()->id()) { - case SR_CHANNEL_LOGIC: - if (!signalbase) { - signalbase = shared_ptr( - new data::SignalBase(channel)); - signalbases_.insert(signalbase); - - all_signal_data_.insert(logic_data_); - signalbase->set_data(logic_data_); + for (shared_ptr viewbase : views_) { + views::TraceView::View *trace_view = + qobject_cast(viewbase.get()); + + if (trace_view) { + unordered_set< shared_ptr > + prev_sigs(trace_view->signals()); + trace_view->clear_signals(); + + for (auto channel : sr_dev->channels()) { + shared_ptr signalbase; + shared_ptr signal; + + // Find the channel in the old signals + const auto iter = find_if( + prev_sigs.cbegin(), prev_sigs.cend(), + [&](const shared_ptr &s) { + return s->base()->channel() == channel; + }); + if (iter != prev_sigs.end()) { + // Copy the signal from the old set to the new + signal = *iter; + trace_view->add_signal(signal); + } else { + // Find the signalbase for this channel if possible + signalbase.reset(); + for (const shared_ptr b : signalbases_) + if (b->channel() == channel) + signalbase = b; + + switch(channel->type()->id()) { + case SR_CHANNEL_LOGIC: + if (!signalbase) { + signalbase = make_shared(channel, + data::SignalBase::LogicChannel); + signalbases_.insert(signalbase); + + all_signal_data_.insert(logic_data_); + signalbase->set_data(logic_data_); + + connect(this, SIGNAL(capture_state_changed(int)), + signalbase.get(), SLOT(on_capture_state_changed(int))); + } + + signal = shared_ptr( + new views::TraceView::LogicSignal(*this, + device_, signalbase)); + trace_view->add_signal(signal); + break; + + case SR_CHANNEL_ANALOG: + { + if (!signalbase) { + signalbase = make_shared(channel, + data::SignalBase::AnalogChannel); + signalbases_.insert(signalbase); + + shared_ptr data(new data::Analog()); + all_signal_data_.insert(data); + signalbase->set_data(data); + + connect(this, SIGNAL(capture_state_changed(int)), + signalbase.get(), SLOT(on_capture_state_changed(int))); + } + + signal = shared_ptr( + new views::TraceView::AnalogSignal( + *this, signalbase)); + trace_view->add_signal(signal); + break; } - signal = shared_ptr( - new view::LogicSignal(*this, - device_, signalbase)); - view->add_signal(signal); - break; - - case SR_CHANNEL_ANALOG: - { - if (!signalbase) { - signalbase = shared_ptr( - new data::SignalBase(channel)); - signalbases_.insert(signalbase); - - shared_ptr data(new data::Analog()); - all_signal_data_.insert(data); - signalbase->set_data(data); + default: + assert(false); + break; } - - signal = shared_ptr( - new view::AnalogSignal( - *this, signalbase)); - view->add_signal(signal); - break; - } - - default: - assert(0); - break; } } } @@ -679,13 +853,34 @@ void Session::sample_thread_proc(function error_handler) // Confirm that SR_DF_END was received if (cur_logic_segment_) { qDebug("SR_DF_END was not received."); - assert(0); + assert(false); } + // Optimize memory usage + free_unused_memory(); + + // We now have unsaved data unless we just "captured" from a file + shared_ptr file_device = + dynamic_pointer_cast(device_); + + if (!file_device) + data_saved_ = false; + if (out_of_memory_) error_handler(tr("Out of memory, acquisition stopped.")); } +void Session::free_unused_memory() +{ + for (shared_ptr data : all_signal_data_) { + const vector< shared_ptr > segments = data->segments(); + + for (shared_ptr segment : segments) { + segment->free_unused_memory(); + } + } +} + void Session::feed_in_header() { cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE); @@ -745,8 +940,6 @@ void Session::feed_in_logic(shared_ptr logic) { lock_guard lock(data_mutex_); - const size_t sample_count = logic->data_length() / logic->unit_size(); - if (!logic_data_) { // The only reason logic_data_ would not have been created is // if it was not possible to determine the signals when the @@ -759,9 +952,8 @@ void Session::feed_in_logic(shared_ptr logic) set_capture_state(Running); // Create a new data segment - cur_logic_segment_ = shared_ptr( - new data::LogicSegment( - logic, cur_samplerate_, sample_count)); + cur_logic_segment_ = make_shared( + *logic_data_, logic->unit_size(), cur_samplerate_); logic_data_->push_segment(cur_logic_segment_); // @todo Putting this here means that only listeners querying @@ -769,11 +961,10 @@ void Session::feed_in_logic(shared_ptr logic) // frame_began is DecoderStack, but in future we need to signal // this after both analog and logic sweeps have begun. frame_began(); - } else { - // Append to the existing data segment - cur_logic_segment_->append_payload(logic); } + cur_logic_segment_->append_payload(logic); + data_received(); } @@ -804,12 +995,6 @@ void Session::feed_in_analog(shared_ptr analog) // in the sweep containing this segment. sweep_beginning = true; - // Create a segment, keep it in the maps of channels - segment = shared_ptr( - new data::AnalogSegment( - cur_samplerate_, sample_count)); - cur_analog_segments_[channel] = segment; - // Find the analog data associated with the channel shared_ptr base = signalbase_from_channel(channel); assert(base); @@ -817,6 +1002,11 @@ void Session::feed_in_analog(shared_ptr analog) shared_ptr data(base->analog_data()); assert(data); + // Create a segment, keep it in the maps of channels + segment = make_shared( + *data, cur_samplerate_); + cur_analog_segments_[channel] = segment; + // Push the segment into the analog data. data->push_segment(segment); } @@ -839,6 +1029,8 @@ void Session::feed_in_analog(shared_ptr analog) void Session::data_feed_in(shared_ptr device, shared_ptr packet) { + static bool frame_began = false; + (void)device; assert(device); @@ -860,12 +1052,13 @@ void Session::data_feed_in(shared_ptr device, case SR_DF_FRAME_BEGIN: feed_in_frame_begin(); + frame_began = true; break; case SR_DF_LOGIC: try { feed_in_logic(dynamic_pointer_cast(packet->payload())); - } catch (std::bad_alloc) { + } catch (bad_alloc) { out_of_memory_ = true; device_->stop(); } @@ -874,12 +1067,13 @@ void Session::data_feed_in(shared_ptr device, case SR_DF_ANALOG: try { feed_in_analog(dynamic_pointer_cast(packet->payload())); - } catch (std::bad_alloc) { + } catch (bad_alloc) { out_of_memory_ = true; device_->stop(); } break; + case SR_DF_FRAME_END: case SR_DF_END: { { @@ -887,7 +1081,10 @@ void Session::data_feed_in(shared_ptr device, cur_logic_segment_.reset(); cur_analog_segments_.clear(); } - frame_ended(); + if (frame_began) { + frame_began = false; + frame_ended(); + } break; } default: @@ -895,4 +1092,9 @@ void Session::data_feed_in(shared_ptr device, } } +void Session::on_data_saved() +{ + data_saved_ = true; +} + } // namespace pv