/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "lib/audio_content.h"
-#include "lib/subtitle_content.h"
-#include "lib/video_content.h"
-#include "lib/ffmpeg_content.h"
-#include "lib/content_factory.h"
-#include "lib/image_content.h"
-#include "lib/dcp_content.h"
-#include "lib/playlist.h"
#include "content_panel.h"
#include "wx_util.h"
#include "video_panel.h"
#include "audio_panel.h"
-#include "subtitle_panel.h"
+#include "text_panel.h"
#include "timing_panel.h"
#include "timeline_dialog.h"
#include "image_sequence_dialog.h"
+#include "film_viewer.h"
+#include "dcpomatic_button.h"
+#include "lib/audio_content.h"
+#include "lib/text_content.h"
+#include "lib/video_content.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/content_factory.h"
+#include "lib/image_content.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/string_text_file_content.h"
+#include "lib/string_text_file.h"
+#include "lib/dcpomatic_log.h"
#include <wx/wx.h>
#include <wx/notebook.h>
#include <wx/listctrl.h>
+#include <wx/display.h>
#include <boost/filesystem.hpp>
-
-#include "lib/image_filename_sorter.cc"
+#include <boost/foreach.hpp>
+#include <iostream>
using std::list;
using std::string;
using std::cout;
using std::vector;
+using std::max;
+using std::exception;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
+using boost::optional;
+using namespace dcpomatic;
+
+class LimitedSplitter : public wxSplitterWindow
+{
+public:
+ LimitedSplitter (wxWindow* parent)
+ : wxSplitterWindow (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER | wxSP_3DSASH | wxSP_LIVE_UPDATE)
+ {
+ /* This value doesn't really mean much but we just want to stop double-click on the
+ divider from shrinking the bottom panel (#1601).
+ */
+ SetMinimumPaneSize (64);
+ }
+
+ bool OnSashPositionChange (int new_position)
+ {
+ /* Try to stop the top bit of the splitter getting so small that buttons disappear */
+ return new_position > 220;
+ }
+};
-ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> film, FilmViewer* viewer)
- : _timeline_dialog (0)
+ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
+ : _video_panel (0)
+ , _audio_panel (0)
+ , _timeline_dialog (0)
, _parent (n)
+ , _last_selected_tab (0)
, _film (film)
+ , _film_viewer (viewer)
, _generally_sensitive (true)
+ , _ignore_deselect (false)
+ , _no_check_selection (false)
{
- _panel = new wxPanel (n);
- _sizer = new wxBoxSizer (wxVERTICAL);
- _panel->SetSizer (_sizer);
+ for (int i = 0; i < TEXT_COUNT; ++i) {
+ _text_panel[i] = 0;
+ }
+
+ _splitter = new LimitedSplitter (n);
+ optional<wxRect> screen;
+ int const sn = wxDisplay::GetFromWindow(_splitter);
+ if (sn >= 0) {
+ screen = wxDisplay(sn).GetClientArea();
+ }
+ wxPanel* top = new wxPanel (_splitter);
+
+ _menu = new ContentMenu (_splitter);
- _menu = new ContentMenu (_panel);
{
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _content = new wxListCtrl (_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER);
+ _content = new wxListCtrl (top, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER);
_content->DragAcceptFiles (true);
s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6);
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 = new Button (top, _("Add file(s)..."));
+ _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 = new Button (top, _("Add folder..."));
+ _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);
- _remove = new wxButton (_panel, wxID_ANY, _("Remove"));
+ _add_dcp = new Button (top, _("Add DCP..."));
+ _add_dcp->SetToolTip (_("Add a DCP."));
+ b->Add (_add_dcp, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+
+ _remove = new Button (top, _("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 Button (top, _("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 Button (top, _("Later"));
_later->SetToolTip (_("Move the selected piece of content later in the film."));
b->Add (_later, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
- _timeline = new wxButton (_panel, wxID_ANY, _("Timeline..."));
+ _timeline = new Button (top, _("Timeline..."));
_timeline->SetToolTip (_("Open the timeline for the film."));
b->Add (_timeline, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
s->Add (b, 0, wxALL, 4);
-
- _sizer->Add (s, 0, wxEXPAND | wxALL, 6);
+ top->SetSizer (s);
}
- _notebook = new wxNotebook (_panel, wxID_ANY);
- _sizer->Add (_notebook, 1, wxEXPAND | wxTOP, 6);
+ _notebook = new wxNotebook (_splitter, wxID_ANY);
- _video_panel = new VideoPanel (this);
- _panels.push_back (_video_panel);
- _audio_panel = new AudioPanel (this);
- _panels.push_back (_audio_panel);
- _subtitle_panel = new SubtitlePanel (this);
- _panels.push_back (_subtitle_panel);
- _timing_panel = new TimingPanel (this, viewer);
- _panels.push_back (_timing_panel);
+ /* This is a hack to try and make the content notebook a sensible size; large on big displays but small
+ enough on small displays to leave space for the content area.
+ */
+ if (screen) {
+ _splitter->SplitHorizontally (top, _notebook, screen->height > 800 ? -600 : -150);
+ }
+
+ _timing_panel = new TimingPanel (this, _film_viewer);
+ _notebook->AddPage (_timing_panel, _("Timing"), false);
- _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::item_selected, this));
+ _content->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind (&ContentPanel::item_deselected, 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));
- _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
break;
}
- if (s < int (_film->content().size ())) {
- sel.push_back (_film->content()[s]);
+ ContentList cl = _film->content();
+ if (s < int (cl.size())) {
+ sel.push_back (cl[s]);
}
}
return sel;
}
-VideoContentList
+ContentList
ContentPanel::selected_video ()
{
- ContentList c = selected ();
- VideoContentList vc;
+ ContentList vc;
- for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
- shared_ptr<VideoContent> t = dynamic_pointer_cast<VideoContent> (*i);
- if (t) {
- vc.push_back (t);
+ BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+ if (i->video) {
+ vc.push_back (i);
}
}
return vc;
}
-AudioContentList
+ContentList
ContentPanel::selected_audio ()
{
- ContentList c = selected ();
- AudioContentList ac;
+ ContentList ac;
- for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
- shared_ptr<AudioContent> t = dynamic_pointer_cast<AudioContent> (*i);
- if (t) {
- ac.push_back (t);
+ BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+ if (i->audio) {
+ ac.push_back (i);
}
}
return ac;
}
-SubtitleContentList
-ContentPanel::selected_subtitle ()
+ContentList
+ContentPanel::selected_text ()
{
- ContentList c = selected ();
- SubtitleContentList sc;
+ ContentList sc;
- for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
- shared_ptr<SubtitleContent> t = dynamic_pointer_cast<SubtitleContent> (*i);
- if (t) {
- sc.push_back (t);
+ BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+ if (!i->text.empty()) {
+ sc.push_back (i);
}
}
FFmpegContentList
ContentPanel::selected_ffmpeg ()
{
- ContentList c = selected ();
FFmpegContentList sc;
- for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
- shared_ptr<FFmpegContent> t = dynamic_pointer_cast<FFmpegContent> (*i);
+ BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+ shared_ptr<FFmpegContent> t = dynamic_pointer_cast<FFmpegContent> (i);
if (t) {
sc.push_back (t);
}
{
switch (p) {
case Film::CONTENT:
+ case Film::CONTENT_ORDER:
setup ();
break;
default:
break;
}
- for (list<ContentSubPanel*>::iterator i = _panels.begin(); i != _panels.end(); ++i) {
- (*i)->film_changed (p);
+ BOOST_FOREACH (ContentSubPanel* i, panels()) {
+ i->film_changed (p);
}
}
void
-ContentPanel::selection_changed ()
+ContentPanel::item_deselected ()
{
+ /* Maybe this is just a re-click on the same item; if not, _ignore_deselect will stay
+ false and item_deselected_foo will handle the deselection.
+ */
+ _ignore_deselect = false;
+ signal_manager->when_idle (boost::bind (&ContentPanel::item_deselected_idle, this));
+}
+
+void
+ContentPanel::item_deselected_idle ()
+{
+ if (!_ignore_deselect) {
+ check_selection ();
+ }
+}
+
+void
+ContentPanel::item_selected ()
+{
+ _ignore_deselect = true;
+ check_selection ();
+}
+
+void
+ContentPanel::check_selection ()
+{
+ if (_no_check_selection) {
+ return;
+ }
+
setup_sensitivity ();
- for (list<ContentSubPanel*>::iterator i = _panels.begin(); i != _panels.end(); ++i) {
- (*i)->content_selection_changed ();
+ BOOST_FOREACH (ContentSubPanel* i, panels()) {
+ i->content_selection_changed ();
+ }
+
+ optional<DCPTime> go_to;
+ BOOST_FOREACH (shared_ptr<Content> i, selected()) {
+ DCPTime p;
+ p = i->position();
+ if (dynamic_pointer_cast<StringTextFileContent>(i) && i->paths_valid()) {
+ /* Rather special case; if we select a text subtitle file jump to its
+ first subtitle.
+ */
+ StringTextFile ts (dynamic_pointer_cast<StringTextFileContent>(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 && Config::instance()->jump_to_selected() && signal_manager) {
+ shared_ptr<FilmViewer> fv = _film_viewer.lock ();
+ DCPOMATIC_ASSERT (fv);
+ signal_manager->when_idle(boost::bind(&FilmViewer::seek, fv.get(), go_to.get().ceil(_film->video_frame_rate()), true));
+ }
+
+ if (_timeline_dialog) {
+ _timeline_dialog->set_selection (selected());
+ }
+
+ /* Make required tabs visible */
+
+ if (_notebook->GetPageCount() > 1) {
+ /* There's more than one tab in the notebook so the current selection could be meaningful
+ to the user; store it so that we can try to restore it later.
+ */
+ _last_selected_tab = 0;
+ if (_notebook->GetSelection() != wxNOT_FOUND) {
+ _last_selected_tab = _notebook->GetPage(_notebook->GetSelection());
+ }
+ }
+
+ bool have_video = false;
+ bool have_audio = false;
+ bool have_text[TEXT_COUNT] = { false, false };
+ BOOST_FOREACH (shared_ptr<Content> i, selected()) {
+ if (i->video) {
+ have_video = true;
+ }
+ if (i->audio) {
+ have_audio = true;
+ }
+ BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
+ have_text[j->original_type()] = true;
+ }
+ }
+
+ int off = 0;
+
+ if (have_video && !_video_panel) {
+ _video_panel = new VideoPanel (this);
+ _notebook->InsertPage (off, _video_panel, _video_panel->name());
+ } else if (!have_video && _video_panel) {
+ _notebook->DeletePage (off);
+ _video_panel = 0;
+ }
+
+ if (have_video) {
+ ++off;
+ }
+
+ if (have_audio && !_audio_panel) {
+ _audio_panel = new AudioPanel (this);
+ _notebook->InsertPage (off, _audio_panel, _audio_panel->name());
+ } else if (!have_audio && _audio_panel) {
+ _notebook->DeletePage (off);
+ _audio_panel = 0;
}
+
+ if (have_audio) {
+ ++off;
+ }
+
+ for (int i = 0; i < TEXT_COUNT; ++i) {
+ if (have_text[i] && !_text_panel[i]) {
+ _text_panel[i] = new TextPanel (this, static_cast<TextType>(i));
+ _notebook->InsertPage (off, _text_panel[i], _text_panel[i]->name());
+ } else if (!have_text[i] && _text_panel[i]) {
+ _notebook->DeletePage (off);
+ _text_panel[i] = 0;
+ }
+ if (have_text[i]) {
+ ++off;
+ }
+ }
+
+ /* Set up the tab selection */
+
+ bool done = false;
+ for (size_t i = 0; i < _notebook->GetPageCount(); ++i) {
+ if (_notebook->GetPage(i) == _last_selected_tab) {
+ _notebook->SetSelection (i);
+ done = true;
+ }
+ }
+
+ if (!done && _notebook->GetPageCount() > 0) {
+ _notebook->SetSelection (0);
+ }
+
+ setup_sensitivity ();
+ 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() != _splitter || !_film) {
return;
}
/* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using
non-Latin filenames or paths.
*/
- wxFileDialog* d = new wxFileDialog (_panel, _("Choose a file or files"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE | wxFD_CHANGE_DIR);
+ wxFileDialog* d = new wxFileDialog (
+ _splitter,
+ _("Choose a file or files"),
+ wxT (""),
+ wxT (""),
+ wxT ("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"),
+ wxFD_MULTIPLE | wxFD_CHANGE_DIR
+ );
+
int const r = d->ShowModal ();
if (r != wxID_OK) {
void
ContentPanel::add_folder_clicked ()
{
- wxDirDialog* d = new wxDirDialog (_panel, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST);
+ wxDirDialog* d = new wxDirDialog (_splitter, _("Choose a folder"), wxT(""), wxDD_DIR_MUST_EXIST);
int r = d->ShowModal ();
boost::filesystem::path const path (wx_to_std (d->GetPath ()));
d->Destroy ();
return;
}
- shared_ptr<Content> content = content_factory (_film, path);
+ list<shared_ptr<Content> > content;
+
+ try {
+ content = content_factory (path);
+ } catch (exception& e) {
+ error_dialog (_parent, e.what());
+ return;
+ }
+
+ if (content.empty ()) {
+ error_dialog (_parent, _("No content found in this folder."));
+ return;
+ }
+
+ BOOST_FOREACH (shared_ptr<Content> i, content) {
+ shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (i);
+ if (ic) {
+ ImageSequenceDialog* e = new ImageSequenceDialog (_splitter);
+ r = e->ShowModal ();
+ float const frame_rate = e->frame_rate ();
+ e->Destroy ();
- 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;
+ }
- 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);
}
-
- _film->examine_and_add_content (content);
}
void
-ContentPanel::remove_clicked ()
+ContentPanel::add_dcp_clicked ()
+{
+ wxDirDialog* d = new wxDirDialog (_splitter, _("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;
+ }
+
+ try {
+ _film->examine_and_add_content (shared_ptr<Content> (new DCPContent (path)));
+ } catch (exception& e) {
+ error_dialog (_parent, e.what());
+ }
+}
+
+/** @return true if this remove "click" should be ignored */
+bool
+ContentPanel::remove_clicked (bool hotkey)
{
- ContentList c = selected ();
- if (c.size() == 1) {
- _film->remove_content (c.front ());
+ /* If the method was called because Delete was pressed check that our notebook page
+ is visible and that the content list is focussed.
+ */
+ if (hotkey && (_parent->GetCurrentPage() != _splitter || !_content->HasFocus())) {
+ return true;
+ }
+
+ BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+ _film->remove_content (i);
}
- selection_changed ();
+ check_selection ();
+ return false;
}
void
ContentPanel::timeline_clicked ()
{
+ if (!_film) {
+ return;
+ }
+
if (_timeline_dialog) {
_timeline_dialog->Destroy ();
_timeline_dialog = 0;
}
- _timeline_dialog = new TimelineDialog (this, _film);
+ _timeline_dialog = new TimelineDialog (this, _film, _film_viewer);
+ _timeline_dialog->set_selection (selected());
_timeline_dialog->Show ();
}
{
_add_file->Enable (_generally_sensitive);
_add_folder->Enable (_generally_sensitive);
+ _add_dcp->Enable (_generally_sensitive);
ContentList selection = selected ();
- VideoContentList video_selection = selected_video ();
- AudioContentList audio_selection = selected_audio ();
-
- _remove->Enable (selection.size() == 1 && _generally_sensitive);
- _earlier->Enable (selection.size() == 1 && _generally_sensitive);
- _later->Enable (selection.size() == 1 && _generally_sensitive);
- _timeline->Enable (!_film->content().empty() && _generally_sensitive);
-
- _video_panel->Enable (video_selection.size() > 0 && _generally_sensitive);
- _audio_panel->Enable (audio_selection.size() > 0 && _generally_sensitive);
- _subtitle_panel->Enable (selection.size() == 1 && dynamic_pointer_cast<SubtitleContent> (selection.front()) && _generally_sensitive);
- _timing_panel->Enable (selection.size() == 1 && _generally_sensitive);
+ ContentList video_selection = selected_video ();
+ ContentList audio_selection = selected_audio ();
+
+ _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());
+
+ if (_video_panel) {
+ _video_panel->Enable (_generally_sensitive && video_selection.size() > 0);
+ }
+ if (_audio_panel) {
+ _audio_panel->Enable (_generally_sensitive && audio_selection.size() > 0);
+ }
+ for (int i = 0; i < TEXT_COUNT; ++i) {
+ if (_text_panel[i]) {
+ _text_panel[i]->Enable (_generally_sensitive && selection.size() == 1 && !selection.front()->text.empty());
+ }
+ }
+ _timing_panel->Enable (_generally_sensitive);
}
void
ContentPanel::set_film (shared_ptr<Film> film)
{
+ if (_audio_panel) {
+ _audio_panel->set_film (film);
+ }
+
_film = film;
film_changed (Film::CONTENT);
film_changed (Film::AUDIO_CHANNELS);
- selection_changed ();
+
+ if (_film) {
+ check_selection ();
+ }
+
+ setup_sensitivity ();
}
void
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 */
- for (list<ContentSubPanel*>::iterator i = _panels.begin(); i != _panels.end(); ++i) {
- (*i)->Enable (s);
- }
+ setup_sensitivity ();
}
void
ContentList sel = selected ();
if (sel.size() == 1) {
_film->move_content_earlier (sel.front ());
- selection_changed ();
+ check_selection ();
}
}
ContentList sel = selected ();
if (sel.size() == 1) {
_film->move_content_later (sel.front ());
- selection_changed ();
+ check_selection ();
}
}
}
void
-ContentPanel::film_content_changed (int property)
+ContentPanel::set_selection (ContentList cl)
{
- if (property == ContentProperty::PATH || property == ContentProperty::POSITION || property == DCPContentProperty::CAN_BE_PLAYED) {
- setup ();
- }
+ _no_check_selection = true;
- for (list<ContentSubPanel*>::iterator i = _panels.begin(); i != _panels.end(); ++i) {
- (*i)->film_content_changed (property);
+ 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);
+ }
}
+
+ _no_check_selection = false;
+ check_selection ();
}
void
-ContentPanel::setup ()
+ContentPanel::film_content_changed (int property)
{
- ContentList content = _film->content ();
- sort (content.begin(), content.end(), ContentSorter ());
-
- /* First, check to see if anything has changed and bail if not; this avoids
- flickering on OS X.
- */
+ if (
+ property == ContentProperty::PATH ||
+ property == DCPContentProperty::NEEDS_ASSETS ||
+ property == DCPContentProperty::NEEDS_KDM ||
+ property == DCPContentProperty::NAME
+ ) {
- vector<string> existing;
- for (int i = 0; i < _content->GetItemCount(); ++i) {
- existing.push_back (wx_to_std (_content->GetItemText (i)));
+ setup ();
}
- vector<string> proposed;
- for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
- bool const valid = (*i)->paths_valid ();
-
- string s = (*i)->summary ();
- if (!valid) {
- s = _("MISSING: ") + s;
- }
-
- proposed.push_back (s);
+ BOOST_FOREACH (ContentSubPanel* i, panels()) {
+ i->film_content_changed (property);
}
+}
- if (existing == proposed) {
+void
+ContentPanel::setup ()
+{
+ if (!_film) {
+ _content->DeleteAllItems ();
+ setup_sensitivity ();
return;
}
- /* Something has changed: set up the control */
+ ContentList content = _film->content ();
- string selected_summary;
+ Content* selected_content = 0;
int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
if (s != -1) {
- selected_summary = wx_to_std (_content->GetItemText (s));
+ wxListItem item;
+ item.SetId (s);
+ item.SetMask (wxLIST_MASK_DATA);
+ _content->GetItem (item);
+ selected_content = reinterpret_cast<Content*> (item.GetData ());
}
_content->DeleteAllItems ();
- for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
+ BOOST_FOREACH (shared_ptr<Content> i, content) {
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 valid = i->paths_valid ();
- string s = (*i)->summary ();
+ 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 ();
+
+ wxString s = std_to_wx (i->summary ());
if (!valid) {
s = _("MISSING: ") + s;
s = _("NEEDS KDM: ") + s;
}
- _content->InsertItem (t, std_to_wx (s));
+ if (needs_assets) {
+ s = _("NEEDS OV: ") + s;
+ }
+
+ wxListItem item;
+ item.SetId (t);
+ item.SetText (s);
+ item.SetData (i.get ());
+ _content->InsertItem (item);
- if ((*i)->summary() == selected_summary) {
+ if (i.get() == selected_content) {
_content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
}
- if (!valid || needs_kdm) {
+ if (!valid || needs_kdm || needs_assets) {
_content->SetItemTextColour (t, *wxRED);
}
}
- if (selected_summary.empty () && !content.empty ()) {
+ if (!selected_content && !content.empty ()) {
/* Select the item of content if none was selected before */
_content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
}
+
+ setup_sensitivity ();
}
void
ContentPanel::add_files (list<boost::filesystem::path> paths)
{
/* It has been reported that the paths returned from e.g. wxFileDialog are not always sorted;
- I can't reproduce that, but sort them anyway.
+ I can't reproduce that, but sort them anyway. Don't use ImageFilenameSorter as a normal
+ alphabetical sort is expected here.
*/
- paths.sort (ImageFilenameSorter ());
+ paths.sort (CaseInsensitiveSorter ());
/* XXX: check for lots of files here and do something */
- for (list<boost::filesystem::path>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
- shared_ptr<Content> c = content_factory (_film, *i);
- shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (c);
- if (ic) {
- ic->set_video_frame_rate (24);
+ try {
+ BOOST_FOREACH (boost::filesystem::path i, paths) {
+ BOOST_FOREACH (shared_ptr<Content> j, content_factory(i)) {
+ _film->examine_and_add_content (j);
+ }
+ }
+ } catch (exception& e) {
+ error_dialog (_parent, e.what());
+ }
+}
+
+list<ContentSubPanel*>
+ContentPanel::panels () const
+{
+ list<ContentSubPanel*> p;
+ if (_video_panel) {
+ p.push_back (_video_panel);
+ }
+ if (_audio_panel) {
+ p.push_back (_audio_panel);
+ }
+ for (int i = 0; i < TEXT_COUNT; ++i) {
+ if (_text_panel[i]) {
+ p.push_back (_text_panel[i]);
}
- _film->examine_and_add_content (c);
}
+ p.push_back (_timing_panel);
+ return p;
}
projects / dcpomatic.git / blobdiff