Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0

[libdcp.git] / src / reel.cc

diff --git a/src/reel.cc b/src/reel.cc
index 772ac717409a3cbdd12897229121a6ea1ddae8b5..78be2293b46c8664ce47a155a8de547fa48d0c07 100644 (file)
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2014-2015 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/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "reel.h"
@@ -31,6 +45,7 @@
 #include "decrypted_kdm_key.h"
 #include "decrypted_kdm.h"
 #include "interop_subtitle_asset.h"
+#include "reel_atmos_asset.h"
 #include <libxml++/nodes/element.h>
 
 using std::string;
@@ -66,6 +81,11 @@ Reel::Reel (boost::shared_ptr<const cxml::Node> node)
                _main_subtitle.reset (new ReelSubtitleAsset (main_subtitle));
        }
 
+       shared_ptr<cxml::Node> atmos = asset_list->optional_node_child ("axd:AuxData");
+       if (atmos) {
+               _atmos.reset (new ReelAtmosAsset (atmos));
+       }
+
        node->ignore_child ("AnnotationText");
        node->done ();
 }
@@ -94,6 +114,10 @@ Reel::write_to_cpl (xmlpp::Element* node, Standard standard) const
                /* ... but stereo pictures must come after */
                _main_picture->write_to_cpl (asset_list, standard);
        }
+
+       if (_atmos) {
+               _atmos->write_to_cpl (asset_list, standard);
+       }
 }
 
 bool
@@ -126,13 +150,26 @@ Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, NoteHand
                return false;
        }
 
+       if ((_atmos && !other->_atmos) || (!_atmos && other->_atmos)) {
+               note (DCP_ERROR, "Reel: assets differ");
+               return false;
+       }
+
+       if (_atmos && !_atmos->equals (other->_atmos, opt, note)) {
+               return false;
+       }
+
        return true;
 }
 
 bool
 Reel::encrypted () const
 {
-       return ((_main_picture && _main_picture->encrypted ()) || (_main_sound && _main_sound->encrypted ()));
+       return (
+               (_main_picture && _main_picture->encrypted ()) ||
+               (_main_sound && _main_sound->encrypted ()) ||
+               (_atmos && _atmos->encrypted ())
+               );
 }
 
 void
@@ -141,12 +178,15 @@ Reel::add (DecryptedKDM const & kdm)
        list<DecryptedKDMKey> keys = kdm.keys ();
 
        for (list<DecryptedKDMKey>::iterator i = keys.begin(); i != keys.end(); ++i) {
-               if (i->id() == _main_picture->key_id()) {
+               if (_main_picture && i->id() == _main_picture->key_id()) {
                        _main_picture->asset()->set_key (i->key ());
                }
-               if (i->id() == _main_sound->key_id()) {
+               if (_main_sound && i->id() == _main_sound->key_id()) {
                        _main_sound->asset()->set_key (i->key ());
                }
+               if (_atmos && i->id() == _atmos->key_id()) {
+                       _atmos->asset()->set_key (i->key ());
+               }
        }
 }
 
@@ -156,12 +196,15 @@ Reel::add (shared_ptr<ReelAsset> asset)
        shared_ptr<ReelPictureAsset> p = dynamic_pointer_cast<ReelPictureAsset> (asset);
        shared_ptr<ReelSoundAsset> so = dynamic_pointer_cast<ReelSoundAsset> (asset);
        shared_ptr<ReelSubtitleAsset> su = dynamic_pointer_cast<ReelSubtitleAsset> (asset);
+       shared_ptr<ReelAtmosAsset> a = dynamic_pointer_cast<ReelAtmosAsset> (asset);
        if (p) {
                _main_picture = p;
        } else if (so) {
                _main_sound = so;
        } else if (su) {
                _main_subtitle = su;
+       } else if (a) {
+               _atmos = a;
        }
 }
 
@@ -185,6 +228,10 @@ Reel::resolve_refs (list<shared_ptr<Asset> > assets)
                        iop->resolve_fonts (assets);
                }
        }
+
+       if (_atmos) {
+               _atmos->asset_ref().resolve (assets);
+       }
 }
 
 int64_t
@@ -201,6 +248,9 @@ Reel::duration () const
        if (_main_subtitle) {
                d = max (d, _main_subtitle->duration ());
        }
+       if (_atmos) {
+               d = max (d, _atmos->duration ());
+       }
 
        return d;
 }