Hand-apply a2f776bd239ef1a744c1a9fea841ac0a51c4f33b from master; more deflickering.

[dcpomatic.git] / src / wx / content_panel.cc

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 30c03538b05ee4512ca69229b3d0c0655acb9898..33308b1126dc70f6ce698d3ab0a15d07c96c02e0 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -17,9 +17,6 @@
 
 */
 
-#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"
@@ -36,10 +33,17 @@
 #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;
@@ -59,6 +63,7 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> f)
                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(""));
@@ -244,12 +249,11 @@ ContentPanel::add_file_clicked ()
 
        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) {
-               _film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i])));
+               path_list.push_back (wx_to_std (paths[i]));
        }
+       add_files (path_list);
 
        d->Destroy ();
 }
@@ -437,6 +441,36 @@ ContentPanel::film_content_changed (int property)
 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) {
@@ -445,9 +479,6 @@ ContentPanel::setup ()
        
        _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 ();
@@ -489,7 +520,31 @@ ContentPanel::files_dropped (wxDropFilesEvent& event)
        }
        
        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])));
+               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);
        }
 }