Rename everything.

[libdcp.git] / src / reel.cc

diff --git a/src/reel.cc b/src/reel.cc
index a8481d593f03db5a8f60517353da65a7d8fd3508..95769140bff4734349e9e7385fb2b40ef6993183 100644 (file)
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -40,7 +40,7 @@
 #include "decrypted_kdm.h"
 #include "decrypted_kdm_key.h"
 #include "equality_options.h"
-#include "interop_subtitle_asset.h"
+#include "interop_text_asset.h"
 #include "mono_picture_asset.h"
 #include "picture_asset.h"
 #include "reel.h"
@@ -55,10 +55,10 @@
 #include "reel_sound_asset.h"
 #include "reel_stereo_picture_asset.h"
 #include "reel_subtitle_asset.h"
-#include "smpte_subtitle_asset.h"
+#include "smpte_text_asset.h"
 #include "sound_asset.h"
 #include "stereo_picture_asset.h"
-#include "subtitle_asset.h"
+#include "text_asset.h"
 #include "util.h"
 #include <libxml++/nodes/element.h>
 #include <stdint.h>
@@ -409,7 +409,7 @@ Reel::resolve_refs (vector<shared_ptr<Asset>> assets)
 
                /* Interop subtitle handling is all special cases */
                if (_main_subtitle->asset_ref().resolved()) {
-                       auto iop = dynamic_pointer_cast<InteropSubtitleAsset> (_main_subtitle->asset_ref().asset());
+                       auto iop = dynamic_pointer_cast<InteropTextAsset>(_main_subtitle->asset_ref().asset());
                        if (iop) {
                                iop->resolve_fonts (assets);
                        }
@@ -421,7 +421,7 @@ Reel::resolve_refs (vector<shared_ptr<Asset>> assets)
 
                /* Interop subtitle handling is all special cases */
                if (i->asset_ref().resolved()) {
-                       auto iop = dynamic_pointer_cast<InteropSubtitleAsset> (i->asset_ref().asset());
+                       auto iop = dynamic_pointer_cast<InteropTextAsset>(i->asset_ref().asset());
                        if (iop) {
                                iop->resolve_fonts (assets);
                        }