diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-09 21:20:10 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-09 21:20:10 +0200 |
| commit | c27d14badb229c24533db65dbaee1939dce89455 (patch) | |
| tree | 250f422babe86b56bac69fe45142fd1fd4d0ec11 /src/lib/dcp_text_track.h | |
| parent | f10849bd52470a93f54bb90686aa9a3b1e72e796 (diff) | |
Make DCP text track language properly optional and ignore bad values on imported DCPs (#1950).
Diffstat (limited to 'src/lib/dcp_text_track.h')
| -rw-r--r-- | src/lib/dcp_text_track.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/dcp_text_track.h b/src/lib/dcp_text_track.h index e6a146b3b..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,24 +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; @@ -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 |