X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=7d9375a7451f414b14975557f6c49a3705361171;hp=9148ba9bdcaafd8985f5b1f7c833f87d3b1e81f0;hb=611c86259f66dd1766b10b1e1b671b0fadd51fe2;hpb=7ea2a4ff0765fdad34b84e4b4631d6f3f5588714

diff --git a/pv/session.hpp b/pv/session.hpp
index 9148ba9b..7d9375a7 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -20,6 +20,12 @@
 #ifndef PULSEVIEW_PV_SESSION_HPP
 #define PULSEVIEW_PV_SESSION_HPP
 
+#ifdef ENABLE_FLOW
+#include <atomic>
+#include <condition_variable>
+#endif
+
+#include <functional>
 #include <map>
 #include <memory>
 #include <mutex>
@@ -32,10 +38,17 @@
 #include <QObject>
 #include <QSettings>
 #include <QString>
+#include <QTime>
+
+#ifdef ENABLE_FLOW
+#include <gstreamermm.h>
+#include <libsigrokflow/libsigrokflow.hpp>
+#endif
 
 #include "util.hpp"
 #include "views/viewbase.hpp"
 
+
 using std::function;
 using std::list;
 using std::map;
@@ -45,6 +58,13 @@ using std::shared_ptr;
 using std::string;
 using std::unordered_set;
 
+#ifdef ENABLE_FLOW
+using Glib::RefPtr;
+using Gst::AppSink;
+using Gst::Element;
+using Gst::Pipeline;
+#endif
+
 struct srd_decoder;
 struct srd_channel;
 
@@ -132,8 +152,12 @@ public:
 	 */
 	bool data_saved() const;
 
+	void save_setup(QSettings &settings) const;
+
 	void save_settings(QSettings &settings) const;
 
+	void restore_setup(QSettings &settings);
+
 	void restore_settings(QSettings &settings);
 
 	/**
@@ -148,9 +172,12 @@ public:
 
 	void set_default_device();
 
-	void load_init_file(const string &file_name, const string &format);
+	void load_init_file(const string &file_name,
+		const string &format,
+		const string &setup_file_name);
 
 	void load_file(QString file_name,
+		QString setup_file_name = nullptr,
 		shared_ptr<sigrok::InputFormat> format = nullptr,
 		const map<string, Glib::VariantBase> &options =
 			map<string, Glib::VariantBase>());
@@ -202,6 +229,12 @@ private:
 	void signal_new_segment();
 	void signal_segment_completed();
 
+#ifdef ENABLE_FLOW
+	bool on_gst_bus_message(const Glib::RefPtr<Gst::Bus>& bus, const Glib::RefPtr<Gst::Message>& message);
+
+	Gst::FlowReturn on_gst_new_sample();
+#endif
+
 	void feed_in_header();
 
 	void feed_in_meta(shared_ptr<sigrok::Meta> meta);
@@ -239,6 +272,10 @@ Q_SIGNALS:
 public Q_SLOTS:
 	void on_data_saved();
 
+#ifdef ENABLE_DECODE
+	void on_new_decoders_selected(vector<const srd_decoder*> decoders);
+#endif
+
 private:
 	DeviceManager &device_manager_;
 	shared_ptr<devices::Device> device_;
@@ -271,6 +308,18 @@ private:
 	bool out_of_memory_;
 	bool data_saved_;
 	bool frame_began_;
+
+	QTime acq_time_;
+
+#ifdef ENABLE_FLOW
+	RefPtr<Pipeline> pipeline_;
+	RefPtr<Element> source_;
+	RefPtr<AppSink> sink_;
+
+	mutable mutex pipeline_done_mutex_;
+	mutable condition_variable pipeline_done_cond_;
+	atomic<bool> pipeline_done_interrupt_;
+#endif
 };
 
 } // namespace pv