Rework decode sample count getters

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index c7e1699bbac1193342e35e81df919be33b7fcfe6..5a54d83aa047a0f245457eae0eb8832f67bc98ba 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;
@@ -67,6 +70,7 @@ class DeviceManager;
 namespace data {
 class Analog;
 class AnalogSegment;
+class DecodeSignal;
 class Logic;
 class LogicSegment;
 class SignalBase;
@@ -168,7 +172,7 @@ public:
 #ifdef ENABLE_DECODE
        bool add_decoder(srd_decoder *const dec);
 
-       void remove_decode_signal(shared_ptr<data::SignalBase> signalbase);
+       void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
 #endif
 
 private:
@@ -179,6 +183,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);