*/
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
#include "subtitle_content.h"
#include "util.h"
#include "exceptions.h"
#include "safe_stringstream.h"
+#include "font.h"
+#include "raw_convert.h"
+#include <libcxml/cxml.h>
#include "i18n.h"
using std::string;
using std::vector;
using std::cout;
+using std::list;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
-using dcp::raw_convert;
int const SubtitleContentProperty::SUBTITLE_X_OFFSET = 500;
int const SubtitleContentProperty::SUBTITLE_Y_OFFSET = 501;
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;
SubtitleContent::SubtitleContent (shared_ptr<const Film> f)
: Content (f)
} else {
_subtitle_x_scale = _subtitle_y_scale = node->number_child<float> ("SubtitleScale");
}
+
+ _subtitle_language = node->optional_string_child ("SubtitleLanguage").get_value_or ("");
+
+ list<cxml::NodePtr> fonts = node->node_children ("Font");
+ for (list<cxml::NodePtr>::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
+ _fonts.push_back (shared_ptr<Font> (new Font (*i)));
+ }
}
SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
: Content (f, c)
{
shared_ptr<SubtitleContent> ref = dynamic_pointer_cast<SubtitleContent> (c[0]);
- assert (ref);
+ 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]);
if (sc->subtitle_y_scale() != ref->subtitle_y_scale()) {
throw JoinError (_("Content to be joined must have the same subtitle Y scale."));
}
+
+ list<shared_ptr<Font> > fonts = sc->fonts ();
+ if (fonts.size() != ref_fonts.size()) {
+ throw JoinError (_("Content to be joined must use the same fonts."));
+ }
+
+ list<shared_ptr<Font> >::const_iterator j = ref_fonts.begin ();
+ list<shared_ptr<Font> >::const_iterator k = fonts.begin ();
+
+ while (j != ref_fonts.end ()) {
+ if (**j != **k) {
+ throw JoinError (_("Content to be joined must use the same fonts."));
+ }
+ ++j;
+ ++k;
+ }
}
_use_subtitles = ref->use_subtitles ();
_subtitle_y_offset = ref->subtitle_y_offset ();
_subtitle_x_scale = ref->subtitle_x_scale ();
_subtitle_y_scale = ref->subtitle_y_scale ();
+ _subtitle_language = ref->subtitle_language ();
+ _fonts = ref_fonts;
}
+/** _mutex must not be held on entry */
void
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("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));
root->add_child("SubtitleYScale")->add_child_text (raw_convert<string> (_subtitle_y_scale));
+ root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language);
+
+ for (list<shared_ptr<Font> >::const_iterator i = _fonts.begin(); i != _fonts.end(); ++i) {
+ (*i)->as_xml (root->add_child("Font"));
+ }
}
void
signal_changed (SubtitleContentProperty::SUBTITLE_Y_SCALE);
}
+void
+SubtitleContent::set_subtitle_language (string language)
+{
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ _subtitle_language = language;
+ }
+ signal_changed (SubtitleContentProperty::SUBTITLE_LANGUAGE);
+}
+
string
SubtitleContent::identifier () const
{
<< "_" << raw_convert<string> (subtitle_x_offset())
<< "_" << raw_convert<string> (subtitle_y_offset());
+ /* The language is for metadata only, and doesn't affect
+ how this content looks.
+ */
+
return s.str ();
}