X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=eec1a051b5a8838ba3f81b58c0759adbadb024a9;hp=e84f78042b89593e9cb96adef18ed187067e5b11;hb=de060a86f27bea5d459d4d2d1fc097815cefcd8a;hpb=6f925ba9d6faf1077b73c5a5808259576081716a

diff --git a/pv/session.cpp b/pv/session.cpp
index e84f7804..eec1a051 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -17,32 +17,25 @@
  * 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>
+#include <memory>
 #include <mutex>
 #include <stdexcept>
 
 #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 +55,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,30 +70,24 @@ 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::unique_ptr;
 using std::unordered_set;
 using std::vector;
 
 using sigrok::Analog;
 using sigrok::Channel;
-using sigrok::ChannelType;
 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) :
@@ -621,6 +604,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;
 
@@ -638,7 +624,7 @@ bool Session::add_decoder(srd_decoder *const dec)
 		// Auto select the initial channels
 		for (const srd_channel *pdch : all_channels)
 			for (shared_ptr<data::SignalBase> b : signalbases_) {
-				if (b->type() == ChannelType::LOGIC) {
+				if (b->logic_data()) {
 					if (QString::fromUtf8(pdch->name).toLower().
 						contains(b->name().toLower()))
 						channels[pdch] = b;
@@ -652,7 +638,7 @@ bool Session::add_decoder(srd_decoder *const dec)
 
 		// Create the decode signal
 		shared_ptr<data::SignalBase> signalbase =
-			make_shared<data::SignalBase>(nullptr);
+			make_shared<data::SignalBase>(nullptr, data::SignalBase::DecodeChannel);
 
 		signalbase->set_decoder_stack(decoder_stack);
 		signalbases_.insert(signalbase);
@@ -730,7 +716,7 @@ void Session::update_signals()
 	unsigned int logic_channel_count = count_if(
 		channels.begin(), channels.end(),
 		[] (shared_ptr<Channel> channel) {
-			return channel->type() == ChannelType::LOGIC; });
+			return channel->type() == sigrok::ChannelType::LOGIC; });
 
 	// Create data containers for the logic data segments
 	{
@@ -780,11 +766,15 @@ void Session::update_signals()
 					switch(channel->type()->id()) {
 					case SR_CHANNEL_LOGIC:
 						if (!signalbase) {
-							signalbase = make_shared<data::SignalBase>(channel);
+							signalbase = make_shared<data::SignalBase>(channel,
+								data::SignalBase::LogicChannel);
 							signalbases_.insert(signalbase);
 
 							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>(
@@ -796,12 +786,16 @@ void Session::update_signals()
 					case SR_CHANNEL_ANALOG:
 					{
 						if (!signalbase) {
-							signalbase = make_shared<data::SignalBase>(channel);
+							signalbase = make_shared<data::SignalBase>(channel,
+								data::SignalBase::AnalogChannel);
 							signalbases_.insert(signalbase);
 
 							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>(
@@ -812,7 +806,7 @@ void Session::update_signals()
 					}
 
 					default:
-						assert(0);
+						assert(false);
 						break;
 					}
 				}
@@ -861,7 +855,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
@@ -961,7 +955,7 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 
 		// Create a new data segment
 		cur_logic_segment_ = make_shared<data::LogicSegment>(
-			*logic_data_, logic, cur_samplerate_);
+			*logic_data_, logic->unit_size(), cur_samplerate_);
 		logic_data_->push_segment(cur_logic_segment_);
 
 		// @todo Putting this here means that only listeners querying
@@ -969,11 +963,10 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 		// frame_began is DecoderStack, but in future we need to signal
 		// this after both analog and logic sweeps have begun.
 		frame_began();
-	} else {
-		// Append to the existing data segment
-		cur_logic_segment_->append_payload(logic);
 	}
 
+	cur_logic_segment_->append_payload(logic);
+
 	data_received();
 }
 
@@ -984,12 +977,15 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 	const vector<shared_ptr<Channel>> channels = analog->channels();
 	const unsigned int channel_count = channels.size();
 	const size_t sample_count = analog->num_samples() / channel_count;
-	const float *data = static_cast<const float *>(analog->data_pointer());
 	bool sweep_beginning = false;
 
+	unique_ptr<float> data(new float[analog->num_samples()]);
+	analog->get_data_as_float(data.get());
+
 	if (signalbases_.empty())
 		update_signals();
 
+	float *channel_data = data.get();
 	for (auto channel : channels) {
 		shared_ptr<data::AnalogSegment> segment;
 
@@ -1023,7 +1019,7 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 		assert(segment);
 
 		// Append the samples in the segment
-		segment->append_interleaved_samples(data++, sample_count,
+		segment->append_interleaved_samples(channel_data++, sample_count,
 			channel_count);
 	}
 
@@ -1038,7 +1034,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;