X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=9c3a9c81e0ca8d5b11a10c4ac7cbda386b655c73;hb=f10e025eba54b0ab4dbe1b3611071b160ca89208;hp=f3250dbfa8f62c5901f036e995204922a5cb1ed2;hpb=046d84f45621f7e128cb30160a315f98881c6f4b;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index f3250dbfa..9c3a9c81e 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -86,16 +86,12 @@ 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) , _pad_black (false) #ifdef DCPOMATIC_VARIANT_SWAROOP , _background_image (false) #endif - , _state_timer ("viewer") - , _gets (0) , _idle_get (false) { switch (Config::instance()->video_view_type()) { @@ -157,14 +153,13 @@ FilmViewer::set_film (shared_ptr film) _film = film; - _video_view->set_film (_film); _video_view->clear (); _closed_captions_dialog->clear (); if (!_film) { _player.reset (); recreate_butler (); - refresh_view (); + _video_view->update (); return; } @@ -184,8 +179,13 @@ FilmViewer::set_film (shared_ptr 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)); + film_change (CHANGE_TYPE_DONE, Film::VIDEO_FRAME_RATE); + film_change (CHANGE_TYPE_DONE, Film::THREE_D); + film_length_change (); + /* Keep about 1 second's worth of history samples */ _latency_history_count = _film->audio_frame_rate() / _audio_block_size; @@ -226,25 +226,17 @@ FilmViewer::recreate_butler () resume (); } -void -FilmViewer::refresh_view () -{ - _state_timer.set ("update-view"); - _video_view->update (); - _state_timer.unset (); -} - void FilmViewer::set_outline_content (bool o) { _outline_content = o; - refresh_view (); + _video_view->update (); } void FilmViewer::set_eyes (Eyes e) { - _eyes = e; + _video_view->set_eyes (e); slow_refresh (); } @@ -298,6 +290,7 @@ FilmViewer::suspend () void FilmViewer::resume () { + DCPOMATIC_ASSERT (_suspended > 0); --_suspended; if (_playing && !_suspended) { if (_audio.isStreamOpen()) { @@ -321,12 +314,22 @@ FilmViewer::start () return; } + /* We are about to set up the audio stream from the position of the video view. + If there is `lazy' seek in progress we need to wait for it to go through so that + _video_view->position() gives us a sensible answer. + */ + while (_idle_get) { + idle_handler (); + } + + /* Take the video view's idea of position as our `playhead' and start the + audio stream (which is the timing reference) there. + */ if (_audio.isStreamOpen()) { _audio.setStreamTime (_video_view->position().seconds()); _audio.startStream (); } - _dropped = 0; _playing = true; _video_view->start (); Started (position()); @@ -347,6 +350,8 @@ FilmViewer::stop () _playing = false; _video_view->stop (); Stopped (position()); + + _video_view->rethrow (); return true; } @@ -384,11 +389,25 @@ 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()); + } else if (p == Film::THREE_D) { + _video_view->set_three_d (_film->three_d()); } } +void +FilmViewer::film_length_change () +{ + _video_view->set_length (_film->length()); +} + /** Re-get the current frame slowly by seeking */ void FilmViewer::slow_refresh () @@ -403,16 +422,10 @@ FilmViewer::slow_refresh () bool FilmViewer::quick_refresh () { - if (!_video_view->_player_video.first) { - return false; - } - - if (!_video_view->_player_video.first->reset_metadata (_film, _player->video_container_size(), _film->frame_size())) { - return false; + if (!_video_view || !_film) { + return true; } - - _video_view->display_player_video (); - return true; + return _video_view->refresh_metadata (_film, _player->video_container_size(), _film->frame_size()); } void @@ -458,8 +471,14 @@ FilmViewer::seek (DCPTime t, bool accurate) _butler->seek (t, accurate); if (!_playing) { + /* We're not playing, so let the GUI thread get on and + come back later to get the next frame after the seek. + */ request_idle_display_next_frame (); } else { + /* We're going to start playing again straight away + so wait for the seek to finish. + */ while (!_video_view->display_next_frame(false)) {} } @@ -471,7 +490,7 @@ FilmViewer::config_changed (Config::Property p) { #ifdef DCPOMATIC_VARIANT_SWAROOP if (p == Config::PLAYER_BACKGROUND_IMAGE) { - refresh_view (); + _video_view->update (); return; } #endif @@ -555,12 +574,7 @@ FilmViewer::audio_time () const DCPTime FilmViewer::time () const { - if (_audio.isStreamRunning ()) { - return DCPTime::from_seconds (const_cast(&_audio)->getStreamTime ()) - - DCPTime::from_frames (average_latency(), _film->audio_frame_rate()); - } - - return _video_view->position(); + return audio_time().get_value_or(_video_view->position()); } int @@ -642,10 +656,33 @@ FilmViewer::set_pad_black (bool p) _pad_black = p; } -/* May be called from a non-UI thread */ +/** Called when a player has finished the current film. + * May be called from a non-UI thread. + */ void -FilmViewer::emit_finished () +FilmViewer::finished () { - emit (boost::bind(boost::ref(Finished))); + emit (boost::bind(&FilmViewer::ui_finished, this)); } +/** Called by finished() in the UI thread */ +void +FilmViewer::ui_finished () +{ + stop (); + Finished (); +} + +int +FilmViewer::dropped () const +{ + return _video_view->dropped (); +} + +int +FilmViewer::gets () const +{ + return _video_view->gets (); +} + +