Merge master.

diff --git a/ChangeLog b/ChangeLog
index cb4d1c3c7d74511b0e682af494b31f1dfc8bb1c6..12d262f4b595944f1ba520248f0aa9335915ba0f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,31 @@
 
        * Add subtitle view.
 
+2014-06-30  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.72.0 released.
+
+2014-06-28  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.71.2 released.
+
+2014-06-28  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.71.1 released.
+
+2014-06-28  Carl Hetherington  <cth@carlh.net>
+
+       * Fix crash on analysing audio (and possibly DCP creation) with
+       resampled content.
+
+2014-06-27  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.71.0 released.
+
+2014-06-27  Carl Hetherington  <cth@carlh.net>
+
+       * Fix up/down buttons in content list.
+
 2014-06-26  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.70.1 released.

diff --git a/debian/changelog b/debian/changelog
index 7a38ec535fbcd49f43f487d721a886bbc7b91c6f..69508cb1036f9a412dbefbc172bd687c6d64c705 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.70.1-1) UNRELEASED; urgency=low
+dcpomatic (1.72.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -163,8 +163,10 @@ dcpomatic (1.70.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 26 Jun 2014 19:30:39 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Mon, 30 Jun 2014 10:43:16 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 002f89604289b108c1635c06ee28711610d3f127..0c70d4b3efc3d12c092dddda5ab72be55e970b58 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -529,6 +529,8 @@ FilmEditor::film_content_changed (int property)
                setup_dcp_name ();
        } else if (property == ContentProperty::PATH) {
                setup_content ();
+       } else if (property == ContentProperty::POSITION) {
+               setup_content ();
        }
 }
 
@@ -749,6 +751,8 @@ FilmEditor::setup_content ()
        _content->DeleteAllItems ();
 
        ContentList content = _film->content ();
+       sort (content.begin(), content.end(), ContentSorter ());
+       
        for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
                int const t = _content->GetItemCount ();
                bool const valid = (*i)->paths_valid ();
@@ -757,7 +761,7 @@ FilmEditor::setup_content ()
                if (!valid) {
                        s = _("MISSING: ") + s;
                }
-                       
+
                _content->InsertItem (t, std_to_wx (s));
 
                if ((*i)->summary() == selected_summary) {

diff --git a/src/wx/wscript b/src/wx/wscript
index bc21f9d81b22277723133598f748ad13ed05b08f..bb530989452cee3e6558a322f85cafb83197bde6 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -72,8 +72,8 @@ def configure(conf):
     conf.in_msg = 1
     wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip()
     conf.im_msg = 0
-    if wx_version != '3.0.0':
-        conf.fatal('wxwidgets version 3.0.0 is required; %s found' % wx_version)
+    if not wx_version.startswith('3.0.'):
+        conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version)
 
 def build(bld):
     if bld.env.BUILD_STATIC: