Merge 1.70.0-hotfix branch into master.

diff --git a/ChangeLog b/ChangeLog
index 14032c101b52cf8100d6c00289940a29fe8d9aa1..a417575e5bf41be0b1c476923ea88e1888cd8d05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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..2cb6795fa2c6ed5bdb2776850297696b9be41599 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.70.1-1) UNRELEASED; urgency=low
+dcpomatic (1.71.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -164,7 +164,11 @@ dcpomatic (1.70.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
 
+<<<<<<< HEAD
  -- Carl Hetherington <carl@d1stkfactory>  Thu, 26 Jun 2014 19:30:39 +0100
+=======
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 27 Jun 2014 13:25:44 +0100
+>>>>>>> 1.70.0-hotfix
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index e847e623baf00d9f73150cc005c6e074dca4f4e6..df3e633036f174fe609f192f3f3eba370eed062f 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -362,6 +362,7 @@ Playlist::move_earlier (shared_ptr<Content> c)
        if (previous == _content.end ()) {
                return;
        }
+
        
        Time const p = (*previous)->position ();
        (*previous)->set_position (p + c->length_after_trim ());
@@ -390,7 +391,7 @@ Playlist::move_later (shared_ptr<Content> c)
 
        Time 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 9c980b62568dbe037fd2456e215f7a848bb57cda..de215a0d294298a484f6407715ef7d9bb9b55933 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -532,6 +532,8 @@ FilmEditor::film_content_changed (int property)
                setup_dcp_name ();
        } else if (property == ContentProperty::PATH) {
                setup_content ();
+       } else if (property == ContentProperty::POSITION) {
+               setup_content ();
        }
 }
 
@@ -753,6 +755,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 ();
@@ -761,7 +765,7 @@ FilmEditor::setup_content ()
                if (!valid) {
                        s = _("MISSING: ") + s;
                }
-                       
+
                _content->InsertItem (t, std_to_wx (s));
 
                if ((*i)->summary() == selected_summary) {

diff --git a/wscript b/wscript
index 2625ee852d16fb35db02b60fbb799aa4c508e4b2..9612821a10da50f762e91f067eb37a67df93d385 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.70.1devel'
+VERSION = '1.71.0devel'
 
 def options(opt):
     opt.load('compiler_cxx')