diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-02-12 00:13:14 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-02-12 00:13:14 +0000 |
| commit | 80400212e939dc2f3b987cb6df57709929aa5178 (patch) | |
| tree | acffc7b335b79b27261610986fcf5fd95f6437ab /src/lib/content_factory.cc | |
| parent | db3cd90dadf60df72ebbd95c59b32954f29b9c38 (diff) | |
Rename SubRip -> TextSubtitle.
Diffstat (limited to 'src/lib/content_factory.cc')
| -rw-r--r-- | src/lib/content_factory.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index 3aa8ca9d3..2b17d69e4 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -24,7 +24,7 @@ #include "ffmpeg_content.h" #include "image_content.h" #include "sndfile_content.h" -#include "subrip_content.h" +#include "text_subtitle_content.h" #include "dcp_content.h" #include "dcp_subtitle_content.h" #include "util.h" @@ -56,8 +56,8 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l content.reset (new ImageContent (film, node, version)); } else if (type == "Sndfile") { content.reset (new SndfileContent (film, node, version)); - } else if (type == "SubRip") { - content.reset (new SubRipContent (film, node, version)); + } else if (type == "SubRip" || type == "TextSubtitle") { + content.reset (new TextSubtitleContent (film, node, version)); } else if (type == "DCP") { content.reset (new DCPContent (film, node, version)); } else if (type == "DCPSubtitle") { @@ -118,8 +118,8 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path) content.reset (new ImageContent (film, path)); } else if (SndfileContent::valid_file (path)) { content.reset (new SndfileContent (film, path)); - } else if (ext == ".srt") { - content.reset (new SubRipContent (film, path)); + } else if (ext == ".srt" || ext == ".ssa") { + content.reset (new TextSubtitleContent (film, path)); } else if (ext == ".xml") { content.reset (new DCPSubtitleContent (film, path)); } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) { |