Merge 1.70.0-hotfix branch into master.

5 files changed, 21 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 14032c101..a417575e5 100644
--- 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 7a38ec535..2cb6795fa 100644
--- 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 e847e623b..df3e63303 100644
--- 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 9c980b625..de215a0d2 100644
--- 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 2625ee852..9612821a1 100644
--- 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')