Extract Film::Property to its own header to (maybe) increase compilation speed.

[dcpomatic.git] / src / tools / dcpomatic_player.cc

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 56ab26be418ef5d8ef9c0790b1f157642b721973..c4f0e886c3ff43f15a4d43aea7159bd24039e229 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -254,6 +254,7 @@ public:
                } else {
                        _controls = new StandardControls (_overall_panel, _viewer, false);
                }
+               _controls->set_film(_viewer.film());
                _viewer.set_dcp_decode_reduction(Config::instance()->decode_reduction());
                _viewer.set_optimise_for_j2k(true);
                _viewer.PlaybackPermitted.connect(bind(&DOMFrame::playback_permitted, this));
@@ -453,9 +454,9 @@ public:
                _info->triggered_update ();
        }
 
-       void film_changed (ChangeType type, Film::Property property)
+       void film_changed (ChangeType type, FilmProperty property)
        {
-               if (type != ChangeType::DONE || property != Film::Property::CONTENT) {
+               if (type != ChangeType::DONE || property != FilmProperty::CONTENT) {
                        return;
                }
 
@@ -909,12 +910,12 @@ private:
                auto job = make_shared<VerifyDCPJob>(dcp->directories());
                VerifyDCPProgressDialog progress(this, _("DCP-o-matic Player"));
                bool const completed = progress.run(job);
-               if (!completed) {
-                       return;
-               }
+               progress.Close();
 
-               VerifyDCPDialog dialog(this, job);
-               dialog.ShowModal();
+               if (completed) {
+                       VerifyDCPDialog dialog(this, job);
+                       dialog.ShowModal();
+               }
        }
 
        void tools_check_for_updates ()