Merge master.

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

diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index 3415ae613f5aee8175e122a9dea0d0517b791cf1..0e56619455b09613a7ada5229d0b932a2fe72e11 100644 (file)
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -22,11 +22,11 @@
 #include "subtitle_content.h"
 #include "util.h"
 #include "exceptions.h"
+#include "safe_stringstream.h"
 
 #include "i18n.h"
 
 using std::string;
-using std::stringstream;
 using std::vector;
 using std::cout;
 using boost::shared_ptr;
@@ -65,8 +65,13 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr n
        , _subtitle_y_offset (0)
        , _subtitle_scale (1)
 {
-       if (version >= 7) {
+       if (version >= 32) {
                _use_subtitles = node->bool_child ("UseSubtitles");
+       } else {
+               _use_subtitles = false;
+       }
+       
+       if (version >= 7) {
                _subtitle_x_offset = node->number_child<float> ("SubtitleXOffset");
                _subtitle_y_offset = node->number_child<float> ("SubtitleYOffset");
        } else {
@@ -160,7 +165,7 @@ SubtitleContent::set_subtitle_scale (double s)
 string
 SubtitleContent::identifier () const
 {
-       stringstream s;
+       SafeStringStream s;
        s << Content::identifier()
          << "_" << raw_convert<string> (subtitle_scale())
          << "_" << raw_convert<string> (subtitle_x_offset())