diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-12-16 17:02:45 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-12-16 17:02:45 +0000 |
| commit | 7a8bf6efd00161b1ce7bb160bd50a0c11c28d792 (patch) | |
| tree | 1f53d16ca14837a1fc08f153676f5c3182ba6651 | |
| parent | bec7cbcc015814452690a0f702cc41b6f5f56311 (diff) | |
Tidy API; subtitle_asset() -> asset()>
| -rw-r--r-- | src/reel_subtitle_asset.h | 2 | ||||
| -rw-r--r-- | test/rewrite_subs.cc | 2 | ||||
| -rw-r--r-- | tools/dcpinfo.cc | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/reel_subtitle_asset.h b/src/reel_subtitle_asset.h index 876b3511..d4f11cfa 100644 --- a/src/reel_subtitle_asset.h +++ b/src/reel_subtitle_asset.h @@ -40,7 +40,7 @@ public: ReelSubtitleAsset (boost::shared_ptr<SubtitleAsset> asset, Fraction edit_rate, int64_t instrinsic_duration, int64_t entry_point); ReelSubtitleAsset (boost::shared_ptr<const cxml::Node>); - boost::shared_ptr<SubtitleAsset> subtitle_asset () const { + boost::shared_ptr<SubtitleAsset> asset () const { return boost::dynamic_pointer_cast<SubtitleAsset> (_asset_ref.object ()); } diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc index 4cfc0c62..f3165601 100644 --- a/test/rewrite_subs.cc +++ b/test/rewrite_subs.cc @@ -52,7 +52,7 @@ main (int argc, char* argv[]) for (list<shared_ptr<Reel> >::iterator j = reels.begin(); j != reels.end(); ++j) { if ((*j)->main_subtitle()) { - (*j)->main_subtitle()->subtitle_asset()->write ((*j)->main_subtitle()->subtitle_asset()->file ()); + (*j)->main_subtitle()->asset()->write ((*j)->main_subtitle()->asset()->file ()); } } } diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index bd74387b..e15c164b 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -83,13 +83,13 @@ main_subtitle (shared_ptr<Reel> reel, bool list_subtitles) return; } - list<SubtitleString> subs = reel->main_subtitle()->subtitle_asset()->subtitles (); + list<SubtitleString> subs = reel->main_subtitle()->asset()->subtitles (); cout << " Subtitle: " << subs.size() << " subtitles"; - shared_ptr<InteropSubtitleAsset> iop = dynamic_pointer_cast<InteropSubtitleAsset> (reel->main_subtitle()->subtitle_asset()); + shared_ptr<InteropSubtitleAsset> iop = dynamic_pointer_cast<InteropSubtitleAsset> (reel->main_subtitle()->asset()); if (iop) { cout << " in " << iop->language() << "\n"; } - shared_ptr<SMPTESubtitleAsset> smpte = dynamic_pointer_cast<SMPTESubtitleAsset> (reel->main_subtitle()->subtitle_asset()); + shared_ptr<SMPTESubtitleAsset> smpte = dynamic_pointer_cast<SMPTESubtitleAsset> (reel->main_subtitle()->asset()); if (smpte && smpte->language ()) { cout << " in " << smpte->language().get() << "\n"; } |