Add to_upper() method to util.{cc,h}

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

diff --git a/src/lib/string_text_file_content.cc b/src/lib/string_text_file_content.cc
index 9a25ef06f00ce6e10532721b88183a9d0ed46d9a..01e0fe60ff490450b3e30a950f640020f4ce22dd 100644 (file)
--- a/src/lib/string_text_file_content.cc
+++ b/src/lib/string_text_file_content.cc
@@ -32,7 +32,8 @@
 
 using std::string;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::make_shared;
 using boost::optional;
 using dcp::raw_convert;
 using namespace dcpomatic;
@@ -40,7 +41,7 @@ using namespace dcpomatic;
 StringTextFileContent::StringTextFileContent (boost::filesystem::path path)
        : Content (path)
 {
-       text.push_back (shared_ptr<TextContent> (new TextContent (this, TEXT_OPEN_SUBTITLE, TEXT_UNKNOWN)));
+       text.push_back (shared_ptr<TextContent> (new TextContent (this, TextType::OPEN_SUBTITLE, TextType::UNKNOWN)));
 }
 
 StringTextFileContent::StringTextFileContent (cxml::ConstNodePtr node, int version)
@@ -61,7 +62,7 @@ StringTextFileContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job
 
        boost::mutex::scoped_lock lm (_mutex);
        _length = s.length ();
-       only_text()->add_font (shared_ptr<Font> (new Font (TEXT_FONT_ID)));
+       only_text()->add_font (make_shared<Font>(TEXT_FONT_ID));
 }
 
 string