Merge branch 'master' into 2.0--libdcp-1.0

6 files changed, 27 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index e51740c33..a66eb71d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2014-02-12  Carl Hetherington  <cth@carlh.net>
+
+	* Make the batch converter remember its last directory
+	for the film picker (#318).
+
+	* Add dcpomatic_batch to OS X .app.
+
+2014-02-11  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.64.12 released.
+
 2014-02-11  Carl Hetherington  <cth@carlh.net>
 
 	* Be more careful when catching exceptions from KDM creation.
diff --git a/debian/changelog b/debian/changelog
index 0b4453a31..ec21747ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.64.11-1) UNRELEASED; urgency=low
+dcpomatic (1.64.12-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -92,8 +92,9 @@ dcpomatic (1.64.11-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 10 Feb 2014 20:09:25 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Tue, 11 Feb 2014 15:52:44 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 7a4d81a2b..7e9390e2c 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -41,6 +41,7 @@ function universal_copy {
 universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic $WORK/$macos
 universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_cli $WORK/$macos
 universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_server_cli $WORK/$macos
+universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_batch $WORK/$macos
 universal_copy $ROOT src/dcpomatic/build/src/lib/libdcpomatic.dylib $WORK/$libs
 universal_copy $ROOT src/dcpomatic/build/src/wx/libdcpomatic-wx.dylib $WORK/$libs
 universal_copy $ROOT lib/libcxml.dylib $WORK/$libs
diff --git a/run/dcpomatic b/run/dcpomatic
index 74181fcf8..f3f1b84ff 100755
--- a/run/dcpomatic
+++ b/run/dcpomatic
@@ -10,6 +10,9 @@ elif [ "$1" == "--valgrind" ]; then
 elif [ "$1" == "--callgrind" ]; then
     shift
     valgrind --tool="callgrind" build/src/tools/dcpomatic $*
+elif [ "$1" == "--massif" ]; then
+    shift
+    valgrind --tool="massif" build/src/tools/dcpomatic $*
 elif [ "$1" == "--i18n" ]; then
     shift
     LANGUAGE=de_DE.UTF8 LANG=de_DE.UTF8 LC_ALL=de_DE.UTF8 build/src/tools/dcpomatic "$*"
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index 41cb23e73..58fbaec98 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -168,6 +168,10 @@ private:
 	void add_film ()
 	{
 		wxDirDialog* c = new wxDirDialog (this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST);
+		if (_last_parent) {
+			c->SetPath (std_to_wx (_last_parent.get().string ()));
+		}
+		
 		int r;
 		while (1) {
 			r = c->ShowModal ();
@@ -190,8 +194,12 @@ private:
 			}
 		}
 
+		_last_parent = boost::filesystem::path (wx_to_std (c->GetPath ())).parent_path ();
+
 		c->Destroy ();
 	}
+
+	boost::optional<boost::filesystem::path> _last_parent;
 };
 
 static const wxCmdLineEntryDesc command_line_description[] = {
diff --git a/wscript b/wscript
index 86cddf7f2..a7a9922d6 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.64.11devel'
+VERSION = '1.64.12devel'
 
 def options(opt):
     opt.load('compiler_cxx')