/*
- Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "image_sequence_dialog.h"
#include "film_viewer.h"
#include "lib/audio_content.h"
-#include "lib/subtitle_content.h"
+#include "lib/text_content.h"
#include "lib/video_content.h"
#include "lib/ffmpeg_content.h"
#include "lib/content_factory.h"
#include "lib/dcp_content.h"
#include "lib/case_insensitive_sorter.h"
#include "lib/playlist.h"
+#include "lib/config.h"
+#include "lib/log.h"
+#include "lib/compose.hpp"
+#include "lib/plain_text_file_content.h"
+#include "lib/plain_text_file.h"
#include <wx/wx.h>
#include <wx/notebook.h>
#include <wx/listctrl.h>
using boost::dynamic_pointer_cast;
using boost::optional;
+#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
+
ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> film, FilmViewer* viewer)
: _timeline_dialog (0)
, _parent (n)
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);
_content->Bind (wxEVT_DROP_FILES, boost::bind (&ContentPanel::files_dropped, this, _1));
_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));
optional<DCPTime> go_to;
BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
- if (!go_to || i->position() < go_to.get()) {
- go_to = i->position ();
+ DCPTime p;
+ p = i->position();
+ if (dynamic_pointer_cast<PlainTextFileContent>(i) && i->paths_valid()) {
+ /* Rather special case; if we select a text subtitle file jump to its
+ first subtitle.
+ */
+ PlainTextFile ts (dynamic_pointer_cast<PlainTextFileContent>(i));
+ if (ts.first()) {
+ p += DCPTime(ts.first().get(), _film->active_frame_rate_change(i->position()));
+ }
+ }
+ if (!go_to || p < go_to.get()) {
+ go_to = p;
}
}
- if (go_to) {
- _film_viewer->set_position (go_to.get ());
+ if (go_to && Config::instance()->jump_to_selected ()) {
+ _film_viewer->set_position (go_to.get().ceil(_film->video_frame_rate()));
}
if (_timeline_dialog) {
_timeline_dialog->set_selection (selected ());
}
+
+ SelectionChanged ();
}
void
/* 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 ();
+
+ if (r != wxID_OK) {
+ return;
}
- _film->examine_and_add_content (content);
+ 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 */
void
ContentPanel::timeline_clicked ()
{
+ if (!_film) {
+ return;
+ }
+
if (_timeline_dialog) {
_timeline_dialog->Destroy ();
_timeline_dialog = 0;
{
_add_file->Enable (_generally_sensitive);
_add_folder->Enable (_generally_sensitive);
+ _add_dcp->Enable (_generally_sensitive);
ContentList selection = selected ();
ContentList video_selection = selected_video ();
ContentList audio_selection = selected_audio ();
- _remove->Enable (!selection.empty() && _generally_sensitive);
- _earlier->Enable (selection.size() == 1 && _generally_sensitive);
- _later->Enable (selection.size() == 1 && _generally_sensitive);
- _timeline->Enable (!_film->content().empty() && _generally_sensitive);
+ _remove->Enable (_generally_sensitive && !selection.empty());
+ _earlier->Enable (_generally_sensitive && selection.size() == 1);
+ _later->Enable (_generally_sensitive && selection.size() == 1);
+ _timeline->Enable (_generally_sensitive && _film && !_film->content().empty());
- _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);
+ _video_panel->Enable (_generally_sensitive && video_selection.size() > 0);
+ _audio_panel->Enable (_generally_sensitive && audio_selection.size() > 0);
+ _subtitle_panel->Enable (_generally_sensitive && selection.size() == 1 && selection.front()->subtitle);
_timing_panel->Enable (_generally_sensitive);
}
ContentPanel::set_general_sensitivity (bool s)
{
_generally_sensitive = s;
-
- _content->Enable (s);
- _add_file->Enable (s);
- _add_folder->Enable (s);
- _remove->Enable (s);
- _earlier->Enable (s);
- _later->Enable (s);
- _timeline->Enable (s);
-
- /* Set the panels in the content notebook */
- BOOST_FOREACH (ContentSubPanel* i, _panels) {
- i->Enable (s);
- }
+ setup_sensitivity ();
}
void
BOOST_FOREACH (shared_ptr<Content> i, content) {
int const t = _content->GetItemCount ();
bool const valid = i->paths_valid ();
+
+ /* Temporary debugging for Igor */
+ BOOST_FOREACH (boost::filesystem::path j, i->paths()) {
+ LOG_GENERAL ("Check %1 %2 answer %3", j.string(), boost::filesystem::exists(j) ? "yes" : "no", valid ? "yes" : "no");
+ }
+
shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (i);
bool const needs_kdm = dcp && dcp->needs_kdm ();
bool const needs_assets = dcp && dcp->needs_assets ();
/* Select the item of content if none was selected before */
_content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
}
+
+ setup_sensitivity ();
}
void
/* 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());
}
}
projects / dcpomatic.git / blobdiff