Pass through <Ruby> tags in subtitles (#2635) (GH#23).

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

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 1a340cbcee16358402c1ea24d334e87e83965d84..d23989afaadff0556842b8ba5fe6f01e86b96efd 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -33,7 +33,6 @@
 #include "config.h"
 #include "constants.h"
 #include "cross.h"
-#include "crypto.h"
 #include "dcp_content_type.h"
 #include "dcpomatic_log.h"
 #include "digester.h"
@@ -471,7 +470,7 @@ LIBDCP_ENABLE_WARNINGS
        vector<StringText> subs;
        dcp::SubtitleString ss(
                optional<string>(), false, false, false, dcp::Colour(), 42, 1, dcp::Time(), dcp::Time(), 0, dcp::HAlign::CENTER, 0, dcp::VAlign::CENTER, 0, dcp::Direction::LTR,
-               "Hello dolly", dcp::Effect::NONE, dcp::Colour(), dcp::Time(), dcp::Time(), 0
+               "Hello dolly", dcp::Effect::NONE, dcp::Colour(), dcp::Time(), dcp::Time(), 0, std::vector<dcp::Ruby>()
                );
        subs.push_back(StringText(ss, 0, make_shared<dcpomatic::Font>("foo"), dcp::SubtitleStandard::SMPTE_2014));
        render_text (subs, dcp::Size(640, 480), DCPTime(), 24);
@@ -674,7 +673,7 @@ short_audio_channel_name (int c)
 bool
 valid_image_file (boost::filesystem::path f)
 {
-       if (boost::starts_with (f.leaf().string(), "._")) {
+       if (boost::starts_with(f.filename().string(), "._")) {
                return false;
        }
 
@@ -691,7 +690,7 @@ valid_image_file (boost::filesystem::path f)
 bool
 valid_sound_file (boost::filesystem::path f)
 {
-       if (boost::starts_with (f.leaf().string(), "._")) {
+       if (boost::starts_with(f.filename().string(), "._")) {
                return false;
        }