pot/merge.

[dcpomatic.git] / src / wx / film_viewer.cc

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 6d9592b650cae3d0c47aa0db9c7624d0e8ad3397..8b58d42f0f508f8e813e83acaea1544546b94164 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -121,8 +121,9 @@ FilmViewer::set_film (shared_ptr<Film> film)
        }
 
        _film = film;
-
-       FilmChanged ();
+       _video_position = DCPTime ();
+       _player_video.first.reset ();
+       _player_video.second = DCPTime ();
 
        _frame.reset ();
        _closed_captions_dialog->clear ();
@@ -193,7 +194,7 @@ FilmViewer::recreate_butler ()
                map.set (dcp::RS,     1, 1 / sqrt(2)); // Rs -> Rt
        }
 
-       _butler.reset (new Butler(_player, _film->log(), map, _audio_channels, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
+       _butler.reset (new Butler(_player, map, _audio_channels, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
        if (!Config::instance()->sound() && !_audio.isStreamOpen()) {
                _butler->disable_audio ();
        }
@@ -297,6 +298,8 @@ FilmViewer::timer ()
 
        if (next >= _film->length()) {
                stop ();
+               Finished ();
+               return;
        }
 
        _timer.Start (max ((next.seconds() - time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT);
@@ -306,21 +309,39 @@ FilmViewer::timer ()
        }
 }
 
+bool
+FilmViewer::maybe_draw_background_image (wxPaintDC& dc)
+{
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+       optional<boost::filesystem::path> bg = Config::instance()->player_background_image();
+       if (bg) {
+               wxImage image (std_to_wx(bg->string()));
+               wxBitmap bitmap (image);
+               dc.DrawBitmap (bitmap, max(0, (_panel_size.width - image.GetSize().GetWidth()) / 2), max(0, (_panel_size.height - image.GetSize().GetHeight()) / 2));
+               return true;
+       }
+#endif
+
+       return false;
+}
+
 void
 FilmViewer::paint_panel ()
 {
        wxPaintDC dc (_panel);
 
-       if (!_frame || !_film || !_out_size.width || !_out_size.height || _out_size != _frame->size()) {
+       if (!_out_size.width || !_out_size.height || (_frame && _out_size != _frame->size())) {
                dc.Clear ();
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-               optional<boost::filesystem::path> bg = Config::instance()->player_background_image();
-               if (bg) {
-                       wxImage image (std_to_wx(bg->string()));
-                       wxBitmap bitmap (image);
-                       dc.DrawBitmap (bitmap, max(0, (_panel_size.width - image.GetSize().GetWidth()) / 2), max(0, (_panel_size.height - image.GetSize().GetHeight()) / 2));
-               }
-#endif
+               return;
+       }
+
+       if (!_frame || !_film) {
+               dc.Clear ();
+               maybe_draw_background_image (dc);
+               return;
+       }
+
+       if (_video_position == DCPTime() && maybe_draw_background_image (dc)) {
                return;
        }
 
@@ -531,7 +552,7 @@ FilmViewer::quick_refresh ()
                return false;
        }
 
-       if (!_player_video.first->reset_metadata (_player->video_container_size(), _film->frame_size())) {
+       if (!_player_video.first->reset_metadata (_film, _player->video_container_size(), _film->frame_size())) {
                return false;
        }
 
@@ -587,7 +608,6 @@ FilmViewer::seek (DCPTime t, bool accurate)
        }
 
        PositionChanged ();
-       Seeked (position());
 }
 
 void