X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsubtitle_asset.h;h=60ddc357d72da3d7bd58e191030677ec023fe151;hb=d95eacd3851a20e52202465ec22b4f72a4983dc8;hp=1b834522abff14126c6597143e19208b4d677c55;hpb=af9b2212f0d8f8c1f53aaf29e520b812dfdc321c;p=libdcp.git diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h index 1b834522..60ddc357 100644 --- a/src/subtitle_asset.h +++ b/src/subtitle_asset.h @@ -1,238 +1,198 @@ /* - Copyright (C) 2012 Carl Hetherington + 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. */ -#include "asset.h" -#include "xml.h" -#include "dcp_time.h" - -namespace libdcp -{ +#ifndef LIBDCP_SUBTITLE_ASSET_H +#define LIBDCP_SUBTITLE_ASSET_H -class FontNode; -class TextNode : public XMLNode -{ -public: - TextNode () {} - TextNode (xmlpp::Node const * node); - - float v_position; - VAlign v_align; - std::string text; - std::list > font_nodes; -}; - -class SubtitleNode : public XMLNode -{ -public: - SubtitleNode () {} - SubtitleNode (xmlpp::Node const * node); +#include "array_data.h" +#include "asset.h" +#include "dcp_time.h" +#include "subtitle_string.h" +#include +#include +#include - Time in; - Time out; - Time fade_up_time; - Time fade_down_time; - std::list > font_nodes; - std::list > text_nodes; +namespace xmlpp { + class Element; +} -private: - Time fade_time (std::string name); -}; +struct interop_dcp_font_test; +struct smpte_dcp_font_test; +struct pull_fonts_test1; +struct pull_fonts_test2; +struct pull_fonts_test3; -class FontNode : public XMLNode +namespace dcp { -public: - FontNode () {} - FontNode (xmlpp::Node const * node); - FontNode (std::list > const & font_nodes); - - std::string text; - std::string id; - int size; - boost::optional italic; - boost::optional color; - boost::optional effect; - boost::optional effect_color; - - std::list > subtitle_nodes; - std::list > font_nodes; - std::list > text_nodes; -}; -class LoadFontNode : public XMLNode -{ -public: - LoadFontNode () {} - LoadFontNode (xmlpp::Node const * node); +class SubtitleString; +class SubtitleImage; +class FontNode; +class TextNode; +class SubtitleNode; +class LoadFontNode; - std::string id; - std::string uri; -}; +namespace order { + class Part; + struct Context; +} -class Subtitle +/** @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: - Subtitle ( - std::string font, - bool italic, - Color color, - int size, - Time in, - Time out, - float v_position, - VAlign v_align, - std::string text, - Effect effect, - Color effect_color, - Time fade_up_time, - Time fade_down_time - ); - - std::string font () const { - return _font; - } - - bool italic () const { - return _italic; - } + SubtitleAsset (); + explicit SubtitleAsset (boost::filesystem::path file); - Color color () const { - return _color; - } + bool equals ( + std::shared_ptr, + EqualityOptions, + NoteHandler note + ) const; - Time in () const { - return _in; + std::vector> subtitles_during (Time from, Time to, bool starting) const; + std::vector> const & subtitles () const { + return _subtitles; } - Time out () const { - return _out; - } + virtual void add (std::shared_ptr); + virtual void add_font (std::string id, dcp::ArrayData data) = 0; + std::map font_data () const; + std::map font_filenames () const; - std::string text () const { - return _text; - } + virtual void write (boost::filesystem::path) const = 0; + virtual std::string xml_as_string () const = 0; - float v_position () const { - return _v_position; - } + Time latest_subtitle_out () const; - VAlign v_align () const { - return _v_align; - } + void fix_empty_font_ids (); - Effect effect () const { - return _effect; - } + virtual std::vector> load_font_nodes () const = 0; - Color effect_color () const { - return _effect_color; + std::string raw_xml () const { + return _raw_xml; } - Time fade_up_time () const { - return _fade_up_time; - } - - Time fade_down_time () const { - return _fade_down_time; - } - - int size () const { - return _size; - } - - int size_in_pixels (int screen_height) const; - -private: - std::string _font; - bool _italic; - Color _color; - int _size; - Time _in; - Time _out; - float _v_position; - VAlign _v_align; - std::string _text; - Effect _effect; - Color _effect_color; - Time _fade_up_time; - Time _fade_down_time; -}; - -bool operator== (Subtitle const & a, Subtitle const & b); -std::ostream& operator<< (std::ostream& s, Subtitle const & sub); - -class SubtitleAsset : public Asset -{ -public: - SubtitleAsset (std::string directory, std::string xml_file); - SubtitleAsset (std::string directory, std::string movie_title, std::string language); - - void write_to_cpl (std::ostream&) const; - virtual bool equals (boost::shared_ptr, EqualityOptions, std::list& notes) const { - /* XXX */ - notes.push_back ("subtitle assets not compared yet"); - return true; - } +protected: + friend struct ::interop_dcp_font_test; + friend struct ::smpte_dcp_font_test; - std::string language () const { - return _language; - } + 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