Don't use Qt-defined keywords, they can cause problems with other headers.

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 927b2e7c3a5e41800b0669aff04997d267e18b7d..a06de7e14db9ae7e83813932d95c7fec1ae8a5cc 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -180,7 +180,7 @@ private:
 
        std::thread _sampling_thread;
 
-signals:
+Q_SIGNALS:
        void capture_state_changed(int state);
 
        void signals_changed();
@@ -196,6 +196,16 @@ private:
        // sessions should should be supported and it should be
        // possible to associate a pointer with a sr_session.
        static SigSession *_session;
+
+public:
+       // TODO: Even more of a hack. The libsigrok API now allows for
+       // multiple sessions. However sr_session_* calls are scattered
+       // around the PV architecture and a single SigSession object is
+       // being used across multiple sequential sessions, which are
+       // created and destroyed in other classes in pv::device. This
+       // is a mess. For now just keep a single sr_session pointer here
+       // which we can use for all those scattered calls.
+       static struct sr_session *_sr_session;
 };
 
 } // namespace pv