diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-12-04 23:14:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-12-05 00:49:33 +0100 |
| commit | e3033879f7693d40f652f013b00c76deed6994da (patch) | |
| tree | 16c6a62810d61306e15b0e81e8f4ef92015d0473 /tools | |
| parent | 6973568117ed23c300f5ffa538f7eae87a9a9927 (diff) | |
Rename everything.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dcpdumpsub.cc | 4 | ||||
| -rw-r--r-- | tools/dcpinfo.cc | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tools/dcpdumpsub.cc b/tools/dcpdumpsub.cc index fa7a170c..a14d4978 100644 --- a/tools/dcpdumpsub.cc +++ b/tools/dcpdumpsub.cc @@ -36,7 +36,7 @@ #include "decrypted_kdm_key.h" #include "encrypted_kdm.h" #include "file.h" -#include "smpte_subtitle_asset.h" +#include "smpte_text_asset.h" #include "util.h" #include <getopt.h> #include <cstdlib> @@ -107,7 +107,7 @@ main (int argc, char* argv[]) exit (EXIT_FAILURE); } - dcp::SMPTESubtitleAsset sub (argv[optind]); + dcp::SMPTETextAsset sub (argv[optind]); if (sub.key_id() && (!kdm_file || !private_key_file)) { cerr << "Subtitle MXF is encrypted so you must provide a KDM and private key.\n"; diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index e812afe4..648140d8 100644 --- 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; |