diff options
Diffstat (limited to 'examples/read_dcp.cc')
| -rw-r--r-- | examples/read_dcp.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/examples/read_dcp.cc b/examples/read_dcp.cc index f099409f..432c2f27 100644 --- a/examples/read_dcp.cc +++ b/examples/read_dcp.cc @@ -27,12 +27,12 @@ #include "cpl.h" #include "reel.h" #include "reel_picture_asset.h" -#include "mono_picture_frame.h" -#include "mono_picture_asset.h" -#include "mono_picture_asset_reader.h" -#include "stereo_picture_asset.h" +#include "mono_j2k_picture_frame.h" +#include "mono_j2k_picture_asset.h" +#include "mono_j2k_picture_asset_reader.h" +#include "stereo_j2k_picture_asset.h" #include "sound_asset.h" -#include "subtitle_asset.h" +#include "text_asset.h" #include "openjpeg_image.h" #include "colour_conversion.h" #include "rgb_xyz.h" @@ -71,14 +71,14 @@ main () auto assets = dcp.assets(); std::cout << "DCP has " << assets.size() << " assets.\n"; for (auto i: assets) { - if (std::dynamic_pointer_cast<dcp::MonoPictureAsset>(i)) { + if (std::dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(i)) { std::cout << "2D picture\n"; - } else if (std::dynamic_pointer_cast<dcp::StereoPictureAsset>(i)) { + } else if (std::dynamic_pointer_cast<dcp::StereoJ2KPictureAsset>(i)) { std::cout << "3D picture\n"; } else if (std::dynamic_pointer_cast<dcp::SoundAsset>(i)) { std::cout << "Sound\n"; - } else if (std::dynamic_pointer_cast<dcp::SubtitleAsset>(i)) { - std::cout << "Subtitle\n"; + } else if (std::dynamic_pointer_cast<dcp::TextAsset>(i)) { + std::cout << "Subtitle/caption\n"; } else if (std::dynamic_pointer_cast<dcp::CPL>(i)) { std::cout << "CPL\n"; } @@ -89,7 +89,7 @@ main () auto cpl = dcp.cpls().front(); /* Get the picture asset in the first reel */ - auto picture_asset = std::dynamic_pointer_cast<dcp::MonoPictureAsset>( + auto picture_asset = std::dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>( cpl->reels()[0]->main_picture()->asset() ); |