Basic WebVTT subtitle support (#1361).

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

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index 0e8b04eda21c48b9b22f975a2e7e4b126485a417..5f1e6c9b71b13b44cad388e4abfc906a48e35908 100644 (file)
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -18,10 +18,12 @@
 
 */
 
+
 /** @file  src/lib/content_factory.cc
  *  @brief Methods to create content objects.
  */
 
+
 #include "ffmpeg_content.h"
 #include "audio_content.h"
 #include "image_content.h"
@@ -43,10 +45,13 @@
 
 #include "i18n.h"
 
-using std::string;
+
 using std::list;
-using boost::shared_ptr;
-using boost::optional;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+using std::vector;
+
 
 /** Create a Content object from an XML node.
  *  @param node XML description.
@@ -57,57 +62,53 @@ using boost::optional;
 shared_ptr<Content>
 content_factory (cxml::ConstNodePtr node, int version, list<string>& notes)
 {
-       string const type = node->string_child ("Type");
+       auto const type = node->string_child ("Type");
 
-       boost::shared_ptr<Content> content;
+       std::shared_ptr<Content> content;
 
        if (type == "FFmpeg") {
-               /* SndfileContent is now handled by the FFmpeg code rather than by
-                  separate libsndfile-based code.
-               */
-               content.reset (new FFmpegContent (node, version, notes));
+               content = make_shared<FFmpegContent>(node, version, notes);
        } else if (type == "Image") {
-               content.reset (new ImageContent (node, version));
+               content = make_shared<ImageContent>(node, version);
        } else if (type == "Sndfile") {
                /* SndfileContent is now handled by the FFmpeg code rather than by
                   separate libsndfile-based code.
                */
-               content.reset (new FFmpegContent (node, version, notes));
+               content = make_shared<FFmpegContent>(node, version, notes);
 
                content->audio->set_stream (
-                       AudioStreamPtr (
-                               new FFmpegAudioStream (
-                                       "Stream", 0,
-                                       node->number_child<int> ("AudioFrameRate"),
-                                       node->number_child<Frame> ("AudioLength"),
-                                       AudioMapping (node->node_child ("AudioMapping"), version)
-                                       )
+                       make_shared<FFmpegAudioStream>(
+                               "Stream", 0,
+                               node->number_child<int> ("AudioFrameRate"),
+                               node->number_child<Frame> ("AudioLength"),
+                               AudioMapping (node->node_child ("AudioMapping"), version)
                                )
                        );
 
        } else if (type == "SubRip" || type == "TextSubtitle") {
-               content.reset (new StringTextFileContent (node, version));
+               content = make_shared<StringTextFileContent>(node, version, notes);
        } else if (type == "DCP") {
-               content.reset (new DCPContent (node, version));
+               content = make_shared<DCPContent>(node, version);
        } else if (type == "DCPSubtitle") {
-               content.reset (new DCPSubtitleContent (node, version));
+               content = make_shared<DCPSubtitleContent>(node, version);
        } else if (type == "VideoMXF") {
-               content.reset (new VideoMXFContent (node, version));
+               content = make_shared<VideoMXFContent>(node, version);
        } else if (type == "AtmosMXF") {
-               content.reset (new AtmosMXFContent (node, version));
+               content = make_shared<AtmosMXFContent>(node, version);
        }
 
        return content;
 }
 
+
 /** Create some Content objects from a file or directory.
  *  @param path File or directory.
  *  @return Content objects.
  */
-list<shared_ptr<Content> >
+vector<shared_ptr<Content>>
 content_factory (boost::filesystem::path path)
 {
-       list<shared_ptr<Content> > content;
+       vector<shared_ptr<Content>> content;
 
        if (boost::filesystem::is_directory (path)) {
 
@@ -138,11 +139,11 @@ content_factory (boost::filesystem::path path)
                                continue;
                        }
 
-                       if (valid_image_file (i->path ())) {
+                       if (valid_image_file(i->path())) {
                                ++image_files;
                        }
 
-                       if (valid_sound_file (i->path ())) {
+                       if (valid_sound_file(i->path())) {
                                ++sound_files;
                        }
 
@@ -150,10 +151,10 @@ content_factory (boost::filesystem::path path)
                }
 
                if (image_files > 0 && sound_files == 0)  {
-                       content.push_back (shared_ptr<Content> (new ImageContent(path)));
+                       content.push_back (make_shared<ImageContent>(path));
                } else if (image_files == 0 && sound_files > 0) {
-                       for (boost::filesystem::directory_iterator i(path); i != boost::filesystem::directory_iterator(); ++i) {
-                               content.push_back (shared_ptr<FFmpegContent> (new FFmpegContent(i->path())));
+                       for (auto i: boost::filesystem::directory_iterator(path)) {
+                               content.push_back (make_shared<FFmpegContent>(i.path()));
                        }
                }
 
@@ -161,30 +162,30 @@ content_factory (boost::filesystem::path path)
 
                shared_ptr<Content> single;
 
-               string ext = path.extension().string ();
+               auto ext = path.extension().string();
                transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
 
                if (valid_image_file (path)) {
-                       single.reset (new ImageContent(path));
-               } else if (ext == ".srt" || ext == ".ssa" || ext == ".ass" || ext == ".stl") {
-                       single.reset (new StringTextFileContent(path));
+                       single = make_shared<ImageContent>(path);
+               } else if (ext == ".srt" || ext == ".ssa" || ext == ".ass" || ext == ".stl" || ext == ".vtt") {
+                       single = make_shared<StringTextFileContent>(path);
                } else if (ext == ".xml") {
                        cxml::Document doc;
                        doc.read_file (path);
                        if (doc.root_name() == "DCinemaSecurityMessage") {
                                throw KDMAsContentError ();
                        }
-                       single.reset (new DCPSubtitleContent(path));
-               } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) {
-                       single.reset (new DCPSubtitleContent(path));
-               } else if (ext == ".mxf" && VideoMXFContent::valid_mxf (path)) {
-                       single.reset (new VideoMXFContent(path));
-               } else if (ext == ".mxf" && AtmosMXFContent::valid_mxf (path)) {
-                       single.reset (new AtmosMXFContent(path));
+                       single = make_shared<DCPSubtitleContent>(path);
+               } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf(path)) {
+                       single = make_shared<DCPSubtitleContent>(path);
+               } else if (ext == ".mxf" && VideoMXFContent::valid_mxf(path)) {
+                       single = make_shared<VideoMXFContent>(path);
+               } else if (ext == ".mxf" && AtmosMXFContent::valid_mxf(path)) {
+                       single = make_shared<AtmosMXFContent>(path);
                }
 
                if (!single) {
-                       single.reset (new FFmpegContent(path));
+                       single = make_shared<FFmpegContent>(path);
                }
 
                content.push_back (single);