summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-08-26 20:45:45 +0100
committerCarl Hetherington <cth@carlh.net>2017-08-26 20:45:45 +0100
commita5f9f8163ecb38a140cf623e141bea1d96866fe5 (patch)
tree6bcc05e9bd7d92d2bf0f6ca655d255ed9059b1f9 /src/tools
parenta6533bd9d37d217035421977d3f0dec86f7a91a1 (diff)
Stop player analysing audio even if it is configured automatically to happen.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/dcpomatic_player.cc8
1 files changed, 3 insertions, 5 deletions
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();