diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-08-13 17:37:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-08-14 00:05:06 +0100 |
| commit | 1fe6bd7f8ba059322b8357b2210f0fd590567ce2 (patch) | |
| tree | 2c76fbf24b9b520f94f741040f11dc920d3bab91 /src/lib/content.h | |
| parent | f30ad4dec0a3fa5f1770fba93106a3e8910d66ba (diff) | |
More fixes for errors / crashes / misbehaviour with content changes
and the butler.
Here we signal both before and after a change in content. Before,
the player disables itself so that any pass()/seek() will be no-ops.
After, the player rebuilds its pieces and the butler re-seeks to
get back to where it was before the change.
Diffstat (limited to 'src/lib/content.h')
| -rw-r--r-- | src/lib/content.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/content.h b/src/lib/content.h index 23afa2243..c9edf6e22 100644 --- a/src/lib/content.h +++ b/src/lib/content.h @@ -178,8 +178,15 @@ public: std::list<UserProperty> user_properties () const; + /* May be emitted from any thread */ + boost::signals2::signal<void ()> MayChange; + + /* Emitted from the GUI thread */ boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> Changed; + /* May be emitted from any thread */ + boost::signals2::signal<void ()> NotChanged; + boost::shared_ptr<VideoContent> video; boost::shared_ptr<AudioContent> audio; std::list<boost::shared_ptr<TextContent> > text; @@ -187,8 +194,6 @@ public: boost::shared_ptr<TextContent> only_text () const; boost::shared_ptr<TextContent> text_of_original_type (TextType type) const; - void signal_changed (int); - protected: virtual void add_properties (std::list<UserProperty> &) const; @@ -208,6 +213,9 @@ private: friend struct best_dcp_frame_rate_test_single; friend struct best_dcp_frame_rate_test_double; friend struct audio_sampling_rate_test; + friend class ContentChange; + + void signal_changed (int); std::string _digest; DCPTime _position; |