/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
-#include <wx/wx.h>
-#include <wx/notebook.h>
-#include <wx/listctrl.h>
#include "lib/audio_content.h"
#include "lib/subtitle_content.h"
#include "lib/video_content.h"
#include "timing_panel.h"
#include "timeline_dialog.h"
#include "image_sequence_dialog.h"
+#include <wx/wx.h>
+#include <wx/notebook.h>
+#include <wx/listctrl.h>
+#include <boost/filesystem.hpp>
+
+#include "lib/image_filename_sorter.cc"
using std::list;
using std::string;
using std::cout;
+using std::vector;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
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->InsertColumn (0, wxT(""));
wxArrayString paths;
d->GetPaths (paths);
-
- /* XXX: check for lots of files here and do something */
-
+ list<boost::filesystem::path> path_list;
for (unsigned int i = 0; i < paths.GetCount(); ++i) {
- shared_ptr<Content> c = content_factory (_film, wx_to_std (paths[i]));
- shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (c);
- if (ic) {
- ic->set_video_frame_rate (24);
- }
- _film->examine_and_add_content (c, true);
+ path_list.push_back (wx_to_std (paths[i]));
}
+ add_files (path_list);
d->Destroy ();
}
if (is_dcp) {
try {
shared_ptr<DCPContent> content (new DCPContent (_film, path));
- _film->examine_and_add_content (content, true);
+ _film->examine_and_add_content (content);
} catch (...) {
error_dialog (_panel, _("Could not find a DCP in that folder."));
}
ImageSequenceDialog* e = new ImageSequenceDialog (_panel);
r = e->ShowModal ();
float const frame_rate = e->frame_rate ();
- bool const digest = e->digest ();
e->Destroy ();
if (r != wxID_OK) {
try {
shared_ptr<ImageContent> content (new ImageContent (_film, path));
content->set_video_frame_rate (frame_rate);
- _film->examine_and_add_content (content, digest);
+ _film->examine_and_add_content (content);
} catch (...) {
error_dialog (_panel, _("Could not find any images in that folder"));
return;
void
ContentPanel::right_click (wxListEvent& ev)
{
- _menu->popup (_film, selected (), ev.GetPoint ());
+ _menu->popup (_film, selected (), TimelineContentViewList (), ev.GetPoint ());
}
/** Set up broad sensitivity based on the type of content that is selected */
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;
int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
if (s != -1) {
_content->DeleteAllItems ();
- ContentList content = _film->content ();
- sort (content.begin(), content.end(), ContentSorter ());
-
for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
int const t = _content->GetItemCount ();
bool const valid = (*i)->paths_valid ();
}
wxString* paths = event.GetFiles ();
+ list<boost::filesystem::path> path_list;
for (int i = 0; i < event.GetNumberOfFiles(); i++) {
- _film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i])), true);
+ path_list.push_back (wx_to_std (paths[i]));
+ }
+
+ add_files (path_list);
+}
+
+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.
+ */
+
+ paths.sort (ImageFilenameSorter ());
+
+ /* 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);
+ }
+ _film->examine_and_add_content (c);
}
}