#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 <dcp/dcp.h>
+#include <dcp/cpl.h>
+#include <dcp/reel.h>
+#include <dcp/reel_picture_asset.h>
#include <wx/wx.h>
#include <wx/tglbtn.h>
#include <wx/listctrl.h>
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<FilmViewer> viewer, bool editor_controls)
: wxPanel (parent)
wxBoxSizer* e_sizer = new wxBoxSizer (wxHORIZONTAL);
- _dcp_directory = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
- _dcp_directory->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 580);
- e_sizer->Add (_dcp_directory, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
-
- _log = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, 400), wxTE_READONLY | wxTE_MULTILINE);
- e_sizer->Add (_log, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
-
- _dcp_directory->Show (false);
+ _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);
+ 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);
_log->Show (false);
- _v_sizer->Add (e_sizer, 0, wxEXPAND);
-
wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL);
wxBoxSizer* time_sizer = new wxBoxSizer (wxVERTICAL);
_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));
_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 ();
_config_changed_connection = Config::instance()->Changed.connect (bind(&Controls::config_changed, this, _1));
}
+void
+Controls::add_clicked ()
+{
+ optional<CPL> sel = selected_cpl ();
+ DCPOMATIC_ASSERT (sel);
+ _spl.push_back (SPLEntry(sel->first, sel->second));
+ add_cpl_to_list (sel->first, _spl_view);
+ SPLChanged (_spl);
+ setup_sensitivity ();
+}
+
void
Controls::config_changed (int property)
{
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.empty()) && !active_job;
_slider->Enable (c);
_rewind_button->Enable (c);
_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
if (_eye) {
_eye->Enable (c && _film->three_d ());
}
+
+ _add_button->Enable (static_cast<bool>(selected_cpl()));
+}
+
+optional<Controls::CPL>
+Controls::selected_cpl () const
+{
+ long int s = _cpl->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ if (s == -1) {
+ return optional<CPL>();
+ }
+
+ DCPOMATIC_ASSERT (s < int(_cpls.size()));
+ return _cpls[s];
}
void
void
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);
+ _v_sizer->Layout ();
+}
+
+void
+Controls::add_cpl_to_list (shared_ptr<dcp::CPL> cpl, wxListCtrl* ctrl)
+{
+ list<shared_ptr<dcp::Reel> > 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 ();
+ _cpl->DeleteAllItems ();
+ _cpls.clear ();
optional<path> dir = Config::instance()->player_dcp_directory();
if (!dir) {
return;
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<dcp::CPL> j, dcp.cpls()) {
+ add_cpl_to_list (j, _cpl);
+ _cpls.push_back (make_pair(j, *i));
+ }
}
} catch (boost::filesystem::filesystem_error& 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 ()
Controls::stop_clicked ()
{
_viewer->stop ();
- DCPEjected ();
+ _viewer->seek (DCPTime(), true);
}
#endif
wxString ts = std_to_wx(string(buffer)) + N_(": ");
_log->SetValue(_log->GetValue() + ts + s + "\n");
}
+
+void
+Controls::image_changed (boost::weak_ptr<PlayerVideo> weak_pv)
+{
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ shared_ptr<PlayerVideo> pv = weak_pv.lock ();
+ if (!pv) {
+ return;
+ }
+
+ shared_ptr<Content> c = pv->content().lock();
+ if (!c) {
+ return;
+ }
+
+ shared_ptr<DCPContent> dc = dynamic_pointer_cast<DCPContent> (c);
+ if (!dc) {
+ return;
+ }
+
+ if (!_current_kind || *_current_kind != dc->content_kind()) {
+ _current_kind = dc->content_kind ();
+ setup_sensitivity ();
+ }
+#endif
+}
projects / dcpomatic.git / blobdiff