diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-04 16:48:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-05 14:34:43 +0100 |
| commit | 6c55e8d2c3b0129a19fc40dca344219021ad12ef (patch) | |
| tree | cf9c3244ed55fb1fa8db89ca87923f3b7a6d35a1 /src/dcp.cc | |
| parent | 2105caa32a12236d5b70a0cf8b9ac62fcf7f574e (diff) | |
Rename some stuff Content -> Asset.
Diffstat (limited to 'src/dcp.cc')
| -rw-r--r-- | src/dcp.cc | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -25,8 +25,8 @@ #include "dcp.h" #include "sound_mxf.h" #include "picture_mxf.h" -#include "interop_subtitle_content.h" -#include "smpte_subtitle_content.h" +#include "interop_subtitle_asset.h" +#include "smpte_subtitle_asset.h" #include "mono_picture_mxf.h" #include "stereo_picture_mxf.h" #include "util.h" @@ -137,7 +137,7 @@ DCP::read (bool keep_going, ReadErrors* errors) if (root == "CompositionPlaylist") { _assets.push_back (shared_ptr<CPL> (new CPL (path))); } else if (root == "DCSubtitle") { - _assets.push_back (shared_ptr<InteropSubtitleContent> (new InteropSubtitleContent (path))); + _assets.push_back (shared_ptr<InteropSubtitleAsset> (new InteropSubtitleAsset (path))); } } else if (boost::algorithm::ends_with (path.string(), ".mxf")) { ASDCP::EssenceType_t type; @@ -159,7 +159,7 @@ DCP::read (bool keep_going, ReadErrors* errors) _assets.push_back (shared_ptr<StereoPictureMXF> (new StereoPictureMXF (path))); break; case ASDCP::ESS_TIMED_TEXT: - _assets.push_back (shared_ptr<SMPTESubtitleContent> (new SMPTESubtitleContent (path))); + _assets.push_back (shared_ptr<SMPTESubtitleAsset> (new SMPTESubtitleAsset (path))); break; default: throw DCPReadError ("Unknown MXF essence type"); |
