Rename everything.

[libdcp.git] / tools / dcpinfo.cc

diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc
index e812afe40775161afc2c1370a951bb4b56ea2b92..648140d88689c18de7280e52a103c4bbf081a0ed 100644 (file)
--- a/tools/dcpinfo.cc
+++ b/tools/dcpinfo.cc
@@ -40,18 +40,18 @@
 #include "encrypted_kdm.h"
 #include "exceptions.h"
 #include "filesystem.h"
-#include "interop_subtitle_asset.h"
+#include "interop_text_asset.h"
 #include "mono_picture_asset.h"
 #include "picture_asset.h"
 #include "reel.h"
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "reel_subtitle_asset.h"
-#include "smpte_subtitle_asset.h"
+#include "smpte_text_asset.h"
 #include "sound_asset.h"
-#include "subtitle_asset.h"
 #include "subtitle_image.h"
-#include "subtitle_string.h"
+#include "text_asset.h"
+#include "text_string.h"
 #include <getopt.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
@@ -251,19 +251,19 @@ main_subtitle (vector<string> const& only, shared_ptr<Reel> reel, bool list_subt
        OUTPUT_SUBTITLE("      Subtitle ID: %1", ms->id());
 
        if (ms->asset_ref().resolved()) {
-               auto subs = ms->asset()->subtitles ();
+               auto subs = ms->asset()->texts();
                OUTPUT_SUBTITLE("\n      Subtitle:    %1 subtitles", subs.size());
-               shared_ptr<InteropSubtitleAsset> iop = dynamic_pointer_cast<InteropSubtitleAsset> (ms->asset());
+               auto iop = dynamic_pointer_cast<InteropTextAsset>(ms->asset());
                if (iop) {
                        OUTPUT_SUBTITLE(" in %1\n", iop->language());
                }
-               shared_ptr<SMPTESubtitleAsset> smpte = dynamic_pointer_cast<SMPTESubtitleAsset> (ms->asset());
+               auto smpte = dynamic_pointer_cast<SMPTETextAsset>(ms->asset());
                if (smpte && smpte->language ()) {
                        OUTPUT_SUBTITLE(" in %1\n", smpte->language().get());
                }
                if (list_subtitles) {
                        for (auto k: subs) {
-                               auto ks = dynamic_pointer_cast<const SubtitleString>(k);
+                               auto ks = dynamic_pointer_cast<const TextString>(k);
                                if (ks) {
                                        stringstream s;
                                        s << *ks;