#include "font.h"
#include "raw_convert.h"
#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
+#include <iostream>
#include "i18n.h"
int const SubtitleContentProperty::SUBTITLE_X_SCALE = 502;
int const SubtitleContentProperty::SUBTITLE_Y_SCALE = 503;
int const SubtitleContentProperty::USE_SUBTITLES = 504;
-int const SubtitleContentProperty::SUBTITLE_LANGUAGE = 505;
-int const SubtitleContentProperty::FONTS = 506;
+int const SubtitleContentProperty::BURN_SUBTITLES = 505;
+int const SubtitleContentProperty::SUBTITLE_LANGUAGE = 506;
+int const SubtitleContentProperty::FONTS = 507;
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f)
- : Content (f)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> film)
+ : Content (film)
, _use_subtitles (false)
+ , _burn_subtitles (false)
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
, _subtitle_x_scale (1)
}
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::path p)
- : Content (f, p)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> film, boost::filesystem::path p)
+ : Content (film, p)
, _use_subtitles (false)
+ , _burn_subtitles (false)
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
, _subtitle_x_scale (1)
}
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
- : Content (f, node)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
+ : Content (film, node)
, _use_subtitles (false)
+ , _burn_subtitles (false)
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
, _subtitle_x_scale (1)
{
if (version >= 32) {
_use_subtitles = node->bool_child ("UseSubtitles");
- } else {
- _use_subtitles = false;
+ _burn_subtitles = node->bool_child ("BurnSubtitles");
}
-
+
if (version >= 7) {
_subtitle_x_offset = node->number_child<float> ("SubtitleXOffset");
_subtitle_y_offset = node->number_child<float> ("SubtitleYOffset");
connect_to_fonts ();
}
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
- : Content (f, c)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
+ : Content (film, c)
{
shared_ptr<SubtitleContent> ref = dynamic_pointer_cast<SubtitleContent> (c[0]);
DCPOMATIC_ASSERT (ref);
list<shared_ptr<Font> > ref_fonts = ref->fonts ();
-
+
for (size_t i = 0; i < c.size(); ++i) {
shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (c[i]);
throw JoinError (_("Content to be joined must have the same 'use subtitles' setting."));
}
+ if (sc->burn_subtitles() != ref->burn_subtitles()) {
+ throw JoinError (_("Content to be joined must have the same 'burn subtitles' setting."));
+ }
+
if (sc->subtitle_x_offset() != ref->subtitle_x_offset()) {
throw JoinError (_("Content to be joined must have the same subtitle X offset."));
}
-
+
if (sc->subtitle_y_offset() != ref->subtitle_y_offset()) {
throw JoinError (_("Content to be joined must have the same subtitle Y offset."));
}
}
_use_subtitles = ref->use_subtitles ();
+ _burn_subtitles = ref->burn_subtitles ();
_subtitle_x_offset = ref->subtitle_x_offset ();
_subtitle_y_offset = ref->subtitle_y_offset ();
_subtitle_x_scale = ref->subtitle_x_scale ();
SubtitleContent::as_xml (xmlpp::Node* root) const
{
boost::mutex::scoped_lock lm (_mutex);
-
+
root->add_child("UseSubtitles")->add_child_text (raw_convert<string> (_use_subtitles));
+ root->add_child("BurnSubtitles")->add_child_text (raw_convert<string> (_burn_subtitles));
root->add_child("SubtitleXOffset")->add_child_text (raw_convert<string> (_subtitle_x_offset));
root->add_child("SubtitleYOffset")->add_child_text (raw_convert<string> (_subtitle_y_offset));
root->add_child("SubtitleXScale")->add_child_text (raw_convert<string> (_subtitle_x_scale));
}
signal_changed (SubtitleContentProperty::USE_SUBTITLES);
}
-
+
+void
+SubtitleContent::set_burn_subtitles (bool b)
+{
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ _burn_subtitles = b;
+ }
+ signal_changed (SubtitleContentProperty::BURN_SUBTITLES);
+}
+
void
SubtitleContent::set_subtitle_x_offset (double o)
{
<< "_" << raw_convert<string> (subtitle_x_offset())
<< "_" << raw_convert<string> (subtitle_y_offset());
+ /* XXX: I suppose really _fonts shouldn't be in here, since not all
+ types of subtitle content involve fonts.
+ */
+ BOOST_FOREACH (shared_ptr<Font> f, _fonts) {
+ s << f->file().get_value_or ("Default");
+ }
+
/* The language is for metadata only, and doesn't affect
how this content looks.
*/
signal_changed (SubtitleContentProperty::FONTS);
}
+bool
+SubtitleContent::has_subtitles () const
+{
+ return has_text_subtitles() || has_image_subtitles();
+}