Account for split branch in libdcp.

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

diff --git a/src/lib/util.cc b/src/lib/util.cc
index d23989afaadff0556842b8ba5fe6f01e86b96efd..9884df730588e9ae8981198fa8bde3c63deb4fe9 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -59,7 +59,7 @@
 #include <dcp/picture_asset.h>
 #include <dcp/raw_convert.h>
 #include <dcp/sound_asset.h>
-#include <dcp/subtitle_asset.h>
+#include <dcp/text_asset.h>
 #include <dcp/util.h>
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
@@ -468,7 +468,7 @@ LIBDCP_ENABLE_WARNINGS
 #if defined(DCPOMATIC_WINDOWS) || defined(DCPOMATIC_OSX)
        /* Render something to fontconfig to create its cache */
        vector<StringText> subs;
-       dcp::SubtitleString ss(
+       dcp::TextString 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, std::vector<dcp::Ruby>()
                );
@@ -754,7 +754,7 @@ audio_asset_filename (shared_ptr<dcp::SoundAsset> asset, int reel_index, int ree
 
 
 string
-subtitle_asset_filename (shared_ptr<dcp::SubtitleAsset> asset, int reel_index, int reel_count, optional<string> summary, string extension)
+subtitle_asset_filename(shared_ptr<dcp::TextAsset> asset, int reel_index, int reel_count, optional<string> summary, string extension)
 {
        return asset_filename(asset, "sub", reel_index, reel_count, summary, extension);
 }