Merge master

[libdcp.git] / examples / make_dcp.cc

diff --git a/examples/make_dcp.cc b/examples/make_dcp.cc
index 41026cc23dd7e146b3fbe14003a73fe9754bb349..8061ca614d26dba3cf3188939748c65d079c9e56 100644 (file)
--- a/examples/make_dcp.cc
+++ b/examples/make_dcp.cc
@@ -17,13 +17,19 @@
 
 */
 
-/* This example file shows how to make a DCP from some JPEG2000 and WAV files
-   using libdcp.
-*/
+/** @file examples/make_dcp.cc
+ *  @brief Shows how to make a DCP from some JPEG2000 and WAV files.
+ */
 
 #include <vector>
 #include <string>
-#include <sigc++/sigc++.h>
+
+/* If you are using an installed libdcp, these #includes would need to be changed to
+#include <libdcp/dcp.h>
+#include <libdcp/picture_asset.h>
+... etc. ...
+*/
+
 #include "dcp.h"
 #include "picture_asset.h"
 #include "sound_asset.h"
@@ -42,14 +48,19 @@ video_frame (int /* frame */)
 int
 main ()
 {
-       /* Make a DCP object.  "My Film DCP" is the directory name for the DCP, "My Film" is the title
-          that will be shown on the projector / TMS when the DCP is ingested.
+       /* Make a DCP object.  "My Film DCP" is the directory name for the DCP */
+       libdcp::DCP dcp ("My Film DCP");
+       
+       /* Now make a CPL object.
 
+          "My Film" is the title that will be shown on the projector / TMS when the DCP is ingested.
           FEATURE is the type that the projector will list the DCP as.
-
           24 is the frame rate, and the DCP will be 48 frames long (ie 2 seconds at 24 fps).
-       */
-       libdcp::DCP dcp ("My Film DCP", "My Film", libdcp::FEATURE, 24, 48);
+       */      
+       boost::shared_ptr<libdcp::CPL> cpl (new libdcp::CPL ("My Film DCP", "My Film", libdcp::FEATURE, 24, 48));
+
+       /* And add the CPL to the DCP */
+       dcp.add_cpl (cpl);
 
        /* Now make a `picture asset'.  This is a collection of the JPEG2000 files that make up the picture, one per frame.
           Here we're using a function (video_frame) to obtain the name of the JPEG2000 file for each frame.
@@ -62,11 +73,19 @@ main ()
           for 2K projectors.
        */
        boost::shared_ptr<libdcp::MonoPictureAsset> picture_asset (
-               new libdcp::MonoPictureAsset (sigc::ptr_fun (&video_frame), "My Film DCP", "video.mxf", 0, 24, 48, 1998, 1080)
+               new libdcp::MonoPictureAsset (video_frame, "My Film DCP", "video.mxf", 0, 24, 48, 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
           stereo, so we add two WAV files to a vector.
+
+          We could add more files here to use more channels; the file order is:
+              Left
+              Right
+              Centre
+              LFE (sub)
+              Left surround
+              Right surround
        */
        std::vector<std::string> sound_files;
        sound_files.push_back ("examples/sine_440_-12dB.wav");
@@ -74,11 +93,11 @@ 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)
+               new libdcp::SoundAsset (sound_files, "My Film DCP", "audio.mxf", 0, 24, 48, 0, false)
                );
 
-       /* Now that we have the assets, we can create a Reel to put them in and add it to the DCP */
-       dcp.add_reel (
+       /* Now that we have the assets, we can create a Reel to put them in and add it to the CPL */
+       cpl->add_reel (
                boost::shared_ptr<libdcp::Reel> (
                        new libdcp::Reel (picture_asset, sound_asset, boost::shared_ptr<libdcp::SubtitleAsset> ())
                        )