Fix uninitialised variable.

[libdcp.git] / examples / make_dcp.cc

diff --git a/examples/make_dcp.cc b/examples/make_dcp.cc
index 904877639576e30ff900b5cc3020484ef18d0247..94eef710978643bdfb3805b19bcf060c3e870e6d 100644 (file)
--- a/examples/make_dcp.cc
+++ b/examples/make_dcp.cc
@@ -1,41 +1,47 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /** @file examples/make_dcp.cc
- *  @brief Shows how to make a DCP from some JPEG2000 and WAV files.
+ *  @brief Shows how to make a DCP from some JPEG2000 and audio data.
  */
 
 #include <vector>
 #include <string>
 
 /* 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/mono_picture_asset.h>
+#include <dcp/dcp.h>
+#include <dcp/cpl.h>
+#include <dcp/mono_picture_asset.h>
 ... etc. ...
 */
 
 #include "dcp.h"
 #include "cpl.h"
 #include "mono_picture_asset.h"
+#include "mono_picture_asset_writer.h"
 #include "sound_asset.h"
+#include "sound_asset_writer.h"
 #include "reel.h"
+#include "file.h"
+#include "reel_mono_picture_asset.h"
+#include "reel_sound_asset.h"
+#include <cmath>
 
 int
 main ()
@@ -43,15 +49,15 @@ main ()
        /* Create a directory to put the DCP in */
        boost::filesystem::create_directory ("DCP");
        
-       /* Make a picture MXF.  This is a file which combines JPEG2000 files together to make
+       /* Make a picture asset.  This is a file which combines JPEG2000 files together to make
           up the video of the DCP.  First, create the object, specifying a frame rate of 24 frames
           per second.
        */
 
-       boost::shared_ptr<dcp::MonoPictureMXF> picture_mxf (new dcp::MonoPictureMXF (24));
+       boost::shared_ptr<dcp::MonoPictureAsset> picture_asset (new dcp::MonoPictureAsset (dcp::Fraction (24, 1)));
 
        /* Start off a write to it */
-       boost::shared_ptr<dcp::MonoPictureMXFWriter> picture_writer = picture_mxf->start_write ("DCP/picture.mxf", false);
+       boost::shared_ptr<dcp::PictureAssetWriter> picture_writer = picture_asset->start_write ("DCP/picture.mxf", dcp::SMPTE, false);
 
        /* Write 24 frames of the same JPEG2000 file */
        dcp::File picture ("examples/help.j2c");
@@ -65,8 +71,8 @@ main ()
        /* Now create a sound MXF.  As before, create an object and a writer.
           When creating the object we specify the sampling rate (48kHz) and the number of channels (2).
        */
-       boost::shared_ptr<dcp::SoundMXF> sound_mxf (new dcp::SoundMXF (48000, 2));
-       boost::shared_ptr<dcp::SoundMXFWriter> sound_writer = sound_mxf->start_write ("DCP/sound.mxf", false);
+       boost::shared_ptr<dcp::SoundAsset> sound_asset (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 2));
+       boost::shared_ptr<dcp::SoundAssetWriter> sound_writer = sound_asset->start_write ("DCP/sound.mxf", dcp::SMPTE);
 
        /* Write some sine waves */
        float* audio[2];
@@ -84,24 +90,22 @@ main ()
        sound_writer->finalize ();
 
        /* Now create a reel */
-       shared_ptr<dcp::Reel> reel (new dcp::Reel ());
+       boost::shared_ptr<dcp::Reel> reel (new dcp::Reel ());
 
        /* Add picture and sound to it.  The zeros are the `entry points', i.e. the first
-          (video) frame from the MXFs that the reel should play.
+          (video) frame from the assets that the reel should play.
        */
-       reel->add (picture, 0);
-       reel->add (sound, 0);
+       reel->add (boost::shared_ptr<dcp::ReelPictureAsset> (new dcp::ReelMonoPictureAsset (picture_asset, 0)));
+       reel->add (boost::shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (sound_asset, 0)));
 
        /* Make a CPL with this reel */
-       shared_ptr<dcp::CPL> cpl (new dcp::CPL ("My film", dcp::FEATURE));
+       boost::shared_ptr<dcp::CPL> cpl (new dcp::CPL ("My film", dcp::FEATURE));
        cpl->add (reel);
 
        /* Write the DCP */
-       list<shared_ptr<dcp::Asset> > assets;
-       asset.push_back (cpl);
-       asset.push_back (picture);
-       asset.push_back (sound);
-       dcp::write ("DCP", assets);
+       dcp::DCP dcp ("DCP");
+       dcp.add (cpl);
+       dcp.write_xml (dcp::SMPTE);
        
        return 0;
 }