summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-12-14 22:44:23 +0000
committerCarl Hetherington <cth@carlh.net>2014-12-14 22:44:23 +0000
commit861117816d557cd048d56b26f8903ac26a94b395 (patch)
tree269649a3b7e3ed2f3f6dedd46e167921da388958 /tools
parente58cec97a15d1d5dd198dfb145e1d7daf6be9641 (diff)
Switch subtitle string font specs to be the font ID; split SubtitleContent into Interop and SMPTE.
Diffstat (limited to 'tools')
-rw-r--r--tools/dcpinfo.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc
index a705d5f4..0bf0df08 100644
--- a/tools/dcpinfo.cc
+++ b/tools/dcpinfo.cc
@@ -85,7 +85,7 @@ main_subtitle (shared_ptr<Reel> reel, bool list_subtitles)
for (list<SubtitleString>::const_iterator k = subs.begin(); k != subs.end(); ++k) {
cout << " " << k->text() << "\n";
cout << " "
- << "font:" << k->font() << "; "
+ << "font:" << k->font().get_value_or("[default]") << "; "
<< "italic:" << k->italic() << "; "
<< "color:" << k->color() << "; "
<< "in:" << k->in() << "; "