Simplify signal clearing in Session::start_capture

[pulseview.git] / pv / session.cpp

diff --git a/pv/session.cpp b/pv/session.cpp
index 08bec08e4a5f664b87c0c30f2333c603861ce9fd..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()
@@ -180,6 +179,10 @@ void Session::start_capture(function<void (const QString)> error_handler)
                }
        }
 
+       // 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,7 +301,7 @@ 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);
 }
 
@@ -412,6 +415,8 @@ 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 {