X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=9359176c784ac5ebbd633741e4d4eb9782dde19b;hb=7db87de3cf2079f49ad395fba3a0b16f2b0f8ce5;hp=927b2e7c3a5e41800b0669aff04997d267e18b7d;hpb=d23445348bf04a698e062a3b917360313ecbcaad;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 927b2e7c..9359176c 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -115,27 +115,12 @@ private:
 
 	void update_signals(std::shared_ptr<device::DevInst> dev_inst);
 
-	std::shared_ptr<view::Signal> signal_from_probe(
-		const sr_channel *probe) const;
+	std::shared_ptr<view::Signal> signal_from_channel(
+		const sr_channel *channel) const;
 
 	void read_sample_rate(const sr_dev_inst *const sdi);
 
 private:
-	/**
-	 * Attempts to autodetect the format. Failing that
-	 * @param filename The filename of the input file.
-	 * @return A pointer to the 'struct sr_input_format' that should be
-	 * 	used, or NULL if no input format was selected or
-	 * 	auto-detected.
-	 */
-	static sr_input_format* determine_input_file_format(
-		const std::string &filename);
-
-	static sr_input* load_input_file_format(
-		const std::string &filename,
-		std::function<void (const QString)> error_handler,
-		sr_input_format *format = NULL);
-
 	void sample_thread_proc(std::shared_ptr<device::DevInst> dev_inst,
 		std::function<void (const QString)> error_handler);
 
@@ -180,7 +165,7 @@ private:
 
 	std::thread _sampling_thread;
 
-signals:
+Q_SIGNALS:
 	void capture_state_changed(int state);
 
 	void signals_changed();
@@ -196,6 +181,16 @@ private:
 	// sessions should should be supported and it should be
 	// possible to associate a pointer with a sr_session.
 	static SigSession *_session;
+
+public:
+	// TODO: Even more of a hack. The libsigrok API now allows for
+	// multiple sessions. However sr_session_* calls are scattered
+	// around the PV architecture and a single SigSession object is
+	// being used across multiple sequential sessions, which are
+	// created and destroyed in other classes in pv::device. This
+	// is a mess. For now just keep a single sr_session pointer here
+	// which we can use for all those scattered calls.
+	static struct sr_session *_sr_session;
 };
 
 } // namespace pv