Tidy up test film naming.

[dcpomatic.git] / src / lib / film.cc

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 4ceef17ea43de55d6c83109bbbca7a7d2be6433a..aa0bfa21192cfb6d1c87c2bf858198c1b283072c 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -103,47 +103,6 @@ Film::~Film ()
        delete _log;
 }
          
-/** The pre-processing GUI part of a thumbs update.
- *  Must be called from the GUI thread.
- */
-void
-Film::update_thumbs_pre_gui ()
-{
-       set_thumbs (vector<int> ());
-       filesystem::remove_all (dir ("thumbs"));
-
-       /* This call will recreate the directory */
-       dir ("thumbs");
-}
-
-/** The post-processing GUI part of a thumbs update.
- *  Must be called from the GUI thread.
- */
-void
-Film::update_thumbs_post_gui ()
-{
-       string const tdir = dir ("thumbs");
-       vector<int> thumbs;
-       
-       for (filesystem::directory_iterator i = filesystem::directory_iterator (tdir); i != filesystem::directory_iterator(); ++i) {
-
-               /* Aah, the sweet smell of progress */
-#if BOOST_FILESYSTEM_VERSION == 3              
-               string const l = filesystem::path(*i).leaf().generic_string();
-#else
-               string const l = i->leaf ();
-#endif
-               
-               size_t const d = l.find (".png");
-               if (d != string::npos) {
-                       thumbs.push_back (atoi (l.substr (0, d).c_str()));
-               }
-       }
-
-       sort (thumbs.begin(), thumbs.end());
-       set_thumbs (thumbs);
-}
-
 /** @return The path to the directory to write JPEG2000 files to */
 string
 Film::j2k_dir () const
@@ -185,7 +144,7 @@ Film::j2k_dir () const
  *  @param true to transcode, false to use the WAV and J2K files that are already there.
  */
 void
-Film::make_dcp (bool transcode, int freq)
+Film::make_dcp (bool transcode)
 {
        if (dcp_name().find ("/") != string::npos) {
                throw BadSettingError ("name", "cannot contain slashes");
@@ -233,7 +192,6 @@ Film::make_dcp (bool transcode, int freq)
                }
        }
        
-       o->decode_video_frequency = freq;
        o->padding = format()->dcp_padding (this);
        o->ratio = format()->ratio_as_float (this);
        o->decode_subtitles = with_subtitles ();
@@ -282,6 +240,12 @@ Film::examine_content ()
        if (_examine_content_job) {
                return;
        }
+
+       set_thumbs (vector<int> ());
+       filesystem::remove_all (dir ("thumbs"));
+
+       /* This call will recreate the directory */
+       dir ("thumbs");
        
        _examine_content_job.reset (new ExamineContentJob (state_copy (), log(), shared_ptr<Job> ()));
        _examine_content_job->Finished.connect (sigc::mem_fun (*this, &Film::examine_content_post_gui));
@@ -293,6 +257,28 @@ Film::examine_content_post_gui ()
 {
        set_length (_examine_content_job->last_video_frame ());
        _examine_content_job.reset ();
+
+       string const tdir = dir ("thumbs");
+       vector<int> thumbs;
+
+       for (filesystem::directory_iterator i = filesystem::directory_iterator (tdir); i != filesystem::directory_iterator(); ++i) {
+
+               /* Aah, the sweet smell of progress */
+#if BOOST_FILESYSTEM_VERSION == 3              
+               string const l = filesystem::path(*i).leaf().generic_string();
+#else
+               string const l = i->leaf ();
+#endif
+               
+               size_t const d = l.find (".png");
+               size_t const t = l.find (".tmp");
+               if (d != string::npos && t == string::npos) {
+                       thumbs.push_back (atoi (l.substr (0, d).c_str()));
+               }
+       }
+
+       sort (thumbs.begin(), thumbs.end());
+       set_thumbs (thumbs);    
 }
 
 
@@ -371,3 +357,10 @@ Film::thumb_subtitle (int n) const
        
        return sub;
 }
+
+void
+Film::set_content (string c)
+{
+       FilmState::set_content (c);
+       examine_content ();
+}