#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/job.h"
+#include "lib/examine_content_job.h"
+#include "lib/content_factory.h"
+#include "lib/cross.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>
+#include <wx/progdlg.h>
using std::string;
+using std::list;
+using std::make_pair;
+using std::exception;
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)
_v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP);
- wxBoxSizer* e_sizer = new wxBoxSizer (wxHORIZONTAL);
+ wxBoxSizer* left_sizer = new wxBoxSizer (wxVERTICAL);
- _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);
+ _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);
- _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);
+ _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);
- _dcp_directory->Show (false);
+ 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);
- _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));
+ _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 ();
setup_sensitivity ();
- update_dcp_directory ();
+ update_content_directory ();
+ update_playlist_directory ();
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::add_clicked ()
+{
+ shared_ptr<Content> sel = selected_content()->clone();
+ 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;
+ }
+ 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<Content> i, _film->content()) {
+ shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent>(i);
+ add_content_to_list (dcp, _current_spl_view);
+ }
+ }
+
+ d->Destroy ();
}
void
Controls::config_changed (int property)
{
- if (property == Config::PLAYER_DCP_DIRECTORY) {
- update_dcp_directory ();
+ if (property == Config::PLAYER_CONTENT_DIRECTORY) {
+ update_content_directory ();
+ } else if (property == Config::PLAYER_PLAYLIST_DIRECTORY) {
+ update_playlist_directory ();
+ } else {
+ setup_sensitivity ();
}
}
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() && !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 (Config::instance()->allow_spl_editing() && static_cast<bool>(selected_content()));
+ _save_button->Enable (Config::instance()->allow_spl_editing());
+}
+
+shared_ptr<Content>
+Controls::selected_content () const
+{
+ long int s = _content_view->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ if (s == -1) {
+ return shared_ptr<Content>();
+ }
+
+ DCPOMATIC_ASSERT (s < int(_content.size()));
+ return _content[s];
}
void
void
Controls::show_extended_player_controls (bool s)
{
- _dcp_directory->Show (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> 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<DCPContent> dcp = dynamic_pointer_cast<DCPContent>(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::update_dcp_directory ()
+Controls::add_playlist_to_list (shared_ptr<Film> 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;
- _dcp_directory->DeleteAllItems ();
- _dcp_directories.clear ();
- optional<path> dir = Config::instance()->player_dcp_directory();
+ _content_view->DeleteAllItems ();
+ _content.clear ();
+ optional<path> 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> content;
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);
+ content.reset (new DCPContent(_film, *i));
+ } else if (i->path().extension() == ".mp4" || i->path().extension() == ".ecinema") {
+ content = content_factory(_film, *i).front();
+ }
+
+ if (content) {
+ jm->add (shared_ptr<Job>(new ExamineContentJob(_film, content)));
+ while (jm->work_to_do()) {
+ if (!progress.Pulse()) {
+ /* user pressed cancel */
+ BOOST_FOREACH (shared_ptr<Job> 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::dcp_directory_selected ()
+Controls::update_playlist_directory ()
{
- long int s = _dcp_directory->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- if (s == -1) {
+ if (!_spl_view->IsShown()) {
+ return;
+ }
+
+ using namespace boost::filesystem;
+
+ _spl_view->DeleteAllItems ();
+ optional<path> dir = Config::instance()->player_playlist_directory();
+ if (!dir) {
return;
}
- DCPOMATIC_ASSERT (s < int(_dcp_directories.size()));
- DCPDirectorySelected (*Config::instance()->player_dcp_directory() / _dcp_directories[s]);
+ for (directory_iterator i = directory_iterator(*dir); i != directory_iterator(); ++i) {
+ try {
+ shared_ptr<Film> film (new Film(optional<path>()));
+ film->read_metadata (i->path());
+ _playlists.push_back (film);
+ add_playlist_to_list (film);
+ } catch (exception& e) {
+ /* Never mind */
+ }
+ }
}
#ifdef DCPOMATIC_VARIANT_SWAROOP
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