X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=c4f2bed83324779c0593b9d05635c9288c188f32;hp=7229c7e337f3ec71efa1041d9799b3c3e4fe2c42;hb=6e2a5b1d677a26a637465cd4d304e2bc52e14f36;hpb=83b1c8d251386ac1980284c4668cbdd8e425550f

diff --git a/pv/session.hpp b/pv/session.hpp
index 7229c7e3..c4f2bed8 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 {
 
@@ -169,8 +166,7 @@ public:
 
 	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);
@@ -186,6 +182,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);