X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=ac3a076d2fb8d5e0edda93c86a849b5e16310847;hb=464f05d59f205225eff1cb435f9ae11716dbe9de;hp=fa96ce641bd418f4ca7448986d1d66cf10ecc538;hpb=419ec4e11ee29e27566d1c0c17741fcad85dbdf6;p=pulseview.git diff --git a/pv/session.hpp b/pv/session.hpp index fa96ce64..ac3a076d 100644 --- a/pv/session.hpp +++ b/pv/session.hpp @@ -20,6 +20,12 @@ #ifndef PULSEVIEW_PV_SESSION_HPP #define PULSEVIEW_PV_SESSION_HPP +#ifdef ENABLE_FLOW +#include +#include +#endif + +#include #include #include #include @@ -32,12 +38,18 @@ #include #include #include +#include + +#ifdef ENABLE_FLOW +#include +#include +#endif +#include "metadata_obj.hpp" #include "util.hpp" #include "views/viewbase.hpp" using std::function; -using std::list; using std::map; using std::mutex; using std::recursive_mutex; @@ -45,6 +57,13 @@ using std::shared_ptr; using std::string; using std::unordered_set; +#ifdef ENABLE_FLOW +using Glib::RefPtr; +using Gst::AppSink; +using Gst::Element; +using Gst::Pipeline; +#endif + struct srd_decoder; struct srd_channel; @@ -89,6 +108,7 @@ namespace views { class ViewBase; } + class Session : public QObject { Q_OBJECT @@ -116,15 +136,12 @@ public: shared_ptr device() const; QString name() const; - void set_name(QString name); - const list< shared_ptr > views() const; + const vector< shared_ptr > views() const; shared_ptr main_view() const; - shared_ptr main_bar() const; - void set_main_bar(shared_ptr main_bar); /** @@ -132,8 +149,9 @@ public: */ bool data_saved() const; + void save_setup(QSettings &settings) const; void save_settings(QSettings &settings) const; - + void restore_setup(QSettings &settings); void restore_settings(QSettings &settings); /** @@ -145,31 +163,34 @@ public: * Sets device instance that will be used in the next capture session. */ void set_device(shared_ptr device); - void set_default_device(); + bool using_file_device() const; - void load_init_file(const string &file_name, const string &format); + void load_init_file(const string &file_name, const string &format, + const string &setup_file_name); - void load_file(QString file_name, + void load_file(QString file_name, QString setup_file_name = QString(), shared_ptr format = nullptr, const map &options = map()); capture_state get_capture_state() const; - void start_capture(function error_handler); - void stop_capture(); double get_samplerate() const; - void register_view(shared_ptr view); + uint32_t get_segment_count() const; - void deregister_view(shared_ptr view); + vector get_triggers(uint32_t segment_id) const; + void register_view(shared_ptr view); + void deregister_view(shared_ptr view); bool has_view(shared_ptr view); - const unordered_set< shared_ptr > signalbases() const; + const vector< shared_ptr > signalbases() const; + + bool all_segments_complete(uint32_t segment_id) const; #ifdef ENABLE_DECODE shared_ptr add_decode_signal(); @@ -177,6 +198,8 @@ public: void remove_decode_signal(shared_ptr signal); #endif + MetadataObjManager* metadata_obj_manager(); + private: void set_capture_state(capture_state state); @@ -189,32 +212,60 @@ private: vector user_spec, map> fmt_opts); -private: void sample_thread_proc(function error_handler); void free_unused_memory(); - void feed_in_header(); + void signal_new_segment(); + void signal_segment_completed(); - void feed_in_meta(shared_ptr meta); +#ifdef ENABLE_FLOW + bool on_gst_bus_message(const Glib::RefPtr& bus, const Glib::RefPtr& message); - void feed_in_trigger(); + Gst::FlowReturn on_gst_new_sample(); +#endif + void feed_in_header(); + void feed_in_meta(shared_ptr meta); + void feed_in_trigger(); void feed_in_frame_begin(); - + void feed_in_frame_end(); void feed_in_logic(shared_ptr logic); - void feed_in_analog(shared_ptr analog); void data_feed_in(shared_ptr device, shared_ptr packet); +Q_SIGNALS: + void capture_state_changed(int state); + void device_changed(); + + void signals_changed(); + + void name_changed(); + + void trigger_event(int segment_id, util::Timestamp location); + + void new_segment(int new_segment_id); + void segment_completed(int segment_id); + + void data_received(); + + void add_view(views::ViewType type, Session *session); + +public Q_SLOTS: + void on_data_saved(); + +#ifdef ENABLE_DECODE + void on_new_decoders_selected(vector decoders); +#endif + private: DeviceManager &device_manager_; shared_ptr device_; QString default_name_, name_; - list< shared_ptr > views_; + vector< shared_ptr > views_; shared_ptr main_view_; shared_ptr main_bar_; @@ -222,42 +273,39 @@ private: mutable mutex sampling_mutex_; //!< Protects access to capture_state_. capture_state capture_state_; - unordered_set< shared_ptr > signalbases_; + vector< shared_ptr > signalbases_; unordered_set< shared_ptr > all_signal_data_; + /// trigger_list_ contains pairs of values. + vector< std::pair > trigger_list_; + mutable recursive_mutex data_mutex_; shared_ptr logic_data_; uint64_t cur_samplerate_; shared_ptr cur_logic_segment_; map< shared_ptr, shared_ptr > cur_analog_segments_; + int32_t highest_segment_id_; std::thread sampling_thread_; bool out_of_memory_; bool data_saved_; + bool frame_began_; -Q_SIGNALS: - void capture_state_changed(int state); - void device_changed(); - - void signals_changed(); - - void name_changed(); - - void trigger_event(util::Timestamp location); - - void frame_began(); - - void data_received(); + QElapsedTimer acq_time_; - void frame_ended(); + MetadataObjManager metadata_obj_manager_; - void add_view(const QString &title, views::ViewType type, - Session *session); +#ifdef ENABLE_FLOW + RefPtr pipeline_; + RefPtr source_; + RefPtr sink_; -public Q_SLOTS: - void on_data_saved(); + mutable mutex pipeline_done_mutex_; + mutable condition_variable pipeline_done_cond_; + atomic pipeline_done_interrupt_; +#endif }; } // namespace pv