From: Joel Holdsworth <redacted>
Date: Sat, 31 Aug 2013 12:28:02 +0000 (+0100)
Subject: Made SigSession::update_signals take sdi as a parameter
X-Git-Tag: pulseview-0.2.0~325
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=b698553cd745bf4f50f73f513798bba6209a5d13;p=pulseview.git

Made SigSession::update_signals take sdi as a parameter
---

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index cbdbac07..6d8e09d6 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -79,7 +79,7 @@ void SigSession::set_device(struct sr_dev_inst *sdi)
 	if (sdi)
 		_device_manager.use_device(sdi, this);
 	_sdi = sdi;
-	update_signals();
+	update_signals(sdi);
 }
 
 void SigSession::release_device(struct sr_dev_inst *sdi)
@@ -88,7 +88,7 @@ void SigSession::release_device(struct sr_dev_inst *sdi)
 
 	assert(_capture_state == Stopped);
 	_sdi = NULL;
-	update_signals();
+	update_signals(NULL);
 }
 
 void SigSession::load_file(const string &name,
@@ -246,7 +246,7 @@ sr_input* SigSession::load_input_file_format(const string &filename,
 	return in;
 }
 
-void SigSession::update_signals()
+void SigSession::update_signals(const sr_dev_inst *const sdi)
 {
 	assert(_capture_state == Stopped);
 
@@ -255,8 +255,8 @@ void SigSession::update_signals()
 	unsigned int analog_probe_count = 0;
 
 	// Detect what data types we will receive
-	if(_sdi) {
-		for (const GSList *l = _sdi->probes; l; l = l->next) {
+	if(sdi) {
+		for (const GSList *l = sdi->probes; l; l = l->next) {
 			const sr_probe *const probe = (const sr_probe *)l->data;
 			if (!probe->enabled)
 				continue;
@@ -297,8 +297,8 @@ void SigSession::update_signals()
 
 		_signals.clear();
 
-		if(_sdi) {
-			for (const GSList *l = _sdi->probes; l; l = l->next) {
+		if(sdi) {
+			for (const GSList *l = sdi->probes; l; l = l->next) {
 				const sr_probe *const probe =
 					(const sr_probe *)l->data;
 				assert(probe);
diff --git a/pv/sigsession.h b/pv/sigsession.h
index 6e23c632..296f28d5 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -92,7 +92,7 @@ public:
 private:
 	void set_capture_state(capture_state state);
 
-	void update_signals();
+	void update_signals(const sr_dev_inst *const sdi);
 
 	bool is_trigger_enabled() const;