X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=31ca328deca53bf1c9cfd90d426fb228da228af6;hp=fb7d6379c2a6af1b613e410b3f68e5e1239e1e52;hb=8ce8ebb9796488bd2211591806ed00854ad64bb3;hpb=04e1acc23e835018c3c13d8f29115cb285035151

diff --git a/pv/session.cpp b/pv/session.cpp
index fb7d6379..31ca328d 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -17,14 +17,6 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-#include <boost/thread/locks.hpp>
-#include <boost/thread/shared_mutex.hpp>
-
 #include <QFileInfo>
 
 #include <cassert>
@@ -33,16 +25,16 @@
 
 #include <sys/stat.h>
 
-#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"
@@ -62,10 +54,6 @@
 #include <libsigrokdecode/libsigrokdecode.h>
 #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;
@@ -81,7 +69,6 @@ using std::mutex;
 using std::pair;
 using std::recursive_mutex;
 using std::runtime_error;
-using std::set;
 using std::shared_ptr;
 using std::string;
 using std::unordered_set;
@@ -92,18 +79,13 @@ using sigrok::Channel;
 using sigrok::ConfigKey;
 using sigrok::DatafeedCallbackFunction;
 using sigrok::Error;
-using sigrok::Header;
 using sigrok::InputFormat;
 using sigrok::Logic;
 using sigrok::Meta;
-using sigrok::OutputFormat;
 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) :
@@ -620,6 +602,9 @@ const unordered_set< shared_ptr<data::SignalBase> > Session::signalbases() const
 #ifdef ENABLE_DECODE
 bool Session::add_decoder(srd_decoder *const dec)
 {
+	if (!dec)
+		return false;
+
 	map<const srd_channel*, shared_ptr<data::SignalBase> > channels;
 	shared_ptr<data::DecoderStack> decoder_stack;
 
@@ -785,6 +770,9 @@ void Session::update_signals()
 
 							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<views::TraceView::Signal>(
@@ -803,6 +791,9 @@ void Session::update_signals()
 							shared_ptr<data::Analog> 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<views::TraceView::Signal>(
@@ -813,7 +804,7 @@ void Session::update_signals()
 					}
 
 					default:
-						assert(0);
+						assert(false);
 						break;
 					}
 				}
@@ -862,7 +853,7 @@ void Session::sample_thread_proc(function<void (const QString)> 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
@@ -1038,7 +1029,7 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 void Session::data_feed_in(shared_ptr<sigrok::Device> device,
 	shared_ptr<Packet> packet)
 {
-	static bool frame_began=false;
+	static bool frame_began = false;
 
 	(void)device;