Attempt to tidy up internal APIs slightly.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index beab8f321df9dbd32b5b839a0e8212b2f7c22613..c17927ac5bc0de8d483004ed4c41dcd69c9bbb16 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -178,9 +178,10 @@ FilmViewer::set_film (shared_ptr<Film> film)
        _player->set_ignore_audio ();
        _player->set_play_referenced ();
 
-       _film_connection = _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
+       _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
 
-       _player_connection = _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
+       _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
+       _player->Video.connect (boost::bind (&FilmViewer::video, this, _1, _2));
 
        calculate_sizes ();
        refresh ();
@@ -196,7 +197,7 @@ FilmViewer::refresh_panel ()
 }
 
 void
-FilmViewer::video (shared_ptr<PlayerVideo> pv)
+FilmViewer::video (shared_ptr<PlayerVideo> pv, DCPTime time)
 {
        if (!_player) {
                return;
@@ -234,7 +235,7 @@ FilmViewer::video (shared_ptr<PlayerVideo> pv)
 
        ImageChanged (pv);
 
-       _position = pv->time ();
+       _position = time;
        _inter_position = pv->inter_position ();
        _inter_size = pv->inter_size ();