X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsubtitle_asset.h;h=9f137abe300c1c1aae52af0e0d8c65c522474af4;hb=9d3e7f716accd67985f23048b4c36e7581348848;hp=06b144f152e5c594daae0b234c5f8d0b781b773a;hpb=d1f0b2b71a702b5624485cfeacaee5d58c4af5b2;p=libdcp.git
diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index 06b144f1..9f137abe 100644
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -15,6 +15,20 @@
You should have received a copy of the GNU General Public License
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
@@ -34,20 +48,29 @@ namespace xmlpp {
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 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 SubtitleString objects which it can extract
+ * 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.
@@ -56,7 +79,7 @@ class SubtitleAsset : public Asset
{
public:
SubtitleAsset ();
- SubtitleAsset (boost::filesystem::path file);
+ explicit SubtitleAsset (boost::filesystem::path file);
bool equals (
boost::shared_ptr,
@@ -64,12 +87,12 @@ public:
NoteHandler note
) const;
- std::list subtitles_during (Time from, Time to, bool starting) const;
- std::list const & subtitles () const {
+ std::list > subtitles_during (Time from, Time to, bool starting) const;
+ std::list > const & subtitles () const {
return _subtitles;
}
- virtual 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;
@@ -78,22 +101,52 @@ public:
Time latest_subtitle_out () const;
+ void fix_empty_font_ids ();
+
virtual std::list > load_font_nodes () const = 0;
protected:
friend struct ::interop_dcp_font_test;
friend struct ::smpte_dcp_font_test;
- void parse_subtitles (
- boost::shared_ptr xml,
- std::list > font_nodes,
- std::list > subtitle_nodes
- );
+ 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