From a5f9f8163ecb38a140cf623e141bea1d96866fe5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 26 Aug 2017 20:45:45 +0100
Subject: Stop player analysing audio even if it is configured automatically to
 happen.

---
 src/tools/dcpomatic_player.cc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index a0221424e..6753b5423 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -132,17 +132,15 @@ public:
 	{
 		_film.reset (new Film (optional<boost::filesystem::path>()));
 		shared_ptr<DCPContent> dcp (new DCPContent (_film, dir));
-		_film->examine_and_add_content (dcp);
+		_film->examine_and_add_content (dcp, true);
 
 		JobManager* jm = JobManager::instance ();
-		while (jm->work_to_do ()) {
+
+		while (jm->work_to_do() || signal_manager->ui_idle()) {
 			/* XXX: progress dialog */
-			while (signal_manager->ui_idle ()) {}
 			dcpomatic_sleep (1);
 		}
 
-		while (signal_manager->ui_idle ()) {}
-
 		DCPOMATIC_ASSERT (!jm->get().empty());
 
 		shared_ptr<Job> last = jm->get().back();
-- 
cgit v1.2.3