diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-06-28 23:12:42 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-08-17 12:57:31 +0200 |
| commit | 8e43142645252daeeaccbad7b9f3ed746c4b2382 (patch) | |
| tree | 6c029caa9f0c961087ec6145da0bbbb8abf17146 /tools | |
| parent | 06c28c700f0a398a3289c4adfa83ceb2d0fc999d (diff) | |
{,Interop,SMPTE}SubtitleAsset -> {,Interop,SMPTE}TextAsset.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dcpdumpsub.cc | 4 | ||||
| -rw-r--r-- | tools/dcpinfo.cc | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/dcpdumpsub.cc b/tools/dcpdumpsub.cc index fa7a170c..da40b386 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 7cbdf140..4a790561 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -40,16 +40,16 @@ #include "encrypted_kdm.h" #include "exceptions.h" #include "filesystem.h" -#include "interop_subtitle_asset.h" +#include "interop_text_asset.h" #include "mono_j2k_picture_asset.h" #include "j2k_picture_asset.h" #include "reel.h" #include "reel_picture_asset.h" #include "reel_sound_asset.h" #include "reel_text_asset.h" -#include "smpte_subtitle_asset.h" +#include "smpte_text_asset.h" #include "sound_asset.h" -#include "subtitle_asset.h" +#include "text_asset.h" #include "subtitle_image.h" #include "subtitle_string.h" #include <getopt.h> @@ -253,11 +253,11 @@ main_subtitle (vector<string> const& only, shared_ptr<Reel> reel, bool list_subt if (ms->asset_ref().resolved()) { auto subs = ms->asset()->subtitles (); 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()); } |