X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=b27fd6ec7f80e8d77635e4219a2fed65c4cfde63;hb=88cd7da01957d3c3e17cf01a313aa37e356a2e66;hp=1ee5e0033939a1918102f9edd71e84c4e48b03bc;hpb=06bb4e6a55f5f6983d94fef2b25afc0a70f7b8d9;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 1ee5e003..b27fd6ec 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -34,6 +34,8 @@
 
 #include <assert.h>
 
+#include <stdexcept>
+
 #include <sys/stat.h>
 
 #include <QDebug>
@@ -193,27 +195,30 @@ boost::shared_ptr<data::Logic> SigSession::get_data()
 	return _logic_data;
 }
 
-void SigSession::add_decoder(srd_decoder *const dec,
+bool SigSession::add_decoder(srd_decoder *const dec,
 	std::map<const srd_probe*,
-		boost::shared_ptr<view::Signal> > probes)
+		boost::shared_ptr<view::LogicSignal> > probes,
+	GHashTable *options)
 {
+	try
 	{
 		lock_guard<mutex> lock(_signals_mutex);
 
-		if (!_decode_traces.empty()) {
-			qDebug("Currently only one decode trace can be added "
-				"at once");
-			_decode_traces.clear();
-		}
-
 		shared_ptr<data::Decoder> decoder(
-			new data::Decoder(dec, probes));
+			new data::Decoder(dec, probes, options));
 		shared_ptr<view::DecodeSignal> d(
 			new view::DecodeSignal(*this, decoder,
 				_decode_traces.size()));
 		_decode_traces.push_back(d);
 	}
+	catch(std::runtime_error e)
+	{
+		return false;
+	}
+
 	signals_changed();
+
+	return true;
 }
 
 vector< shared_ptr<view::DecodeSignal> > SigSession::get_decode_signals() const
@@ -222,6 +227,20 @@ vector< shared_ptr<view::DecodeSignal> > SigSession::get_decode_signals() const
 	return _decode_traces;
 }
 
+void SigSession::remove_decode_signal(view::DecodeSignal *signal)
+{
+	for (vector< shared_ptr<view::DecodeSignal> >::iterator i =
+		_decode_traces.begin();
+		i != _decode_traces.end();
+		i++)
+		if ((*i).get() == signal)
+		{
+			_decode_traces.erase(i);
+			signals_changed();
+			return;
+		}
+}
+
 void SigSession::set_capture_state(capture_state state)
 {
 	lock_guard<mutex> lock(_sampling_mutex);
@@ -363,8 +382,7 @@ void SigSession::update_signals(const sr_dev_inst *const sdi)
 
 		if(sdi) {
 			for (const GSList *l = sdi->probes; l; l = l->next) {
-				const sr_probe *const probe =
-					(const sr_probe *)l->data;
+				sr_probe *const probe =	(sr_probe *)l->data;
 				assert(probe);
 
 				switch(probe->type) {
@@ -410,8 +428,8 @@ void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
 	// Read out the sample rate
 	if(sdi->driver)
 	{
-		const int ret = sr_config_get(sdi->driver,
-			SR_CONF_SAMPLERATE, &gvar, sdi);
+		const int ret = sr_config_get(sdi->driver, sdi, NULL,
+			SR_CONF_SAMPLERATE, &gvar);
 		if (ret != SR_OK) {
 			qDebug("Failed to get samplerate\n");
 			return;
@@ -487,7 +505,7 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
 	}
 
 	// Set the sample limit
-	if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES,
+	if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES,
 		g_variant_new_uint64(record_length)) != SR_OK) {
 		error_handler(tr("Failed to configure "
 			"time-based sample limit."));