From 5a820bb8fae34591be5ac6d19a73461b9dab532a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 1 Jun 2022 13:03:38 +0200 Subject: 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. --- src/lib/font_data.cc | 55 ---------------------------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 src/lib/font_data.cc (limited to 'src/lib/font_data.cc') diff --git a/src/lib/font_data.cc b/src/lib/font_data.cc deleted file mode 100644 index 830b2da34..000000000 --- a/src/lib/font_data.cc +++ /dev/null @@ -1,55 +0,0 @@ -/* - Copyright (C) 2020-2021 Carl Hetherington - - 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 . - -*/ - - -#include "font.h" -#include "font_data.h" -#include "dcpomatic_assert.h" - - -using std::shared_ptr; - - -dcpomatic::FontData::FontData (shared_ptr font) - : id (font->id()) -{ - if (font->file()) { - data = dcp::ArrayData(font->file().get()); - } -} - - -bool -dcpomatic::operator== (FontData const& a, FontData const& b) -{ - if (a.id != b.id) { - return false; - } - - return a.data == b.data; -} - - -bool -dcpomatic::operator!= (FontData const& a, FontData const& b) -{ - return !(a == b); -} - -- cgit v1.2.3