#include "audio_content.h"
#include "image_content.h"
#include "atmos_mxf_content.h"
-#include "text_text_content.h"
+#include "string_text_file_content.h"
#include "dcp_content.h"
-#include "dcp_text_content.h"
+#include "dcp_subtitle_content.h"
#include "util.h"
#include "ffmpeg_audio_stream.h"
#include "video_mxf_content.h"
* @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");
);
} else if (type == "SubRip" || type == "TextSubtitle") {
- content.reset (new TextTextContent (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") {
- content.reset (new DCPTextContent (film, node, version));
+ content.reset (new DCPSubtitleContent (film, node, version));
} else if (type == "VideoMXF") {
content.reset (new VideoMXFContent (film, node, version));
} else if (type == "AtmosMXF") {
if (valid_image_file (path)) {
single.reset (new ImageContent (film, path));
} else if (ext == ".srt" || ext == ".ssa" || ext == ".ass") {
- single.reset (new TextTextContent (film, path));
+ single.reset (new StringTextFileContent (film, path));
} else if (ext == ".xml") {
cxml::Document doc;
doc.read_file (path);
if (doc.root_name() == "DCinemaSecurityMessage") {
throw KDMAsContentError ();
}
- single.reset (new DCPTextContent (film, path));
+ single.reset (new DCPSubtitleContent (film, path));
} else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) {
- single.reset (new DCPTextContent (film, path));
+ single.reset (new DCPSubtitleContent (film, path));
} else if (ext == ".mxf" && VideoMXFContent::valid_mxf (path)) {
single.reset (new VideoMXFContent (film, path));
} else if (ext == ".mxf" && AtmosMXFContent::valid_mxf (path)) {