projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename subtitle_use -> use_subtitles.
[dcpomatic.git]
/
src
/
lib
/
subtitle_content.cc
diff --git
a/src/lib/subtitle_content.cc
b/src/lib/subtitle_content.cc
index f839a56d0f6b60b008090b7d1d6756c1b06f34d5..3415ae613f5aee8175e122a9dea0d0517b791cf1 100644
(file)
--- a/
src/lib/subtitle_content.cc
+++ b/
src/lib/subtitle_content.cc
@@
-26,6
+26,7
@@
#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;
@@
-35,11
+36,21
@@
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;
+int const SubtitleContentProperty::USE_SUBTITLES = 503;
+
+SubtitleContent::SubtitleContent (shared_ptr<const Film> f)
+ : Content (f)
+ , _use_subtitles (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)
+ , _
use_subtitles
(false)
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
, _subtitle_scale (1)
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
, _subtitle_scale (1)
@@
-49,13
+60,13
@@
SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::p
SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
: Content (f, node)
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)
{
if (version >= 7) {
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
, _subtitle_scale (1)
{
if (version >= 7) {
- _
subtitle_use = node->bool_child ("SubtitleUse
");
+ _
use_subtitles = node->bool_child ("UseSubtitles
");
_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 {
@@
-74,7
+85,7
@@
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
()) {
+ 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 'use subtitles' setting."));
}
@@
-91,7
+102,7
@@
SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Co
}
}
}
}
- _
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_offset = ref->subtitle_x_offset ();
_subtitle_y_offset = ref->subtitle_y_offset ();
_subtitle_scale = ref->subtitle_scale ();
@@
-100,20
+111,20
@@
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
{
- 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));
}
void
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)
+SubtitleContent::set_
use_subtitles
(bool u)
{
{
boost::mutex::scoped_lock lm (_mutex);
{
{
boost::mutex::scoped_lock lm (_mutex);
- _
subtitle_use
= u;
+ _
use_subtitles
= u;
}
}
- signal_changed (SubtitleContentProperty::
SUBTITLE_USE
);
+ signal_changed (SubtitleContentProperty::
USE_SUBTITLES
);
}
void
}
void
@@
-145,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 ();
+}