Merge master.

diff --git a/ChangeLog b/ChangeLog
index b59b94c8cd70913d8a74bef9cb93ea8cdef3d621..61f558dcc3163a1534c7594393e62d61072ed98c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 
        * Add subtitle view.
 
+2014-07-10  Carl Hetherington  <cth@carlh.net>
+
+       * Try to fix corruption of KDM email setting in
+       some cases.
+
+       * Version 1.72.1 released.
+
+2014-07-08  Carl Hetherington  <cth@carlh.net>
+
+       * Fix various problems with seek and content
+       being trimmed when its video frame rate is
+       overridden.
+
 2014-07-02  Carl Hetherington  <cth@carlh.net>
 
        * Updated de_DE translation from Carsten Kurz.

diff --git a/debian/changelog b/debian/changelog
index 69508cb1036f9a412dbefbc172bd687c6d64c705..09662e58b5b27ba453f855894c351f0d076f9919 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.72.0-1) UNRELEASED; urgency=low
+dcpomatic (1.72.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -165,8 +165,9 @@ dcpomatic (1.72.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 30 Jun 2014 10:43:16 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 10 Jul 2014 15:37:26 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 1c65d1326b3d57e74e8b819553388c97bca94570..16c740943ca89f382f27082ba70a935d987c484b 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -393,7 +393,6 @@ Playlist::move_later (shared_ptr<Content> c)
                return;
        }
 
-       DCPTime const p = (*next)->position ();
        (*next)->set_position (c->position ());
        c->set_position (c->position() + c->length_after_trim ());
        sort (_content.begin(), _content.end(), ContentSorter ());

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index b25b470c1334ff920b95672eb6cdb2e8c66371f1..fc77b42a28903f2248ab77bad14bb16ab6c074c8 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -697,7 +697,7 @@ public:
                _kdm_cc->SetValue (std_to_wx (config->kdm_cc ()));
                _kdm_cc->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_cc_changed, this));
                _kdm_email->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_email_changed, this));
-               _kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ()));
+               _kdm_email->SetValue (std_to_wx (Config::instance()->kdm_email ()));
                _reset_kdm_email->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMEmailPage::reset_kdm_email, this));
 
                return panel;