Move _state_timer into VideoView.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index f40ed229faa6d253c80592b901d370c6ebdf91c9..c323c8281e7043ef7082c3346baf79ab97951508 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -86,7 +86,6 @@ FilmViewer::FilmViewer (wxWindow* p)
        , _playing (false)
        , _suspended (0)
        , _latency_history_count (0)
-       , _dropped (0)
        , _closed_captions_dialog (new ClosedCaptionsDialog(p, this))
        , _outline_content (false)
        , _eyes (EYES_LEFT)
@@ -94,7 +93,6 @@ FilmViewer::FilmViewer (wxWindow* p)
 #ifdef DCPOMATIC_VARIANT_SWAROOP
        , _background_image (false)
 #endif
-       , _state_timer ("viewer")
        , _gets (0)
        , _idle_get (false)
 {
@@ -156,9 +154,8 @@ FilmViewer::set_film (shared_ptr<Film> film)
        }
 
        _film = film;
-       _video_view->clear ();
 
-       _video_view->set_image (shared_ptr<Image>());
+       _video_view->clear ();
        _closed_captions_dialog->clear ();
 
        if (!_film) {
@@ -184,6 +181,7 @@ FilmViewer::set_film (shared_ptr<Film> film)
        _player->set_play_referenced ();
 
        _film->Change.connect (boost::bind (&FilmViewer::film_change, this, _1, _2));
+       _film->LengthChange.connect (boost::bind(&FilmViewer::film_length_change, this));
        _player->Change.connect (boost::bind (&FilmViewer::player_change, this, _1, _2, _3));
 
        /* Keep about 1 second's worth of history samples */
@@ -229,9 +227,7 @@ FilmViewer::recreate_butler ()
 void
 FilmViewer::refresh_view ()
 {
-       _state_timer.set ("update-view");
        _video_view->update ();
-       _state_timer.unset ();
 }
 
 void
@@ -327,7 +323,6 @@ FilmViewer::start ()
        }
 
        _playing = true;
-       _dropped = 0;
        _video_view->start ();
        Started (position());
 }
@@ -345,6 +340,7 @@ FilmViewer::stop ()
        }
 
        _playing = false;
+       _video_view->stop ();
        Stopped (position());
        return true;
 }
@@ -383,11 +379,23 @@ FilmViewer::player_change (ChangeType type, int property, bool frequent)
 void
 FilmViewer::film_change (ChangeType type, Film::Property p)
 {
-       if (type == CHANGE_TYPE_DONE && p == Film::AUDIO_CHANNELS) {
+       if (type != CHANGE_TYPE_DONE) {
+               return;
+       }
+
+       if (p == Film::AUDIO_CHANNELS) {
                recreate_butler ();
+       } else if (p == Film::VIDEO_FRAME_RATE) {
+               _video_view->set_video_frame_rate (_film->video_frame_rate());
        }
 }
 
+void
+FilmViewer::film_length_change ()
+{
+       _video_view->set_length (_film->length());
+}
+
 /** Re-get the current frame slowly by seeking */
 void
 FilmViewer::slow_refresh ()
@@ -540,15 +548,21 @@ FilmViewer::uncorrected_time () const
        return _video_view->position();
 }
 
-DCPTime
-FilmViewer::time () const
+optional<DCPTime>
+FilmViewer::audio_time () const
 {
-       if (_audio.isStreamRunning ()) {
-               return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime ()) -
-                       DCPTime::from_frames (average_latency(), _film->audio_frame_rate());
+       if (!_audio.isStreamRunning()) {
+               return optional<DCPTime>();
        }
 
-       return _video_view->position();
+       return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime ()) -
+               DCPTime::from_frames (average_latency(), _film->audio_frame_rate());
+}
+
+DCPTime
+FilmViewer::time () const
+{
+       return audio_time().get_value_or(_video_view->position());
 }
 
 int
@@ -630,14 +644,16 @@ FilmViewer::set_pad_black (bool p)
        _pad_black = p;
 }
 
-/* XXX_b: comment */
+/* May be called from a non-UI thread */
+void
+FilmViewer::emit_finished ()
+{
+       emit (boost::bind(boost::ref(Finished)));
+}
+
 int
-FilmViewer::time_until_next_frame () const
+FilmViewer::dropped () const
 {
-       DCPTime const next = position() + one_video_frame();
-       std::cout << to_string(next) << " " << to_string(time()) << " " << ((next.seconds() - time().seconds()) * 1000) << "\n";
-       if (next < time()) {
-               return 0;
-       }
-       return (next.seconds() - time().seconds()) * 1000;
+       return _video_view->dropped ();
 }
+