Session: Use set_device to select session file devices

[pulseview.git] / pv / session.cpp

diff --git a/pv/session.cpp b/pv/session.cpp
index 46af90cc0fa68141e1fe48782d56dc9a2a8a6771..751afb30bd746abb7fe95fa20a35dcce9a232149 100644 (file)
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -27,10 +27,10 @@
 #include "devicemanager.hpp"
 
 #include "data/analog.hpp"
-#include "data/analogsnapshot.hpp"
+#include "data/analogsegment.hpp"
 #include "data/decoderstack.hpp"
 #include "data/logic.hpp"
-#include "data/logicsnapshot.hpp"
+#include "data/logicsegment.hpp"
 #include "data/decode/decoder.hpp"
 
 #include "view/analogsignal.hpp"
@@ -45,7 +45,7 @@
 
 #include <QDebug>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using boost::shared_lock;
 using boost::shared_mutex;
@@ -123,9 +123,12 @@ void Session::set_device(shared_ptr<Device> device)
        stop_capture();
 
        // Are we setting a session device?
-       auto session_device = dynamic_pointer_cast<SessionDevice>(device);
+       const auto session_device =
+               dynamic_pointer_cast<SessionDevice>(device);
+
        // Did we have a session device selected previously?
-       auto prev_session_device = dynamic_pointer_cast<SessionDevice>(device_);
+       const auto prev_session_device =
+               dynamic_pointer_cast<SessionDevice>(device_);
 
        if (device_) {
                session_->remove_datafeed_callbacks();
@@ -159,6 +162,7 @@ void Session::set_device(shared_ptr<Device> device)
                        (shared_ptr<Device> device, shared_ptr<Packet> packet) {
                                data_feed_in(device, packet);
                        });
+               device_manager_.update_display_name(device);
                update_signals(device);
        } else
                device_ = nullptr;
@@ -166,18 +170,11 @@ void Session::set_device(shared_ptr<Device> device)
        device_selected();
 }
 
-void Session::set_file(const string &name)
+void Session::set_session_file(const string &name)
 {
-       session_ = device_manager_.context()->load_session(name);
-       device_ = session_->devices()[0];
-       decode_traces_.clear();
-       session_->add_datafeed_callback([=]
-               (shared_ptr<Device> device, shared_ptr<Packet> packet) {
-                       data_feed_in(device, packet);
-               });
-       device_manager_.update_display_name(device_);
-       update_signals(device_);
-       device_selected();
+       const shared_ptr<sigrok::Session> session =
+               device_manager_.context()->load_session(name);
+       set_device(session->devices()[0]);
 }
 
 void Session::set_default_device()
@@ -364,7 +361,7 @@ void Session::update_signals(shared_ptr<Device> device)
                [] (shared_ptr<Channel> channel) {
                        return channel->type() == ChannelType::LOGIC; });
 
-       // Create data containers for the logic data snapshots
+       // Create data containers for the logic data segments
        {
                lock_guard<mutex> data_lock(data_mutex_);
 
@@ -460,7 +457,7 @@ void Session::sample_thread_proc(shared_ptr<Device> device,
        set_capture_state(Stopped);
 
        // Confirm that SR_DF_END was received
-       if (cur_logic_snapshot_)
+       if (cur_logic_segment_)
        {
                qDebug("SR_DF_END was not received.");
                assert(0);
@@ -493,7 +490,7 @@ void Session::feed_in_meta(shared_ptr<Device> device,
 
 void Session::feed_in_frame_begin()
 {
-       if (cur_logic_snapshot_ || !cur_analog_snapshots_.empty())
+       if (cur_logic_segment_ || !cur_analog_segments_.empty())
                frame_began();
 }
 
@@ -507,7 +504,7 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
                return;
        }
 
-       if (!cur_logic_snapshot_)
+       if (!cur_logic_segment_)
        {
                // This could be the first packet after a trigger
                set_capture_state(Running);
@@ -522,11 +519,11 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
                        VariantBase::cast_dynamic<Variant<guint64>>(
                        device_->config_get(ConfigKey::LIMIT_SAMPLES)).get() : 0;
 
-               // Create a new data snapshot
-               cur_logic_snapshot_ = shared_ptr<data::LogicSnapshot>(
-                       new data::LogicSnapshot(
+               // Create a new data segment
+               cur_logic_segment_ = shared_ptr<data::LogicSegment>(
+                       new data::LogicSegment(
                                logic, cur_samplerate_, sample_limit));
-               logic_data_->push_snapshot(cur_logic_snapshot_);
+               logic_data_->push_segment(cur_logic_segment_);
 
                // @todo Putting this here means that only listeners querying
                // for logic will be notified. Currently the only user of
@@ -536,8 +533,8 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
        }
        else
        {
-               // Append to the existing data snapshot
-               cur_logic_snapshot_->append_payload(logic);
+               // Append to the existing data segment
+               cur_logic_segment_->append_payload(logic);
        }
 
        data_received();
@@ -555,18 +552,18 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 
        for (auto channel : channels)
        {
-               shared_ptr<data::AnalogSnapshot> snapshot;
+               shared_ptr<data::AnalogSegment> segment;
 
-               // Try to get the snapshot of the channel
-               const map< shared_ptr<Channel>, shared_ptr<data::AnalogSnapshot> >::
-                       iterator iter = cur_analog_snapshots_.find(channel);
-               if (iter != cur_analog_snapshots_.end())
-                       snapshot = (*iter).second;
+               // Try to get the segment of the channel
+               const map< shared_ptr<Channel>, shared_ptr<data::AnalogSegment> >::
+                       iterator iter = cur_analog_segments_.find(channel);
+               if (iter != cur_analog_segments_.end())
+                       segment = (*iter).second;
                else
                {
-                       // If no snapshot was found, this means we havn't
+                       // If no segment was found, this means we havn't
                        // created one yet. i.e. this is the first packet
-                       // in the sweep containing this snapshot.
+                       // in the sweep containing this segment.
                        sweep_beginning = true;
 
                        // Get sample limit.
@@ -578,11 +575,11 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
                                sample_limit = 0;
                        }
 
-                       // Create a snapshot, keep it in the maps of channels
-                       snapshot = shared_ptr<data::AnalogSnapshot>(
-                               new data::AnalogSnapshot(
+                       // Create a segment, keep it in the maps of channels
+                       segment = shared_ptr<data::AnalogSegment>(
+                               new data::AnalogSegment(
                                        cur_samplerate_, sample_limit));
-                       cur_analog_snapshots_[channel] = snapshot;
+                       cur_analog_segments_[channel] = segment;
 
                        // Find the annalog data associated with the channel
                        shared_ptr<view::AnalogSignal> sig =
@@ -593,14 +590,14 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
                        shared_ptr<data::Analog> data(sig->analog_data());
                        assert(data);
 
-                       // Push the snapshot into the analog data.
-                       data->push_snapshot(snapshot);
+                       // Push the segment into the analog data.
+                       data->push_segment(segment);
                }
 
-               assert(snapshot);
+               assert(segment);
 
-               // Append the samples in the snapshot
-               snapshot->append_interleaved_samples(data++, sample_count,
+               // Append the samples in the segment
+               segment->append_interleaved_samples(data++, sample_count,
                        channel_count);
        }
 
@@ -642,8 +639,8 @@ void Session::data_feed_in(shared_ptr<Device> device, shared_ptr<Packet> packet)
        {
                {
                        lock_guard<mutex> lock(data_mutex_);
-                       cur_logic_snapshot_.reset();
-                       cur_analog_snapshots_.clear();
+                       cur_logic_segment_.reset();
+                       cur_analog_segments_.clear();
                }
                frame_ended();
                break;