Fix font_id_map errors when importing DCP subtitles that have no

[dcpomatic.git] / src / lib / dcp_text_track.h

diff --git a/src/lib/dcp_text_track.h b/src/lib/dcp_text_track.h
index e6a146b3b1b1f8f919f7a0e7aa5d69e0565e654c..4b5ed4512e898b3b51aa934edb2615f5835b5971 100644 (file)
--- a/src/lib/dcp_text_track.h
+++ b/src/lib/dcp_text_track.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,24 +18,28 @@
 
 */
 
+
 #ifndef DCPOMATIC_DCP_TEXT_TRACK_H
 #define DCPOMATIC_DCP_TEXT_TRACK_H
 
-#include "warnings.h"
+
+#include <dcp/language_tag.h>
+#include <dcp/warnings.h>
 #include <libcxml/cxml.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
+
 
 class DCPTextTrack
 {
 public:
        DCPTextTrack () {}
        DCPTextTrack (cxml::ConstNodePtr node);
-       DCPTextTrack (std::string name_, std::string language_);
+       DCPTextTrack (std::string name_, boost::optional<dcp::LanguageTag> language_);
 
        std::string name;
-       std::string language;
+       boost::optional<dcp::LanguageTag> language;
 
        std::string summary () const;
        void as_xml (xmlpp::Element* parent) const;
@@ -45,4 +49,5 @@ bool operator== (DCPTextTrack const & a, DCPTextTrack const & b);
 bool operator!= (DCPTextTrack const & a, DCPTextTrack const & b);
 bool operator< (DCPTextTrack const & a, DCPTextTrack const & b);
 
+
 #endif