X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=6bdfaa24ffe861c27b8919571115c0de67bb6ae7;hb=9009d9b5ca2e2039725040060c0fec19e7bc3caa;hp=4ac7f509b516dcf18b4738753b1dd5038041f6ec;hpb=6f925ba9d6faf1077b73c5a5808259576081716a;p=pulseview.git

diff --git a/pv/session.hpp b/pv/session.hpp
index 4ac7f509..6bdfaa24 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -29,13 +29,6 @@
 #include <unordered_set>
 #include <vector>
 
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-#include <boost/thread/shared_mutex.hpp>
-
 #include <QObject>
 #include <QSettings>
 #include <QString>
@@ -62,10 +55,13 @@ class Device;
 class InputFormat;
 class Logic;
 class Meta;
+class Option;
 class OutputFormat;
 class Packet;
 class Session;
-}
+}  // namespace sigrok
+
+using sigrok::Option;
 
 namespace pv {
 
@@ -74,6 +70,7 @@ class DeviceManager;
 namespace data {
 class Analog;
 class AnalogSegment;
+class DecodeSignal;
 class Logic;
 class LogicSegment;
 class SignalBase;
@@ -103,6 +100,8 @@ public:
 		Running
 	};
 
+	static shared_ptr<sigrok::Context> sr_context;
+
 public:
 	Session(DeviceManager &device_manager, QString name);
 
@@ -164,19 +163,20 @@ public:
 
 	double get_samplerate() const;
 
+	uint32_t get_segment_count() const;
+
 	void register_view(shared_ptr<views::ViewBase> view);
 
 	void deregister_view(shared_ptr<views::ViewBase> view);
 
 	bool has_view(shared_ptr<views::ViewBase> view);
 
-	const unordered_set< shared_ptr<data::SignalBase> >
-		signalbases() const;
+	const unordered_set< shared_ptr<data::SignalBase> > signalbases() const;
 
 #ifdef ENABLE_DECODE
-	bool add_decoder(srd_decoder *const dec);
+	shared_ptr<data::DecodeSignal> add_decode_signal();
 
-	void remove_decode_signal(shared_ptr<data::SignalBase> signalbase);
+	void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
 #endif
 
 private:
@@ -187,11 +187,18 @@ private:
 	shared_ptr<data::SignalBase> signalbase_from_channel(
 		shared_ptr<sigrok::Channel> channel) const;
 
+	static map<string, Glib::VariantBase> input_format_options(
+		vector<string> user_spec,
+		map<string, shared_ptr<Option>> fmt_opts);
+
 private:
 	void sample_thread_proc(function<void (const QString)> error_handler);
 
 	void free_unused_memory();
 
+	void signal_new_segment();
+	void signal_segment_completed();
+
 	void feed_in_header();
 
 	void feed_in_meta(shared_ptr<sigrok::Meta> meta);
@@ -199,6 +206,7 @@ private:
 	void feed_in_trigger();
 
 	void feed_in_frame_begin();
+	void feed_in_frame_end();
 
 	void feed_in_logic(shared_ptr<sigrok::Logic> logic);
 
@@ -229,11 +237,13 @@ private:
 	shared_ptr<data::LogicSegment> cur_logic_segment_;
 	map< shared_ptr<sigrok::Channel>, shared_ptr<data::AnalogSegment> >
 		cur_analog_segments_;
+	int32_t highest_segment_id_;
 
 	std::thread sampling_thread_;
 
 	bool out_of_memory_;
 	bool data_saved_;
+	bool frame_began_;
 
 Q_SIGNALS:
 	void capture_state_changed(int state);
@@ -245,12 +255,11 @@ Q_SIGNALS:
 
 	void trigger_event(util::Timestamp location);
 
-	void frame_began();
+	void new_segment(int new_segment_id);
+	void segment_completed(int segment_id);
 
 	void data_received();
 
-	void frame_ended();
-
 	void add_view(const QString &title, views::ViewType type,
 		Session *session);