#include "subtitle_content.h"
#include "util.h"
#include "exceptions.h"
+#include "safe_stringstream.h"
#include "i18n.h"
int const SubtitleContentProperty::SUBTITLE_X_OFFSET = 500;
int const SubtitleContentProperty::SUBTITLE_Y_OFFSET = 501;
-int const SubtitleContentProperty::SUBTITLE_SCALE = 502;
-int const SubtitleContentProperty::SUBTITLE_USE = 503;
+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;
+
+SubtitleContent::SubtitleContent (shared_ptr<const Film> f)
+ : Content (f)
+ , _use_subtitles (false)
+ , _subtitle_x_offset (0)
+ , _subtitle_y_offset (0)
+ , _subtitle_x_scale (1)
+ , _subtitle_y_scale (1)
+{
+
+}
SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::path p)
: Content (f, p)
- , _subtitle_use (false)
+ , _use_subtitles (false)
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
- , _subtitle_scale (1)
+ , _subtitle_x_scale (1)
+ , _subtitle_y_scale (1)
{
}
SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
: Content (f, node)
- , _subtitle_use (false)
+ , _use_subtitles (false)
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
- , _subtitle_scale (1)
+ , _subtitle_x_scale (1)
+ , _subtitle_y_scale (1)
{
+ if (version >= 32) {
+ _use_subtitles = node->bool_child ("UseSubtitles");
+ } else {
+ _use_subtitles = false;
+ }
+
if (version >= 7) {
- _subtitle_use = node->bool_child ("SubtitleUse");
_subtitle_x_offset = node->number_child<float> ("SubtitleXOffset");
_subtitle_y_offset = node->number_child<float> ("SubtitleYOffset");
} else {
_subtitle_y_offset = node->number_child<float> ("SubtitleOffset");
}
-
- _subtitle_scale = node->number_child<float> ("SubtitleScale");
+
+ if (version >= 10) {
+ _subtitle_x_scale = node->number_child<float> ("SubtitleXScale");
+ _subtitle_y_scale = node->number_child<float> ("SubtitleYScale");
+ } else {
+ _subtitle_x_scale = _subtitle_y_scale = node->number_child<float> ("SubtitleScale");
+ }
+
+ _subtitle_language = node->optional_string_child ("SubtitleLanguage").get_value_or ("");
}
SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
for (size_t i = 0; i < c.size(); ++i) {
shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (c[i]);
- if (sc->subtitle_use() != ref->subtitle_use()) {
+ if (sc->use_subtitles() != ref->use_subtitles()) {
throw JoinError (_("Content to be joined must have the same 'use subtitles' setting."));
}
throw JoinError (_("Content to be joined must have the same subtitle Y offset."));
}
- if (sc->subtitle_scale() != ref->subtitle_scale()) {
- throw JoinError (_("Content to be joined must have the same subtitle scale."));
+ if (sc->subtitle_x_scale() != ref->subtitle_x_scale()) {
+ throw JoinError (_("Content to be joined must have the same subtitle X scale."));
+ }
+
+ if (sc->subtitle_y_scale() != ref->subtitle_y_scale()) {
+ throw JoinError (_("Content to be joined must have the same subtitle Y scale."));
}
}
- _subtitle_use = ref->subtitle_use ();
+ _use_subtitles = ref->use_subtitles ();
_subtitle_x_offset = ref->subtitle_x_offset ();
_subtitle_y_offset = ref->subtitle_y_offset ();
- _subtitle_scale = ref->subtitle_scale ();
+ _subtitle_x_scale = ref->subtitle_x_scale ();
+ _subtitle_y_scale = ref->subtitle_y_scale ();
+ _subtitle_language = ref->subtitle_language ();
}
void
SubtitleContent::as_xml (xmlpp::Node* root) const
{
- root->add_child("SubtitleUse")->add_child_text (raw_convert<string> (_subtitle_use));
+ 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("SubtitleScale")->add_child_text (raw_convert<string> (_subtitle_scale));
+ 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));
+<<<<<<< HEAD
+ if (_subtitle_language) {
+ root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language.get ());
+ }
+=======
+ root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language);
+>>>>>>> 30a2bb95980d74a33baeb18d18f2e4ac72d66845
}
void
-SubtitleContent::set_subtitle_use (bool u)
+SubtitleContent::set_use_subtitles (bool u)
{
{
boost::mutex::scoped_lock lm (_mutex);
- _subtitle_use = u;
+ _use_subtitles = u;
}
- signal_changed (SubtitleContentProperty::SUBTITLE_USE);
+ signal_changed (SubtitleContentProperty::USE_SUBTITLES);
}
void
}
void
-SubtitleContent::set_subtitle_scale (double s)
+SubtitleContent::set_subtitle_x_scale (double s)
{
{
boost::mutex::scoped_lock lm (_mutex);
- _subtitle_scale = s;
+ _subtitle_x_scale = s;
}
- signal_changed (SubtitleContentProperty::SUBTITLE_SCALE);
+ signal_changed (SubtitleContentProperty::SUBTITLE_X_SCALE);
+}
+
+void
+SubtitleContent::set_subtitle_y_scale (double s)
+{
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ _subtitle_y_scale = s;
+ }
+ 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
+{
+ SafeStringStream s;
+ s << Content::identifier()
+ << "_" << raw_convert<string> (subtitle_x_scale())
+ << "_" << raw_convert<string> (subtitle_y_scale())
+ << "_" << 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 ();
}