Simplify signal clearing in Session::start_capture

[pulseview.git] / pv / session.cpp

diff --git a/pv/session.cpp b/pv/session.cpp
index 2a4814f807e2be19fe0c4aeef93d5abfb982e13f..2bd3a054038f846d2263a26caf3ee124422f9293 100644 (file)
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -90,7 +90,6 @@ Session::Session(DeviceManager &device_manager) :
        capture_state_(Stopped),
        cur_samplerate_(0)
 {
-       set_default_device();
 }
 
 Session::~Session()
@@ -169,17 +168,21 @@ void Session::start_capture(function<void (const QString)> error_handler)
 
        // Check that at least one channel is enabled
        assert(device_);
-       const std::shared_ptr<sigrok::Device> device = device_->device();
-       assert(device);
-       auto channels = device->channels();
-       bool enabled = std::any_of(channels.begin(), channels.end(),
-               [](shared_ptr<Channel> channel) { return channel->enabled(); });
-
-       if (!enabled) {
-               error_handler(tr("No channels enabled."));
-               return;
+       const shared_ptr<sigrok::Device> sr_dev = device_->device();
+       if (sr_dev) {
+               const auto channels = sr_dev->channels();
+               if (!std::any_of(channels.begin(), channels.end(),
+                       [](shared_ptr<Channel> channel) {
+                               return channel->enabled(); })) {
+                       error_handler(tr("No channels enabled."));
+                       return;
+               }
        }
 
+       // Clear signal data
+       for (const shared_ptr<data::SignalData> d : get_data())
+               d->clear();
+
        // Begin the session
        sampling_thread_ = std::thread(
                &Session::sample_thread_proc, this, device_,
@@ -234,9 +237,9 @@ bool Session::add_decoder(srd_decoder *const dec)
 
                // Make a list of all the channels
                std::vector<const srd_channel*> all_channels;
-               for(const GSList *i = dec->channels; i; i = i->next)
+               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)
+               for (const GSList *i = dec->opt_channels; i; i = i->next)
                        all_channels.push_back((const srd_channel*)i->data);
 
                // Auto select the initial channels
@@ -298,14 +301,15 @@ void Session::set_capture_state(capture_state state)
        lock_guard<mutex> lock(sampling_mutex_);
        const bool changed = capture_state_ != state;
        capture_state_ = state;
-       if(changed)
+       if (changed)
                capture_state_changed(state);
 }
 
 void Session::update_signals()
 {
        assert(device_);
-       assert(capture_state_ == Stopped);
+
+       lock_guard<recursive_mutex> lock(data_mutex_);
 
        const shared_ptr<sigrok::Device> sr_dev = device_->device();
        if (!sr_dev) {
@@ -411,10 +415,12 @@ void Session::sample_thread_proc(shared_ptr<devices::Device> device,
        assert(device);
        assert(error_handler);
 
+       (void)device;
+
        cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
 
        try {
-               device_->session()->start();
+               device_->start();
        } catch(Error e) {
                error_handler(e.what());
                return;
@@ -467,8 +473,10 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 
        if (!logic_data_)
        {
-               qDebug() << "Unexpected logic packet";
-               return;
+               // The only reason logic_data_ would not have been created is
+               // if it was not possible to determine the signals when the
+               // device was created.
+               update_signals();
        }
 
        if (!cur_logic_segment_)