Merge master.

diff --git a/ChangeLog b/ChangeLog
index e70b7373e8d8059f212a3211b9aaddbbf3a6303a..2edfe0e121e482b7af60bd004a583fe869787501 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 
        * Add subtitle view.
 
+2014-03-17  Carl Hetherington  <cth@carlh.net>
+
+       * Improve behaviour of the position slider at the end of films.
+
+       * Version 1.66.2 released.
+
 2014-03-17  Carl Hetherington  <cth@carlh.net>
 
        * Improve appearance of config dialog on OS X.

diff --git a/debian/changelog b/debian/changelog
index 2a1593a5b45b02f6c82536dc11d7f22b031cfd65..c7b6fbebc0b949a10dab1dc1f2ccf1ba0da77577 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.66.1-1) UNRELEASED; urgency=low
+dcpomatic (1.66.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -105,8 +105,9 @@ dcpomatic (1.66.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Wed, 12 Mar 2014 00:12:04 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Mon, 17 Mar 2014 09:20:12 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 2b3bf7d5e30ca5a17f6b3143d8d676466a228198..0a9936e4b45dbaed443b249ec850ec54ab615d95 100644 (file)
--- 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 7e1b618119eec5367b0374fa09239886a3f12181..b0bc65750f71ea8e202d973a07792a858c814c13 100644 (file)
--- 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) {