X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsubtitle_asset.h;h=59ed1165475a41d5ca7957f9428ced598c2508b5;hb=c763ce17ea1d2bf621a343c4893f5d0c390ec433;hp=c8100d58b1503939aa841a3ab4313dfbf06536e3;hpb=42a65cba0d8da23c12af52015e66cd9dc0b5a5fa;p=libdcp.git diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h index c8100d58..59ed1165 100644 --- a/src/subtitle_asset.h +++ b/src/subtitle_asset.h @@ -1,20 +1,34 @@ /* Copyright (C) 2012-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of libdcp. + + libdcp 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. - This program is distributed in the hope that it will be useful, + libdcp 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 this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + along with libdcp. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. */ #ifndef LIBDCP_SUBTITLE_ASSET_H @@ -23,29 +37,49 @@ #include "asset.h" #include "dcp_time.h" #include "subtitle_string.h" +#include "data.h" #include +#include +#include namespace xmlpp { class Element; } +struct interop_dcp_font_test; +struct smpte_dcp_font_test; +struct pull_fonts_test1; +struct pull_fonts_test2; +struct pull_fonts_test3; + namespace dcp { -class SubtitleString; +class SubtitleString; +class SubtitleImage; class FontNode; class TextNode; class SubtitleNode; class LoadFontNode; +namespace order { + class Part; + class Context; +} + /** @class SubtitleAsset * @brief A parent for classes representing a file containing subtitles. + * + * This class holds a list of Subtitle objects which it can extract + * from the appropriate part of either an Interop or SMPTE XML file. + * Its subclasses InteropSubtitleAsset and SMPTESubtitleAsset handle the + * differences between the two types. */ class SubtitleAsset : public Asset { public: SubtitleAsset (); - SubtitleAsset (boost::filesystem::path file); + explicit SubtitleAsset (boost::filesystem::path file); bool equals ( boost::shared_ptr, @@ -53,53 +87,99 @@ public: NoteHandler note ) const; - std::list subtitles_during (Time from, Time to) const; - std::list const & subtitles () const { + std::list > subtitles_during (Time from, Time to, bool starting) const; + std::list > const & subtitles () const { return _subtitles; } - void add (SubtitleString); + virtual void add (boost::shared_ptr); + virtual void add_font (std::string id, boost::filesystem::path file) = 0; + std::map fonts_with_load_ids () const; virtual void write (boost::filesystem::path) const = 0; - virtual Glib::ustring xml_as_string () const = 0; + virtual std::string xml_as_string () const = 0; Time latest_subtitle_out () const; virtual std::list > load_font_nodes () const = 0; protected: - void parse_common (boost::shared_ptr xml, std::list > font_nodes); - - virtual std::string pkl_type (Standard) const = 0; + friend struct ::interop_dcp_font_test; + friend struct ::smpte_dcp_font_test; - std::string asdcp_kind () const { - return "Subtitle"; - } + struct ParseState { + boost::optional font_id; + boost::optional size; + boost::optional aspect_adjust; + boost::optional italic; + boost::optional bold; + boost::optional underline; + boost::optional colour; + boost::optional effect; + boost::optional effect_colour; + boost::optional h_position; + boost::optional h_align; + boost::optional v_position; + boost::optional v_align; + boost::optional direction; + boost::optional