X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontrols.cc;h=5b1e62c2e06244f3d04f0a479677695dc2bc20bf;hb=313319ba2d8544bc25524e02e634804a503b54f1;hp=ef93b85973a2d098f89b628433a889c224fc57fa;hpb=a8ca8dd8c3838f42c1dcd86e09901275271c298e;p=dcpomatic.git diff --git a/src/wx/controls.cc b/src/wx/controls.cc index ef93b8597..5b1e62c2e 100644 --- a/src/wx/controls.cc +++ b/src/wx/controls.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2018 Carl Hetherington + Copyright (C) 2018-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,60 +18,67 @@ */ + +#include "check_box.h" +#include "content_view.h" #include "controls.h" +#include "dcpomatic_button.h" #include "film_viewer.h" -#include "wx_util.h" -#include "playhead_to_timecode_dialog.h" #include "playhead_to_frame_dialog.h" -#include "content_view.h" +#include "playhead_to_timecode_dialog.h" #include "static_text.h" -#include "check_box.h" -#include "dcpomatic_button.h" -#include "lib/job_manager.h" -#include "lib/player_video.h" -#include "lib/dcp_content.h" -#include "lib/job.h" -#include "lib/examine_content_job.h" +#include "wx_util.h" #include "lib/content_factory.h" #include "lib/cross.h" -#include +#include "lib/dcp_content.h" +#include "lib/examine_content_job.h" +#include "lib/job.h" +#include "lib/job_manager.h" +#include "lib/player_video.h" #include +#include #include #include -#include -#include #include #include +#include +#include + -using std::string; -using std::list; using std::cout; -using std::make_pair; +using std::dynamic_pointer_cast; using std::exception; +using std::list; +using std::make_pair; +using std::shared_ptr; +using std::string; +using std::weak_ptr; using boost::optional; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif +using namespace dcpomatic; + Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor_controls) : wxPanel (parent) - , _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096)) + , _slider (new wxSlider(this, wxID_ANY, 0, 0, 4096)) , _viewer (viewer) , _slider_being_moved (false) - , _was_running_before_slider (false) , _outline_content (0) , _eye (0) , _jump_to_selected (0) - , _rewind_button (new Button (this, wxT("|<"))) - , _back_button (new Button (this, wxT("<"))) - , _forward_button (new Button (this, wxT(">"))) - , _frame_number (new StaticText (this, wxT(""))) - , _timecode (new StaticText (this, wxT(""))) + , _rewind_button (new Button(this, wxT("|<"))) + , _back_button (new Button(this, wxT("<"))) + , _forward_button (new Button(this, wxT(">"))) + , _frame_number (new StaticText(this, wxT(""))) + , _timecode (new StaticText(this, wxT(""))) + , _timer (this) { _v_sizer = new wxBoxSizer (wxVERTICAL); SetSizer (_v_sizer); - wxBoxSizer* view_options = new wxBoxSizer (wxHORIZONTAL); + auto view_options = new wxBoxSizer (wxHORIZONTAL); if (editor_controls) { _outline_content = new CheckBox (this, _("Outline content")); view_options->Add (_outline_content, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP); @@ -86,16 +93,16 @@ Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor _v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP); - wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL); + auto h_sizer = new wxBoxSizer (wxHORIZONTAL); - wxBoxSizer* time_sizer = new wxBoxSizer (wxVERTICAL); + auto time_sizer = new wxBoxSizer (wxVERTICAL); time_sizer->Add (_frame_number, 0, wxEXPAND); time_sizer->Add (_timecode, 0, wxEXPAND); - h_sizer->Add (_rewind_button, 0, wxALL, 2); - h_sizer->Add (_back_button, 0, wxALL, 2); + h_sizer->Add (_rewind_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); h_sizer->Add (time_sizer, 0, wxEXPAND); - h_sizer->Add (_forward_button, 0, wxALL, 2); + h_sizer->Add (_back_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); + h_sizer->Add (_forward_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); _button_sizer = new wxBoxSizer (wxHORIZONTAL); h_sizer->Add (_button_sizer, 0, wxEXPAND); @@ -104,10 +111,17 @@ Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor _v_sizer->Add (h_sizer, 0, wxEXPAND | wxALL, 6); +#ifdef __WXGTK3__ + _frame_number->SetMinSize (wxSize(100, -1)); + _rewind_button->SetMinSize (wxSize(48, -1)); + _back_button->SetMinSize (wxSize(48, -1)); + _forward_button->SetMinSize (wxSize(48, -1)); +#else _frame_number->SetMinSize (wxSize (84, -1)); _rewind_button->SetMinSize (wxSize (32, -1)); _back_button->SetMinSize (wxSize (32, -1)); _forward_button->SetMinSize (wxSize (32, -1)); +#endif if (_eye) { _eye->Bind (wxEVT_CHOICE, boost::bind (&Controls::eye_changed, this)); @@ -119,7 +133,7 @@ Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor _slider->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind(&Controls::slider_moved, this, false)); _slider->Bind (wxEVT_SCROLL_PAGEUP, boost::bind(&Controls::slider_moved, this, true)); _slider->Bind (wxEVT_SCROLL_PAGEDOWN, boost::bind(&Controls::slider_moved, this, true)); - _slider->Bind (wxEVT_SCROLL_CHANGED, boost::bind(&Controls::slider_released, this)); + _slider->Bind (wxEVT_SCROLL_THUMBRELEASE, boost::bind(&Controls::slider_released, this)); _rewind_button->Bind (wxEVT_LEFT_DOWN, boost::bind(&Controls::rewind_clicked, this, _1)); _back_button->Bind (wxEVT_LEFT_DOWN, boost::bind(&Controls::back_clicked, this, _1)); _forward_button->Bind (wxEVT_LEFT_DOWN, boost::bind(&Controls::forward_clicked, this, _1)); @@ -130,11 +144,13 @@ Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor _jump_to_selected->SetValue (Config::instance()->jump_to_selected ()); } - _viewer->PositionChanged.connect (boost::bind(&Controls::position_changed, this)); - _viewer->Started.connect (boost::bind(&Controls::started, this)); - _viewer->Stopped.connect (boost::bind(&Controls::stopped, this)); + viewer->Started.connect (boost::bind(&Controls::started, this)); + viewer->Stopped.connect (boost::bind(&Controls::stopped, this)); - set_film (_viewer->film()); + Bind (wxEVT_TIMER, boost::bind(&Controls::update_position, this)); + _timer.Start (80, wxTIMER_CONTINUOUS); + + set_film (viewer->film()); setup_sensitivity (); @@ -152,79 +168,104 @@ Controls::config_changed (int) setup_sensitivity (); } + void Controls::started () { setup_sensitivity (); } + void Controls::stopped () { setup_sensitivity (); } + void -Controls::position_changed () +Controls::update_position () { - if (!_slider_being_moved) { + auto viewer = _viewer.lock (); + if (!viewer) { + return; + } + + if (!_slider_being_moved && !viewer->pending_idle_get()) { update_position_label (); update_position_slider (); } } + void Controls::eye_changed () { - _viewer->set_eyes (_eye->GetSelection() == 0 ? EYES_LEFT : EYES_RIGHT); + auto viewer = _viewer.lock (); + if (!viewer) { + return; + } + + viewer->set_eyes (_eye->GetSelection() == 0 ? Eyes::LEFT : Eyes::RIGHT); } + void Controls::outline_content_changed () { - _viewer->set_outline_content (_outline_content->GetValue()); + auto viewer = _viewer.lock (); + if (!viewer) { + return; + } + + viewer->set_outline_content (_outline_content->GetValue()); } + /** @param page true if this was a PAGEUP/PAGEDOWN event for which we won't receive a THUMBRELEASE */ void Controls::slider_moved (bool page) { - if (!_film) { + auto viewer = _viewer.lock (); + if (!_film || !viewer) { return; } if (!page && !_slider_being_moved) { /* This is the first event of a drag; stop playback for the duration of the drag */ - _was_running_before_slider = _viewer->stop (); + viewer->suspend (); _slider_being_moved = true; } DCPTime t (_slider->GetValue() * _film->length().get() / 4096); t = t.round (_film->video_frame_rate()); - /* Ensure that we hit the end of the film at the end of the slider */ + /* Ensure that we hit the end of the film at the end of the slider. In particular, we + need to do an accurate seek in case there isn't a keyframe near the end. + */ + bool accurate = false; if (t >= _film->length ()) { - t = _film->length() - _viewer->one_video_frame(); + t = _film->length() - viewer->one_video_frame(); + accurate = true; } - _viewer->seek (t, false); + viewer->seek (t, accurate); update_position_label (); - - log ( - wxString::Format( - "playback-seeked %s", t.timecode(_film->video_frame_rate()).c_str() - ) - ); } + void Controls::slider_released () { - if (_was_running_before_slider) { - /* Restart after a drag */ - _viewer->start (); + auto viewer = _viewer.lock (); + if (!viewer) { + return; } + + /* Restart after a drag */ + viewer->resume (); _slider_being_moved = false; } + void Controls::update_position_slider () { @@ -233,31 +274,43 @@ Controls::update_position_slider () return; } - DCPTime const len = _film->length (); + auto viewer = _viewer.lock (); + if (!viewer) { + return; + } + + auto const len = _film->length (); if (len.get ()) { - int const new_slider_position = 4096 * _viewer->position().get() / len.get(); + int const new_slider_position = 4096 * viewer->position().get() / len.get(); if (new_slider_position != _slider->GetValue()) { _slider->SetValue (new_slider_position); } } } + void Controls::update_position_label () { if (!_film) { - _frame_number->SetLabel ("0"); - _timecode->SetLabel ("0:0:0.0"); + checked_set (_frame_number, wxT("0")); + checked_set (_timecode, wxT("0:0:0.0")); + return; + } + + auto viewer = _viewer.lock (); + if (!viewer) { 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 (_viewer->position().seconds() * fps) + 1)); - _timecode->SetLabel (time_to_timecode (_viewer->position(), fps)); + checked_set (_frame_number, wxString::Format (wxT("%ld"), lrint (viewer->position().seconds() * fps) + 1)); + checked_set (_timecode, time_to_timecode (viewer->position(), fps)); } + void Controls::active_jobs_changed (optional j) { @@ -265,10 +318,16 @@ Controls::active_jobs_changed (optional j) setup_sensitivity (); } + DCPTime Controls::nudge_amount (wxKeyboardState& ev) { - DCPTime amount = _viewer->one_video_frame (); + auto viewer = _viewer.lock (); + if (!viewer) { + return {}; + } + + auto amount = viewer->one_video_frame (); if (ev.ShiftDown() && !ev.ControlDown()) { amount = DCPTime::from_seconds (1); @@ -281,37 +340,58 @@ Controls::nudge_amount (wxKeyboardState& ev) return amount; } + void Controls::rewind_clicked (wxMouseEvent& ev) { - _viewer->seek (DCPTime(), true); + auto viewer = _viewer.lock (); + if (viewer) { + viewer->seek (DCPTime(), true); + } ev.Skip(); } + void Controls::back_frame () { - _viewer->seek_by (-_viewer->one_video_frame(), true); + auto viewer = _viewer.lock (); + if (viewer) { + viewer->seek_by (-viewer->one_video_frame(), true); + } } + void Controls::forward_frame () { - _viewer->seek_by (_viewer->one_video_frame(), true); + auto viewer = _viewer.lock (); + if (viewer) { + viewer->seek_by (viewer->one_video_frame(), true); + } } + void Controls::back_clicked (wxKeyboardState& ev) { - _viewer->seek_by (-nudge_amount(ev), true); + auto viewer = _viewer.lock (); + if (viewer) { + viewer->seek_by (-nudge_amount(ev), true); + } } + void Controls::forward_clicked (wxKeyboardState& ev) { - _viewer->seek_by (nudge_amount(ev), true); + auto viewer = _viewer.lock (); + if (viewer) { + viewer->seek_by (nudge_amount(ev), true); + } } + void Controls::setup_sensitivity () { @@ -337,32 +417,46 @@ Controls::setup_sensitivity () } } + void Controls::timecode_clicked () { - PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _film->video_frame_rate ()); + auto viewer = _viewer.lock (); + if (!viewer) { + return; + } + + auto dialog = new PlayheadToTimecodeDialog (this, viewer->position(), _film->video_frame_rate()); if (dialog->ShowModal() == wxID_OK) { - _viewer->seek (dialog->get(), true); + viewer->seek (dialog->get(), true); } dialog->Destroy (); } + void Controls::frame_number_clicked () { - PlayheadToFrameDialog* dialog = new PlayheadToFrameDialog (this, _film->video_frame_rate ()); + auto viewer = _viewer.lock (); + if (!viewer) { + return; + } + + auto dialog = new PlayheadToFrameDialog (this, viewer->position(), _film->video_frame_rate()); if (dialog->ShowModal() == wxID_OK) { - _viewer->seek (dialog->get(), true); + viewer->seek (dialog->get(), true); } dialog->Destroy (); } + void Controls::jump_to_selected_clicked () { Config::instance()->set_jump_to_selected (_jump_to_selected->GetValue ()); } + void Controls::set_film (shared_ptr film) { @@ -371,7 +465,10 @@ Controls::set_film (shared_ptr film) } _film = film; - _film_change_connection = _film->Change.connect (boost::bind(&Controls::film_change, this, _1, _2)); + + if (_film) { + _film_change_connection = _film->Change.connect (boost::bind(&Controls::film_change, this, _1, _2)); + } setup_sensitivity (); @@ -379,22 +476,33 @@ Controls::set_film (shared_ptr film) update_position_label (); } + shared_ptr Controls::film () const { return _film; } + void Controls::film_change (ChangeType type, Film::Property p) { - if (type == CHANGE_TYPE_DONE) { - if (p == Film::CONTENT) { + if (type == ChangeType::DONE) { + if (p == Film::Property::CONTENT) { setup_sensitivity (); update_position_label (); update_position_slider (); - } else if (p == Film::THREE_D) { + } else if (p == Film::Property::THREE_D) { setup_sensitivity (); } } } + + +void +Controls::seek (int slider) +{ + _slider->SetValue (slider); + slider_moved (false); + slider_released (); +}