X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=8c1a79113c732d33d2ca054307569eba039b1b90;hp=8fff213454b2193c4fa8d218cf2e798cfe4a7980;hb=b33437685e43427459e7ea752f3cd3d621878573;hpb=4f9cb03792e85cbb5b4d554ab8ec0a3275fa7524 diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 8fff21345..17573b438 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -26,6 +26,9 @@ #include "playhead_to_timecode_dialog.h" #include "playhead_to_frame_dialog.h" #include "wx_util.h" +#include "closed_captions_dialog.h" +#include "gl_video_view.h" +#include "simple_video_view.h" #include "lib/film.h" #include "lib/ratio.h" #include "lib/util.h" @@ -42,6 +45,8 @@ #include "lib/butler.h" #include "lib/log.h" #include "lib/config.h" +#include "lib/compose.hpp" +#include "lib/dcpomatic_log.h" extern "C" { #include } @@ -64,85 +69,79 @@ using boost::dynamic_pointer_cast; using boost::weak_ptr; using boost::optional; using dcp::Size; +using namespace dcpomatic; + +static +int +rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamStatus, void* data) +{ + return reinterpret_cast(data)->audio_callback (out, frames); +} FilmViewer::FilmViewer (wxWindow* p) - : wxPanel (p) - , _panel (new wxPanel (this)) - , _outline_content (new wxCheckBox (this, wxID_ANY, _("Outline content"))) - , _left_eye (new wxRadioButton (this, wxID_ANY, _("Left eye"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP)) - , _right_eye (new wxRadioButton (this, wxID_ANY, _("Right eye"))) - , _jump_to_selected (new wxCheckBox (this, wxID_ANY, _("Jump to selected content"))) - , _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096)) - , _back_button (new wxButton (this, wxID_ANY, wxT("<"))) - , _forward_button (new wxButton (this, wxID_ANY, wxT(">"))) - , _frame_number (new wxStaticText (this, wxID_ANY, wxT(""))) - , _timecode (new wxStaticText (this, wxID_ANY, wxT(""))) - , _play_button (new wxToggleButton (this, wxID_ANY, _("Play"))) - , _coalesce_player_changes (false) - , _pending_player_change (false) - , _last_seek_accurate (true) -{ -#ifndef __WXOSX__ - _panel->SetDoubleBuffered (true); + : _coalesce_player_changes (false) + , _audio (DCPOMATIC_RTAUDIO_API) + , _audio_channels (0) + , _audio_block_size (1024) + , _playing (false) + , _suspended (0) + , _latency_history_count (0) + , _closed_captions_dialog (new ClosedCaptionsDialog(p, this)) + , _outline_content (false) + , _pad_black (false) +#ifdef DCPOMATIC_VARIANT_SWAROOP + , _background_image (false) #endif + , _idle_get (false) +{ + switch (Config::instance()->video_view_type()) { + case Config::VIDEO_VIEW_OPENGL: + _video_view = new GLVideoView (this, p); + break; + case Config::VIDEO_VIEW_SIMPLE: + _video_view = new SimpleVideoView (this, p); + break; + } - _panel->SetBackgroundStyle (wxBG_STYLE_PAINT); - - _v_sizer = new wxBoxSizer (wxVERTICAL); - SetSizer (_v_sizer); - - _v_sizer->Add (_panel, 1, wxEXPAND); - - wxBoxSizer* view_options = new wxBoxSizer (wxHORIZONTAL); - view_options->Add (_outline_content, 0, wxRIGHT, DCPOMATIC_SIZER_GAP); - view_options->Add (_left_eye, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); - view_options->Add (_right_eye, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); - view_options->Add (_jump_to_selected, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); - _v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP); - - wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL); - - wxBoxSizer* time_sizer = new wxBoxSizer (wxVERTICAL); - time_sizer->Add (_frame_number, 0, wxEXPAND); - time_sizer->Add (_timecode, 0, wxEXPAND); - - h_sizer->Add (_back_button, 0, wxALL, 2); - h_sizer->Add (time_sizer, 0, wxEXPAND); - h_sizer->Add (_forward_button, 0, wxALL, 2); - h_sizer->Add (_play_button, 0, wxEXPAND); - h_sizer->Add (_slider, 1, wxEXPAND); + _video_view->Sized.connect (boost::bind(&FilmViewer::video_view_sized, this)); - _v_sizer->Add (h_sizer, 0, wxEXPAND | wxALL, 6); + set_film (shared_ptr ()); - _frame_number->SetMinSize (wxSize (84, -1)); - _back_button->SetMinSize (wxSize (32, -1)); - _forward_button->SetMinSize (wxSize (32, -1)); + _config_changed_connection = Config::instance()->Changed.connect (bind (&FilmViewer::config_changed, this, _1)); + config_changed (Config::SOUND_OUTPUT); +} - _panel->Bind (wxEVT_PAINT, boost::bind (&FilmViewer::paint_panel, this)); - _panel->Bind (wxEVT_SIZE, boost::bind (&FilmViewer::panel_sized, this, _1)); - _outline_content->Bind (wxEVT_CHECKBOX, boost::bind (&FilmViewer::refresh_panel, this)); - _left_eye->Bind (wxEVT_RADIOBUTTON, boost::bind (&FilmViewer::refresh, this)); - _right_eye->Bind (wxEVT_RADIOBUTTON, boost::bind (&FilmViewer::refresh, this)); - _slider->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind (&FilmViewer::slider_moved, this)); - _slider->Bind (wxEVT_SCROLL_PAGEUP, boost::bind (&FilmViewer::slider_moved, this)); - _slider->Bind (wxEVT_SCROLL_PAGEDOWN, boost::bind (&FilmViewer::slider_moved, this)); - _play_button->Bind (wxEVT_TOGGLEBUTTON, boost::bind (&FilmViewer::play_clicked, this)); - _timer.Bind (wxEVT_TIMER, boost::bind (&FilmViewer::timer, this)); - _back_button->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::back_clicked, this, _1)); - _forward_button->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::forward_clicked, this, _1)); - _frame_number->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::frame_number_clicked, this)); - _timecode->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::timecode_clicked, this)); - _jump_to_selected->Bind (wxEVT_CHECKBOX, boost::bind (&FilmViewer::jump_to_selected_clicked, this)); +FilmViewer::~FilmViewer () +{ + stop (); +} - _jump_to_selected->SetValue (Config::instance()->jump_to_selected ()); +/** Ask for ::get() to be called next time we are idle */ +void +FilmViewer::request_idle_display_next_frame () +{ + if (_idle_get) { + return; + } - set_film (shared_ptr ()); + _idle_get = true; + DCPOMATIC_ASSERT (signal_manager); + signal_manager->when_idle (boost::bind(&FilmViewer::idle_handler, this)); +} - JobManager::instance()->ActiveJobsChanged.connect ( - bind (&FilmViewer::active_jobs_changed, this, _2) - ); +void +FilmViewer::idle_handler () +{ + if (!_idle_get) { + return; + } - setup_sensitivity (); + if (_video_view->display_next_frame(true)) { + _idle_get = false; + } else { + /* get() could not complete quickly so we'll try again later */ + signal_manager->when_idle (boost::bind(&FilmViewer::idle_handler, this)); + } } void @@ -154,207 +153,117 @@ FilmViewer::set_film (shared_ptr film) _film = film; - _frame.reset (); - - update_position_slider (); - update_position_label (); + _video_view->clear (); + _closed_captions_dialog->clear (); if (!_film) { + _player.reset (); + recreate_butler (); + _video_view->update (); return; } try { _player.reset (new Player (_film, _film->playlist ())); _player->set_fast (); - } catch (bad_alloc) { - error_dialog (this, _("There is not enough free memory to do that.")); + if (_dcp_decode_reduction) { + _player->set_dcp_decode_reduction (_dcp_decode_reduction); + } + } catch (bad_alloc &) { + error_dialog (_video_view->get(), _("There is not enough free memory to do that.")); _film.reset (); return; } - /* Always burn in subtitles, even if content is set not to, otherwise we won't see them - in the preview. - */ - _player->set_always_burn_subtitles (true); - _player->set_ignore_audio (); + _player->set_always_burn_open_subtitles (); _player->set_play_referenced (); - _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1)); - _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1)); + _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 */ + _latency_history_count = _film->audio_frame_rate() / _audio_block_size; recreate_butler (); calculate_sizes (); - refresh (); - - setup_sensitivity (); + slow_refresh (); } void FilmViewer::recreate_butler () { + suspend (); _butler.reset (); if (!_film) { + resume (); return; } - _butler.reset (new Butler (_film, _player)); -} - -void -FilmViewer::refresh_panel () -{ - _panel->Refresh (); - _panel->Update (); -} - -void -FilmViewer::get () -{ - pair, DCPTime> video; - do { - video = _butler->get_video (); - } while (_film->three_d() && ((_left_eye->GetValue() && video.first->eyes() == EYES_RIGHT) || (_right_eye->GetValue() && video.first->eyes() == EYES_LEFT))); - - if (!video.first) { - return; - } - - /* In an ideal world, what we would do here is: - * - * 1. convert to XYZ exactly as we do in the DCP creation path. - * 2. convert back to RGB for the preview display, compensating - * for the monitor etc. etc. - * - * but this is inefficient if the source is RGB. Since we don't - * (currently) care too much about the precise accuracy of the preview's - * colour mapping (and we care more about its speed) we try to short- - * circuit this "ideal" situation in some cases. - * - * The content's specified colour conversion indicates the colourspace - * which the content is in (according to the user). - * - * PlayerVideo::image (bound to PlayerVideo::always_rgb) will take the source - * image and convert it (from whatever the user has said it is) to RGB. - */ - - _frame = video.first->image ( - bind (&Log::dcp_log, _film->log().get(), _1, _2), - bind (&PlayerVideo::always_rgb, _1), - false, true + _butler.reset( + new Butler( + _player, + Config::instance()->audio_mapping(_audio_channels), + _audio_channels, + bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), + false, + true + ) ); - ImageChanged (video.first); - - _position = video.second; - _inter_position = video.first->inter_position (); - _inter_size = video.first->inter_size (); - - refresh_panel (); -} - -void -FilmViewer::timer () -{ - DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ()); - - if ((_position + frame) >= _film->length ()) { - _play_button->SetValue (false); - check_play_state (); - } else { - get (); + if (!Config::instance()->sound() && !_audio.isStreamOpen()) { + _butler->disable_audio (); } - update_position_label (); - update_position_slider (); + _closed_captions_dialog->set_film_and_butler (_film, _butler); + + resume (); } void -FilmViewer::paint_panel () +FilmViewer::set_outline_content (bool o) { - wxPaintDC dc (_panel); - - if (!_frame || !_film || !_out_size.width || !_out_size.height) { - dc.Clear (); - return; - } - - wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true); - wxBitmap frame_bitmap (frame); - dc.DrawBitmap (frame_bitmap, 0, 0); - - if (_out_size.width < _panel_size.width) { - wxPen p (GetBackgroundColour ()); - wxBrush b (GetBackgroundColour ()); - dc.SetPen (p); - dc.SetBrush (b); - dc.DrawRectangle (_out_size.width, 0, _panel_size.width - _out_size.width, _panel_size.height); - } - - if (_out_size.height < _panel_size.height) { - wxPen p (GetBackgroundColour ()); - wxBrush b (GetBackgroundColour ()); - dc.SetPen (p); - dc.SetBrush (b); - dc.DrawRectangle (0, _out_size.height, _panel_size.width, _panel_size.height - _out_size.height); - } - - if (_outline_content->GetValue ()) { - wxPen p (wxColour (255, 0, 0), 2); - dc.SetPen (p); - dc.SetBrush (*wxTRANSPARENT_BRUSH); - dc.DrawRectangle (_inter_position.x, _inter_position.y, _inter_size.width, _inter_size.height); - } + _outline_content = o; + _video_view->update (); } void -FilmViewer::slider_moved () +FilmViewer::set_eyes (Eyes e) { - if (!_film) { - return; - } - - DCPTime t (_slider->GetValue() * _film->length().get() / 4096); - /* Ensure that we hit the end of the film at the end of the slider */ - if (t >= _film->length ()) { - t = _film->length() - DCPTime::from_frames (1, _film->video_frame_rate ()); - } - seek (t, false); - update_position_label (); + _video_view->set_eyes (e); + slow_refresh (); } void -FilmViewer::panel_sized (wxSizeEvent& ev) +FilmViewer::video_view_sized () { - _panel_size.width = ev.GetSize().GetWidth(); - _panel_size.height = ev.GetSize().GetHeight(); - calculate_sizes (); - refresh (); - update_position_label (); - update_position_slider (); + if (!quick_refresh()) { + slow_refresh (); + } } void FilmViewer::calculate_sizes () { - if (!_film) { + if (!_film || !_player) { return; } Ratio const * container = _film->container (); - float const panel_ratio = _panel_size.ratio (); + float const view_ratio = float(_video_view->get()->GetSize().x) / _video_view->get()->GetSize().y; float const film_ratio = container ? container->ratio () : 1.78; - if (panel_ratio < film_ratio) { + if (view_ratio < film_ratio) { /* panel is less widscreen than the film; clamp width */ - _out_size.width = _panel_size.width; + _out_size.width = _video_view->get()->GetSize().x; _out_size.height = lrintf (_out_size.width / film_ratio); } else { /* panel is more widescreen than the film; clamp height */ - _out_size.height = _panel_size.height; + _out_size.height = _video_view->get()->GetSize().y; _out_size.width = lrintf (_out_size.height * film_ratio); } @@ -366,86 +275,173 @@ FilmViewer::calculate_sizes () } void -FilmViewer::play_clicked () +FilmViewer::suspend () +{ + ++_suspended; + if (_audio.isStreamRunning()) { + _audio.abortStream(); + } +} + +void +FilmViewer::resume () { - check_play_state (); + DCPOMATIC_ASSERT (_suspended > 0); + --_suspended; + if (_playing && !_suspended) { + if (_audio.isStreamOpen()) { + _audio.setStreamTime (_video_view->position().seconds()); + _audio.startStream (); + } + _video_view->start (); + } } void -FilmViewer::check_play_state () +FilmViewer::start () { - if (!_film || _film->video_frame_rate() == 0) { + if (!_film) { return; } - if (_play_button->GetValue()) { - _timer.Start (1000 / _film->video_frame_rate()); - } else { - _timer.Stop (); + optional v = PlaybackPermitted (); + if (v && !*v) { + /* Computer says no */ + return; + } + + if (_audio.isStreamOpen()) { + _audio.setStreamTime (_video_view->position().seconds()); + _audio.startStream (); + } + + _playing = true; + _video_view->start (); + Started (position()); +} + +bool +FilmViewer::stop () +{ + if (_audio.isStreamRunning()) { + /* stop stream and discard any remaining queued samples */ + _audio.abortStream (); + } + + if (!_playing) { + return false; } + + _playing = false; + _video_view->stop (); + Stopped (position()); + + _video_view->rethrow (); + return true; } void -FilmViewer::update_position_slider () +FilmViewer::player_change (ChangeType type, int property, bool frequent) { - if (!_film) { - _slider->SetValue (0); + if (type != CHANGE_TYPE_DONE || frequent) { + return; + } + + if (_coalesce_player_changes) { + _pending_player_changes.push_back (property); return; } - DCPTime const len = _film->length (); + calculate_sizes (); + bool refreshed = false; + if ( + property == VideoContentProperty::CROP || + property == VideoContentProperty::SCALE || + property == VideoContentProperty::FADE_IN || + property == VideoContentProperty::FADE_OUT || + property == VideoContentProperty::COLOUR_CONVERSION || + property == PlayerProperty::VIDEO_CONTAINER_SIZE || + property == PlayerProperty::FILM_CONTAINER + ) { + refreshed = quick_refresh (); + } - if (len.get ()) { - int const new_slider_position = 4096 * _position.get() / len.get(); - if (new_slider_position != _slider->GetValue()) { - _slider->SetValue (new_slider_position); - } + if (!refreshed) { + slow_refresh (); } } void -FilmViewer::update_position_label () +FilmViewer::film_change (ChangeType type, Film::Property p) { - if (!_film) { - _frame_number->SetLabel ("0"); - _timecode->SetLabel ("0:0:0.0"); + if (type != CHANGE_TYPE_DONE) { return; } - double const fps = _film->video_frame_rate (); - /* Count frame number from 1 ... not sure if this is the best idea */ - _frame_number->SetLabel (wxString::Format (wxT("%ld"), lrint (_position.seconds() * fps) + 1)); - _timecode->SetLabel (time_to_timecode (_position, fps)); + 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::active_jobs_changed (optional j) +FilmViewer::film_length_change () { - /* examine content is the only job which stops the viewer working */ - bool const a = !j || *j != "examine_content"; - _slider->Enable (a); - _play_button->Enable (a); + _video_view->set_length (_film->length()); } -DCPTime -FilmViewer::nudge_amount (wxMouseEvent& ev) +/** Re-get the current frame slowly by seeking */ +void +FilmViewer::slow_refresh () { - DCPTime amount = DCPTime::from_frames (1, _film->video_frame_rate ()); + seek (_video_view->position(), true); +} - if (ev.ShiftDown() && !ev.ControlDown()) { - amount = DCPTime::from_seconds (1); - } else if (!ev.ShiftDown() && ev.ControlDown()) { - amount = DCPTime::from_seconds (10); - } else if (ev.ShiftDown() && ev.ControlDown()) { - amount = DCPTime::from_seconds (60); +/** Try to re-get the current frame quickly by resetting the metadata + * in the PlayerVideo that we used last time. + * @return true if this was possible, false if not. + */ +bool +FilmViewer::quick_refresh () +{ + if (!_video_view || !_film) { + return true; } + return _video_view->refresh_metadata (_film, _player->video_container_size(), _film->frame_size()); +} - return amount; +void +FilmViewer::seek (shared_ptr content, ContentTime t, bool accurate) +{ + optional dt = _player->content_time_to_dcp (content, t); + if (dt) { + seek (*dt, accurate); + } +} + +void +FilmViewer::set_coalesce_player_changes (bool c) +{ + _coalesce_player_changes = c; + + if (!c) { + BOOST_FOREACH (int i, _pending_player_changes) { + player_change (CHANGE_TYPE_DONE, i, false); + } + _pending_player_changes.clear (); + } } void -FilmViewer::go_to (DCPTime t) +FilmViewer::seek (DCPTime t, bool accurate) { + if (!_butler) { + return; + } + if (t < DCPTime ()) { t = DCPTime (); } @@ -454,132 +450,218 @@ FilmViewer::go_to (DCPTime t) t = _film->length (); } - seek (t, true); - update_position_label (); - update_position_slider (); + suspend (); + + _closed_captions_dialog->clear (); + _butler->seek (t, accurate); + + if (!_playing) { + request_idle_display_next_frame (); + } else { + while (!_video_view->display_next_frame(false)) {} + } + + resume (); } void -FilmViewer::back_clicked (wxMouseEvent& ev) +FilmViewer::config_changed (Config::Property p) { - go_to (_position - nudge_amount (ev)); - ev.Skip (); +#ifdef DCPOMATIC_VARIANT_SWAROOP + if (p == Config::PLAYER_BACKGROUND_IMAGE) { + _video_view->update (); + return; + } +#endif + + if (p == Config::AUDIO_MAPPING) { + recreate_butler (); + return; + } + + if (p != Config::SOUND && p != Config::SOUND_OUTPUT) { + return; + } + + if (_audio.isStreamOpen ()) { + _audio.closeStream (); + } + + if (Config::instance()->sound() && _audio.getDeviceCount() > 0) { + unsigned int st = 0; + if (Config::instance()->sound_output()) { + while (st < _audio.getDeviceCount()) { + if (_audio.getDeviceInfo(st).name == Config::instance()->sound_output().get()) { + break; + } + ++st; + } + if (st == _audio.getDeviceCount()) { + st = _audio.getDefaultOutputDevice(); + } + } else { + st = _audio.getDefaultOutputDevice(); + } + + _audio_channels = _audio.getDeviceInfo(st).outputChannels; + + RtAudio::StreamParameters sp; + sp.deviceId = st; + sp.nChannels = _audio_channels; + sp.firstChannel = 0; + try { + _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 + error_dialog ( + _video_view->get(), + _("Could not set up audio output. There will be no audio during the preview."), std_to_wx(e.what()) + ); + } + recreate_butler (); + + } else { + _audio_channels = 0; + recreate_butler (); + } } -void -FilmViewer::forward_clicked (wxMouseEvent& ev) +DCPTime +FilmViewer::uncorrected_time () const { - go_to (_position + nudge_amount (ev)); - ev.Skip (); + if (_audio.isStreamRunning ()) { + return DCPTime::from_seconds (const_cast(&_audio)->getStreamTime()); + } + + return _video_view->position(); } -void -FilmViewer::player_changed (bool frequent) +optional +FilmViewer::audio_time () const { - if (frequent) { - return; + if (!_audio.isStreamRunning()) { + return optional(); } - if (_coalesce_player_changes) { - _pending_player_change = true; - return; + return DCPTime::from_seconds (const_cast(&_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 +FilmViewer::audio_callback (void* out_p, unsigned int frames) +{ + while (true) { + optional t = _butler->get_audio (reinterpret_cast (out_p), frames); + if (!t || DCPTime(uncorrected_time() - *t) < one_video_frame()) { + /* There was an underrun or this audio is on time; carry on */ + break; + } + /* The audio we just got was (very) late; drop it and get some more. */ } - calculate_sizes (); - refresh (); - update_position_label (); - update_position_slider (); + 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 (_latency_history_count)) { + _latency_history.pop_front (); + } + } + + return 0; } -void -FilmViewer::setup_sensitivity () +Frame +FilmViewer::average_latency () const { - bool const c = _film && !_film->content().empty (); + boost::mutex::scoped_lock lm (_latency_history_mutex); + if (_latency_history.empty()) { + return 0; + } - _slider->Enable (c); - _back_button->Enable (c); - _forward_button->Enable (c); - _play_button->Enable (c); - _outline_content->Enable (c); - _frame_number->Enable (c); - _timecode->Enable (c); + Frame total = 0; + BOOST_FOREACH (Frame i, _latency_history) { + total += i; + } - _left_eye->Enable (c && _film->three_d ()); - _right_eye->Enable (c && _film->three_d ()); + return total / _latency_history.size(); } void -FilmViewer::film_changed (Film::Property p) +FilmViewer::set_dcp_decode_reduction (optional reduction) { - if (p == Film::CONTENT || p == Film::THREE_D) { - setup_sensitivity (); + _dcp_decode_reduction = reduction; + if (_player) { + _player->set_dcp_decode_reduction (reduction); } } -/** Re-get the current frame */ -void -FilmViewer::refresh () +optional +FilmViewer::dcp_decode_reduction () const { - seek (_position, _last_seek_accurate); + return _dcp_decode_reduction; } -void -FilmViewer::set_position (DCPTime p) +DCPTime +FilmViewer::one_video_frame () const { - _position = p; - seek (p, true); - update_position_label (); - update_position_slider (); + return DCPTime::from_frames (1, _film ? _film->video_frame_rate() : 24); } +/** Open a dialog box showing our film's closed captions */ void -FilmViewer::set_coalesce_player_changes (bool c) +FilmViewer::show_closed_captions () { - _coalesce_player_changes = c; - - if (c) { - _pending_player_change = false; - } else { - if (_pending_player_change) { - player_changed (false); - } - } + _closed_captions_dialog->Show(); } void -FilmViewer::timecode_clicked () +FilmViewer::seek_by (DCPTime by, bool accurate) { - PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _film->video_frame_rate ()); - if (dialog->ShowModal() == wxID_OK) { - go_to (dialog->get ()); - } - dialog->Destroy (); + seek (_video_view->position() + by, accurate); } void -FilmViewer::frame_number_clicked () +FilmViewer::set_pad_black (bool p) { - PlayheadToFrameDialog* dialog = new PlayheadToFrameDialog (this, _film->video_frame_rate ()); - if (dialog->ShowModal() == wxID_OK) { - go_to (dialog->get ()); - } - dialog->Destroy (); + _pad_black = p; } +/** Called when a player has finished the current film. + * May be called from a non-UI thread. + */ void -FilmViewer::jump_to_selected_clicked () +FilmViewer::finished () { - Config::instance()->set_jump_to_selected (_jump_to_selected->GetValue ()); + emit (boost::bind(&FilmViewer::ui_finished, this)); } +/** Called by finished() in the UI thread */ void -FilmViewer::seek (DCPTime t, bool accurate) +FilmViewer::ui_finished () { - if (!_butler) { - return; - } + stop (); + Finished (); +} - _butler->seek (t, accurate); - _last_seek_accurate = accurate; - get (); +int +FilmViewer::dropped () const +{ + return _video_view->dropped (); +} + +int +FilmViewer::gets () const +{ + return _video_view->gets (); } + +