X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=e8c3b8c71363292bccd5cbd8c1dea57bf26f0990;hb=1d2a51bdc8315fa7283be329669860e435a1513f;hp=7437612af9f9fde9094737ee545a7f10c979190e;hpb=7f5d317d3ba2bdb1838e942c436ad9f5de321bb4;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 7437612af..e8c3b8c71 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -47,6 +47,7 @@ #include "lib/config.h" #include "lib/compose.hpp" #include "lib/dcpomatic_log.h" +#include "lib/text_content.h" extern "C" { #include } @@ -64,10 +65,13 @@ using std::list; using std::bad_alloc; using std::make_pair; using std::exception; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; -using boost::weak_ptr; +using std::shared_ptr; +using std::dynamic_pointer_cast; +using std::weak_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::Size; using namespace dcpomatic; @@ -88,12 +92,7 @@ FilmViewer::FilmViewer (wxWindow* p) , _latency_history_count (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 - , _gets (0) , _idle_get (false) { switch (Config::instance()->video_view_type()) { @@ -138,11 +137,11 @@ FilmViewer::idle_handler () return; } - if (_video_view->display_next_frame(true)) { - _idle_get = false; - } else { + if (_video_view->display_next_frame(true) == VideoView::AGAIN) { /* get() could not complete quickly so we'll try again later */ signal_manager->when_idle (boost::bind(&FilmViewer::idle_handler, this)); + } else { + _idle_get = false; } } @@ -166,7 +165,7 @@ FilmViewer::set_film (shared_ptr film) } try { - _player.reset (new Player (_film, _film->playlist ())); + _player.reset (new Player(_film)); _player->set_fast (); if (_dcp_decode_reduction) { _player->set_dcp_decode_reduction (_dcp_decode_reduction); @@ -181,12 +180,19 @@ FilmViewer::set_film (shared_ptr film) _player->set_play_referenced (); _film->Change.connect (boost::bind (&FilmViewer::film_change, this, _1, _2)); + _film->ContentChange.connect (boost::bind(&FilmViewer::content_change, this, _1, _3)); _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; + _closed_captions_dialog->update_tracks (_film); + recreate_butler (); calculate_sizes (); @@ -206,10 +212,12 @@ FilmViewer::recreate_butler () _butler.reset( new Butler( + _film, _player, Config::instance()->audio_mapping(_audio_channels), _audio_channels, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), + VideoRange::FULL, false, true ) @@ -219,7 +227,7 @@ FilmViewer::recreate_butler () _butler->disable_audio (); } - _closed_captions_dialog->set_film_and_butler (_film, _butler); + _closed_captions_dialog->set_butler (_butler); resume (); } @@ -231,10 +239,19 @@ FilmViewer::set_outline_content (bool o) _video_view->update (); } + +void +FilmViewer::set_outline_subtitles (optional > rect) +{ + _outline_subtitles = rect; + _video_view->update (); +} + + void FilmViewer::set_eyes (Eyes e) { - _eyes = e; + _video_view->set_eyes (e); slow_refresh (); } @@ -288,6 +305,7 @@ FilmViewer::suspend () void FilmViewer::resume () { + DCPOMATIC_ASSERT (_suspended > 0); --_suspended; if (_playing && !_suspended) { if (_audio.isStreamOpen()) { @@ -311,14 +329,28 @@ 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 (); } _playing = true; - _video_view->start (); + /* Calling start() below may directly result in Stopped being emitted, and if that + * happens we want it to come after the Started signal, so do that first. + */ Started (position()); + _video_view->start (); } bool @@ -336,6 +368,8 @@ FilmViewer::stop () _playing = false; _video_view->stop (); Stopped (position()); + + _video_view->rethrow (); return true; } @@ -381,6 +415,10 @@ FilmViewer::film_change (ChangeType type, Film::Property p) 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()); + } else if (p == Film::CONTENT) { + _closed_captions_dialog->update_tracks (_film); } } @@ -404,16 +442,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 || !_player) { + return true; } - - _video_view->display_player_video (); - return true; + return _video_view->reset_metadata (_film, _player->video_container_size()); } void @@ -431,7 +463,7 @@ FilmViewer::set_coalesce_player_changes (bool c) _coalesce_player_changes = c; if (!c) { - BOOST_FOREACH (int i, _pending_player_changes) { + for (auto i: _pending_player_changes) { player_change (CHANGE_TYPE_DONE, i, false); } _pending_player_changes.clear (); @@ -450,7 +482,7 @@ FilmViewer::seek (DCPTime t, bool accurate) } if (t >= _film->length ()) { - t = _film->length (); + t = _film->length() - one_video_frame(); } suspend (); @@ -459,9 +491,15 @@ 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 { - while (!_video_view->display_next_frame(false)) {} + /* We're going to start playing again straight away + so wait for the seek to finish. + */ + while (_video_view->display_next_frame(false) == VideoView::AGAIN) {} } resume (); @@ -470,13 +508,6 @@ FilmViewer::seek (DCPTime t, bool accurate) void FilmViewer::config_changed (Config::Property p) { -#ifdef DCPOMATIC_VARIANT_SWAROOP - if (p == Config::PLAYER_BACKGROUND_IMAGE) { - _video_view->update (); - return; - } -#endif - if (p == Config::AUDIO_MAPPING) { recreate_butler (); return; @@ -494,8 +525,12 @@ FilmViewer::config_changed (Config::Property p) unsigned int st = 0; if (Config::instance()->sound_output()) { while (st < _audio.getDeviceCount()) { - if (_audio.getDeviceInfo(st).name == Config::instance()->sound_output().get()) { - break; + try { + if (_audio.getDeviceInfo(st).name == Config::instance()->sound_output().get()) { + break; + } + } catch (RtAudioError&) { + /* Something went wrong with that device so we don't want to use it anyway */ } ++st; } @@ -506,19 +541,15 @@ FilmViewer::config_changed (Config::Property p) st = _audio.getDefaultOutputDevice(); } - _audio_channels = _audio.getDeviceInfo(st).outputChannels; - - RtAudio::StreamParameters sp; - sp.deviceId = st; - sp.nChannels = _audio_channels; - sp.firstChannel = 0; try { + _audio_channels = _audio.getDeviceInfo(st).outputChannels; + RtAudio::StreamParameters sp; + sp.deviceId = st; + sp.nChannels = _audio_channels; + sp.firstChannel = 0; _audio.openStream (&sp, 0, RTAUDIO_FLOAT32, 48000, &_audio_block_size, &rtaudio_callback, this); -#ifdef DCPOMATIC_USE_RTERROR - } catch (RtError& e) { -#else } catch (RtAudioError& e) { -#endif + _audio_channels = 0; error_dialog ( _video_view->get(), _("Could not set up audio output. There will be no audio during the preview."), std_to_wx(e.what()) @@ -591,7 +622,7 @@ FilmViewer::average_latency () const } Frame total = 0; - BOOST_FOREACH (Frame i, _latency_history) { + for (auto i: _latency_history) { total += i; } @@ -638,11 +669,21 @@ 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::finished () +{ + emit (boost::bind(&FilmViewer::ui_finished, this)); +} + +/** Called by finished() in the UI thread */ void -FilmViewer::emit_finished () +FilmViewer::ui_finished () { - emit (boost::bind(boost::ref(Finished))); + stop (); + Finished (); } int @@ -651,3 +692,37 @@ FilmViewer::dropped () const return _video_view->dropped (); } + +int +FilmViewer::errored () const +{ + return _video_view->errored (); +} + + +int +FilmViewer::gets () const +{ + return _video_view->gets (); +} + + +void +FilmViewer::content_change (ChangeType type, int property) +{ + if (type != CHANGE_TYPE_DONE) { + return; + } + + if (property == TextContentProperty::USE || property == TextContentProperty::TYPE || property == TextContentProperty::DCP_TRACK) { + _closed_captions_dialog->update_tracks (_film); + } +} + + +void +FilmViewer::image_changed (shared_ptr pv) +{ + emit (boost::bind(boost::ref(ImageChanged), pv)); +} +