*/
-#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 "timing_panel.h"
#include "timeline_dialog.h"
#include "image_sequence_dialog.h"
+#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 <wx/wx.h>
#include <wx/notebook.h>
#include <wx/listctrl.h>
#include <boost/filesystem.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
#include "lib/image_filename_sorter.cc"
ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> film, FilmViewer* viewer)
: _timeline_dialog (0)
+ , _parent (n)
, _film (film)
, _generally_sensitive (true)
{
{
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-
+
_content = new wxListCtrl (_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER);
_content->DragAcceptFiles (true);
s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6);
_content->SetColumnWidth (0, 512);
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."));
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."));
b->Add (_add_folder, 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->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->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->SetToolTip (_("Open the timeline for the film."));
b->Add (_timeline, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
VideoContentList
ContentPanel::selected_video ()
{
- ContentList c = selected ();
VideoContentList vc;
-
- for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
- shared_ptr<VideoContent> t = dynamic_pointer_cast<VideoContent> (*i);
+
+ BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+ shared_ptr<VideoContent> t = dynamic_pointer_cast<VideoContent> (i);
if (t) {
vc.push_back (t);
}
AudioContentList
ContentPanel::selected_audio ()
{
- ContentList c = selected ();
AudioContentList ac;
-
- for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
- shared_ptr<AudioContent> t = dynamic_pointer_cast<AudioContent> (*i);
+
+ BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+ shared_ptr<AudioContent> t = dynamic_pointer_cast<AudioContent> (i);
if (t) {
ac.push_back (t);
}
SubtitleContentList
ContentPanel::selected_subtitle ()
{
- ContentList c = selected ();
SubtitleContentList sc;
-
- for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
- shared_ptr<SubtitleContent> t = dynamic_pointer_cast<SubtitleContent> (*i);
+
+ BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+ shared_ptr<SubtitleContent> t = dynamic_pointer_cast<SubtitleContent> (i);
if (t) {
sc.push_back (t);
}
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);
}
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 ()
{
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 ();
}
}
void
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) {
+ return;
+ }
+
/* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using
non-Latin filenames or paths.
*/
int r = d->ShowModal ();
boost::filesystem::path const path (wx_to_std (d->GetPath ()));
d->Destroy ();
-
+
if (r != wxID_OK) {
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.
- */
+ shared_ptr<Content> content = content_factory (_film, path);
- 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;
- }
- }
-
- 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 {
-
+ 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 ();
return;
}
- shared_ptr<Content> content;
-
- 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 (content);
}
void
_timeline_dialog->Destroy ();
_timeline_dialog = 0;
}
-
+
_timeline_dialog = new TimelineDialog (this, _film);
_timeline_dialog->Show ();
}
_timeline->Enable (s);
/* Set the panels in the content notebook */
- for (list<ContentSubPanel*>::iterator i = _panels.begin(); i != _panels.end(); ++i) {
- (*i)->Enable (s);
+ BOOST_FOREACH (ContentSubPanel* i, _panels) {
+ i->Enable (s);
}
}
if (content[i] == wc.lock ()) {
_content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
} else {
- _content->SetItemState (i, 0, wxLIST_STATE_SELECTED | wxLIST_STATE_FOCUSED);
+ _content->SetItemState (i, 0, wxLIST_STATE_SELECTED);
}
}
}
if (property == ContentProperty::PATH || property == ContentProperty::POSITION || property == DCPContentProperty::CAN_BE_PLAYED) {
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);
}
}
{
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> proposed;
- for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
- bool const valid = (*i)->paths_valid ();
+ BOOST_FOREACH (shared_ptr<Content> i, content) {
+ bool const valid = i->paths_valid ();
- string s = (*i)->summary ();
+ 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;
int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
if (s != -1) {
selected_summary = wx_to_std (_content->GetItemText (s));
}
-
+
_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 valid = i->paths_valid ();
+ shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (i);
bool const needs_kdm = dcp && !dcp->can_be_played ();
- string s = (*i)->summary ();
-
+ string s = i->summary ();
+
if (!valid) {
s = _("MISSING: ") + s;
}
_content->InsertItem (t, std_to_wx (s));
- if ((*i)->summary() == selected_summary) {
+ if (i->summary() == selected_summary) {
_content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
}
if (!_film) {
return;
}
-
+
wxString* paths = event.GetFiles ();
list<boost::filesystem::path> path_list;
for (int i = 0; i < event.GetNumberOfFiles(); i++) {
/* 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.
*/
-
+
paths.sort (ImageFilenameSorter ());
/* XXX: check for lots of files here and do something */