Fix seconds_to_approximate_hms sometimes saying things like 1h60m (#1314).

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

diff --git a/src/lib/video_content_scale.cc b/src/lib/video_content_scale.cc
index 47ceab5d1f2f4516f21b071081e4d298abf2f419..636f0e807413972d7fa5cb1ea8161e755bd4fb7a 100644 (file)
--- a/src/lib/video_content_scale.cc
+++ b/src/lib/video_content_scale.cc
@@ -22,7 +22,6 @@
 #include "video_content.h"
 #include "ratio.h"
 #include "util.h"
-#include <locked_sstream.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/optional.hpp>
@@ -85,22 +84,18 @@ VideoContentScale::as_xml (xmlpp::Node* node) const
 string
 VideoContentScale::id () const
 {
-       locked_stringstream s;
-
        if (_ratio) {
-               s << _ratio->id ();
-       } else {
-               s << (_scale ? "S1" : "S0");
+               return _ratio->id ();
        }
 
-       return s.str ();
+       return (_scale ? "S1" : "S0");
 }
 
 string
 VideoContentScale::name () const
 {
        if (_ratio) {
-               return _ratio->nickname ();
+               return _ratio->image_nickname ();
        }
 
        if (_scale) {