Fix typo if -> of (thanks to Uwe Dittes)

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

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 4bd718e96207212eeb1860672514ccac27b1f214..fa6ec383f8ccae10bde9e6990dda77345948fc5c 100644 (file)
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -56,7 +56,7 @@ using std::string;
 using std::vector;
 using boost::scoped_ptr;
 using boost::optional;
 using std::vector;
 using boost::scoped_ptr;
 using boost::optional;

-using boost::function;
+using std::function;

 using std::dynamic_pointer_cast;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 using std::dynamic_pointer_cast;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;


@@ -186,10 +186,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 {
                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 ();

                }
        }
 
                }
        }
 


@@ -219,10 +216,10 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
        bool const needed_kdm = needs_kdm ();
        string const old_name = name ();
 
        bool const needed_kdm = needs_kdm ();
        string const old_name = name ();
 

-       ChangeSignaller<Content> cc_texts (this, DCPContentProperty::TEXTS);
-       ChangeSignaller<Content> cc_assets (this, DCPContentProperty::NEEDS_ASSETS);
-       ChangeSignaller<Content> cc_kdm (this, DCPContentProperty::NEEDS_KDM);
-       ChangeSignaller<Content> cc_name (this, DCPContentProperty::NAME);
+       ContentChangeSignaller cc_texts (this, DCPContentProperty::TEXTS);
+       ContentChangeSignaller cc_assets (this, DCPContentProperty::NEEDS_ASSETS);
+       ContentChangeSignaller cc_kdm (this, DCPContentProperty::NEEDS_KDM);
+       ContentChangeSignaller cc_name (this, DCPContentProperty::NAME);

 
        if (job) {
                job->set_progress_unknown ();
 
        if (job) {
                job->set_progress_unknown ();


@@ -264,15 +261,18 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
                atmos->set_length (examiner->atmos_length());
        }
 
                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);

        }
 
        {
        }
 
        {


@@ -288,7 +288,7 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
                _cpl = examiner->cpl ();
                _reel_lengths = examiner->reel_lengths ();
                for (auto const& i: examiner->markers()) {
                _cpl = examiner->cpl ();
                _reel_lengths = examiner->reel_lengths ();
                for (auto const& i: examiner->markers()) {

-                       _markers[i.first] = ContentTime(i.second.as_editable_units(DCPTime::HZ));
+                       _markers[i.first] = ContentTime(i.second.as_editable_units_ceil(DCPTime::HZ));

                }
                _ratings = examiner->ratings ();
                _content_versions = examiner->content_versions ();
                }
                _ratings = examiner->ratings ();
                _content_versions = examiner->content_versions ();


@@ -509,7 +509,7 @@ DCPContent::set_default_colour_conversion ()
 void
 DCPContent::set_reference_video (bool r)
 {
 void
 DCPContent::set_reference_video (bool r)
 {

-       ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_VIDEO);
+       ContentChangeSignaller cc (this, DCPContentProperty::REFERENCE_VIDEO);

 
        {
                boost::mutex::scoped_lock lm (_mutex);
 
        {
                boost::mutex::scoped_lock lm (_mutex);


@@ -520,7 +520,7 @@ DCPContent::set_reference_video (bool r)
 void
 DCPContent::set_reference_audio (bool r)
 {
 void
 DCPContent::set_reference_audio (bool r)
 {

-       ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_AUDIO);
+       ContentChangeSignaller cc (this, DCPContentProperty::REFERENCE_AUDIO);

 
        {
                boost::mutex::scoped_lock lm (_mutex);
 
        {
                boost::mutex::scoped_lock lm (_mutex);


@@ -531,7 +531,7 @@ DCPContent::set_reference_audio (bool r)
 void
 DCPContent::set_reference_text (TextType type, bool r)
 {
 void
 DCPContent::set_reference_text (TextType type, bool r)
 {

-       ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_TEXT);
+       ContentChangeSignaller cc (this, DCPContentProperty::REFERENCE_TEXT);

 
        {
                boost::mutex::scoped_lock lm (_mutex);
 
        {
                boost::mutex::scoped_lock lm (_mutex);


@@ -740,7 +740,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: "
                                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;
                        }
                 }
                                return false;
                        }
                 }


@@ -753,7 +753,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: "
                        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;
                                }
                        }
                                        return false;
                                }
                        }


@@ -788,7 +788,7 @@ DCPContent::take_settings_from (shared_ptr<const Content> c)
 void
 DCPContent::set_cpl (string id)
 {
 void
 DCPContent::set_cpl (string id)
 {

-       ChangeSignaller<Content> cc (this, DCPContentProperty::CPL);
+       ContentChangeSignaller cc (this, DCPContentProperty::CPL);

 
        {
                boost::mutex::scoped_lock lm (_mutex);
 
        {
                boost::mutex::scoped_lock lm (_mutex);