Move 'show in file manager' code to cross_*

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

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 0da42502f821fe3d0510c649b3f0cc7b3ae8b69e..e454853a1c2bc592db72a8d16686b32a5c28c625 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 boost::function;
+using std::function;
 using std::dynamic_pointer_cast;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
@@ -96,7 +96,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) {
@@ -242,7 +243,6 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
                        boost::mutex::scoped_lock lm (_mutex);
                        audio = make_shared<AudioContent>(this);
                }
-               audio->set_language (examiner->audio_language());
                auto as = make_shared<AudioStream>(examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels());
                audio->set_stream (as);
                auto m = as->mapping ();
@@ -741,7 +741,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;
                        }
                 }
@@ -754,7 +754,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;
                                }
                        }