projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
subtitle_content.cc
diff --git
a/src/lib/subtitle_content.cc
b/src/lib/subtitle_content.cc
index 4c6e601926d2ebf096450a443ee7560bda152fba..8c94a94b995f7f35798dc3ec06f1a02a090890a4 100644
(file)
--- a/
src/lib/subtitle_content.cc
+++ b/
src/lib/subtitle_content.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-18,6
+18,7
@@
*/
#include <libcxml/cxml.h>
*/
#include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
#include "subtitle_content.h"
#include "util.h"
#include "exceptions.h"
#include "subtitle_content.h"
#include "util.h"
#include "exceptions.h"
@@
-25,18
+26,31
@@
#include "i18n.h"
using std::string;
#include "i18n.h"
using std::string;
+using std::stringstream;
using std::vector;
using std::cout;
using boost::shared_ptr;
using std::vector;
using std::cout;
using boost::shared_ptr;
-using boost::lexical_cast;
using boost::dynamic_pointer_cast;
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_SCALE = 502;
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;
+
+SubtitleContent::SubtitleContent (shared_ptr<const Film> f)
+ : Content (f)
+ , _subtitle_use (false)
+ , _subtitle_x_offset (0)
+ , _subtitle_y_offset (0)
+ , _subtitle_scale (1)
+{
+
+}
SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::path p)
: Content (f, p)
SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::path p)
: Content (f, p)
+ , _subtitle_use (false)
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
, _subtitle_scale (1)
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
, _subtitle_scale (1)
@@
-44,15
+58,15
@@
SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::p
}
}
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f,
shared_ptr<const cxml::Node>
node, int version)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> f,
cxml::ConstNodePtr
node, int version)
: Content (f, node)
: Content (f, node)
+ , _subtitle_use (false)
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
, _subtitle_scale (1)
{
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
, _subtitle_scale (1)
{
- LocaleGuard lg;
-
if (version >= 7) {
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_x_offset = node->number_child<float> ("SubtitleXOffset");
_subtitle_y_offset = node->number_child<float> ("SubtitleYOffset");
} else {
@@
-71,6
+85,10
@@
SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Co
for (size_t i = 0; i < c.size(); ++i) {
shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (c[i]);
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()) {
+ throw JoinError (_("Content to be joined must have the same 'use 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_x_offset() != ref->subtitle_x_offset()) {
throw JoinError (_("Content to be joined must have the same subtitle X offset."));
}
@@
-84,6
+102,7
@@
SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Co
}
}
}
}
+ _subtitle_use = ref->subtitle_use ();
_subtitle_x_offset = ref->subtitle_x_offset ();
_subtitle_y_offset = ref->subtitle_y_offset ();
_subtitle_scale = ref->subtitle_scale ();
_subtitle_x_offset = ref->subtitle_x_offset ();
_subtitle_y_offset = ref->subtitle_y_offset ();
_subtitle_scale = ref->subtitle_scale ();
@@
-92,13
+111,22
@@
SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Co
void
SubtitleContent::as_xml (xmlpp::Node* root) const
{
void
SubtitleContent::as_xml (xmlpp::Node* root) const
{
- LocaleGuard lg;
-
- root->add_child("SubtitleXOffset")->add_child_text (lexical_cast<string> (_subtitle_x_offset));
- root->add_child("SubtitleYOffset")->add_child_text (lexical_cast<string> (_subtitle_y_offset));
- root->add_child("SubtitleScale")->add_child_text (lexical_cast<string> (_subtitle_scale));
+ root->add_child("SubtitleUse")->add_child_text (raw_convert<string> (_subtitle_use));
+ 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));
}
}
+void
+SubtitleContent::set_subtitle_use (bool u)
+{
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ _subtitle_use = u;
+ }
+ signal_changed (SubtitleContentProperty::SUBTITLE_USE);
+}
+
void
SubtitleContent::set_subtitle_x_offset (double o)
{
void
SubtitleContent::set_subtitle_x_offset (double o)
{
@@
-128,3
+156,15
@@
SubtitleContent::set_subtitle_scale (double s)
}
signal_changed (SubtitleContentProperty::SUBTITLE_SCALE);
}
}
signal_changed (SubtitleContentProperty::SUBTITLE_SCALE);
}
+
+string
+SubtitleContent::identifier () const
+{
+ stringstream s;
+ s << Content::identifier()
+ << "_" << raw_convert<string> (subtitle_scale())
+ << "_" << raw_convert<string> (subtitle_x_offset())
+ << "_" << raw_convert<string> (subtitle_y_offset());
+
+ return s.str ();
+}