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/butler.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/butler.h')
| -rw-r--r-- | src/lib/butler.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/butler.h b/src/lib/butler.h index 5b09f6e5f..56374deeb 100644 --- a/src/lib/butler.h +++ b/src/lib/butler.h @@ -56,7 +56,7 @@ private: void text (PlayerText pt, TextType type, DCPTimePeriod period); bool should_run () const; void prepare (boost::weak_ptr<PlayerVideo> video) const; - void player_changed (bool frequent); + void return_seek (bool frequent); void seek_unlocked (DCPTime position, bool accurate); boost::shared_ptr<Player> _player; @@ -101,4 +101,5 @@ private: boost::signals2::scoped_connection _player_audio_connection; boost::signals2::scoped_connection _player_text_connection; boost::signals2::scoped_connection _player_changed_connection; + boost::signals2::scoped_connection _player_not_changed_connection; }; |