Merge branch '1.0' into 1.0-seek

7 files changed, 32 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 1f3097c87..3bbc4989e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2013-12-18  Carl Hetherington  <cth@carlh.net>
 
+	* Version 1.43 released.
+
+2013-12-18  Carl Hetherington  <cth@carlh.net>
+
+	* Update libdcp version to get fix for 3D IntrinsicDuration.
+
+	* Fix progress reporting when making 3D DCPs.
+
+	* Fix non-update of display when changing video frame type (2D,
+	3D left/right etc.)
+
+	* Restore video information in video tab when using still images.
+
 	* Hopefully fix exception on new film in some strange cases.
 
 2013-12-09  Carl Hetherington  <cth@carlh.net>
diff --git a/cscript b/cscript
index 531f71098..286b0112b 100644
--- a/cscript
+++ b/cscript
@@ -115,7 +115,7 @@ def make_control(version, bits, filename):
 
 def dependencies(target):
     return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'),
-            ('libdcp', 'v0.85'))
+            ('libdcp', 'v0.87'))
 
 def build(target):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
diff --git a/debian/changelog b/debian/changelog
index fe06438d2..f689a0a83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.42-1) UNRELEASED; urgency=low
+dcpomatic (1.43-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -46,8 +46,9 @@ dcpomatic (1.42-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 09 Dec 2013 11:22:42 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 18 Dec 2013 16:28:55 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/src/lib/player.cc b/src/lib/player.cc
index a79a4fc5e..f5bc68565 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -465,7 +465,8 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
 
 	if (
 		property == ContentProperty::POSITION || property == ContentProperty::LENGTH ||
-		property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END
+		property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END ||
+		property == VideoContentProperty::VIDEO_FRAME_TYPE 
 		) {
 		
 		_have_valid_pieces = false;
@@ -476,10 +477,7 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
 		update_subtitle ();
 		Changed (frequent);
 
-	} else if (
-		property == VideoContentProperty::VIDEO_FRAME_TYPE || property == VideoContentProperty::VIDEO_CROP ||
-		property == VideoContentProperty::VIDEO_RATIO
-		) {
+	} else if (property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_RATIO) {
 		
 		Changed (frequent);
 
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 4c9749d89..109447f73 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -274,9 +274,14 @@ try
 			if (_film->length()) {
 				shared_ptr<Job> job = _job.lock ();
 				assert (job);
-				job->set_progress (
-					float (_full_written + _fake_written + _repeat_written) / _film->time_to_video_frames (_film->length())
-					);
+				int total = _film->time_to_video_frames (_film->length ());
+				if (_film->three_d ()) {
+					/* _full_written and so on are incremented for each eye, so we need to double the total
+					   frames to get the correct progress.
+					*/
+					total *= 2;
+				}
+				job->set_progress (float (_full_written + _fake_written + _repeat_written) / total);
 			}
 		}
 
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 4605abae7..1bf092786 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -271,7 +271,7 @@ VideoPanel::edit_filters_clicked ()
 void
 VideoPanel::setup_description ()
 {
-	FFmpegContentList vc = _editor->selected_ffmpeg_content ();
+	VideoContentList vc = _editor->selected_video_content ();
 	if (vc.empty ()) {
 		_description->SetLabel ("");
 		return;
@@ -280,7 +280,7 @@ VideoPanel::setup_description ()
 		return;
 	}
 
-	shared_ptr<FFmpegContent> vcs = vc.front ();
+	shared_ptr<VideoContent> vcs = vc.front ();
 
 	wxString d;
 
diff --git a/wscript b/wscript
index 63b907ccb..489bfb689 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.43pre'
+VERSION = '1.44pre'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -88,7 +88,7 @@ def configure(conf):
 
     # Dependencies which are dynamically linked everywhere except --static
     # Get libs only when we are dynamically linking
-    conf.check_cfg(package='libdcp',        atleast_version='0.85', args=pkg_config_args(conf), uselib_store='DCP',  mandatory=True)
+    conf.check_cfg(package='libdcp',        atleast_version='0.87', args=pkg_config_args(conf), uselib_store='DCP',  mandatory=True)
     # Remove erroneous escaping of quotes from xmlsec1 defines
     conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
     conf.check_cfg(package='libcxml',       atleast_version='0.08', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True)