X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_text_track.h;h=b29d8c4894f2111e3c3bbfe005b91ef70717c13c;hb=2e2f11b29651cffe37c64275dbd45c7563310020;hp=913e77fa59cdb08f0500ebdf862a6dc2df8a4a88;hpb=1db0293ad36605da9ca8daa8736ef581f4f6a34e;p=dcpomatic.git

diff --git a/src/lib/dcp_text_track.h b/src/lib/dcp_text_track.h
index 913e77fa5..b29d8c489 100644
--- 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,21 +18,28 @@
 
 */
 
+
 #ifndef DCPOMATIC_DCP_TEXT_TRACK_H
 #define DCPOMATIC_DCP_TEXT_TRACK_H
 
+
+#include "warnings.h"
+#include <dcp/language_tag.h>
 #include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_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;
@@ -42,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