Missing file.

[libdcp.git] / src / cpl.cc

diff --git a/src/cpl.cc b/src/cpl.cc
index 38f22d9428a7ade0bff46f0cd41ebb17258ace8f..f807bc61c5cf00672b7e8ca2cf5d15b1db9e2860 100644 (file)
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     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 "cpl.h"
@@ -26,6 +40,7 @@
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "reel_subtitle_asset.h"
+#include "reel_closed_caption_asset.h"
 #include "reel_atmos_asset.h"
 #include "local_time.h"
 #include "dcp_assert.h"
@@ -35,8 +50,6 @@
 #include <boost/foreach.hpp>
 
 using std::string;
-using std::stringstream;
-using std::ostream;
 using std::list;
 using std::pair;
 using std::make_pair;
@@ -50,12 +63,12 @@ static string const cpl_interop_ns = "http://www.digicine.com/PROTO-ASDCP-CPL-20
 static string const cpl_smpte_ns   = "http://www.smpte-ra.org/schemas/429-7/2006/CPL";
 
 CPL::CPL (string annotation_text, ContentKind content_kind)
-       : _annotation_text (annotation_text)
-       /* default _content_title_text to _annotation_text */
-       , _content_title_text (annotation_text)
+       /* default _content_title_text to annotation_text */
+       : _content_title_text (annotation_text)
        , _content_kind (content_kind)
        , _content_version_id ("urn:uuid:" + make_uuid ())
 {
+       _metadata.annotation_text = annotation_text;
        /* default _content_version_id to a random ID and _content_version_label to
           a random ID and the current time.
        */
@@ -80,7 +93,7 @@ CPL::CPL (boost::filesystem::path file)
        }
 
        _id = remove_urn_uuid (f.string_child ("Id"));
-       _annotation_text = f.optional_string_child ("AnnotationText").get_value_or ("");
+       _metadata.annotation_text = f.optional_string_child ("AnnotationText").get_value_or ("");
        _metadata.issuer = f.optional_string_child ("Issuer").get_value_or ("");
        _metadata.creator = f.optional_string_child ("Creator").get_value_or ("");
        _metadata.issue_date = f.string_child ("IssueDate");
@@ -132,7 +145,7 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr<cons
        }
 
        root->add_child("Id")->add_child_text ("urn:uuid:" + _id);
-       root->add_child("AnnotationText")->add_child_text (_annotation_text);
+       root->add_child("AnnotationText")->add_child_text (_metadata.annotation_text);
        root->add_child("IssueDate")->add_child_text (_metadata.issue_date);
        root->add_child("Issuer")->add_child_text (_metadata.issuer);
        root->add_child("Creator")->add_child_text (_metadata.creator);
@@ -176,6 +189,9 @@ CPL::reel_assets () const
                if (i->main_subtitle ()) {
                        c.push_back (i->main_subtitle());
                }
+               if (i->closed_caption ()) {
+                       c.push_back (i->closed_caption());
+               }
                if (i->atmos ()) {
                        c.push_back (i->atmos());
                }
@@ -192,10 +208,9 @@ CPL::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler not
                return false;
        }
 
-       if (_annotation_text != other_cpl->_annotation_text && !opt.cpl_annotation_texts_can_differ) {
-               stringstream s;
-               s << "CPL: annotation texts differ: " << _annotation_text << " vs " << other_cpl->_annotation_text << "\n";
-               note (DCP_ERROR, s.str ());
+       if (_metadata.annotation_text != other_cpl->_metadata.annotation_text && !opt.cpl_annotation_texts_can_differ) {
+               string const s = "CPL: annotation texts differ: " + _metadata.annotation_text + " vs " + other_cpl->_metadata.annotation_text + "\n";
+               note (DCP_ERROR, s);
                return false;
        }