#include "lib/dcp_content.h"
#include "lib/case_insensitive_sorter.h"
#include "lib/playlist.h"
+#include "lib/config.h"
#include <wx/wx.h>
#include <wx/notebook.h>
#include <wx/listctrl.h>
wxBoxSizer* b = new wxBoxSizer (wxVERTICAL);
_add_file = new wxButton (_panel, wxID_ANY, _("Add file(s)..."));
- _add_file->SetToolTip (_("Add video, image or sound files to the film."));
+ _add_file->SetToolTip (_("Add video, image, sound or subtitle files to the film."));
b->Add (_add_file, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
_add_folder = new wxButton (_panel, wxID_ANY, _("Add folder..."));
- _add_folder->SetToolTip (_("Add a folder of image files (which will be used as a moving image sequence) or a DCP."));
+ _add_folder->SetToolTip (_("Add a folder of image files (which will be used as a moving image sequence) or a folder of sound files."));
b->Add (_add_folder, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+ _add_dcp = new wxButton (_panel, wxID_ANY, _("Add DCP..."));
+ _add_dcp->SetToolTip (_("Add a DCP."));
+ b->Add (_add_dcp, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+
_remove = new wxButton (_panel, wxID_ANY, _("Remove"));
_remove->SetToolTip (_("Remove the selected piece of content from the film."));
b->Add (_remove, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
- _earlier = new wxButton (_panel, wxID_ANY, _("Up"));
+ _earlier = new wxButton (_panel, wxID_ANY, _("Earlier"));
_earlier->SetToolTip (_("Move the selected piece of content earlier in the film."));
b->Add (_earlier, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
- _later = new wxButton (_panel, wxID_ANY, _("Down"));
+ _later = new wxButton (_panel, wxID_ANY, _("Later"));
_later->SetToolTip (_("Move the selected piece of content later in the film."));
b->Add (_later, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
_timing_panel = new TimingPanel (this, _film_viewer);
_panels.push_back (_timing_panel);
- _content->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&ContentPanel::selection_changed, this));
- _content->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&ContentPanel::selection_changed, this));
- _content->Bind (wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, boost::bind (&ContentPanel::right_click, this, _1));
+ _content->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&ContentPanel::selection_changed, this));
+ _content->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind (&ContentPanel::selection_changed, this));
+ _content->Bind (wxEVT_LIST_ITEM_RIGHT_CLICK, boost::bind (&ContentPanel::right_click, this, _1));
_content->Bind (wxEVT_DROP_FILES, boost::bind (&ContentPanel::files_dropped, this, _1));
- _add_file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::add_file_clicked, this));
- _add_folder->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::add_folder_clicked, this));
- _remove->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::remove_clicked, this, false));
- _earlier->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::earlier_clicked, this));
- _later->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::later_clicked, this));
- _timeline->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::timeline_clicked, this));
+ _add_file->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::add_file_clicked, this));
+ _add_folder->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::add_folder_clicked, this));
+ _add_dcp->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::add_dcp_clicked, this));
+ _remove->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::remove_clicked, this, false));
+ _earlier->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::earlier_clicked, this));
+ _later->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::later_clicked, this));
+ _timeline->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::timeline_clicked, this));
}
ContentList
}
}
- if (go_to) {
+ if (go_to && Config::instance()->jump_to_selected ()) {
_film_viewer->set_position (go_to.get ());
}
/* This method is also called when Ctrl-A is pressed, so check that our notebook page
is visible.
*/
- if (_parent->GetCurrentPage() != _panel) {
+ if (_parent->GetCurrentPage() != _panel || !_film) {
return;
}
return;
}
- shared_ptr<Content> content;
+ list<shared_ptr<Content> > content;
try {
content = content_factory (_film, path);
return;
}
- if (!content) {
+ if (content.empty ()) {
error_dialog (_parent, _("No content found in this folder."));
return;
}
- shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (content);
- if (ic) {
- ImageSequenceDialog* e = new ImageSequenceDialog (_panel);
- r = e->ShowModal ();
- float const frame_rate = e->frame_rate ();
- e->Destroy ();
-
- if (r != wxID_OK) {
- return;
+ BOOST_FOREACH (shared_ptr<Content> i, content) {
+ shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (i);
+ if (ic) {
+ ImageSequenceDialog* e = new ImageSequenceDialog (_panel);
+ r = e->ShowModal ();
+ float const frame_rate = e->frame_rate ();
+ e->Destroy ();
+
+ if (r != wxID_OK) {
+ return;
+ }
+
+ ic->set_video_frame_rate (frame_rate);
}
- ic->set_video_frame_rate (frame_rate);
+ _film->examine_and_add_content (i);
}
+}
+
+void
+ContentPanel::add_dcp_clicked ()
+{
+ wxDirDialog* d = new wxDirDialog (_panel, _("Choose a DCP folder"), wxT (""), wxDD_DIR_MUST_EXIST);
+ int r = d->ShowModal ();
+ boost::filesystem::path const path (wx_to_std (d->GetPath ()));
+ d->Destroy ();
- _film->examine_and_add_content (content);
+ if (r != wxID_OK) {
+ return;
+ }
+
+ try {
+ _film->examine_and_add_content (shared_ptr<Content> (new DCPContent (_film, path)));
+ } catch (exception& e) {
+ error_dialog (_parent, e.what());
+ }
}
/** @return true if this remove "click" should be ignored */
{
_add_file->Enable (_generally_sensitive);
_add_folder->Enable (_generally_sensitive);
+ _add_dcp->Enable (_generally_sensitive);
ContentList selection = selected ();
ContentList video_selection = selected_video ();
_video_panel->Enable (video_selection.size() > 0 && _generally_sensitive);
_audio_panel->Enable (audio_selection.size() > 0 && _generally_sensitive);
_subtitle_panel->Enable (selection.size() == 1 && selection.front()->subtitle && _generally_sensitive);
- _timing_panel->Enable (selection.size() == 1 && _generally_sensitive);
+ _timing_panel->Enable (_generally_sensitive);
}
void
film_changed (Film::CONTENT);
film_changed (Film::AUDIO_CHANNELS);
selection_changed ();
+ setup_sensitivity ();
}
void
_content->Enable (s);
_add_file->Enable (s);
_add_folder->Enable (s);
+ _add_dcp->Enable (s);
_remove->Enable (s);
_earlier->Enable (s);
_later->Enable (s);
}
}
+void
+ContentPanel::set_selection (ContentList cl)
+{
+ ContentList content = _film->content ();
+ for (size_t i = 0; i < content.size(); ++i) {
+ if (find(cl.begin(), cl.end(), content[i]) != cl.end()) {
+ _content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+ } else {
+ _content->SetItemState (i, 0, wxLIST_STATE_SELECTED);
+ }
+ }
+}
+
void
ContentPanel::film_content_changed (int property)
{
- if (property == ContentProperty::PATH || property == DCPContentProperty::CAN_BE_PLAYED) {
+ if (
+ property == ContentProperty::PATH ||
+ property == DCPContentProperty::NEEDS_ASSETS ||
+ property == DCPContentProperty::NEEDS_KDM ||
+ property == DCPContentProperty::NAME
+ ) {
+
setup ();
}
int const t = _content->GetItemCount ();
bool const valid = i->paths_valid ();
shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (i);
- bool const needs_kdm = dcp && !dcp->can_be_played ();
+ bool const needs_kdm = dcp && dcp->needs_kdm ();
+ bool const needs_assets = dcp && dcp->needs_assets ();
- string s = i->summary ();
+ wxString s = std_to_wx (i->summary ());
if (!valid) {
s = _("MISSING: ") + s;
s = _("NEEDS KDM: ") + s;
}
+ if (needs_assets) {
+ s = _("NEEDS OV: ") + s;
+ }
+
wxListItem item;
item.SetId (t);
- item.SetText (std_to_wx (s));
+ item.SetText (s);
item.SetData (i.get ());
_content->InsertItem (item);
_content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
}
- if (!valid || needs_kdm) {
+ if (!valid || needs_kdm || needs_assets) {
_content->SetItemTextColour (t, *wxRED);
}
}
/* XXX: check for lots of files here and do something */
- for (list<boost::filesystem::path>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
- _film->examine_and_add_content (content_factory (_film, *i));
+ try {
+ BOOST_FOREACH (boost::filesystem::path i, paths) {
+ BOOST_FOREACH (shared_ptr<Content> j, content_factory (_film, i)) {
+ _film->examine_and_add_content (j);
+ }
+ }
+ } catch (exception& e) {
+ error_dialog (_parent, e.what());
}
}