diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-06-28 21:49:44 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-08-17 12:57:31 +0200 |
| commit | a5adc9221d0af15f345cd3dbc76f37ee47fe65d5 (patch) | |
| tree | 0c53851f161fa38d6d7a081ba3de1fa030048ed2 /tools | |
| parent | 8e43142645252daeeaccbad7b9f3ed746c4b2382 (diff) | |
Subtitle{,String,Image} -> Text{,String,Image}.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dcpdiff.cc | 2 | ||||
| -rw-r--r-- | tools/dcpinfo.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc index 7c7c4b71..6c101ab0 100644 --- a/tools/dcpdiff.cc +++ b/tools/dcpdiff.cc @@ -198,7 +198,7 @@ main (int argc, char* argv[]) options.reel_annotation_texts_can_differ = true; break; case 'F': - options.export_differing_subtitles = true; + options.export_differing_texts = true; break; } } diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index 4a790561..8a7f738e 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -50,8 +50,8 @@ #include "smpte_text_asset.h" #include "sound_asset.h" #include "text_asset.h" -#include "subtitle_image.h" -#include "subtitle_string.h" +#include "text_image.h" +#include "text_string.h" #include <getopt.h> #include <boost/filesystem.hpp> #include <boost/algorithm/string.hpp> @@ -251,7 +251,7 @@ 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()); auto iop = dynamic_pointer_cast<InteropTextAsset>(ms->asset()); if (iop) { @@ -263,13 +263,13 @@ main_subtitle (vector<string> const& only, shared_ptr<Reel> reel, bool list_subt } 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; OUTPUT_SUBTITLE("%1\n", s.str()); } - auto is = dynamic_pointer_cast<const SubtitleImage>(k); + auto is = dynamic_pointer_cast<const TextImage>(k); if (is) { stringstream s; s << *is; |