diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-02 00:17:24 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-02 00:17:24 +0100 |
| commit | bd491319f52ba7f37ef5763960b4c0c00434b5f9 (patch) | |
| tree | c8578912077611e7fcbd5ba804abea97adce7b32 /tools | |
| parent | d87f979ea98a19614f164a0d49fccc1be926e789 (diff) | |
Tweaks: don't use shared_ptr for dcp::SubtitleString; SubtitleContent::write_xml takes a path.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dcpinfo.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index 0c41b0c3..a705d5f4 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -79,24 +79,24 @@ main_subtitle (shared_ptr<Reel> reel, bool list_subtitles) return; } - list<shared_ptr<SubtitleString> > subs = reel->main_subtitle()->subtitle_content()->subtitles (); + list<SubtitleString> subs = reel->main_subtitle()->subtitle_content()->subtitles (); cout << " Subtitle: " << subs.size() << " subtitles in " << reel->main_subtitle()->subtitle_content()->language() << "\n"; if (list_subtitles) { - for (list<shared_ptr<SubtitleString> >::const_iterator k = subs.begin(); k != subs.end(); ++k) { - cout << " " << (*k)->text() << "\n"; + for (list<SubtitleString>::const_iterator k = subs.begin(); k != subs.end(); ++k) { + cout << " " << k->text() << "\n"; cout << " " - << "font:" << (*k)->font() << "; " - << "italic:" << (*k)->italic() << "; " - << "color:" << (*k)->color() << "; " - << "in:" << (*k)->in() << "; " - << "out:" << (*k)->out() << "; " - << "v_position:" << (*k)->v_position() << "; " - << "v_align:" << (*k)->v_align() << "; " - << "effect:" << (*k)->effect() << "; " - << "effect_color:" << (*k)->effect_color() << "; " - << "fade_up_time:" << (*k)->fade_up_time() << "; " - << "fade_down_time:" << (*k)->fade_down_time() << "; " - << "size: " << (*k)->size() << "\n"; + << "font:" << k->font() << "; " + << "italic:" << k->italic() << "; " + << "color:" << k->color() << "; " + << "in:" << k->in() << "; " + << "out:" << k->out() << "; " + << "v_position:" << k->v_position() << "; " + << "v_align:" << k->v_align() << "; " + << "effect:" << k->effect() << "; " + << "effect_color:" << k->effect_color() << "; " + << "fade_up_time:" << k->fade_up_time() << "; " + << "fade_down_time:" << k->fade_down_time() << "; " + << "size: " << k->size() << "\n"; } } } |