diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-04 09:59:38 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-04 09:59:38 +0000 |
| commit | 4ba8772aef261da209bbb882325fd61a8b479fd7 (patch) | |
| tree | 7fe9e3976d52503b474cfa96716c1bd4535b8f8d /src/lib/subrip_content.cc | |
| parent | b299c1873bf23414061d551843275c77a9256a05 (diff) | |
| parent | eec6f90d8e2c2246ce674ae13e4f460b12a4f2a9 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/subrip_content.cc')
| -rw-r--r-- | src/lib/subrip_content.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc index 48d3528e1..73499a5f6 100644 --- 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) - , SubtitleContent (film, node) + , SubtitleContent (film, node, version) { } @@ -93,7 +93,8 @@ SubRipContent::identifier () const stringstream s; s << Content::identifier() << "_" << subtitle_scale() - << "_" << subtitle_offset(); + << "_" << subtitle_x_offset() + << "_" << subtitle_y_offset(); return s.str (); } |