X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontrols.cc;h=074aa82c2d1ad764ddcda972abbb86f76c51e788;hb=541e55115e8dfb09bb584f8176698d1db6ff826a;hp=4ad1f6c237ec677ec276469cb37cdadef6bf71d9;hpb=87e1a067e3fdc83b1d6aa840d3448586c48742fb;p=dcpomatic.git diff --git a/src/wx/controls.cc b/src/wx/controls.cc index 4ad1f6c23..074aa82c2 100644 --- a/src/wx/controls.cc +++ b/src/wx/controls.cc @@ -24,16 +24,26 @@ #include "playhead_to_timecode_dialog.h" #include "playhead_to_frame_dialog.h" #include "lib/job_manager.h" +#include "lib/player_video.h" +#include "lib/dcp_content.h" +#include "lib/spl_entry.h" +#include +#include +#include +#include #include #include #include using std::string; +using std::list; +using std::make_pair; using boost::optional; using boost::shared_ptr; using boost::weak_ptr; +using boost::dynamic_pointer_cast; -Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor_controls, bool dcp_directory) +Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor_controls) : wxPanel (parent) , _viewer (viewer) , _slider_being_moved (false) @@ -73,10 +83,43 @@ Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor _v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP); - _dcp_directory = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize(600, -1), wxLC_REPORT | wxLC_NO_HEADER); - _dcp_directory->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 580); - _v_sizer->Add (_dcp_directory, 0, wxALL, DCPOMATIC_SIZER_GAP); - _dcp_directory->Show (dcp_directory); + wxBoxSizer* e_sizer = new wxBoxSizer (wxHORIZONTAL); + + _cpl = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER); + /* time */ + _cpl->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80); + /* type */ + _cpl->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80); + /* annotation text */ + _cpl->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 580); + e_sizer->Add (_cpl, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP); + + _spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER); + _spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80); + _spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80); + _spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 580); + e_sizer->Add (_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); + + _cpl->Show (false); + _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); @@ -109,32 +152,37 @@ Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor _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_CHANGED, boost::bind (&Controls::slider_released, 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_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)); + _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)); + _play_button->Bind (wxEVT_TOGGLEBUTTON, boost::bind(&Controls::play_clicked, this)); #endif - _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)); - _dcp_directory->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&Controls::dcp_directory_selected, 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)); + _cpl->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind(&Controls::setup_sensitivity, this)); + _cpl->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 (); @@ -146,13 +194,61 @@ Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor ); _config_changed_connection = Config::instance()->Changed.connect (bind(&Controls::config_changed, this, _1)); + config_changed (Config::OTHER); +} + +void +Controls::add_clicked () +{ + optional sel = selected_cpl (); + DCPOMATIC_ASSERT (sel); + _spl.playlist.push_back (SPLEntry(sel->first, sel->second)); + add_cpl_to_list (sel->first, _spl_view); + SPLChanged (_spl); + 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) { + _spl.as_xml (boost::filesystem::path(wx_to_std(d->GetPath()))); + } + + 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) { + _spl = SPL (boost::filesystem::path(wx_to_std(d->GetPath()))); + _spl_view->DeleteAllItems (); + BOOST_FOREACH (SPLEntry i, _spl.playlist) { + add_cpl_to_list (i.cpl, _spl_view); + } + SPLChanged (_spl); + } + + d->Destroy (); } void Controls::config_changed (int property) { - if (property == Config::PLAYER_DCP_DIRECTORY) { + if (property == Config::PLAYER_CONTENT_DIRECTORY) { update_dcp_directory (); + } else { + setup_sensitivity (); } } @@ -365,7 +461,8 @@ void Controls::setup_sensitivity () { /* examine content is the only job which stops the viewer working */ - bool const c = _film && !_film->content().empty() && (!_active_job || *_active_job != "examine_content"); + bool const active_job = _active_job && *_active_job != "examine_content"; + bool const c = ((_film && !_film->content().empty()) || !_spl.playlist.empty()) && !active_job; _slider->Enable (c); _rewind_button->Enable (c); @@ -373,8 +470,9 @@ Controls::setup_sensitivity () _forward_button->Enable (c); #ifdef DCPOMATIC_VARIANT_SWAROOP _play_button->Enable (c && !_viewer->playing()); - _pause_button->Enable (c && _viewer->playing()); - _stop_button->Enable (c); + _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 @@ -390,6 +488,21 @@ Controls::setup_sensitivity () if (_eye) { _eye->Enable (c && _film->three_d ()); } + + _add_button->Enable (Config::instance()->allow_spl_editing() && static_cast(selected_cpl())); + _save_button->Enable (Config::instance()->allow_spl_editing()); +} + +optional +Controls::selected_cpl () const +{ + long int s = _cpl->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + if (s == -1) { + return optional(); + } + + DCPOMATIC_ASSERT (s < int(_cpls.size())); + return _cpls[s]; } void @@ -446,19 +559,63 @@ Controls::film () const } void -Controls::show_dcp_directory (bool s) +Controls::show_extended_player_controls (bool s) { - _dcp_directory->Show (s); + _cpl->Show (s); + if (s) { + update_dcp_directory (); + } + _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_cpl_to_list (shared_ptr cpl, wxListCtrl* ctrl) +{ + list > reels = cpl->reels (); + + int const N = ctrl->GetItemCount(); + + wxListItem it; + if (!reels.empty() && reels.front()->main_picture()) { + it.SetId(N); + it.SetColumn(0); + int seconds = rint(double(cpl->duration()) / reels.front()->main_picture()->frame_rate().as_float()); + 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); + } + + it.SetId(N); + it.SetColumn(1); + it.SetText(std_to_wx(dcp::content_kind_to_string(cpl->content_kind()))); + ctrl->SetItem(it); + + it.SetId(N); + it.SetColumn(2); + it.SetText(std_to_wx(cpl->annotation_text())); + ctrl->SetItem(it); } void Controls::update_dcp_directory () { + if (!_cpl->IsShown()) { + return; + } + using namespace boost::filesystem; - _dcp_directory->DeleteAllItems (); - _dcp_directories.clear (); - optional dir = Config::instance()->player_dcp_directory(); + _cpl->DeleteAllItems (); + _cpls.clear (); + optional dir = Config::instance()->player_content_directory(); if (!dir) { return; } @@ -467,27 +624,21 @@ Controls::update_dcp_directory () try { if (is_directory(*i) && (is_regular_file(*i / "ASSETMAP") || is_regular_file(*i / "ASSETMAP.xml"))) { string const x = i->path().string().substr(dir->string().length() + 1); - _dcp_directory->InsertItem(_dcp_directory->GetItemCount(), std_to_wx(x)); - _dcp_directories.push_back(x); + dcp::DCP dcp (*i); + dcp.read (); + BOOST_FOREACH (shared_ptr j, dcp.cpls()) { + add_cpl_to_list (j, _cpl); + _cpls.push_back (make_pair(j, *i)); + } } } catch (boost::filesystem::filesystem_error& e) { /* Never mind */ + } catch (dcp::DCPReadError& e) { + /* Never mind */ } } } -void -Controls::dcp_directory_selected () -{ - long int s = _dcp_directory->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (s == -1) { - return; - } - - DCPOMATIC_ASSERT (s < int(_dcp_directories.size())); - DCPDirectorySelected (*Config::instance()->player_dcp_directory() / _dcp_directories[s]); -} - #ifdef DCPOMATIC_VARIANT_SWAROOP void Controls::pause_clicked () @@ -499,6 +650,45 @@ void Controls::stop_clicked () { _viewer->stop (); - DCPEjected (); + _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) +{ +#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 +}