Use SafeStringStream instead of std::stringstream to try to fix random crashes on...

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

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 9259242a04f442dc9d4340d6302e1a867e07af02..915da7beba33b70687e0536d751d4e8e6e96a65f 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 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
@@ -24,12 +24,13 @@
 #include "compose.hpp"
 #include "film.h"
 #include "job.h"
+#include "frame_rate_change.h"
+#include "safe_stringstream.h"
 
 #include "i18n.h"
 
 using std::string;
 using std::cout;
-using std::stringstream;
 using boost::shared_ptr;
 
 ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
@@ -44,15 +45,19 @@ ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
                                _paths.push_back (i->path ());
                        }
                }
-               
+
+               if (_paths.empty()) {
+                       throw FileError (_("No valid image files were found in the folder."), p);
+               }
+                               
                sort (_paths.begin(), _paths.end());
        }
 }
 
 
-ImageContent::ImageContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
+ImageContent::ImageContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int version)
        : Content (f, node)
-       , VideoContent (f, node)
+       , VideoContent (f, node, version)
 {
        
 }
@@ -60,12 +65,15 @@ ImageContent::ImageContent (shared_ptr<const Film> f, shared_ptr<const cxml::Nod
 string
 ImageContent::summary () const
 {
+       string s = path_summary () + " ";
        /* Get the string() here so that the name does not have quotes around it */
        if (still ()) {
-               return String::compose (_("%1 [still]"), path().filename().string());
+               s += _("[still]");
+       } else {
+               s += _("[moving images]");
        }
 
-       return String::compose (_("%1 [moving images]"), path().filename().string());
+       return s;
 }
 
 string
@@ -123,14 +131,14 @@ ImageContent::full_length () const
        shared_ptr<const Film> film = _film.lock ();
        assert (film);
        
-       FrameRateConversion frc (video_frame_rate(), film->video_frame_rate ());
-       return video_length() * frc.factor() * TIME_HZ / video_frame_rate();
+       FrameRateChange frc (video_frame_rate(), film->video_frame_rate ());
+       return video_length_after_3d_combine() * frc.factor() * TIME_HZ / video_frame_rate();
 }
 
 string
 ImageContent::identifier () const
 {
-       stringstream s;
+       SafeStringStream s;
        s << VideoContent::identifier ();
        s << "_" << video_length();
        return s.str ();
@@ -141,3 +149,19 @@ ImageContent::still () const
 {
        return number_of_paths() == 1;
 }
+
+void
+ImageContent::set_video_frame_rate (float r)
+{
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               if (_video_frame_rate == r) {
+                       return;
+               }
+               
+               _video_frame_rate = r;
+       }
+       
+       signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+}
+