diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-17 11:25:32 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-17 11:25:32 +0000 |
| commit | 1f8b45c7fd49714628009f5ed2161fbaa2b4d729 (patch) | |
| tree | ef5e6838ef5e2809e4e4bece606ee789df4df53d /src | |
| parent | a6b7ff4fc0ad2d05a7b9a9c56c0e0ec60ec44a4c (diff) | |
| parent | db6827cee87a7331e2adc91a852d85dc73856f4d (diff) | |
Merge master.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/po/fr_FR.po | 4 | ||||
| -rw-r--r-- | src/wx/film_viewer.cc | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po index 2b3bf7d5e..0a9936e4b 100644 --- a/src/lib/po/fr_FR.po +++ b/src/lib/po/fr_FR.po @@ -550,12 +550,12 @@ msgstr "Ajoutez un contenu pour créer le DCP" #: src/lib/image_content.cc:68 #, fuzzy msgid "[moving images]" -msgstr "%1 [diaporama]" +msgstr "[diaporama]" #: src/lib/image_content.cc:66 #, fuzzy msgid "[still]" -msgstr "%1 [fixe]" +msgstr "[fixe]" #: src/lib/film.cc:242 msgid "cannot contain slashes" diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 7e1b61811..b0bc65750 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -222,6 +222,11 @@ FilmViewer::slider_moved () { if (_film && _player) { try { + Time t = _slider->GetValue() * _film->length() / 4096; + /* Ensure that we hit the end of the film at the end of the slider */ + if (t >= _film->length ()) { + t = _film->length() - _film->video_frames_to_time (1); + } _player->seek (DCPTime (_film->length().get() * _slider->GetValue() / 4096), false); fetch_next_frame (); } catch (OpenFileError& e) { |