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_id_map.cc | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 src/lib/font_id_map.cc (limited to 'src/lib/font_id_map.cc') diff --git a/src/lib/font_id_map.cc b/src/lib/font_id_map.cc new file mode 100644 index 000000000..15654db6b --- /dev/null +++ b/src/lib/font_id_map.cc @@ -0,0 +1,45 @@ +/* + Copyright (C) 2022 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 "dcpomatic_assert.h" +#include "font.h" +#include "font_id_map.h" + + +using std::shared_ptr; +using std::string; + + +std::string +FontIdMap::get(shared_ptr font) const +{ + auto iter = _map.find(font); + DCPOMATIC_ASSERT(iter != _map.end()); + return iter->second; +} + + +void +FontIdMap::put(shared_ptr font, string id) +{ + _map[font] = id; +} + -- cgit v1.2.3