Turn off play button on stop.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 2aef50c6ddf85b3f12f2316f1b3eb23ea2b1bb9b..942a0fedcd27717faf146d2599e625ab412948fb 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -92,6 +92,7 @@ FilmViewer::FilmViewer (wxWindow* p)
        , _audio_channels (0)
        , _audio_block_size (1024)
        , _playing (false)
+       , _latency_history_count (0)
 {
 #ifndef __WXOSX__
        _panel->SetDoubleBuffered (true);
@@ -200,6 +201,9 @@ FilmViewer::set_film (shared_ptr<Film> film)
        _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
        _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
 
+       /* Keep about 1 second's worth of history samples */
+       _latency_history_count = _film->audio_frame_rate() / _audio_block_size;
+
        recreate_butler ();
 
        calculate_sizes ();
@@ -306,11 +310,15 @@ FilmViewer::timer ()
        }
 
        if (_audio.isStreamRunning ()) {
-               DCPTime const now = time().ceil (_film->video_frame_rate ());
                get ();
                update_position_label ();
                update_position_slider ();
-               DCPTime const next = now + DCPTime::from_frames (1, _film->video_frame_rate ());
+               DCPTime const next = _video_position + DCPTime::from_frames (1, _film->video_frame_rate ());
+
+               if (next >= _film->length()) {
+                       stop ();
+               }
+
                _timer.Start (max ((next.seconds() - time().seconds()) * 1000, 0.0), wxTIMER_ONE_SHOT);
        }
 
@@ -459,6 +467,7 @@ FilmViewer::stop ()
        }
 
        _playing = false;
+       _play_button->SetValue (false);
        return true;
 }
 
@@ -710,7 +719,8 @@ DCPTime
 FilmViewer::time () const
 {
        if (_audio.isStreamRunning ()) {
-               return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime ());
+               return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime ()) -
+                       DCPTime::from_frames (average_latency(), _film->audio_frame_rate());
        }
 
        return _video_position;
@@ -720,5 +730,30 @@ int
 FilmViewer::audio_callback (void* out_p, unsigned int frames)
 {
        _butler->get_audio (reinterpret_cast<float*> (out_p), frames);
+
+        boost::mutex::scoped_lock lm (_latency_history_mutex, boost::try_to_lock);
+        if (lm) {
+                _latency_history.push_back (_audio.getStreamLatency ());
+                if (_latency_history.size() > static_cast<size_t> (_latency_history_count)) {
+                        _latency_history.pop_front ();
+                }
+        }
+
        return 0;
 }
+
+Frame
+FilmViewer::average_latency () const
+{
+        boost::mutex::scoped_lock lm (_latency_history_mutex);
+        if (_latency_history.empty()) {
+                return 0;
+        }
+
+        Frame total = 0;
+        BOOST_FOREACH (Frame i, _latency_history) {
+                total += i;
+        }
+
+        return total / _latency_history.size();
+}