X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=dcb4ad1db96cd55cc06f133838acf1ea42c187b3;hb=7f9654641c096b303fc30b710335e235b9738ce9;hp=faf1396da6bd79f793b56b7bbbca5a715bf2e38f;hpb=c063290ac7189bdd15221450f598504f43286b43;p=pulseview.git

diff --git a/pv/session.hpp b/pv/session.hpp
index faf1396..dcb4ad1 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -29,12 +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 <QObject>
 #include <QSettings>
 #include <QString>
@@ -61,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 {
 
@@ -73,6 +70,7 @@ class DeviceManager;
 namespace data {
 class Analog;
 class AnalogSegment;
+class DecodeSignal;
 class Logic;
 class LogicSegment;
 class SignalBase;
@@ -102,6 +100,8 @@ public:
 		Running
 	};
 
+	static shared_ptr<sigrok::Context> sr_context;
+
 public:
 	Session(DeviceManager &device_manager, QString name);
 
@@ -163,6 +163,8 @@ public:
 
 	double get_samplerate() const;
 
+	int get_segment_count() const;
+
 	void register_view(shared_ptr<views::ViewBase> view);
 
 	void deregister_view(shared_ptr<views::ViewBase> view);
@@ -172,9 +174,9 @@ public:
 	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:
@@ -185,6 +187,10 @@ 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);
 
@@ -197,6 +203,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);
 
@@ -232,6 +239,7 @@ private:
 
 	bool out_of_memory_;
 	bool data_saved_;
+	bool frame_began_;
 
 Q_SIGNALS:
 	void capture_state_changed(int state);