projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove all use of stringstream in an attempt to fix
[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..c86ba6ef8a9995cdc8bf7f5c23e1958f5a3a16b3 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 "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>
#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
{
string
VideoContentScale::id () const
{
- locked_stringstream s;
-
if (_ratio) {
if (_ratio) {
- s << _ratio->id ();
- } else {
- s << (_scale ? "S1" : "S0");
+ return _ratio->id ();
}
}
- return
s.str (
);
+ return
(_scale ? "S1" : "S0"
);
}
string
}
string