Some smaller whitespace fixes.

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 580b6796c680f8a76c679dfad20d7ea11640aaa4..e19291d40004d9bdaa5c7611eeaa1aa71e1f1e20 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -47,7 +47,7 @@ SigSession::~SigSession()
 {
        stop_capture();
 
-       if(_sampling_thread.get())
+       if (_sampling_thread.get())
                _sampling_thread->join();
        _sampling_thread.reset();
 
@@ -85,17 +85,15 @@ void SigSession::start_capture(struct sr_dev_inst *sdi,
 
 void SigSession::stop_capture()
 {
-       if(get_capture_state() == Stopped)
+       if (get_capture_state() == Stopped)
                return;
 
        sr_session_stop();
 
        // Check that sampling stopped
-       if(_sampling_thread.get())
+       if (_sampling_thread.get())
                _sampling_thread->join();
        _sampling_thread.reset();
-
-       _capture_state = Stopped;
 }
 
 vector< shared_ptr<view::Signal> > SigSession::get_signals()
@@ -109,6 +107,13 @@ boost::shared_ptr<LogicData> SigSession::get_data()
        return _logic_data;
 }
 
+void SigSession::set_capture_state(capture_state state)
+{
+       lock_guard<mutex> lock(_state_mutex);
+       _capture_state = state;
+       capture_state_changed(state);
+}
+
 void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
        uint64_t record_length, uint64_t sample_rate)
 {
@@ -140,13 +145,12 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
                return;
        }
 
-       {
-               lock_guard<mutex> lock(_state_mutex);
-               _capture_state = Running;
-       }
+       set_capture_state(Running);
 
        sr_session_run();
        sr_session_destroy();
+
+       set_capture_state(Stopped);
 }
 
 void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
@@ -177,7 +181,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
                // Create an empty LogiData for coming data snapshots
                _logic_data.reset(new LogicData(meta_logic));
                assert(_logic_data);
-               if(!_logic_data)
+               if (!_logic_data)
                        break;
        }
 
@@ -190,7 +194,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
                        const sr_probe *const probe =
                                (const sr_probe*)g_slist_nth_data(
                                        sdi->probes, i);
-                       if(probe->enabled)
+                       if (probe->enabled)
                        {
                                shared_ptr<LogicSignal> signal(
                                        new LogicSignal(probe->name,
@@ -209,7 +213,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
        {
                lock_guard<mutex> lock(_data_mutex);
                assert(packet->payload);
-               if(!_cur_logic_snapshot)
+               if (!_cur_logic_snapshot)
                {
                        // Create a new data snapshot
                        _cur_logic_snapshot = shared_ptr<LogicDataSnapshot>(