X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontrols.cc;h=a90ac79b40e5b89ab706a55a9e0a1a3ecb4b368d;hb=6e99da2707e0af449d1aeec06a43de9af19cfa36;hp=9eae77495452cda5eb181964caebc6cc7a05274b;hpb=e0255a64d22440d718e5512f34a4f21f0d37a21b;p=dcpomatic.git diff --git a/src/wx/controls.cc b/src/wx/controls.cc index 9eae77495..a90ac79b4 100644 --- a/src/wx/controls.cc +++ b/src/wx/controls.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2018-2019 Carl Hetherington + Copyright (C) 2018-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,22 +18,23 @@ */ + +#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 "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 @@ -43,6 +44,7 @@ #include #include + using std::string; using std::list; using std::cout; @@ -60,23 +62,23 @@ 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) , _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); @@ -91,9 +93,9 @@ 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); @@ -142,13 +144,13 @@ Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor _jump_to_selected->SetValue (Config::instance()->jump_to_selected ()); } - _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)); Bind (wxEVT_TIMER, boost::bind(&Controls::update_position, this)); _timer.Start (80, wxTIMER_CONTINUOUS); - set_film (_viewer->film()); + set_film (viewer->film()); setup_sensitivity (); @@ -166,50 +168,72 @@ Controls::config_changed (int) setup_sensitivity (); } + void Controls::started () { setup_sensitivity (); } + void Controls::stopped () { setup_sensitivity (); } + void Controls::update_position () { - if (!_slider_being_moved && !_viewer->pending_idle_get()) { + 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 */ - _viewer->suspend (); + viewer->suspend (); _slider_being_moved = true; } @@ -220,27 +244,28 @@ Controls::slider_moved (bool page) */ 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, accurate); + 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 () { + auto viewer = _viewer.lock (); + if (!viewer) { + return; + } + /* Restart after a drag */ - _viewer->resume (); + viewer->resume (); _slider_being_moved = false; } + void Controls::update_position_slider () { @@ -249,16 +274,22 @@ 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 () { @@ -268,12 +299,18 @@ Controls::update_position_label () 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 */ - checked_set (_frame_number, wxString::Format (wxT("%ld"), lrint (_viewer->position().seconds() * fps) + 1)); - checked_set (_timecode, 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) { @@ -281,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); @@ -297,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 () { @@ -353,32 +417,46 @@ Controls::setup_sensitivity () } } + void Controls::timecode_clicked () { - PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _viewer->position(), _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, _viewer->position(), _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) { @@ -398,12 +476,14 @@ 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) { @@ -418,6 +498,7 @@ Controls::film_change (ChangeType type, Film::Property p) } } + void Controls::seek (int slider) {