summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-06-18 15:07:41 +0100
committerCarl Hetherington <cth@carlh.net>2013-06-18 15:07:41 +0100
commitc2bac22380bea453665a24c6f39200a977771daf (patch)
treea464d94724318b81484eb3011fa0a946205550c3 /examples
parent564f68cb2c258e61c1e70950c9d036859ea8619a (diff)
parent59617eb2230e47b59882c4f9ca6092ce05f53cf1 (diff)
Merge master.
Diffstat (limited to 'examples')
-rw-r--r--examples/make_dcp.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/examples/make_dcp.cc b/examples/make_dcp.cc
index 8061ca61..2bcd4fc9 100644
--- a/examples/make_dcp.cc
+++ b/examples/make_dcp.cc
@@ -26,11 +26,13 @@
/* If you are using an installed libdcp, these #includes would need to be changed to
#include <libdcp/dcp.h>
+#include <libdcp/cpl.h>
#include <libdcp/picture_asset.h>
... etc. ...
*/
#include "dcp.h"
+#include "cpl.h"
#include "picture_asset.h"
#include "sound_asset.h"
#include "reel.h"
@@ -73,7 +75,7 @@ main ()
for 2K projectors.
*/
boost::shared_ptr<libdcp::MonoPictureAsset> picture_asset (
- new libdcp::MonoPictureAsset (video_frame, "My Film DCP", "video.mxf", 0, 24, 48, 1998, 1080, false)
+ new libdcp::MonoPictureAsset (video_frame, "My Film DCP", "video.mxf", 0, 24, 48, libdcp::Size (1998, 1080), false)
);
/* Now we will create a `sound asset', which is made up of a WAV file for each channel of audio. Here we're using
@@ -93,7 +95,7 @@ main ()
/* Now we can create the sound asset using these files */
boost::shared_ptr<libdcp::SoundAsset> sound_asset (
- new libdcp::SoundAsset (sound_files, "My Film DCP", "audio.mxf", 0, 24, 48, 0, false)
+ new libdcp::SoundAsset (sound_files, "My Film DCP", "audio.mxf", 0, 24, 48, false)
);
/* Now that we have the assets, we can create a Reel to put them in and add it to the CPL */
@@ -106,7 +108,8 @@ main ()
/* Finally, we call this to write the XML description files to the DCP. After this, the DCP
is ready to ingest and play.
*/
- dcp.write_xml ();
+ libdcp::XMLMetadata metadata;
+ dcp.write_xml (metadata);
return 0;
}