X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=ce9c66a3ed437bb9fc07b0b55019861e52f9280e;hb=dea824f6ff41384a5e17e23de5434cf84eccff29;hp=32ca3e4945c592ae6871879dd1b0177cb449b289;hpb=7375853f99cb3064ea24c2116db5330e066ffc5d;p=dcpomatic.git

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 32ca3e494..ce9c66a3e 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -1,57 +1,72 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 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 "caption_panel.h"
 #include "timing_panel.h"
 #include "timeline_dialog.h"
 #include "image_sequence_dialog.h"
+#include "film_viewer.h"
+#include "lib/audio_content.h"
+#include "lib/caption_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/text_caption_file_content.h"
+#include "lib/text_caption_file.h"
 #include <wx/wx.h>
 #include <wx/notebook.h>
 #include <wx/listctrl.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;
+
+#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)
+	, _last_selected_tab (0)
 	, _film (film)
+	, _film_viewer (viewer)
 	, _generally_sensitive (true)
 {
 	_panel = new wxPanel (n);
@@ -73,22 +88,26 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> film, FilmVie
 		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);
 
@@ -108,21 +127,24 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> film, FilmVie
 	_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);
+	for (int i = 0; i < CAPTION_COUNT; ++i) {
+		_caption_panel[i] = new CaptionPanel (this, static_cast<CaptionType>(i));
+		_panels.push_back (_caption_panel[i]);
+	}
+	_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));
-	_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
@@ -144,48 +166,42 @@ ContentPanel::selected ()
 	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_caption ()
 {
-	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->caption.empty()) {
+			sc.push_back (i);
 		}
 	}
 
@@ -195,11 +211,10 @@ ContentPanel::selected_subtitle ()
 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);
 		}
@@ -213,25 +228,162 @@ ContentPanel::film_changed (Film::Property p)
 {
 	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 ()
 {
+	if (_last_selected == selected()) {
+		/* This was triggered by a re-build of the view but the selection
+		   did not really change.
+		*/
+		return;
+	}
+
+	_last_selected = selected ();
+
 	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<TextCaptionFileContent>(i) && i->paths_valid()) {
+			/* Rather special case; if we select a text subtitle file jump to its
+			   first subtitle.
+			*/
+			TextCaptionFile ts (dynamic_pointer_cast<TextCaptionFileContent>(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 ()) {
+		_film_viewer->set_position (go_to.get().ceil(_film->video_frame_rate()));
+	}
+
+	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_caption[CAPTION_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<CaptionContent> j, i->caption) {
+			have_caption[j->original_type()] = true;
+		}
+	}
+
+	bool video_panel = false;
+	bool audio_panel = false;
+	bool caption_panel[CAPTION_COUNT] = { false, false };
+	for (size_t i = 0; i < _notebook->GetPageCount(); ++i) {
+		if (_notebook->GetPage(i) == _video_panel) {
+			video_panel = true;
+		} else if (_notebook->GetPage(i) == _audio_panel) {
+			audio_panel = true;
+		}
+		for (int j = 0; j < CAPTION_COUNT; ++j) {
+			if (_notebook->GetPage(i) == _caption_panel[j]) {
+				caption_panel[j] = true;
+			}
+		}
+	}
+
+	int off = 0;
+
+	if (have_video != video_panel) {
+		if (video_panel) {
+			_notebook->RemovePage (off);
+		}
+		if (have_video) {
+			_notebook->InsertPage (off, _video_panel, _video_panel->name());
+		}
+	}
+
+	if (have_video) {
+		++off;
+	}
+
+	if (have_audio != audio_panel) {
+		if (audio_panel) {
+			_notebook->RemovePage (off);
+		}
+		if (have_audio) {
+			_notebook->InsertPage (off, _audio_panel, _audio_panel->name());
+		}
+	}
+
+	if (have_audio) {
+		++off;
+	}
+
+	for (int i = 0; i < CAPTION_COUNT; ++i) {
+		if (have_caption[i] != caption_panel[i]) {
+			if (caption_panel[i]) {
+				_notebook->RemovePage (off);
+			}
+			if (have_caption[i]) {
+				_notebook->InsertPage (off, _caption_panel[i], _caption_panel[i]->name());
+			}
+		}
+		if (have_caption[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->SetSelection (0);
 	}
+
+	SelectionChanged ();
 }
 
 void
@@ -240,14 +392,22 @@ ContentPanel::add_file_clicked ()
 	/* 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;
 	}
 
 	/* 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 (
+		_panel,
+		_("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) {
@@ -278,63 +438,84 @@ ContentPanel::add_folder_clicked ()
 		return;
 	}
 
-	/* Guess if this is a DCP or a set of images: read the first ten filenames and if they
-	   are all valid image files we assume it is a set of images.
-	*/
+	list<shared_ptr<Content> > content;
 
-	bool is_dcp = false;
-	int read = 0;
-	for (boost::filesystem::directory_iterator i(path); i != boost::filesystem::directory_iterator() && read < 10; ++i, ++read) {
-		if (!boost::filesystem::is_regular_file (i->path()) || !valid_image_file (i->path())) {
-			is_dcp = true;
-		}
+	try {
+		content = content_factory (_film, path);
+	} catch (exception& e) {
+		error_dialog (_parent, e.what());
+		return;
 	}
 
-	if (is_dcp) {
-		try {
-			shared_ptr<DCPContent> content (new DCPContent (_film, path));
-			_film->examine_and_add_content (content);
-		} catch (...) {
-			error_dialog (_panel, _("Could not find a DCP nor a set of images in that folder."));
-		}
-	} else {
-
-		ImageSequenceDialog* e = new ImageSequenceDialog (_panel);
-		r = e->ShowModal ();
-		float const frame_rate = e->frame_rate ();
-		e->Destroy ();
+	if (content.empty ()) {
+		error_dialog (_parent, _("No content found in this folder."));
+		return;
+	}
 
-		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 ();
 
-		shared_ptr<Content> content;
+			if (r != wxID_OK) {
+				return;
+			}
 
-		try {
-			shared_ptr<ImageContent> content (new ImageContent (_film, path));
-			content->set_video_frame_rate (frame_rate);
-			_film->examine_and_add_content (content);
-		} catch (...) {
-			error_dialog (_panel, _("Could not find any images in that folder"));
-			return;
+			ic->set_video_frame_rate (frame_rate);
 		}
+
+		_film->examine_and_add_content (i);
 	}
 }
 
 void
-ContentPanel::remove_clicked ()
+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;
+	}
+
+	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 */
+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() != _panel || !_content->HasFocus())) {
+		return true;
+	}
+
+	BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+		_film->remove_content (i);
 	}
 
 	selection_changed ();
+	return false;
 }
 
 void
 ContentPanel::timeline_clicked ()
 {
+	if (!_film) {
+		return;
+	}
+
 	if (_timeline_dialog) {
 		_timeline_dialog->Destroy ();
 		_timeline_dialog = 0;
@@ -356,49 +537,43 @@ ContentPanel::setup_sensitivity ()
 {
 	_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());
+
+	_video_panel->Enable	(_generally_sensitive && video_selection.size() > 0);
+	_audio_panel->Enable	(_generally_sensitive && audio_selection.size() > 0);
+	for (int i = 0; i < CAPTION_COUNT; ++i) {
+		_caption_panel[i]->Enable  (_generally_sensitive && selection.size() == 1 && !selection.front()->caption.empty());
+	}
+	_timing_panel->Enable	(_generally_sensitive);
 }
 
 void
 ContentPanel::set_film (shared_ptr<Film> film)
 {
+	_audio_panel->set_film (film);
+
 	_film = film;
 
 	film_changed (Film::CONTENT);
 	film_changed (Film::AUDIO_CHANNELS);
 	selection_changed ();
+	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
@@ -434,15 +609,34 @@ ContentPanel::set_selection (weak_ptr<Content> wc)
 	}
 }
 
+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 == ContentProperty::POSITION || property == DCPContentProperty::CAN_BE_PLAYED) {
+	if (
+		property == ContentProperty::PATH ||
+		property == DCPContentProperty::NEEDS_ASSETS ||
+		property == DCPContentProperty::NEEDS_KDM ||
+		property == DCPContentProperty::NAME
+		) {
+
 		setup ();
 	}
 
-	for (list<ContentSubPanel*>::iterator i = _panels.begin(); i != _panels.end(); ++i) {
-		(*i)->film_content_changed (property);
+	BOOST_FOREACH (ContentSubPanel* i, _panels) {
+		i->film_content_changed (property);
 	}
 }
 
@@ -450,50 +644,33 @@ void
 ContentPanel::setup ()
 {
 	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.
-	*/
 
-	vector<string> existing;
-	for (int i = 0; i < _content->GetItemCount(); ++i) {
-		existing.push_back (wx_to_std (_content->GetItemText (i)));
-	}
-
-	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);
-	}
-
-	if (existing == proposed) {
-		return;
-	}
-
-	/* Something has changed: set up the control */
-
-	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 ();
+
+		/* 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");
+		}
 
-		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;
@@ -503,21 +680,31 @@ ContentPanel::setup ()
 			s = _("NEEDS KDM: ") + s;
 		}
 
-		_content->InsertItem (t, std_to_wx (s));
+		if (needs_assets) {
+			s = _("NEEDS OV: ") + s;
+		}
 
-		if ((*i)->summary() == selected_summary) {
+		wxListItem item;
+		item.SetId (t);
+		item.SetText (s);
+		item.SetData (i.get ());
+		_content->InsertItem (item);
+
+		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
@@ -540,19 +727,21 @@ 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 (_film, i)) {
+				_film->examine_and_add_content (j);
+			}
 		}
-		_film->examine_and_add_content (c);
+	} catch (exception& e) {
+		error_dialog (_parent, e.what());
 	}
 }