Make the first view own the toolbar instead of the main window

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index 83a73f4af7678252dc28b0afee6f25cf2b02b553..d6cfdd302c97815daec25bcf19b62e12008c96e2 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -72,8 +72,11 @@ namespace devices {
 class Device;
 }
 
+namespace toolbars {
+class MainBar;
+}
+
 namespace view {
-class DecodeTrace;
 class View;
 }
 
@@ -101,6 +104,12 @@ public:
 
        std::shared_ptr<devices::Device> device() const;
 
+       std::shared_ptr<pv::view::View> main_view() const;
+
+       void set_main_bar(std::shared_ptr<pv::toolbars::MainBar> main_bar);
+
+       std::shared_ptr<pv::toolbars::MainBar> main_bar() const;
+
        /**
         * Sets device instance that will be used in the next capture session.
         */
@@ -126,10 +135,7 @@ public:
 #ifdef ENABLE_DECODE
        bool add_decoder(srd_decoder *const dec);
 
-       std::vector< std::shared_ptr<view::DecodeTrace> >
-               get_decode_signals() const;
-
-       void remove_decode_signal(view::DecodeTrace *signal);
+       void remove_decode_signal(std::shared_ptr<data::SignalBase> signalbase);
 #endif
 
 private:
@@ -163,8 +169,9 @@ private:
        std::shared_ptr<devices::Device> device_;
 
        std::unordered_set< std::shared_ptr<pv::view::View> > views_;
+       std::shared_ptr<pv::view::View> main_view_;
 
-       std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
+       std::shared_ptr<pv::toolbars::MainBar> main_bar_;
 
        mutable std::mutex sampling_mutex_; //!< Protects access to capture_state_.
        capture_state capture_state_;