X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontrols.cc;h=62fec0a75b958608ed0dba1cfeb46c6522c546e4;hb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;hp=cc9817b15f2dbef097ca963589be97b6dab3b59e;hpb=8872a0a0028048e277a623fa08e8242dd43f4824;p=dcpomatic.git diff --git a/src/wx/controls.cc b/src/wx/controls.cc index cc9817b15..62fec0a75 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,128 +18,113 @@ */ + +#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 "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 "playhead_to_timecode_dialog.h" +#include "static_text.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 "lib/warnings.h" #include +#include #include #include -#include -#include +DCPOMATIC_DISABLE_WARNINGS #include #include +#include +#include +DCPOMATIC_ENABLE_WARNINGS + -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)) , _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(""))) -#ifdef DCPOMATIC_VARIANT_SWAROOP - , _play_button (new wxButton(this, wxID_ANY, _("Play"))) - , _pause_button (new wxButton(this, wxID_ANY, _("Pause"))) - , _stop_button (new wxButton(this, wxID_ANY, _("Stop"))) -#else - , _play_button (new wxToggleButton(this, wxID_ANY, _("Play"))) -#endif + , _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 wxCheckBox (this, wxID_ANY, _("Outline content")); + _outline_content = new CheckBox (this, _("Outline content")); view_options->Add (_outline_content, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP); _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); - _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); } _v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP); - wxBoxSizer* left_sizer = new wxBoxSizer (wxVERTICAL); - - _spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER); - _spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 740); - left_sizer->Add (_spl_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP); - - _content_view = new ContentView (this, _film); - left_sizer->Add (_content_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP); - - wxBoxSizer* e_sizer = new wxBoxSizer (wxHORIZONTAL); - e_sizer->Add (left_sizer, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP); - - _current_spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER); - _current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 500); - _current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80); - e_sizer->Add (_current_spl_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP); - - _v_sizer->Add (e_sizer, 1, wxEXPAND); + auto h_sizer = new wxBoxSizer (wxHORIZONTAL); - _log = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, 200), wxTE_READONLY | wxTE_MULTILINE); - _v_sizer->Add (_log, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP); - - _content_view->Show (false); - _spl_view->Show (false); - _current_spl_view->Show (false); - _log->Show (false); - - wxBoxSizer* 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 (_play_button, 0, wxEXPAND); -#ifdef DCPOMATIC_VARIANT_SWAROOP - h_sizer->Add (_pause_button, 0, wxEXPAND); - h_sizer->Add (_stop_button, 0, wxEXPAND); -#endif + 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)); @@ -151,14 +136,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)); -#ifdef DCPOMATIC_VARIANT_SWAROOP - _play_button->Bind (wxEVT_BUTTON, boost::bind(&Controls::play_clicked, this)); - _pause_button->Bind (wxEVT_BUTTON, boost::bind(&Controls::pause_clicked, this)); - _stop_button->Bind (wxEVT_BUTTON, boost::bind(&Controls::stop_clicked, this)); -#else - _play_button->Bind (wxEVT_TOGGLEBUTTON, boost::bind(&Controls::play_clicked, this)); -#endif + _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)); @@ -168,19 +146,16 @@ Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor _jump_to_selected->Bind (wxEVT_CHECKBOX, boost::bind (&Controls::jump_to_selected_clicked, this)); _jump_to_selected->SetValue (Config::instance()->jump_to_selected ()); } - _spl_view->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind(&Controls::spl_selection_changed, this)); - _spl_view->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind(&Controls::spl_selection_changed, this)); - _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)); - _viewer->ImageChanged.connect (boost::bind(&Controls::image_changed, this, _1)); + 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); - film_changed (); + set_film (viewer->film()); setup_sensitivity (); - update_playlist_directory (); JobManager::instance()->ActiveJobsChanged.connect ( bind (&Controls::active_jobs_changed, this, _2) @@ -191,147 +166,108 @@ Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor } void -Controls::spl_selection_changed () +Controls::config_changed (int) { - long int selected = _spl_view->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (selected == -1) { - _current_spl_view->DeleteAllItems (); - return; - } - - shared_ptr film (new Film(optional())); - - int N = 0; - BOOST_FOREACH (SPLEntry i, _playlists[selected].get()) { - wxListItem it; - it.SetId (N); - it.SetColumn (0); - it.SetText (std_to_wx(i.name)); - _current_spl_view->InsertItem (it); - film->add_content (i.content); - ++N; - } - - _viewer->set_film (film); + setup_sensitivity (); } -void -Controls::config_changed (int property) -{ - if (property == Config::PLAYER_CONTENT_DIRECTORY) { - _content_view->update (); - } else if (property == Config::PLAYER_PLAYLIST_DIRECTORY) { - update_playlist_directory (); - } else { - setup_sensitivity (); - } -} void Controls::started () { -#ifdef DCPOMATIC_VARIANT_SWAROOP - _play_button->Enable (false); - _pause_button->Enable (true); -#else - _play_button->SetValue (true); -#endif setup_sensitivity (); } + void Controls::stopped () { -#ifdef DCPOMATIC_VARIANT_SWAROOP - _play_button->Enable (true); - _pause_button->Enable (false); -#else - _play_button->SetValue (false); -#endif 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 (); } -void -Controls::slider_released () -{ - if (_was_running_before_slider) { - /* Restart after a drag */ - _viewer->start (); - } - _slider_being_moved = false; -} - -void -Controls::play_clicked () -{ -#ifdef DCPOMATIC_VARIANT_SWAROOP - _viewer->start (); -#else - check_play_state (); -#endif -} - -#ifndef DCPOMATIC_VARIANT_SWAROOP void -Controls::check_play_state () +Controls::slider_released () { - if (!_film || _film->video_frame_rate() == 0) { + auto viewer = _viewer.lock (); + if (!viewer) { return; } - if (_play_button->GetValue()) { - _viewer->start (); - } else { - _viewer->stop (); - } + /* Restart after a drag */ + viewer->resume (); + _slider_being_moved = false; } -#endif + void Controls::update_position_slider () @@ -341,31 +277,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) { @@ -373,10 +321,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); @@ -389,37 +343,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 () { @@ -431,14 +406,6 @@ Controls::setup_sensitivity () _rewind_button->Enable (c); _back_button->Enable (c); _forward_button->Enable (c); -#ifdef DCPOMATIC_VARIANT_SWAROOP - _play_button->Enable (c && !_viewer->playing()); - _pause_button->Enable (c && (!_current_kind || _current_kind != dcp::ADVERTISEMENT) && _viewer->playing()); - _stop_button->Enable (c && (!_current_kind || _current_kind != dcp::ADVERTISEMENT)); - _slider->Enable (c && (!_current_kind || _current_kind != dcp::ADVERTISEMENT)); -#else - _play_button->Enable (c); -#endif if (_outline_content) { _outline_content->Enable (c); } @@ -453,163 +420,92 @@ 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::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 (); - - _content_view->set_film (film); - _content_view->update (); } + shared_ptr Controls::film () const { return _film; } -void -Controls::show_extended_player_controls (bool s) -{ - _content_view->Show (s); - _spl_view->Show (s); - if (s) { - _content_view->update (); - update_playlist_directory (); - } - _current_spl_view->Show (s); - _log->Show (s); - _v_sizer->Layout (); -} - -void -Controls::add_playlist_to_list (SPL spl) -{ - int const N = _spl_view->GetItemCount(); - - wxListItem it; - it.SetId(N); - it.SetColumn(0); - it.SetText (std_to_wx(spl.name())); - _spl_view->InsertItem (it); -} void -Controls::update_playlist_directory () -{ - if (!_spl_view->IsShown()) { - return; - } - - using namespace boost::filesystem; - - _spl_view->DeleteAllItems (); - optional dir = Config::instance()->player_playlist_directory(); - if (!dir) { - return; - } - - for (directory_iterator i = directory_iterator(*dir); i != directory_iterator(); ++i) { - try { - if (is_regular_file(i->path()) && i->path().extension() == ".xml") { - SPL spl; - spl.read (i->path(), _content_view); - _playlists.push_back (spl); - add_playlist_to_list (spl); - } - } catch (exception& e) { - /* Never mind */ +Controls::film_change (ChangeType type, Film::Property p) +{ + if (type == ChangeType::DONE) { + if (p == Film::Property::CONTENT) { + setup_sensitivity (); + update_position_label (); + update_position_slider (); + } else if (p == Film::Property::THREE_D) { + setup_sensitivity (); } } } -#ifdef DCPOMATIC_VARIANT_SWAROOP -void -Controls::pause_clicked () -{ - _viewer->stop (); -} - -void -Controls::stop_clicked () -{ - _viewer->stop (); - _viewer->seek (DCPTime(), true); -} -#endif - -void -Controls::log (wxString s) -{ - struct timeval time; - gettimeofday (&time, 0); - char buffer[64]; - time_t const sec = time.tv_sec; - struct tm* t = localtime (&sec); - strftime (buffer, 64, "%c", t); - wxString ts = std_to_wx(string(buffer)) + N_(": "); - _log->SetValue(_log->GetValue() + ts + s + "\n"); -} void -Controls::image_changed (boost::weak_ptr weak_pv) +Controls::seek (int slider) { -#ifdef DCPOMATIC_VARIANT_SWAROOP - shared_ptr pv = weak_pv.lock (); - if (!pv) { - return; - } - - shared_ptr c = pv->content().lock(); - if (!c) { - return; - } - - shared_ptr dc = dynamic_pointer_cast (c); - if (!dc) { - return; - } - - if (!_current_kind || *_current_kind != dc->content_kind()) { - _current_kind = dc->content_kind (); - setup_sensitivity (); - } -#endif + _slider->SetValue (slider); + slider_moved (false); + slider_released (); }