diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-08-10 16:38:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-08-12 09:13:51 +0100 |
| commit | b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f (patch) | |
| tree | 9968238c6c0511f044e6fcdb4abcc08b5eb28f27 /src/lib/video_content_scale.cc | |
| parent | 4a0ae92e28d7d1f0dd648d1b620efc324fdef161 (diff) | |
Remove all use of stringstream in an attempt to fix
the suspected thread-unsafe crash bugs on OS X.
Diffstat (limited to 'src/lib/video_content_scale.cc')
| -rw-r--r-- | src/lib/video_content_scale.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/video_content_scale.cc b/src/lib/video_content_scale.cc index 47ceab5d1..c86ba6ef8 100644 --- 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,15 +84,11 @@ 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 |