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
/
subrip_content.cc
diff --git
a/src/lib/subrip_content.cc
b/src/lib/subrip_content.cc
index 48d3528e14d881265dd93466b622038c207492a1..73499a5f69c384a17bc5e2ed39787afd31882af3 100644
(file)
--- a/
src/lib/subrip_content.cc
+++ b/
src/lib/subrip_content.cc
@@
-34,9
+34,9
@@
SubRipContent::SubRipContent (shared_ptr<const Film> film, boost::filesystem::pa
}
}
-SubRipContent::SubRipContent (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node, int)
+SubRipContent::SubRipContent (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node, int
version
)
: Content (film, node)
: Content (film, node)
- , SubtitleContent (film, node)
+ , SubtitleContent (film, node
, version
)
{
}
{
}
@@
-93,7
+93,8
@@
SubRipContent::identifier () const
stringstream s;
s << Content::identifier()
<< "_" << subtitle_scale()
stringstream s;
s << Content::identifier()
<< "_" << subtitle_scale()
- << "_" << subtitle_offset();
+ << "_" << subtitle_x_offset()
+ << "_" << subtitle_y_offset();
return s.str ();
}
return s.str ();
}