X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontrols.cc;h=e3f476c05e35530dc28a473bb133d4cd160987d4;hp=62f75fde395db6ec80b94b58da3711f62826bf4c;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=5feadb30fc839601345c4553c5a954ffc37bc1c7 diff --git a/src/wx/controls.cc b/src/wx/controls.cc index 62f75fde3..e3f476c05 100644 --- a/src/wx/controls.cc +++ b/src/wx/controls.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2018 Carl Hetherington + Copyright (C) 2018-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -23,6 +23,10 @@ #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" @@ -41,99 +45,48 @@ 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 boost::dynamic_pointer_cast; +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); 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 wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER); - /* time */ - _content_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80); - /* type */ - _content_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80); - /* annotation text */ - _content_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 580); - 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, 80); - _current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80); - _current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 580); - e_sizer->Add (_current_spl_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP); - - wxBoxSizer* buttons_sizer = new wxBoxSizer (wxVERTICAL); - _add_button = new wxButton(this, wxID_ANY, _("Add")); - buttons_sizer->Add (_add_button); - _save_button = new wxButton(this, wxID_ANY, _("Save...")); - buttons_sizer->Add (_save_button); - _load_button = new wxButton(this, wxID_ANY, _("Load...")); - buttons_sizer->Add (_load_button); - e_sizer->Add (buttons_sizer, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP); - - _v_sizer->Add (e_sizer, 1, wxEXPAND); - - _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); - _add_button->Show (false); - _save_button->Show (false); - _load_button->Show (false); - _log->Show (false); - wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL); wxBoxSizer* time_sizer = new wxBoxSizer (wxVERTICAL); @@ -141,14 +94,13 @@ Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor 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 (time_sizer, 0, wxEXPAND); + h_sizer->Add (_back_button, 0, wxALL, 2); 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 + + _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); @@ -168,40 +120,26 @@ 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)); _frame_number->Bind (wxEVT_LEFT_DOWN, boost::bind(&Controls::frame_number_clicked, this)); _timecode->Bind (wxEVT_LEFT_DOWN, boost::bind(&Controls::timecode_clicked, this)); - _content_view->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind(&Controls::setup_sensitivity, this)); - _content_view->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind(&Controls::setup_sensitivity, 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 ()); } - _add_button->Bind (wxEVT_BUTTON, boost::bind(&Controls::add_clicked, this)); - _save_button->Bind (wxEVT_BUTTON, boost::bind(&Controls::save_clicked, this)); - _load_button->Bind (wxEVT_BUTTON, boost::bind(&Controls::load_clicked, 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)); - film_changed (); + Bind (wxEVT_TIMER, boost::bind(&Controls::update_position, this)); + _timer.Start (80, wxTIMER_CONTINUOUS); + + set_film (_viewer->film()); setup_sensitivity (); - update_content_directory (); - update_playlist_directory (); JobManager::instance()->ActiveJobsChanged.connect ( bind (&Controls::active_jobs_changed, this, _2) @@ -212,99 +150,27 @@ Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor } void -Controls::add_clicked () +Controls::config_changed (int) { - shared_ptr sel = selected_content (); - DCPOMATIC_ASSERT (sel); - _film->examine_and_add_content (sel); - bool const ok = display_progress (_("DCP-o-matic"), _("Loading DCP")); - if (!ok || !report_errors_from_last_job(this)) { - return; - } - if (_film->content().size() == 1) { - /* Put 1 frame of black at the start so when we seek to 0 we don't see anything */ - sel->set_position (DCPTime::from_frames(1, _film->video_frame_rate())); - } - add_content_to_list (sel, _current_spl_view); setup_sensitivity (); } -void -Controls::save_clicked () -{ - wxFileDialog* d = new wxFileDialog ( - this, _("Select playlist file"), wxEmptyString, wxEmptyString, wxT ("XML files (*.xml)|*.xml"), - wxFD_SAVE | wxFD_OVERWRITE_PROMPT - ); - - if (d->ShowModal() == wxID_OK) { - boost::filesystem::path p(wx_to_std(d->GetPath())); - _film->set_name(p.stem().string()); - _film->write_metadata(p); - } - - d->Destroy (); -} - -void -Controls::load_clicked () -{ - wxFileDialog* d = new wxFileDialog ( - this, _("Select playlist file"), wxEmptyString, wxEmptyString, wxT ("XML files (*.xml)|*.xml") - ); - - if (d->ShowModal() == wxID_OK) { - _film->read_metadata (boost::filesystem::path(wx_to_std(d->GetPath()))); - _current_spl_view->DeleteAllItems (); - BOOST_FOREACH (shared_ptr i, _film->content()) { - shared_ptr dcp = dynamic_pointer_cast(i); - add_content_to_list (dcp, _current_spl_view); - } - } - - d->Destroy (); -} - -void -Controls::config_changed (int property) -{ - if (property == Config::PLAYER_CONTENT_DIRECTORY) { - update_content_directory (); - } 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) { + if (!_slider_being_moved && !_viewer->pending_idle_get()) { update_position_label (); update_position_slider (); } @@ -322,18 +188,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) @@ -344,57 +198,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 () -{ -#ifdef DCPOMATIC_VARIANT_SWAROOP - _viewer->start (); -#else - check_play_state (); -#endif -} - - -#ifndef DCPOMATIC_VARIANT_SWAROOP -void -Controls::check_play_state () -{ - if (!_film || _film->video_frame_rate() == 0) { - return; - } - - if (_play_button->GetValue()) { - _viewer->start (); - } else { - _viewer->stop (); - } -} -#endif - void Controls::update_position_slider () { @@ -493,14 +328,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); } @@ -513,27 +340,12 @@ Controls::setup_sensitivity () if (_eye) { _eye->Enable (c && _film->three_d ()); } - - _add_button->Enable (Config::instance()->allow_spl_editing() && static_cast(selected_content())); - _save_button->Enable (Config::instance()->allow_spl_editing()); -} - -shared_ptr -Controls::selected_content () const -{ - long int s = _content_view->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (s == -1) { - return shared_ptr(); - } - - DCPOMATIC_ASSERT (s < int(_content.size())); - return _content[s]; } 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); } @@ -543,7 +355,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); } @@ -557,24 +369,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 (); - - if (_film) { - _film->Change.connect (boost::bind (&Controls::film_change, this, _1, _2)); - } } shared_ptr @@ -584,195 +394,23 @@ Controls::film () const } void -Controls::show_extended_player_controls (bool s) -{ - _content_view->Show (s); - _spl_view->Show (s); - if (s) { - update_content_directory (); - update_playlist_directory (); - } - _current_spl_view->Show (s); - _log->Show (s); - _add_button->Show (s); - _save_button->Show (s); - _load_button->Show (s); - _v_sizer->Layout (); -} - -void -Controls::add_content_to_list (shared_ptr content, wxListCtrl* ctrl) -{ - int const N = ctrl->GetItemCount(); - - wxListItem it; - it.SetId(N); - it.SetColumn(0); - DCPTime length = content->length_after_trim (); - int seconds = length.seconds(); - int minutes = seconds / 60; - seconds -= minutes * 60; - int hours = minutes / 60; - minutes -= hours * 60; - it.SetText(wxString::Format("%02d:%02d:%02d", hours, minutes, seconds)); - ctrl->InsertItem(it); - - shared_ptr dcp = dynamic_pointer_cast(content); - if (dcp && dcp->content_kind()) { - it.SetId(N); - it.SetColumn(1); - it.SetText(std_to_wx(dcp::content_kind_to_string(*dcp->content_kind()))); - ctrl->SetItem(it); - } - - it.SetId(N); - it.SetColumn(2); - it.SetText(std_to_wx(content->summary())); - ctrl->SetItem(it); -} - -void -Controls::add_playlist_to_list (shared_ptr film) -{ - int const N = _spl_view->GetItemCount(); - - wxListItem it; - it.SetId(N); - it.SetColumn(0); - it.SetText (std_to_wx(film->name())); - _spl_view->InsertItem (it); -} - -void -Controls::update_content_directory () -{ - if (!_content_view->IsShown()) { - return; - } - - using namespace boost::filesystem; - - _content_view->DeleteAllItems (); - _content.clear (); - optional dir = Config::instance()->player_content_directory(); - if (!dir) { - return; - } - - wxProgressDialog progress (_("DCP-o-matic"), _("Reading content directory")); - JobManager* jm = JobManager::instance (); - - for (directory_iterator i = directory_iterator(*dir); i != directory_iterator(); ++i) { - try { - shared_ptr content; - if (is_directory(*i) && (is_regular_file(*i / "ASSETMAP") || is_regular_file(*i / "ASSETMAP.xml"))) { - content.reset (new DCPContent(_film, *i)); - } else if (i->path().extension() == ".mp4") { - content = content_factory(_film, *i).front(); - } - - if (content) { - jm->add (shared_ptr(new ExamineContentJob(_film, content))); - while (jm->work_to_do()) { - if (!progress.Pulse()) { - /* user pressed cancel */ - BOOST_FOREACH (shared_ptr i, jm->get()) { - i->cancel(); - } - return; - } - dcpomatic_sleep (1); - } - if (report_errors_from_last_job (this)) { - add_content_to_list (content, _content_view); - _content.push_back (content); - } - } - } catch (boost::filesystem::filesystem_error& e) { - /* Never mind */ - } catch (dcp::DCPReadError& e) { - /* Never mind */ - } - } -} - -void -Controls::update_playlist_directory () +Controls::film_change (ChangeType type, Film::Property p) { - 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 { - shared_ptr film (new Film(optional())); - film->read_metadata (i->path()); - _playlists.push_back (film); - add_playlist_to_list (film); - } catch (exception& e) { - /* Never mind */ + if (type == CHANGE_TYPE_DONE) { + if (p == Film::CONTENT) { + setup_sensitivity (); + update_position_label (); + update_position_slider (); + } else if (p == Film::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 (); }