Move locale_convert into libdcp.

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

diff --git a/src/lib/content.cc b/src/lib/content.cc
index b8e7f8ad2910623e8736334b46ad98b8845a61e2..9083635f242eaea3f5aefe5445c1d25ccb6b8921 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -27,10 +27,10 @@
 #include "content_factory.h"
 #include "exceptions.h"
 #include "film.h"
-#include "safe_stringstream.h"
 #include "job.h"
 #include "compose.hpp"
-#include "raw_convert.h"
+#include <dcp/locale_convert.h>
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/thread/mutex.hpp>
@@ -45,6 +45,8 @@ using std::vector;
 using std::max;
 using std::pair;
 using boost::shared_ptr;
+using dcp::raw_convert;
+using dcp::locale_convert;
 
 int const ContentProperty::PATH = 400;
 int const ContentProperty::POSITION = 401;
@@ -161,10 +163,10 @@ Content::examine (shared_ptr<Job> job)
        lm.unlock ();
 
        /* Some content files are very big, so we use a poor man's
-          digest here: a MD5 of the first and last 1e6 bytes with the
+          digest here: a digest of the first and last 1e6 bytes with the
           size of the first file tacked on the end as a string.
        */
-       string const d = md5_digest_head_tail (p, 1000000) + raw_convert<string> (boost::filesystem::file_size (p.front ()));
+       string const d = digest_head_tail (p, 1000000) + raw_convert<string> (boost::filesystem::file_size (p.front ()));
 
        lm.lock ();
        _digest = d;
@@ -254,14 +256,12 @@ Content::length_after_trim () const
 string
 Content::identifier () const
 {
-       SafeStringStream s;
-
-       s << Content::digest()
-         << "_" << position().get()
-         << "_" << trim_start().get()
-         << "_" << trim_end().get();
-
-       return s.str ();
+       char buffer[256];
+       snprintf (
+               buffer, sizeof(buffer), "%s_%" PRId64 "_%" PRId64 "_%" PRId64,
+               Content::digest().c_str(), position().get(), trim_start().get(), trim_end().get()
+               );
+       return buffer;
 }
 
 bool
@@ -362,10 +362,24 @@ Content::add_properties (list<UserProperty>& p) const
        p.push_back (UserProperty (UserProperty::GENERAL, _("Filename"), path(0).string ()));
 
        if (_video_frame_rate) {
-               p.push_back (
-                       UserProperty (
-                               UserProperty::GENERAL, _("Video frame rate"), raw_convert<string> (_video_frame_rate.get(), 5), _("frames per second")
-                               )
-                       );
+               if (video) {
+                       p.push_back (
+                               UserProperty (
+                                       UserProperty::VIDEO,
+                                       _("Frame rate"),
+                                       locale_convert<string> (_video_frame_rate.get(), 5),
+                                       _("frames per second")
+                                       )
+                               );
+               } else {
+                       p.push_back (
+                               UserProperty (
+                                       UserProperty::GENERAL,
+                                       _("Prepared for video frame rate"),
+                                       locale_convert<string> (_video_frame_rate.get(), 5),
+                                       _("frames per second")
+                                       )
+                               );
+               }
        }
 }