Merge branch 'master' of /home/carl/git/dvdomatic

14 files changed, 9 insertions, 174 deletions

diff --git a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/0148cbf0-96d4-47a6-b8f9-2208b42e9f50/values b/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/0148cbf0-96d4-47a6-b8f9-2208b42e9f50/values
deleted file mode 100644
index fe73af0d3..000000000
--- a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/0148cbf0-96d4-47a6-b8f9-2208b42e9f50/values
+++ /dev/null
@@ -1,18 +0,0 @@
-creator: Carl Hetherington <cth@carlh.net>
-
-
-reporter: Carl Hetherington <cth@carlh.net>
-
-
-severity: minor
-
-
-status: fixed
-
-
-summary: UI and model go out of sync when creating a new film after having another
-  loaded
-
-
-time: Thu, 01 Nov 2012 02:44:14 +0000
-
diff --git a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/1c2591d1-0d87-43e7-bf1d-5d16c1c8a16e/values b/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/1c2591d1-0d87-43e7-bf1d-5d16c1c8a16e/values
deleted file mode 100644
index 0c8b6aa18..000000000
--- a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/1c2591d1-0d87-43e7-bf1d-5d16c1c8a16e/values
+++ /dev/null
@@ -1,17 +0,0 @@
-creator: Carl Hetherington <cth@carlh.net>
-
-
-reporter: Carl Hetherington <cth@carlh.net>
-
-
-severity: minor
-
-
-status: fixed
-
-
-summary: Dependent jobs are started when an earlier one fails
-
-
-time: Sun, 16 Sep 2012 12:17:18 +0000
-
diff --git a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/1db80a1e-53ce-4a5a-8873-932f1873f680/values b/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/1db80a1e-53ce-4a5a-8873-932f1873f680/values
deleted file mode 100644
index 67d0c2178..000000000
--- a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/1db80a1e-53ce-4a5a-8873-932f1873f680/values
+++ /dev/null
@@ -1,17 +0,0 @@
-creator: Carl Hetherington <cth@carlh.net>
-
-
-reporter: Carl Hetherington <cth@carlh.net>
-
-
-severity: minor
-
-
-status: open
-
-
-summary: Allow import of SMPTE XML subtitle files
-
-
-time: Sun, 21 Oct 2012 19:04:41 +0000
-
diff --git a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/53c8f102-7b42-456a-86e2-3e99de0bd883/values b/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/53c8f102-7b42-456a-86e2-3e99de0bd883/values
deleted file mode 100644
index ec3780386..000000000
--- a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/53c8f102-7b42-456a-86e2-3e99de0bd883/values
+++ /dev/null
@@ -1,17 +0,0 @@
-creator: Carl Hetherington <cth@carlh.net>
-
-
-reporter: Carl Hetherington <cth@carlh.net>
-
-
-severity: minor
-
-
-status: fixed
-
-
-summary: Add option to select soundtrack if there is more than one
-
-
-time: Mon, 17 Sep 2012 13:45:16 +0000
-
diff --git a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/666e8ba3-f1a3-4245-9d00-9a3a5e048ed9/values b/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/666e8ba3-f1a3-4245-9d00-9a3a5e048ed9/values
deleted file mode 100644
index 26a0240ff..000000000
--- a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/666e8ba3-f1a3-4245-9d00-9a3a5e048ed9/values
+++ /dev/null
@@ -1,17 +0,0 @@
-creator: Carl Hetherington <cth@carlh.net>
-
-
-reporter: Carl Hetherington <cth@carlh.net>
-
-
-severity: minor
-
-
-status: fixed
-
-
-summary: Re-setting content file runs thumb scan twice?
-
-
-time: Mon, 24 Sep 2012 09:42:18 +0000
-
diff --git a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/75a80a30-2a6d-4c2c-824b-25e5cc04df05/values b/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/75a80a30-2a6d-4c2c-824b-25e5cc04df05/values
deleted file mode 100644
index 4bebc66b3..000000000
--- a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/75a80a30-2a6d-4c2c-824b-25e5cc04df05/values
+++ /dev/null
@@ -1,18 +0,0 @@
-creator: Carl Hetherington <cth@carlh.net>
-
-
-reporter: Carl Hetherington <cth@carlh.net>
-
-
-severity: minor
-
-
-status: open
-
-
-summary: Allow parallel encodes with the content file on the client for low-network-bandwidth
-  situations
-
-
-time: Tue, 30 Oct 2012 01:50:16 +0000
-
diff --git a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/a9aac2c5-74ba-4e8f-938a-b01a1f40df7b/values b/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/a9aac2c5-74ba-4e8f-938a-b01a1f40df7b/values
deleted file mode 100644
index d904c6ba0..000000000
--- a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/a9aac2c5-74ba-4e8f-938a-b01a1f40df7b/values
+++ /dev/null
@@ -1,17 +0,0 @@
-creator: Carl Hetherington <cth@carlh.net>
-
-
-reporter: Carl Hetherington <cth@carlh.net>
-
-
-severity: minor
-
-
-status: fixed
-
-
-summary: Subtitle checkbox sensitivity not setup on creating a new film, perhaps
-
-
-time: Thu, 01 Nov 2012 02:49:18 +0000
-
diff --git a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/af43139c-88e2-4665-94d5-dd8afa07c51a/values b/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/af43139c-88e2-4665-94d5-dd8afa07c51a/values
deleted file mode 100644
index 6eeab71e9..000000000
--- a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/af43139c-88e2-4665-94d5-dd8afa07c51a/values
+++ /dev/null
@@ -1,17 +0,0 @@
-creator: Carl Hetherington <cth@carlh.net>
-
-
-reporter: Carl Hetherington <cth@carlh.net>
-
-
-severity: minor
-
-
-status: open
-
-
-summary: Allow use of externally-generated audio rather than that from the movie
-
-
-time: Sun, 21 Oct 2012 19:02:08 +0000
-
diff --git a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/cc075bd0-4641-4b2c-83b1-4adb05433f71/values b/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/cc075bd0-4641-4b2c-83b1-4adb05433f71/values
deleted file mode 100644
index 84f8f83bf..000000000
--- a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/cc075bd0-4641-4b2c-83b1-4adb05433f71/values
+++ /dev/null
@@ -1,17 +0,0 @@
-creator: Carl Hetherington <cth@carlh.net>
-
-
-reporter: Carl Hetherington <cth@carlh.net>
-
-
-severity: minor
-
-
-status: fixed
-
-
-summary: Do the delay line in deinterleaved floats to simplify code.
-
-
-time: Mon, 22 Oct 2012 13:27:50 +0000
-
diff --git a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/e6b5de1f-5dbe-42f2-b103-e8bb680c4140/values b/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/e6b5de1f-5dbe-42f2-b103-e8bb680c4140/values
deleted file mode 100644
index 7abb73256..000000000
--- a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/e6b5de1f-5dbe-42f2-b103-e8bb680c4140/values
+++ /dev/null
@@ -1,17 +0,0 @@
-creator: Carl Hetherington <cth@carlh.net>
-
-
-reporter: Carl Hetherington <cth@carlh.net>
-
-
-severity: minor
-
-
-status: fixed
-
-
-summary: Decoder should use its own methods more than FilmState
-
-
-time: Mon, 22 Oct 2012 13:28:57 +0000
-
diff --git a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/settings b/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/settings
deleted file mode 100644
index e69de29bb..000000000
--- a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/settings
+++ /dev/null
diff --git a/.be/version b/.be/version
deleted file mode 100644
index e7aade483..000000000
--- a/.be/version
+++ /dev/null
@@ -1 +0,0 @@
-Bugs Everywhere Directory v1.4
diff --git a/src/lib/job.cc b/src/lib/job.cc
index 201397f08..896862d14 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -75,6 +75,12 @@ Job::run_wrapper ()
 		set_state (FINISHED_ERROR);
 		set_error (e.what ());
 
+	} catch (...) {
+
+		set_progress (1);
+		set_state (FINISHED_ERROR);
+		set_error ("unknown exception");
+
 	}
 }
 
diff --git a/src/lib/make_dcp_job.cc b/src/lib/make_dcp_job.cc
index 026724806..65cd272e7 100644
--- a/src/lib/make_dcp_job.cc
+++ b/src/lib/make_dcp_job.cc
@@ -103,7 +103,7 @@ MakeDCPJob::run ()
 	
 	dcp.add_cpl (cpl);
 
-	descend (0.9);
+	descend (0.8);
 	shared_ptr<libdcp::MonoPictureAsset> pa (
 		new libdcp::MonoPictureAsset (
 			boost::bind (&MakeDCPJob::j2c_path, this, _1),
@@ -137,8 +137,10 @@ MakeDCPJob::run ()
 		ascend ();
 	}
 
+	descend (0.1);
 	cpl->add_reel (shared_ptr<libdcp::Reel> (new libdcp::Reel (pa, sa, shared_ptr<libdcp::SubtitleAsset> ())));
 	dcp.write_xml ();
+	ascend ();
 
 	set_progress (1);
 	set_state (FINISHED_OK);