summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-14 16:50:08 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-14 16:50:08 +0100
commita066feba1b455a72fe10b7baa79f17f69cd24ba9 (patch)
treeba2ee6308f200c42870d42b7c716fddf941f8c31 /src/wx
parent27fac0b4c6d42cb3b47bc1240d50ce11923fb66a (diff)
Various fixes to subtitling.
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/film_viewer.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index bfeb44cb9..bf082adc2 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -179,7 +179,7 @@ private:
for (list<SubtitleView>::iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
i->transformed_area = transformed_subtitle_area (
- x_scale, y_scale, i->base_area, _film->state_copy()
+ x_scale, y_scale, i->base_area, _film->subtitle_offset(), _film->subtitle_scale()
);
i->transformed_image = i->base_image;
@@ -328,6 +328,7 @@ FilmViewer::update_thumbs ()
o->apply_crop = false;
o->decode_audio = false;
o->decode_video_frequency = 128;
+ o->decode_subtitles = true;
shared_ptr<Job> j (new ThumbsJob (s, o, _film->log(), shared_ptr<Job> ()));
j->Finished.connect (sigc::mem_fun (_film, &Film::update_thumbs_post_gui));