Add comment.

[libdcp.git] / src / dcp.cc

diff --git a/src/dcp.cc b/src/dcp.cc
index 27f3243eccb0c09022507f0990a65ace49e455f3..b6014941b823c03b3f37eb257e452a6473791342 100644 (file)
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -35,6 +35,7 @@
 #include "exceptions.h"
 #include "cpl.h"
 #include "pkl.h"
+#include "asset_map.h"
 
 using namespace std;
 using namespace boost;
@@ -53,37 +54,25 @@ DCP::DCP (string directory, string name, ContentKind content_kind, int fps, int
 void
 DCP::add_sound_asset (vector<string> const & files)
 {
-       filesystem::path p;
-       p /= _directory;
-       p /= "audio.mxf";
-       _assets.push_back (shared_ptr<SoundAsset> (new SoundAsset (files, p.string(), &Progress, _fps, _length)));
+       _assets.push_back (shared_ptr<SoundAsset> (new SoundAsset (files, _directory, "audio.mxf", &Progress, _fps, _length)));
 }
 
 void
 DCP::add_sound_asset (sigc::slot<string, Channel> get_path, int channels)
 {
-       filesystem::path p;
-       p /= _directory;
-       p /= "audio.mxf";
-       _assets.push_back (shared_ptr<SoundAsset> (new SoundAsset (get_path, p.string(), &Progress, _fps, _length, channels)));
+       _assets.push_back (shared_ptr<SoundAsset> (new SoundAsset (get_path, _directory, "audio.mxf", &Progress, _fps, _length, channels)));
 }
 
 void
 DCP::add_picture_asset (vector<string> const & files, int width, int height)
 {
-       filesystem::path p;
-       p /= _directory;
-       p /= "video.mxf";
-       _assets.push_back (shared_ptr<PictureAsset> (new PictureAsset (files, p.string(), &Progress, _fps, _length, width, height)));
+       _assets.push_back (shared_ptr<PictureAsset> (new PictureAsset (files, _directory, "video.mxf", &Progress, _fps, _length, width, height)));
 }
 
 void
 DCP::add_picture_asset (sigc::slot<string, int> get_path, int width, int height)
 {
-       filesystem::path p;
-       p /= _directory;
-       p /= "video.mxf";
-       _assets.push_back (shared_ptr<PictureAsset> (new PictureAsset (get_path, p.string(), &Progress, _fps, _length, width, height)));
+       _assets.push_back (shared_ptr<PictureAsset> (new PictureAsset (get_path, _directory, "video.mxf", &Progress, _fps, _length, width, height)));
 }
 
 void
@@ -273,7 +262,123 @@ DCP::DCP (string directory)
                }
        }
 
-       CPL cpl (cpl_file);
-       PKL pkl (pkl_file);
+       if (cpl_file.empty ()) {
+               throw FileError ("no CPL file found", "");
+       }
+
+       if (pkl_file.empty ()) {
+               throw FileError ("no PKL file found", "");
+       }
+
+       if (asset_map_file.empty ()) {
+               throw FileError ("no AssetMap file found", "");
+       }
+
+       /* Read the XML */
+       shared_ptr<CPL> cpl;
+       try {
+               cpl.reset (new CPL (cpl_file));
+       } catch (FileError& e) {
+               throw FileError ("could not load CPL file", cpl_file);
+       }
+
+       shared_ptr<PKL> pkl;
+       try {
+               pkl.reset (new PKL (pkl_file));
+       } catch (FileError& e) {
+               throw FileError ("could not load PKL file", pkl_file);
+       }
+
+       shared_ptr<AssetMap> asset_map;
+       try {
+               asset_map.reset (new AssetMap (asset_map_file));
+       } catch (FileError& e) {
+               throw FileError ("could not load AssetMap file", asset_map_file);
+       }
+
+       /* Cross-check */
+       /* XXX */
+
+       /* Now cherry-pick the required bits into our own data structure */
+       
+       _name = cpl->annotation_text;
+       _content_kind = cpl->content_kind;
+
+       shared_ptr<CPLAssetList> cpl_assets = cpl->reels.front()->asset_list;
+
+       /* XXX */
+       _fps = cpl_assets->main_picture->frame_rate.numerator;
+       _length = cpl_assets->main_picture->duration;
+
+       _assets.push_back (shared_ptr<PictureAsset> (
+                                  new PictureAsset (
+                                          _directory,
+                                          cpl_assets->main_picture->annotation_text,
+                                          _fps,
+                                          _length,
+                                          cpl_assets->main_picture->screen_aspect_ratio.numerator,
+                                          cpl_assets->main_picture->screen_aspect_ratio.denominator
+                                          )
+                                  ));
+
+       if (cpl_assets->main_sound) {
+               _assets.push_back (shared_ptr<SoundAsset> (
+                                          new SoundAsset (
+                                                  _directory,
+                                                  cpl_assets->main_sound->annotation_text,
+                                                  _fps,
+                                                  _length
+                                                  )
+                                          ));
+       }
+}
+
+list<string>
+DCP::equals (DCP const & other, EqualityOptions opt) const
+{
+       list<string> notes;
+       
+       if (opt.flags & LIBDCP_METADATA) {
+               if (_name != other._name) {
+                       notes.push_back ("names differ");
+               }
+               if (_content_kind != other._content_kind) {
+                       notes.push_back ("content kinds differ");
+               }
+               if (_fps != other._fps) {
+                       notes.push_back ("frames per second differ");
+               }
+               if (_length != other._length) {
+                       notes.push_back ("lengths differ");
+               }
+       }
+
+       if (_assets.size() != other._assets.size()) {
+               notes.push_back ("asset counts differ");
+       }
+       
+       list<shared_ptr<Asset> >::const_iterator a = _assets.begin ();
+       list<shared_ptr<Asset> >::const_iterator b = other._assets.begin ();
+       
+       while (a != _assets.end ()) {
+               list<string> n = (*a)->equals (*b, opt);
+               notes.merge (n);
+               ++a;
+               ++b;
+       }
+
+       return notes;
 }
 
+shared_ptr<const PictureAsset>
+DCP::picture_asset () const
+{
+       for (list<shared_ptr<Asset> >::const_iterator i = _assets.begin(); i != _assets.end(); ++i) {
+               shared_ptr<PictureAsset> p = dynamic_pointer_cast<PictureAsset> (*i);
+               if (p) {
+                       return p;
+               }
+       }
+
+       return shared_ptr<const PictureAsset> ();
+}