Fix typo causing incorrectly timed subtitles when their content

position is non-zero.

Reported-by: Thierry Journet

diff --git a/ChangeLog b/ChangeLog
index 19beeb5d9d667bef0905743cbfa08968cff46d16..84efa7546d905ad2bd4811d462be6c5909e84c28 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-29  Carl Hetherington  <cth@carlh.net>
+
+       * Fix missing subtitles when subtitled content is at a non-zero position.
+
 2014-01-28  Carl Hetherington  <cth@carlh.net>
 
        * Use Mbit/s instead of the incorrect MBps.

diff --git a/src/lib/player.cc b/src/lib/player.cc
index ce51097334be3e6a48107033e8446568d2dc0c4f..1c54d0fc5d4a3259f7f44b082e9d9dfd6bf83f12 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -695,7 +695,7 @@ Player::update_subtitle ()
                to = rint (to * vc->video_frame_rate() / _film->video_frame_rate());
        }
        
-       _out_subtitle.from = from * piece->content->position ();
+       _out_subtitle.from = from + piece->content->position ();
        _out_subtitle.to = to + piece->content->position ();
 }