Tidying.

[libdcp.git] / src / reel_closed_caption_asset.cc

diff --git a/src/reel_closed_caption_asset.cc b/src/reel_closed_caption_asset.cc
index 9ddd81a6602a2e1cddf586d86b2dfec051df05b6..3369fdd961f7a1ab8cdbbf78b646f6756ca757a6 100644 (file)
--- a/src/reel_closed_caption_asset.cc
+++ b/src/reel_closed_caption_asset.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,32 +31,37 @@
     files in the program, then also delete it here.
 */
 
+
 /** @file  src/reel_closed_caption_asset.cc
- *  @brief ReelClosedCaptionAsset class.
+ *  @brief ReelClosedCaptionAsset class
  */
 
+
 #include "subtitle_asset.h"
 #include "reel_closed_caption_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "dcp_assert.h"
 #include <libxml++/libxml++.h>
 
+
 using std::string;
 using std::pair;
 using std::make_pair;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using boost::optional;
 using namespace dcp;
 
-ReelClosedCaptionAsset::ReelClosedCaptionAsset (boost::shared_ptr<SubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point)
+
+ReelClosedCaptionAsset::ReelClosedCaptionAsset (std::shared_ptr<SubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point)
        : ReelAsset (asset->id(), edit_rate, intrinsic_duration, entry_point)
        , ReelMXF (asset, dynamic_pointer_cast<SMPTESubtitleAsset>(asset) ? dynamic_pointer_cast<SMPTESubtitleAsset>(asset)->key_id() : optional<string>())
 {
 
 }
 
-ReelClosedCaptionAsset::ReelClosedCaptionAsset (boost::shared_ptr<const cxml::Node> node)
+
+ReelClosedCaptionAsset::ReelClosedCaptionAsset (std::shared_ptr<const cxml::Node> node)
        : ReelAsset (node)
        , ReelMXF (node)
 {
@@ -64,51 +69,56 @@ ReelClosedCaptionAsset::ReelClosedCaptionAsset (boost::shared_ptr<const cxml::No
        node->done ();
 }
 
+
 string
 ReelClosedCaptionAsset::cpl_node_name (Standard standard) const
 {
        switch (standard) {
-       case INTEROP:
+       case Standard::INTEROP:
                return "cc-cpl:MainClosedCaption";
-       case SMPTE:
+       case Standard::SMPTE:
                return "tt:ClosedCaption";
        }
 
        DCP_ASSERT (false);
 }
 
+
 pair<string, string>
 ReelClosedCaptionAsset::cpl_node_namespace (Standard standard) const
 {
        switch (standard) {
-       case INTEROP:
+       case Standard::INTEROP:
                return make_pair ("http://www.digicine.com/PROTO-ASDCP-CC-CPL-20070926#", "cc-cpl");
-       case SMPTE:
+       case Standard::SMPTE:
                return make_pair ("http://www.smpte-ra.org/schemas/429-12/2008/TT", "tt");
        }
 
        DCP_ASSERT (false);
 }
 
+
 string
 ReelClosedCaptionAsset::key_type () const
 {
        return "MDSK";
 }
 
+
 xmlpp::Node *
 ReelClosedCaptionAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
-       xmlpp::Node* asset = write_to_cpl_asset (node, standard, hash());
+       auto asset = write_to_cpl_asset (node, standard, hash());
        write_to_cpl_mxf (asset);
 
        if (_language) {
-               asset->add_child("Language")->add_child_text(*_language);
+               asset->add_child("Language", "tt")->add_child_text(*_language);
        }
 
        return asset;
 }
 
+
 bool
 ReelClosedCaptionAsset::equals (shared_ptr<const ReelClosedCaptionAsset> other, EqualityOptions opt, NoteHandler note) const
 {