Remove unnecessary Content class.

[libdcp.git] / src / interop_subtitle_content.cc

diff --git a/src/interop_subtitle_content.cc b/src/interop_subtitle_content.cc
index 2ba698db1f10e7b3a7b91fac1be9cb6b7f93dd1d..29da0b21f93e3ea93a21967175ff0563d3bcb45a 100644 (file)
--- a/src/interop_subtitle_content.cc
+++ b/src/interop_subtitle_content.cc
@@ -22,7 +22,9 @@
 #include "xml.h"
 #include "raw_convert.h"
 #include "font_node.h"
+#include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
+#include <cmath>
 
 using std::list;
 using std::string;
@@ -93,6 +95,7 @@ InteropSubtitleContent::xml_as_string () const
        bool italic = false;
        Colour colour;
        int size = 0;
+       float aspect_adjust = 1.0;
        Effect effect = NONE;
        Colour effect_colour;
        int spot_number = 1;
@@ -112,11 +115,12 @@ InteropSubtitleContent::xml_as_string () const
                */
 
                bool const font_changed =
-                       font         != i->font()         ||
-                       italic       != i->italic()       ||
+                       font          != i->font()          ||
+                       italic        != i->italic()        ||
                        colour        != i->colour()        ||
-                       size         != i->size()         ||
-                       effect       != i->effect()       ||
+                       size          != i->size()          ||
+                       fabs (aspect_adjust - i->aspect_adjust()) > ASPECT_ADJUST_EPSILON ||
+                       effect        != i->effect()        ||
                        effect_colour != i->effect_colour();
 
                if (font_changed) {
@@ -124,6 +128,7 @@ InteropSubtitleContent::xml_as_string () const
                        italic = i->italic ();
                        colour = i->colour ();
                        size = i->size ();
+                       aspect_adjust = i->aspect_adjust ();
                        effect = i->effect ();
                        effect_colour = i->effect_colour ();
                }
@@ -136,6 +141,9 @@ InteropSubtitleContent::xml_as_string () const
                        font_element->set_attribute ("Italic", italic ? "yes" : "no");
                        font_element->set_attribute ("Color", colour.to_argb_string());
                        font_element->set_attribute ("Size", raw_convert<string> (size));
+                       if (fabs (aspect_adjust - 1.0) > ASPECT_ADJUST_EPSILON) {
+                               font_element->set_attribute ("AspectAdjust", raw_convert<string> (aspect_adjust));
+                       }
                        font_element->set_attribute ("Effect", effect_to_string (effect));
                        font_element->set_attribute ("EffectColor", effect_colour.to_argb_string());
                        font_element->set_attribute ("Script", "normal");
@@ -152,10 +160,10 @@ InteropSubtitleContent::xml_as_string () const
 
                        subtitle_element = font_element->add_child ("Subtitle");
                        subtitle_element->set_attribute ("SpotNumber", raw_convert<string> (spot_number++));
-                       subtitle_element->set_attribute ("TimeIn", i->in().to_string());
-                       subtitle_element->set_attribute ("TimeOut", i->out().to_string());
-                       subtitle_element->set_attribute ("FadeUpTime", raw_convert<string> (i->fade_up_time().to_editable_units(250)));
-                       subtitle_element->set_attribute ("FadeDownTime", raw_convert<string> (i->fade_down_time().to_editable_units(250)));
+                       subtitle_element->set_attribute ("TimeIn", i->in().as_string());
+                       subtitle_element->set_attribute ("TimeOut", i->out().as_string());
+                       subtitle_element->set_attribute ("FadeUpTime", raw_convert<string> (i->fade_up_time().as_editable_units(250)));
+                       subtitle_element->set_attribute ("FadeDownTime", raw_convert<string> (i->fade_down_time().as_editable_units(250)));
 
                        last_in = i->in ();
                        last_out = i->out ();
@@ -164,6 +172,12 @@ InteropSubtitleContent::xml_as_string () const
                }
 
                xmlpp::Element* text = subtitle_element->add_child ("Text");
+               if (i->h_align() != HALIGN_CENTER) {
+                       text->set_attribute ("HAlign", halign_to_string (i->h_align ()));
+               }
+               if (i->h_position() > ALIGN_EPSILON) {
+                       text->set_attribute ("HPosition", raw_convert<string> (i->h_position() * 100, 6));
+               }
                text->set_attribute ("VAlign", valign_to_string (i->v_align()));                
                text->set_attribute ("VPosition", raw_convert<string> (i->v_position() * 100, 6));
                text->add_child_text (i->text());
@@ -194,7 +208,7 @@ InteropSubtitleContent::equals (shared_ptr<const Asset> other_asset, EqualityOpt
        list<shared_ptr<InteropLoadFontNode> >::const_iterator j = other->_load_font_nodes.begin ();
 
        while (i != _load_font_nodes.end ()) {
-               if (j == _load_font_nodes.end ()) {
+               if (j == other->_load_font_nodes.end ()) {
                        note (DCP_ERROR, "<LoadFont> nodes differ");
                        return false;
                }