X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=27c8d23b61710d4478c3a96008c52176bceeec66;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hp=07c64886e2577ee3e1ec9ccecf9c800e7ebaa6c4;hpb=94f27fed01e1f4c9cb876fa5594d11e2bbe3f7bd;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 07c64886e..27c8d23b6 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -54,6 +54,7 @@ using std::exception; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::weak_ptr; +using boost::optional; using dcp::Size; FilmViewer::FilmViewer (wxWindow* p) @@ -71,9 +72,9 @@ FilmViewer::FilmViewer (wxWindow* p) #ifndef __WXOSX__ _panel->SetDoubleBuffered (true); #endif - + _panel->SetBackgroundStyle (wxBG_STYLE_PAINT); - + _v_sizer = new wxBoxSizer (wxVERTICAL); SetSizer (_v_sizer); @@ -111,51 +112,53 @@ FilmViewer::FilmViewer (wxWindow* p) _forward_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmViewer::forward_clicked, this)); set_film (shared_ptr ()); - + JobManager::instance()->ActiveJobsChanged.connect ( - bind (&FilmViewer::active_jobs_changed, this, _1) + bind (&FilmViewer::active_jobs_changed, this, _2) ); setup_sensitivity (); } void -FilmViewer::set_film (shared_ptr f) +FilmViewer::set_film (shared_ptr film) { - if (_film == f) { + if (_film == film) { return; } - _film = f; + _film = film; _frame.reset (); - + update_position_slider (); update_position_label (); - + if (!_film) { return; } try { - _player.reset (new Player (f)); + _player.reset (new Player (_film, _film->playlist ())); } catch (bad_alloc) { error_dialog (this, _("There is not enough free memory to do that.")); _film.reset (); return; } - /* Always burn in subtitles, even if we are set not to, otherwise we won't see them + /* Always burn in subtitles, even if content is set not to, otherwise we won't see them in the preview. */ - _player->set_burn_subtitles (true); - + _player->set_always_burn_subtitles (true); + _player->set_ignore_audio (); + _player->set_play_referenced (); + _film_connection = _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1)); _player_connection = _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1)); calculate_sizes (); - get (_position, _last_get_accurate); + refresh (); setup_sensitivity (); } @@ -180,16 +183,17 @@ FilmViewer::get (DCPTime p, bool accurate) } catch (exception& e) { error_dialog (this, wxString::Format (_("Could not get video for view (%s)"), std_to_wx(e.what()).data())); } - + if (!pvf.empty ()) { try { - _frame = pvf.front()->image (PIX_FMT_RGB24, true, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2)); + _frame = pvf.front()->image (PIX_FMT_RGB24, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2)); + ImageChanged (pvf.front ()); dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601; if (pvf.front()->colour_conversion()) { yuv_to_rgb = pvf.front()->colour_conversion().get().yuv_to_rgb(); } - + _frame = _frame->scale (_frame->size(), yuv_to_rgb, PIX_FMT_RGB24, false); _position = pvf.front()->time (); _inter_position = pvf.front()->inter_position (); @@ -229,7 +233,7 @@ FilmViewer::timer () } else { get (_position + frame, true); } - + update_position_label (); update_position_slider (); } @@ -295,7 +299,7 @@ FilmViewer::panel_sized (wxSizeEvent& ev) _panel_size.height = ev.GetSize().GetHeight(); calculate_sizes (); - get (_position, _last_get_accurate); + refresh (); update_position_label (); update_position_slider (); } @@ -308,18 +312,18 @@ FilmViewer::calculate_sizes () } Ratio const * container = _film->container (); - + float const panel_ratio = _panel_size.ratio (); float const film_ratio = container ? container->ratio () : 1.78; - + if (panel_ratio < film_ratio) { /* panel is less widscreen than the film; clamp width */ _out_size.width = _panel_size.width; - _out_size.height = rint (_out_size.width / film_ratio); + _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.width = rint (_out_size.height * film_ratio); + _out_size.width = lrintf (_out_size.height * film_ratio); } /* Catch silly values */ @@ -341,7 +345,7 @@ FilmViewer::check_play_state () if (!_film || _film->video_frame_rate() == 0) { return; } - + if (_play_button->GetValue()) { _timer.Start (1000 / _film->video_frame_rate()); } else { @@ -356,7 +360,7 @@ FilmViewer::update_position_slider () _slider->SetValue (0); return; } - + DCPTime const len = _film->length (); if (len.get ()) { @@ -378,28 +382,17 @@ FilmViewer::update_position_label () 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("%d"), int (rint (_position.seconds() * fps)) + 1)); + _frame_number->SetLabel (wxString::Format (wxT("%ld"), lrint (_position.seconds() * fps) + 1)); _timecode->SetLabel (time_to_timecode (_position, fps)); } void -FilmViewer::active_jobs_changed (bool a) +FilmViewer::active_jobs_changed (optional j) { - if (a) { - list > jobs = JobManager::instance()->get (); - list >::iterator i = jobs.begin (); - while (i != jobs.end() && boost::dynamic_pointer_cast (*i) == 0) { - ++i; - } - - if (i == jobs.end() || (*i)->finished()) { - /* no examine content job running, so we're ok to use the viewer */ - a = false; - } - } - - _slider->Enable (!a); - _play_button->Enable (!a); + /* 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); } void @@ -418,7 +411,12 @@ FilmViewer::back_clicked () void FilmViewer::forward_clicked () { - get (_position + DCPTime::from_frames (1, _film->video_frame_rate ()), true); + DCPTime p = _position + DCPTime::from_frames (1, _film->video_frame_rate ()); + if (p >= _film->length ()) { + p = _position; + } + + get (p, true); update_position_label (); update_position_slider (); } @@ -431,7 +429,7 @@ FilmViewer::player_changed (bool frequent) } calculate_sizes (); - get (_position, _last_get_accurate); + refresh (); update_position_label (); update_position_slider (); } @@ -440,7 +438,7 @@ void FilmViewer::setup_sensitivity () { bool const c = _film && !_film->content().empty (); - + _slider->Enable (c); _back_button->Enable (c); _forward_button->Enable (c); @@ -457,3 +455,10 @@ FilmViewer::film_changed (Film::Property p) setup_sensitivity (); } } + +/** Re-get the current frame */ +void +FilmViewer::refresh () +{ + get (_position, _last_get_accurate); +}