diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-10-20 23:05:59 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-01-08 21:56:47 +0100 |
| commit | 3b173e309f9f2736aa7e7d09900c5baee4ef31b3 (patch) | |
| tree | 8e2c956172da1f7954a9dd9c3dae4de99f84657f /src | |
| parent | ac25cd82d5d29c79b46033a742aaea33c700a524 (diff) | |
Add accessor for butler.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/film_viewer.h | 3 | ||||
| -rw-r--r-- | src/wx/simple_video_view.cc | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index e98fbe176..51419a54d 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -135,6 +135,9 @@ public: bool pad_black () const { return _pad_black; } + boost::shared_ptr<Butler> butler () const { + return _butler; + } boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged; boost::signals2::signal<void ()> PositionChanged; diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc index 91f7df5ff..f0c63d15a 100644 --- a/src/wx/simple_video_view.cc +++ b/src/wx/simple_video_view.cc @@ -161,8 +161,8 @@ SimpleVideoView::timer () LOG_DEBUG_PLAYER("%1 -> %2; delay %3", next.seconds(), _viewer->time().seconds(), max((next.seconds() - _viewer->time().seconds()) * 1000, 1.0)); _timer.Start (max ((next.seconds() - _viewer->time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT); - if (_viewer->_butler) { - _viewer->_butler->rethrow (); + if (_viewer->butler()) { + _viewer->butler()->rethrow (); } } @@ -180,12 +180,12 @@ SimpleVideoView::start () bool SimpleVideoView::get (bool lazy) { - DCPOMATIC_ASSERT (_viewer->_butler); + DCPOMATIC_ASSERT (_viewer->butler()); _viewer->_gets++; do { Butler::Error e; - _player_video = _viewer->_butler->get_video (!lazy, &e); + _player_video = _viewer->butler()->get_video (!lazy, &e); if (!_player_video.first && e == Butler::AGAIN) { if (lazy) { /* No video available; return saying we failed */ @@ -204,7 +204,7 @@ SimpleVideoView::get (bool lazy) ); try { - _viewer->_butler->rethrow (); + _viewer->butler()->rethrow (); } catch (DecodeError& e) { error_dialog (get(), e.what()); } |