C++11 tidying.

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

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 318e3ce5288aafad628b952f40a0b23112b0c0a7..b521234fcacbc1a8a87c472a7f743b08ea7995f4 100644 (file)
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "atmos_content.h"
 #include "dcp_content.h"
 #include "video_content.h"
@@ -45,25 +46,24 @@
 
 #include "i18n.h"
 
+
 using std::cout;
-using std::distance;
+using std::dynamic_pointer_cast;
+using std::function;
 using std::list;
 using std::make_shared;
-using std::map;
-using std::pair;
 using std::shared_ptr;
 using std::string;
 using std::vector;
-using boost::scoped_ptr;
 using boost::optional;
-using boost::function;
-using std::dynamic_pointer_cast;
+using boost::scoped_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
 using dcp::raw_convert;
 using namespace dcpomatic;
 
+
 int const DCPContentProperty::NEEDS_ASSETS       = 600;
 int const DCPContentProperty::NEEDS_KDM          = 601;
 int const DCPContentProperty::REFERENCE_VIDEO    = 602;
@@ -73,6 +73,7 @@ int const DCPContentProperty::NAME               = 605;
 int const DCPContentProperty::TEXTS              = 606;
 int const DCPContentProperty::CPL                = 607;
 
+
 DCPContent::DCPContent (boost::filesystem::path p)
        : _encrypted (false)
        , _needs_assets (false)
@@ -96,7 +97,8 @@ DCPContent::DCPContent (cxml::ConstNodePtr node, int version)
 {
        video = VideoContent::from_xml (this, node, version);
        audio = AudioContent::from_xml (this, node, version);
-       text = TextContent::from_xml (this, node, version);
+       list<string> notes;
+       text = TextContent::from_xml (this, node, version, notes);
        atmos = AtmosContent::from_xml (this, node);
 
        for (int i = 0; i < static_cast<int>(TextType::COUNT); ++i) {
@@ -186,10 +188,7 @@ DCPContent::read_directory (boost::filesystem::path p)
                if (!have_metadata) {
                        throw DCPError ("No ASSETMAP or ASSETMAP.xml file found: is this a DCP?");
                } else {
-                       throw DCPError (
-                               "This looks like a DCP-o-matic project folder, which cannot be added to a different project.  "
-                               "Choose the DCP directory inside the DCP-o-matic project folder if that's what you want to import."
-                               );
+                       throw ProjectFolderError ();
                }
        }
 
@@ -264,15 +263,18 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
                atmos->set_length (examiner->atmos_length());
        }
 
-       list<shared_ptr<TextContent> > new_text;
-       for (int i = 0; i < static_cast<int>(TextType::COUNT); ++i) {
-               for (int j = 0; j < examiner->text_count(static_cast<TextType>(i)); ++j) {
-                       auto c = make_shared<TextContent>(this, static_cast<TextType>(i), static_cast<TextType>(i));
-                       if (i == static_cast<int>(TextType::CLOSED_CAPTION)) {
-                               c->set_dcp_track (examiner->dcp_text_track(j));
-                       }
-                       new_text.push_back (c);
-               }
+       list<shared_ptr<TextContent>> new_text;
+
+       for (int i = 0; i < examiner->text_count(TextType::OPEN_SUBTITLE); ++i) {
+               auto c = make_shared<TextContent>(this, TextType::OPEN_SUBTITLE, TextType::OPEN_SUBTITLE);
+               c->set_language (examiner->open_subtitle_language());
+               new_text.push_back (c);
+       }
+
+       for (int i = 0; i < examiner->text_count(TextType::CLOSED_CAPTION); ++i) {
+               auto c = make_shared<TextContent>(this, TextType::CLOSED_CAPTION, TextType::CLOSED_CAPTION);
+               c->set_dcp_track (examiner->dcp_text_track(i));
+               new_text.push_back (c);
        }
 
        {
@@ -740,7 +742,7 @@ DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, stri
                                return false;
                        } else if (i->main_subtitle()->entry_point().get_value_or(0) != 0) {
                                /// TRANSLATORS: this string will follow "Cannot reference this DCP: "
-                               why_not = _("one if its subtitle reels has a non-zero entry point so it must be re-written.");
+                               why_not = _("one of its subtitle reels has a non-zero entry point so it must be re-written.");
                                return false;
                        }
                 }
@@ -753,7 +755,7 @@ DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, stri
                        for (auto j: i->closed_captions()) {
                                if (j->entry_point().get_value_or(0) != 0) {
                                        /// TRANSLATORS: this string will follow "Cannot reference this DCP: "
-                                       why_not = _("one if its closed caption has a non-zero entry point so it must be re-written.");
+                                       why_not = _("one of its closed caption has a non-zero entry point so it must be re-written.");
                                        return false;
                                }
                        }