Fix warning for unused Session::sample_thread_proc() parameter

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index d17c9dc364205344d157e7c271601cb5c6e9c5a7..e113cf4fdb77711d33a4aac0b45cff49521e88ce 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_SIGSESSION_HPP
-#define PULSEVIEW_PV_SIGSESSION_HPP
+#ifndef PULSEVIEW_PV_SESSION_HPP
+#define PULSEVIEW_PV_SESSION_HPP
 
 #include <map>
 #include <memory>
@@ -31,15 +31,17 @@
 #include <vector>
 
 #ifdef _WIN32
-// Windows: Avoid namespace pollution by thread.hpp (which includes windows.h).
+// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
 #define NOGDI
 #define NORESOURCE
 #endif
-#include <boost/thread.hpp>
+#include <boost/thread/shared_mutex.hpp>
 
 #include <QObject>
 #include <QString>
 
+#include "util.hpp"
+
 struct srd_decoder;
 struct srd_channel;
 
@@ -65,6 +67,10 @@ class LogicSegment;
 class SignalData;
 }
 
+namespace devices {
+class Device;
+}
+
 namespace view {
 class DecodeTrace;
 class LogicSignal;
@@ -91,20 +97,14 @@ public:
 
        const DeviceManager& device_manager() const;
 
-       const std::shared_ptr<sigrok::Session>& session() const;
+       std::shared_ptr<sigrok::Session> session() const;
 
-       std::shared_ptr<sigrok::Device> device() const;
+       std::shared_ptr<devices::Device> device() const;
 
        /**
         * Sets device instance that will be used in the next capture session.
         */
-       void set_device(std::shared_ptr<sigrok::Device> device);
-
-       /**
-        * Sets a sigrok session file as the capture device.
-        * @param name the path to the file.
-        */
-       void set_session_file(const std::string &name);
+       void set_device(std::shared_ptr<devices::Device> device);
 
        void set_default_device();
 
@@ -114,11 +114,9 @@ public:
 
        void stop_capture();
 
-       std::set< std::shared_ptr<data::SignalData> > get_data() const;
-
-       boost::shared_mutex& signals_mutex() const;
+       double get_samplerate() const;
 
-       const std::unordered_set< std::shared_ptr<view::Signal> >&
+       const std::unordered_set< std::shared_ptr<view::Signal> >
                signals() const;
 
 #ifdef ENABLE_DECODE
@@ -133,21 +131,19 @@ public:
 private:
        void set_capture_state(capture_state state);
 
-       void update_signals(std::shared_ptr<sigrok::Device> device);
+       void update_signals();
 
        std::shared_ptr<view::Signal> signal_from_channel(
                std::shared_ptr<sigrok::Channel> channel) const;
 
-       void read_sample_rate(std::shared_ptr<sigrok::Device>);
-
 private:
-       void sample_thread_proc(std::shared_ptr<sigrok::Device> device,
-               std::function<void (const QString)> error_handler);
+       void sample_thread_proc(std::function<void (const QString)> error_handler);
+
+       void feed_in_header();
 
-       void feed_in_header(std::shared_ptr<sigrok::Device> device);
+       void feed_in_meta(std::shared_ptr<sigrok::Meta> meta);
 
-       void feed_in_meta(std::shared_ptr<sigrok::Device> device,
-               std::shared_ptr<sigrok::Meta> meta);
+       void feed_in_trigger();
 
        void feed_in_frame_begin();
 
@@ -160,22 +156,18 @@ private:
 
 private:
        DeviceManager &device_manager_;
-       std::shared_ptr<sigrok::Session> session_;
-
-       /**
-        * The device instance that will be used in the next capture session.
-        */
-       std::shared_ptr<sigrok::Device> device_;
+       std::shared_ptr<devices::Device> device_;
 
        std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
 
-       mutable std::mutex sampling_mutex_;
+       mutable std::mutex sampling_mutex_; //!< Protects access to capture_state_.
        capture_state capture_state_;
 
        mutable boost::shared_mutex signals_mutex_;
        std::unordered_set< std::shared_ptr<view::Signal> > signals_;
+       std::set< std::shared_ptr<data::SignalData> > all_signal_data_;
 
-       mutable std::mutex data_mutex_;
+       mutable std::recursive_mutex data_mutex_;
        std::shared_ptr<data::Logic> logic_data_;
        uint64_t cur_samplerate_;
        std::shared_ptr<data::LogicSegment> cur_logic_segment_;
@@ -184,12 +176,16 @@ private:
 
        std::thread sampling_thread_;
 
+       bool out_of_memory_;
+
 Q_SIGNALS:
        void capture_state_changed(int state);
        void device_selected();
 
        void signals_changed();
 
+       void trigger_event(util::Timestamp location);
+
        void frame_began();
 
        void data_received();
@@ -199,4 +195,4 @@ Q_SIGNALS:
 
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SIGSESSION_HPP
+#endif // PULSEVIEW_PV_SESSION_HPP