Revert "Bump libdcp for new method."

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

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 95713d323c47b032ab17d7fc132699ca7ba3145b..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;
@@ -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
@@ -367,7 +367,7 @@ Content::add_properties (list<UserProperty>& p) const
                                UserProperty (
                                        UserProperty::VIDEO,
                                        _("Frame rate"),
-                                       raw_convert<string> (_video_frame_rate.get(), 5),
+                                       locale_convert<string> (_video_frame_rate.get(), 5),
                                        _("frames per second")
                                        )
                                );
@@ -376,7 +376,7 @@ Content::add_properties (list<UserProperty>& p) const
                                UserProperty (
                                        UserProperty::GENERAL,
                                        _("Prepared for video frame rate"),
-                                       raw_convert<string> (_video_frame_rate.get(), 5),
+                                       locale_convert<string> (_video_frame_rate.get(), 5),
                                        _("frames per second")
                                        )
                                );