diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/make_dcp.cc | 8 | ||||
| -rw-r--r-- | examples/read_dcp.cc | 14 | ||||
| -rw-r--r-- | examples/wscript | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/examples/make_dcp.cc b/examples/make_dcp.cc index 6e0961a5..80e5f52b 100644 --- a/examples/make_dcp.cc +++ b/examples/make_dcp.cc @@ -33,8 +33,8 @@ #include "dcp.h" #include "cpl.h" -#include "mono_picture_asset.h" -#include "mono_picture_asset_writer.h" +#include "mono_j2k_picture_asset.h" +#include "mono_j2k_picture_asset_writer.h" #include "sound_asset.h" #include "sound_asset_writer.h" #include "reel.h" @@ -56,10 +56,10 @@ main () per second. */ - auto picture_asset = std::make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE); + auto picture_asset = std::make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE); /* Start off a write to it */ - auto picture_writer = picture_asset->start_write("DCP/picture.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW); + auto picture_writer = picture_asset->start_write("DCP/picture.mxf", dcp::Behaviour::MAKE_NEW); /* Write 24 frames of the same JPEG2000 file */ dcp::ArrayData picture("examples/help.j2c"); diff --git a/examples/read_dcp.cc b/examples/read_dcp.cc index f099409f..fff02288 100644 --- a/examples/read_dcp.cc +++ b/examples/read_dcp.cc @@ -27,10 +27,10 @@ #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 "openjpeg_image.h" @@ -71,9 +71,9 @@ 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"; @@ -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() ); diff --git a/examples/wscript b/examples/wscript index d062af1b..68cd79ee 100644 --- a/examples/wscript +++ b/examples/wscript @@ -21,7 +21,7 @@ def build(bld): obj = bld(features='cxx cxxprogram') obj.name = example obj.use = 'libdcp%s' % bld.env.API_VERSION - obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM OPENSSL XMLSEC1 MAGICK' + obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_DCPOMATIC BOOST_FILESYSTEM OPENSSL XMLSEC1 MAGICK AVCODEC AVUTIL' obj.source = example + '.cc' obj.target = example obj.install_path = '' |