X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontrols.cc;h=31134340054b2ed232548068ed4bcfad42caeea0;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=feef2e91c53c87862abe0f9ff8baec2536a3c4ea;hpb=45dcdd17c7f860e92d7b1d75598afea64c5fbc50;p=dcpomatic.git diff --git a/src/wx/controls.cc b/src/wx/controls.cc index feef2e91c..311343400 100644 --- a/src/wx/controls.cc +++ b/src/wx/controls.cc @@ -1,55 +1,91 @@ +/* + Copyright (C) 2018-2019 Carl Hetherington + + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + DCP-o-matic is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with DCP-o-matic. If not, see . + +*/ + #include "controls.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 "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 "lib/content_factory.h" +#include "lib/cross.h" +#include +#include +#include +#include #include #include +#include +#include using std::string; +using std::list; +using std::cout; +using std::make_pair; +using std::exception; using boost::optional; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif +using namespace dcpomatic; + -/** @param outline_content true if viewer should present an "outline content" checkbox. - * @param jump_to_selected true if viewer should present a "jump to selected" checkbox. - */ -Controls::Controls (wxWindow* parent, shared_ptr viewer, bool outline_content, bool jump_to_selected, bool eye) +Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor_controls) : wxPanel (parent) + , _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) - , _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096)) - , _rewind_button (new wxButton (this, wxID_ANY, wxT("|<"))) - , _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"))) + , _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); - if (outline_content) { - _outline_content = new wxCheckBox (this, wxID_ANY, _("Outline content")); + if (editor_controls) { + _outline_content = new CheckBox (this, _("Outline content")); view_options->Add (_outline_content, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP); - } - - if (eye) { _eye = new wxChoice (this, wxID_ANY); _eye->Append (_("Left")); _eye->Append (_("Right")); _eye->SetSelection (0); view_options->Add (_eye, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP); - } - - if (jump_to_selected) { - _jump_to_selected = new wxCheckBox (this, wxID_ANY, _("Jump to selected content")); + _jump_to_selected = new CheckBox (this, _("Jump to selected content")); view_options->Add (_jump_to_selected, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP); } @@ -61,19 +97,29 @@ Controls::Controls (wxWindow* parent, shared_ptr viewer, bool outlin 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 (_play_button, 0, wxEXPAND); + 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); + h_sizer->Add (_slider, 1, wxEXPAND); _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)); @@ -82,51 +128,60 @@ Controls::Controls (wxWindow* parent, shared_ptr viewer, bool outlin _outline_content->Bind (wxEVT_CHECKBOX, boost::bind (&Controls::outline_content_changed, this)); } - _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_THUMBRELEASE, boost::bind (&Controls::slider_released, this)); - _play_button->Bind (wxEVT_TOGGLEBUTTON, boost::bind (&Controls::play_clicked, 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)); - _frame_number->Bind (wxEVT_LEFT_DOWN, boost::bind (&Controls::frame_number_clicked, this)); - _timecode->Bind (wxEVT_LEFT_DOWN, boost::bind (&Controls::timecode_clicked, this)); + _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_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)); + _frame_number->Bind (wxEVT_LEFT_DOWN, boost::bind(&Controls::frame_number_clicked, this)); + _timecode->Bind (wxEVT_LEFT_DOWN, boost::bind(&Controls::timecode_clicked, this)); if (_jump_to_selected) { _jump_to_selected->Bind (wxEVT_CHECKBOX, boost::bind (&Controls::jump_to_selected_clicked, this)); _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->FilmChanged.connect (boost::bind(&Controls::film_changed, this)); - film_changed (); + Bind (wxEVT_TIMER, boost::bind(&Controls::update_position, this)); + _timer.Start (80, wxTIMER_CONTINUOUS); + + set_film (_viewer->film()); setup_sensitivity (); JobManager::instance()->ActiveJobsChanged.connect ( bind (&Controls::active_jobs_changed, this, _2) ); + + _config_changed_connection = Config::instance()->Changed.connect (bind(&Controls::config_changed, this, _1)); + config_changed (Config::OTHER); +} + +void +Controls::config_changed (int) +{ + setup_sensitivity (); } void Controls::started () { - _play_button->SetValue (true); + setup_sensitivity (); } void Controls::stopped () { - _play_button->SetValue (false); + setup_sensitivity (); } void -Controls::position_changed () +Controls::update_position () { - if (!_slider_being_moved) { + if (!_slider_being_moved && !_viewer->pending_idle_get()) { update_position_label (); update_position_slider (); } @@ -135,7 +190,7 @@ Controls::position_changed () void Controls::eye_changed () { - _viewer->set_eyes (_eye->GetSelection() == 0 ? EYES_LEFT : EYES_RIGHT); + _viewer->set_eyes (_eye->GetSelection() == 0 ? Eyes::LEFT : Eyes::RIGHT); } void @@ -144,18 +199,6 @@ Controls::outline_content_changed () _viewer->set_outline_content (_outline_content->GetValue()); } -void -Controls::film_change (ChangeType type, Film::Property p) -{ - if (type != CHANGE_TYPE_DONE) { - return; - } - - if (p == Film::CONTENT || p == Film::THREE_D) { - setup_sensitivity (); - } -} - /** @param page true if this was a PAGEUP/PAGEDOWN event for which we won't receive a THUMBRELEASE */ void Controls::slider_moved (bool page) @@ -166,50 +209,38 @@ Controls::slider_moved (bool page) 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(); + 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 (); - } + /* Restart after a drag */ + _viewer->resume (); _slider_being_moved = false; } -void -Controls::play_clicked () -{ - check_play_state (); -} - -void -Controls::check_play_state () -{ - if (!_film || _film->video_frame_rate() == 0) { - return; - } - - if (_play_button->GetValue()) { - _viewer->start (); - } else { - _viewer->stop (); - } -} - void Controls::update_position_slider () { @@ -232,24 +263,22 @@ 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; } 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) { - /* 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); + _active_job = j; + setup_sensitivity (); } DCPTime @@ -302,13 +331,14 @@ Controls::forward_clicked (wxKeyboardState& ev) void Controls::setup_sensitivity () { - bool const c = _film && !_film->content().empty (); + /* examine content is the only job which stops the viewer working */ + bool const active_job = _active_job && *_active_job != "examine_content"; + bool const c = _film && !_film->content().empty() && !active_job; _slider->Enable (c); _rewind_button->Enable (c); _back_button->Enable (c); _forward_button->Enable (c); - _play_button->Enable (c); if (_outline_content) { _outline_content->Enable (c); } @@ -326,7 +356,7 @@ Controls::setup_sensitivity () void Controls::timecode_clicked () { - PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _film->video_frame_rate ()); + PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _viewer->position(), _film->video_frame_rate()); if (dialog->ShowModal() == wxID_OK) { _viewer->seek (dialog->get(), true); } @@ -336,7 +366,7 @@ Controls::timecode_clicked () void Controls::frame_number_clicked () { - PlayheadToFrameDialog* dialog = new PlayheadToFrameDialog (this, _film->video_frame_rate ()); + PlayheadToFrameDialog* dialog = new PlayheadToFrameDialog (this, _viewer->position(), _film->video_frame_rate()); if (dialog->ShowModal() == wxID_OK) { _viewer->seek (dialog->get(), true); } @@ -350,22 +380,22 @@ Controls::jump_to_selected_clicked () } void -Controls::film_changed () +Controls::set_film (shared_ptr film) { - shared_ptr film = _viewer->film (); - if (_film == film) { return; } _film = film; + if (_film) { + _film_change_connection = _film->Change.connect (boost::bind(&Controls::film_change, this, _1, _2)); + } + setup_sensitivity (); update_position_slider (); update_position_label (); - - _film->Change.connect (boost::bind (&Controls::film_change, this, _1, _2)); } shared_ptr @@ -373,3 +403,25 @@ Controls::film () const { return _film; } + +void +Controls::film_change (ChangeType type, Film::Property p) +{ + if (type == ChangeType::DONE) { + if (p == Film::CONTENT) { + setup_sensitivity (); + update_position_label (); + update_position_slider (); + } else if (p == Film::THREE_D) { + setup_sensitivity (); + } + } +} + +void +Controls::seek (int slider) +{ + _slider->SetValue (slider); + slider_moved (false); + slider_released (); +}