projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some comments for translators.
[dcpomatic.git]
/
src
/
lib
/
subtitle_content.cc
diff --git
a/src/lib/subtitle_content.cc
b/src/lib/subtitle_content.cc
index a10e23cafea324a48fe9333e4858c5b30f294771..2f4c88975cfa98bb55bddcfcc6e5919c12d38f00 100644
(file)
--- a/
src/lib/subtitle_content.cc
+++ b/
src/lib/subtitle_content.cc
@@
-24,7
+24,9
@@
#include "font.h"
#include "raw_convert.h"
#include <libcxml/cxml.h>
#include "font.h"
#include "raw_convert.h"
#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
#include <boost/foreach.hpp>
+#include <iostream>
#include "i18n.h"
#include "i18n.h"
@@
-43,6
+45,7
@@
int const SubtitleContentProperty::USE_SUBTITLES = 504;
int const SubtitleContentProperty::BURN_SUBTITLES = 505;
int const SubtitleContentProperty::SUBTITLE_LANGUAGE = 506;
int const SubtitleContentProperty::FONTS = 507;
int const SubtitleContentProperty::BURN_SUBTITLES = 505;
int const SubtitleContentProperty::SUBTITLE_LANGUAGE = 506;
int const SubtitleContentProperty::FONTS = 507;
+int const SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE = 508;
SubtitleContent::SubtitleContent (shared_ptr<const Film> film)
: Content (film)
SubtitleContent::SubtitleContent (shared_ptr<const Film> film)
: Content (film)
@@
-268,6
+271,13
@@
SubtitleContent::identifier () const
<< "_" << raw_convert<string> (subtitle_x_offset())
<< "_" << raw_convert<string> (subtitle_y_offset());
<< "_" << 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.
*/
/* The language is for metadata only, and doesn't affect
how this content looks.
*/