Merge branch '1.0' into 1.0-seek

12 files changed, 37 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index e1986b0fd..7feabc198 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-12-27  Carl Hetherington  <cth@carlh.net>
+
+	* Fix non-update of video information on changing DCP resolution (#299).
+
+	* Version 1.52 released.
+
+2013-12-27  Carl Hetherington  <cth@carlh.net>
+
+	* More speculative fixes for 4K.
+
 2013-12-23  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.51 released.
diff --git a/debian/changelog b/debian/changelog
index 46ba60fc4..adb947cb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.51-1) UNRELEASED; urgency=low
+dcpomatic (1.52-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -55,8 +55,9 @@ dcpomatic (1.51-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 23 Dec 2013 23:55:44 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 27 Dec 2013 12:17:11 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index e719d7ef4..00dc1ac74 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -197,6 +197,24 @@ DCPVideoFrame::encode_locally ()
 	parameters.tcp_numlayers++;
 	parameters.cp_disto_alloc = 1;
 	parameters.cp_rsiz = _resolution == RESOLUTION_2K ? CINEMA2K : CINEMA4K;
+	if (_resolution == RESOLUTION_4K) {
+		parameters.numpocs = 2;
+		parameters.POC[0].tile = 1;
+		parameters.POC[0].resno0 = 0; 
+		parameters.POC[0].compno0 = 0;
+		parameters.POC[0].layno1 = 1;
+		parameters.POC[0].resno1 = parameters.numresolution - 1;
+		parameters.POC[0].compno1 = 3;
+		parameters.POC[0].prg1 = CPRL;
+		parameters.POC[1].tile = 1;
+		parameters.POC[1].resno0 = parameters.numresolution - 1; 
+		parameters.POC[1].compno0 = 0;
+		parameters.POC[1].layno1 = 1;
+		parameters.POC[1].resno1 = parameters.numresolution;
+		parameters.POC[1].compno1 = 3;
+		parameters.POC[1].prg1 = CPRL;
+	}
+	
 	parameters.cp_comment = strdup (N_("DCP-o-matic"));
 	parameters.cp_cinema = _resolution == RESOLUTION_2K ? CINEMA2K_24 : CINEMA4K_24;
 
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 72fb56b4f..66f795ddf 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -552,6 +552,8 @@ private:
 			return;
 		}
 
+		maybe_save_then_delete_film ();
+
 		ev.Skip ();
 	}
 
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 14a997985..0d5ae7fd6 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -125,6 +125,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Randy Stankey"));
 	supported_by.Add (wxT ("Frank Cianciolo"));
 	supported_by.Add (wxT ("Rodolfo Giuliano"));
+	supported_by.Add (wxT ("Sylvain Mielle"));
 	add_section (_("Supported by"), supported_by);
 
 	sizer->Add (_notebook, wxSizerFlags().Centre().Border(wxALL, 16).Expand());
diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index 47a546a8d..fad545283 100644
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -29,7 +29,6 @@ using namespace boost;
 
 DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
 	: wxPanel (parent)
-	, _parent (parent)
 {
 	_sizer = new wxBoxSizer (wxHORIZONTAL);
 
diff --git a/src/wx/dir_picker_ctrl.h b/src/wx/dir_picker_ctrl.h
index 97c0d217a..8d596cefc 100644
--- a/src/wx/dir_picker_ctrl.h
+++ b/src/wx/dir_picker_ctrl.h
@@ -30,7 +30,6 @@ public:
 private:
 	void browse_clicked ();
 	
-	wxWindow* _parent;
 	wxStaticText* _folder;
 	wxButton* _browse;
 	wxString _path;
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 728098b93..1b3903929 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -284,7 +284,7 @@ FilmEditor::make_content_panel ()
 
 		s->Add (b, 0, wxALL, 4);
 
-		_content_sizer->Add (s, 0.75, wxEXPAND | wxALL, 6);
+		_content_sizer->Add (s, 1, wxEXPAND | wxALL, 6);
 	}
 
 	_sequence_video = new wxCheckBox (_content_panel, wxID_ANY, _("Keep video in sequence"));
diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 6a8bf03df..f95740255 100644
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -40,7 +40,6 @@ private:
 	wxSizer* _sizer;
 	wxPanel* _editable;
 	wxTextCtrl* _hours;
-	wxStaticText* _hours_label;
 	wxTextCtrl* _minutes;
 	wxTextCtrl* _seconds;
 	wxTextCtrl* _frames;
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index dd1064d9c..a777b3e88 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -211,6 +211,7 @@ VideoPanel::film_changed (Film::Property property)
 	switch (property) {
 	case Film::CONTAINER:
 	case Film::VIDEO_FRAME_RATE:
+	case Film::RESOLUTION:
 		setup_description ();
 		break;
 	default:
diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index fb1f98b29..2f0c97cb7 100644
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -47,7 +47,6 @@ private:
 	ContentSpinCtrl<VideoContent>*               _top_crop;
 	ContentSpinCtrl<VideoContent>*               _bottom_crop;
 	ContentChoice<VideoContent, Ratio const *>*  _ratio;
-	wxStaticText* _ratio_description;
 	wxStaticText* _description;
 	wxStaticText* _filters;
 	wxButton* _filters_button;
diff --git a/wscript b/wscript
index bfb7d8ecd..93dab6823 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.52pre'
+VERSION = '1.53pre'
 
 def options(opt):
     opt.load('compiler_cxx')