Add some logging to show what's going on with the wxDisplays.

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

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 81af93b9ea4b50f7d2fd6db336c183a6ea75ba3d..3cd25e3ead32fc18cc5bc76bf1d59643865ef88a 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -19,6 +19,7 @@
 */
 
 #include "wx/about_dialog.h"
+#include "wx/file_dialog.h"
 #include "wx/film_viewer.h"
 #include "wx/nag_dialog.h"
 #include "wx/player_config_dialog.h"
@@ -68,6 +69,7 @@
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/exceptions.h>
+#include <dcp/filesystem.h>
 #include <dcp/raw_convert.h>
 #include <dcp/search.h>
 #include <dcp/warnings.h>
@@ -169,7 +171,7 @@ public:
                        if (filenames.GetCount() == 1) {
                                /* Try to load a directory */
                                auto path = boost::filesystem::path(wx_to_std(filenames[0]));
-                               if (boost::filesystem::is_directory(path)) {
+                               if (dcp::filesystem::is_directory(path)) {
                                        _frame->load_dcp(wx_to_std(filenames[0]));
                                        return true;
                                }
@@ -454,9 +456,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;
                }
 
@@ -697,18 +699,23 @@ private:
 
        void file_add_kdm ()
        {
-               auto d = make_wx<wxFileDialog>(this, _("Select KDM"));
+               FileDialog dialog(this, _("Select KDM"), wxT("XML files|*.xml|All files|*.*"), wxFD_MULTIPLE, "AddKDMPath");
 
-               if (d->ShowModal() == wxID_OK) {
+               if (dialog.show()) {
                        DCPOMATIC_ASSERT (_film);
                        auto dcp = std::dynamic_pointer_cast<DCPContent>(_film->content().front());
                        DCPOMATIC_ASSERT (dcp);
                        try {
                                if (dcp) {
+                                       ScopeGuard sg([this]() {
+                                               _viewer.set_coalesce_player_changes(false);
+                                       });
                                        _viewer.set_coalesce_player_changes(true);
-                                       dcp->add_kdm (dcp::EncryptedKDM(dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE)));
+                                       for (auto path: dialog.paths()) {
+                                               dcp->add_kdm(dcp::EncryptedKDM(dcp::file_to_string(path)));
+                                               _kdms.push_back(path);
+                                       }
                                        examine_content();
-                                       _viewer.set_coalesce_player_changes(false);
                                }
                        } catch (exception& e) {
                                error_dialog (this, wxString::Format (_("Could not load KDM.")), std_to_wx(e.what()));
@@ -861,6 +868,18 @@ private:
                        _viewer.panel()->Reparent(_dual_screen);
                        _viewer.panel()->SetFocus();
                        _dual_screen->Show ();
+                       LOG_DEBUG_PLAYER("Setting up dual screen mode with %1 displays", wxDisplay::GetCount());
+                       for (auto index = 0U; index < wxDisplay::GetCount(); ++index) {
+                               wxDisplay display(index);
+                               auto client = display.GetClientArea();
+                               auto mode = display.GetCurrentMode();
+                               auto geometry = display.GetGeometry();
+                               LOG_DEBUG_PLAYER("Display %1", index);
+                               LOG_DEBUG_PLAYER("  ClientArea position=(%1, %2) size=(%3, %4)", client.GetX(), client.GetY(), client.GetWidth(), client.GetHeight());
+                               LOG_DEBUG_PLAYER("  Geometry   position=(%1, %2) size=(%3, %4)", geometry.GetX(), geometry.GetY(), geometry.GetWidth(), geometry.GetHeight());
+                               LOG_DEBUG_PLAYER("  Mode       size=(%1, %2)", mode.GetWidth(), mode.GetHeight());
+                               LOG_DEBUG_PLAYER("  Primary?   %1", static_cast<int>(display.IsPrimary()));
+                       }
                        if (wxDisplay::GetCount() > 1) {
                                switch (Config::instance()->image_display()) {
                                case 0:
@@ -907,7 +926,7 @@ private:
                auto dcp = std::dynamic_pointer_cast<DCPContent>(_film->content().front());
                DCPOMATIC_ASSERT (dcp);
 
-               auto job = make_shared<VerifyDCPJob>(dcp->directories());
+               auto job = make_shared<VerifyDCPJob>(dcp->directories(), _kdms);
                VerifyDCPProgressDialog progress(this, _("DCP-o-matic Player"));
                bool const completed = progress.run(job);
                progress.Close();
@@ -1119,6 +1138,8 @@ private:
        wxMenuItem* _view_dual_screen = nullptr;
        wxSizer* _main_sizer = nullptr;
        PlayerStressTester _stress;
+       /** KDMs that have been loaded, so that we can pass them to the verifier */
+       std::vector<boost::filesystem::path> _kdms;
 };
 
 static const wxCmdLineEntryDesc command_line_description[] = {
@@ -1139,7 +1160,10 @@ public:
        void handle (shared_ptr<Socket> socket) override
        {
                try {
-                       int const length = socket->read_uint32 ();
+                       uint32_t const length = socket->read_uint32 ();
+                       if (length > 65536) {
+                               return;
+                       }
                        scoped_array<char> buffer (new char[length]);
                        socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
                        string s (buffer.get());
@@ -1236,7 +1260,7 @@ private:
                                LOG_DEBUG_PLAYER ("Failed to start play server (%1)", e.what());
                        }
 
-                       if (!_dcp_to_load.empty() && boost::filesystem::is_directory (_dcp_to_load)) {
+                       if (!_dcp_to_load.empty() && dcp::filesystem::is_directory(_dcp_to_load)) {
                                try {
                                        _frame->load_dcp (_dcp_to_load);
                                } catch (exception& e) {