diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-30 12:53:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-30 12:53:33 +0100 |
| commit | c1d35fc679f63d8a2f80287b6c6a9af984a449f5 (patch) | |
| tree | 000b840b6211c28cde9d0dfc73dfb01118e150dc /src | |
| parent | ebabac1b19f7e039ed34f407a73f24dddaa4e493 (diff) | |
Prevent extra frame skip on setting up new video (#147).
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/film_viewer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 79642af9c..a5920b4bb 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -132,9 +132,9 @@ FilmViewer::film_changed (Film::Property p) if (_decoders.video == 0) { break; } + _decoders.video->set_subtitle_stream (_film->subtitle_stream()); _decoders.video->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3, _4)); _decoders.video->OutputChanged.connect (boost::bind (&FilmViewer::decoder_changed, this)); - _decoders.video->set_subtitle_stream (_film->subtitle_stream()); calculate_sizes (); get_frame (); _panel->Refresh (); @@ -436,7 +436,7 @@ FilmViewer::get_frame () _display_frame.reset (); return; } - + try { _got_frame = false; while (!_got_frame) { |