Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

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

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index 706c7975403b9110d10e1c834a325216d6b18667..d3905e4e7c443a2d0c59bb06947f57b669c09f46 100644 (file)
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -24,6 +25,7 @@
 #include "ffmpeg_content.h"
 #include "audio_content.h"
 #include "image_content.h"
+#include "atmos_mxf_content.h"
 #include "text_subtitle_content.h"
 #include "dcp_content.h"
 #include "dcp_subtitle_content.h"
@@ -41,6 +43,7 @@
 using std::string;
 using std::list;
 using boost::shared_ptr;
+using boost::optional;
 
 #define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
 
@@ -90,6 +93,8 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l
                content.reset (new DCPSubtitleContent (film, node, version));
        } else if (type == "VideoMXF") {
                content.reset (new VideoMXFContent (film, node, version));
+       } else if (type == "AtmosMXF") {
+               content.reset (new AtmosMXFContent (film, node, version));
        }
 
        return content;
@@ -123,9 +128,9 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
 
                        LOG_GENERAL ("Checking file %1", i->path());
 
-                       if (boost::starts_with (i->path().leaf().string(), "._") || i->path().leaf().string() == ".DS_Store") {
-                               /* We ignore these files */
-                               LOG_GENERAL ("Ignored %1 (starts with {._}, or .DS_Store)", i->path());
+                       if (boost::starts_with (i->path().leaf().string(), ".")) {
+                               /* We ignore hidden files */
+                               LOG_GENERAL ("Ignored %1 (starts with .)", i->path());
                                continue;
                        }
 
@@ -159,7 +164,7 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
 
                if (valid_image_file (path)) {
                        content.reset (new ImageContent (film, path));
-               } else if (ext == ".srt" || ext == ".ssa") {
+               } else if (ext == ".srt" || ext == ".ssa" || ext == ".ass") {
                        content.reset (new TextSubtitleContent (film, path));
                } else if (ext == ".xml") {
                        content.reset (new DCPSubtitleContent (film, path));
@@ -167,6 +172,8 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
                        content.reset (new DCPSubtitleContent (film, path));
                } else if (ext == ".mxf" && VideoMXFContent::valid_mxf (path)) {
                        content.reset (new VideoMXFContent (film, path));
+               } else if (ext == ".mxf" && AtmosMXFContent::valid_mxf (path)) {
+                       content.reset (new AtmosMXFContent (film, path));
                }
 
                if (!content) {