Add accessor for butler.

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index e98fbe176b84a2bbd086536d74c539b3d743fb25..51419a54dc9c5cf29b139f8ea5af79754e1084cb 100644 (file)
--- 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 91f7df5ffc291eb5fb08143cf0e1a3b0a8563331..f0c63d15aa71f4ad633bc09328b3fea84bb7e299 100644 (file)
--- 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());
        }