diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-12-16 20:20:47 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-12-16 20:20:47 +0000 |
| commit | ff896d5f5ec20e1371b423bb746c32fa55cc126a (patch) | |
| tree | bcd6f76709753812c8a988ad43c1f7b8727c6f28 /src/reel.cc | |
| parent | 7a8bf6efd00161b1ce7bb160bd50a0c11c28d792 (diff) | |
Ref does not need to be a template since it's always used for Asset.
Diffstat (limited to 'src/reel.cc')
| -rw-r--r-- | src/reel.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/reel.cc b/src/reel.cc index 3c3c7892..ddab12d3 100644 --- a/src/reel.cc +++ b/src/reel.cc @@ -165,23 +165,23 @@ Reel::add (shared_ptr<ReelAsset> asset) } void -Reel::resolve_refs (list<shared_ptr<Object> > objects) +Reel::resolve_refs (list<shared_ptr<Asset> > assets) { if (_main_picture) { - _main_picture->asset_ref().resolve (objects); + _main_picture->asset_ref().resolve (assets); } if (_main_sound) { - _main_sound->asset_ref().resolve (objects); + _main_sound->asset_ref().resolve (assets); } if (_main_subtitle) { - _main_subtitle->asset_ref().resolve (objects); + _main_subtitle->asset_ref().resolve (assets); /* Interop subtitle handling is all special cases */ - shared_ptr<InteropSubtitleAsset> iop = dynamic_pointer_cast<InteropSubtitleAsset> (_main_subtitle->asset_ref().object ()); + shared_ptr<InteropSubtitleAsset> iop = dynamic_pointer_cast<InteropSubtitleAsset> (_main_subtitle->asset_ref().asset ()); if (iop) { - iop->resolve_fonts (objects); + iop->resolve_fonts (assets); } } } |
