diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-10 11:27:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-10 11:27:26 +0100 |
| commit | bde76c3341775bd02da59932d285e14eade64ae0 (patch) | |
| tree | 7f0922faf1e64e74c029037afe8857c63f25e51a /src/lib/content_factory.cc | |
| parent | c7b68d663ac3db10dcf2bfcc11009dce46f820dc (diff) | |
Basics of DCP subtitle import.
Diffstat (limited to 'src/lib/content_factory.cc')
| -rw-r--r-- | src/lib/content_factory.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index 73e333816..16340adb4 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -27,6 +27,7 @@ #include "sndfile_content.h" #include "subrip_content.h" #include "dcp_content.h" +#include "dcp_subtitle_content.h" #include "util.h" using std::string; @@ -57,6 +58,8 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l content.reset (new SubRipContent (film, node, version)); } else if (type == "DCP") { content.reset (new DCPContent (film, node, version)); + } else if (type == "DCPSubtitle") { + content.reset (new DCPSubtitleContent (film, node, version)); } return content; @@ -81,6 +84,8 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path) content.reset (new SndfileContent (film, path)); } else if (ext == ".srt") { content.reset (new SubRipContent (film, path)); + } else if (ext == ".xml") { + content.reset (new DCPSubtitleContent (film, path)); } else { content.reset (new FFmpegContent (film, path)); } |