const correctness fix.

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

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index 51dc4e1b333d57e4c4308a22ef94ad38248091ec..10486b0c3948130a63081c24f63a49f13fc522f5 100644 (file)
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -26,7 +26,7 @@
 #include "audio_content.h"
 #include "image_content.h"
 #include "atmos_mxf_content.h"
-#include "text_subtitle_content.h"
+#include "string_text_file_content.h"
 #include "dcp_content.h"
 #include "dcp_subtitle_content.h"
 #include "util.h"
@@ -57,7 +57,7 @@ using boost::optional;
  *  @return Content object, or 0 if no content was recognised in the XML.
  */
 shared_ptr<Content>
-content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, list<string>& notes)
+content_factory (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, list<string>& notes)
 {
        string const type = node->string_child ("Type");
 
@@ -88,7 +88,7 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l
                        );
 
        } else if (type == "SubRip" || type == "TextSubtitle") {
-               content.reset (new TextSubtitleContent (film, node, version));
+               content.reset (new StringTextFileContent (film, node, version));
        } else if (type == "DCP") {
                content.reset (new DCPContent (film, node, version));
        } else if (type == "DCPSubtitle") {
@@ -210,7 +210,7 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
                if (valid_image_file (path)) {
                        single.reset (new ImageContent (film, path));
                } else if (ext == ".srt" || ext == ".ssa" || ext == ".ass") {
-                       single.reset (new TextSubtitleContent (film, path));
+                       single.reset (new StringTextFileContent (film, path));
                } else if (ext == ".xml") {
                        cxml::Document doc;
                        doc.read_file (path);