main window: Prefer the user specified device in new sessions

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index c7e1699bbac1193342e35e81df919be33b7fcfe6..c4f2bed83324779c0593b9d05635c9288c188f32 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -55,11 +55,14 @@ class Device;
 class InputFormat;
 class Logic;
 class Meta;
+class Option;
 class OutputFormat;
 class Packet;
 class Session;
 }  // namespace sigrok
 
+using sigrok::Option;
+
 namespace pv {
 
 class DeviceManager;
@@ -179,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);