Rename DecodeSignal::segment_ to logic_mux_segment_ for clarity

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index 4ac7f509b516dcf18b4738753b1dd5038041f6ec..9d42a4d98b657896a5e61e18667758052c601e8f 100644 (file)
--- 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);
 
@@ -170,13 +169,12 @@ 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);
+       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,6 +185,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);
 
@@ -199,6 +201,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);
 
@@ -234,6 +237,7 @@ private:
 
        bool out_of_memory_;
        bool data_saved_;
+       bool frame_began_;
 
 Q_SIGNALS:
        void capture_state_changed(int state);