diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-06-01 13:03:38 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-06-07 17:01:06 +0200 |
| commit | 5a820bb8fae34591be5ac6d19a73461b9dab532a (patch) | |
| tree | 098e2dc959b6df0fefa62b2976976afc9f81b96b /src/lib/font_data.h | |
| parent | 9a7b67aee32a40539f29bc2d7017edd4a4f65f11 (diff) | |
Rearrange subtitle font management.
With this change each subtitle coming out of the player has a reference
to a dcpomatic::Font that belongs to the TextContent. This hopefully
solves a few problems which all basically stemmed from the fact that
previously the decoders/player were deciding what the font ID in the
output DCP would be - they can't do that properly.
Diffstat (limited to 'src/lib/font_data.h')
| -rw-r--r-- | src/lib/font_data.h | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/src/lib/font_data.h b/src/lib/font_data.h deleted file mode 100644 index 7bd6d4648..000000000 --- a/src/lib/font_data.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net> - - This file is part of DCP-o-matic. - - DCP-o-matic is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - DCP-o-matic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>. - -*/ - - -#ifndef DCPOMATIC_FONT_DATA_H -#define DCPOMATIC_FONT_DATA_H - - -#include <dcp/array_data.h> -#include <boost/optional.hpp> -#include <string> - - -namespace dcpomatic { - - -class Font; - - -/** A font (TTF) file held as a block of data */ -class FontData -{ -public: - FontData (std::shared_ptr<const Font> font); - - FontData (std::string id_, dcp::ArrayData data_) - : id(id_) - , data(data_) - {} - - /** <LoadFont> ID */ - std::string id; - boost::optional<dcp::ArrayData> data; -}; - - -extern bool operator== (FontData const& a, FontData const& b); -extern bool operator!= (FontData const& a, FontData const& b); - - -} - - -#endif |