Another typo.

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

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 8422df28e78ff24dcf7666a5b5b757870a05d629..90cc818ca5d85271001c576ce0df8c5a033c37ad 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -30,6 +30,7 @@
 #include "wx/standard_controls.h"
 #include "wx/swaroop_controls.h"
 #include "wx/timer_display.h"
+#include "wx/system_information_dialog.h"
 #include "lib/cross.h"
 #include "lib/config.h"
 #include "lib/util.h"
@@ -89,6 +90,7 @@ using boost::optional;
 using boost::dynamic_pointer_cast;
 using boost::thread;
 using boost::bind;
+using namespace dcpomatic;
 
 enum {
        ID_file_open = 1,
@@ -110,6 +112,7 @@ enum {
        ID_tools_verify,
        ID_tools_check_for_updates,
        ID_tools_timing,
+       ID_tools_system_information,
        /* IDs for shortcuts (with no associated menu item) */
        ID_start_stop,
        ID_back_frame,
@@ -130,6 +133,7 @@ public:
                , _history_items (0)
                , _history_position (0)
                , _history_separator (0)
+               , _system_information_dialog (0)
                , _view_full_screen (0)
                , _view_dual_screen (0)
        {
@@ -171,6 +175,7 @@ public:
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_verify, this), ID_tools_verify);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_check_for_updates, this), ID_tools_check_for_updates);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_timing, this), ID_tools_timing);
+               Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_system_information, this), ID_tools_system_information);
 
                /* Use a panel as the only child of the Frame so that we avoid
                   the dark-grey background on Windows.
@@ -282,6 +287,15 @@ public:
                        }
                }
 
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+               BOOST_FOREACH (shared_ptr<Content> i, _film->content()) {
+                       shared_ptr<FFmpegContent> c = dynamic_pointer_cast<FFmpegContent>(i);
+                       if (c && !c->kdm_timing_window_valid()) {
+                               ok = false;
+                       }
+               }
+#endif
+
                if (!ok) {
                        error_dialog (this, _("The KDM does not allow playback of this content at this time."));
                }
@@ -502,6 +516,7 @@ private:
                tools->AppendSeparator ();
                tools->Append (ID_tools_check_for_updates, _("Check for updates"));
                tools->Append (ID_tools_timing, _("Timing..."));
+               tools->Append (ID_tools_system_information, _("System information..."));
 
                wxMenu* help = new wxMenu;
 #ifdef __WXOSX__
@@ -598,11 +613,27 @@ private:
 
                if (d->ShowModal() == wxID_OK) {
                        DCPOMATIC_ASSERT (_film);
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+                       shared_ptr<FFmpegContent> ffmpeg = boost::dynamic_pointer_cast<FFmpegContent>(_film->content().front());
+                       if (ffmpeg) {
+                               try {
+                                       ffmpeg->add_kdm (EncryptedECinemaKDM(dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE)));
+                               } catch (exception& e) {
+                                       error_dialog (this, wxString::Format(_("Could not load KDM.")), std_to_wx(e.what()));
+                                       d->Destroy();
+                                       return;
+                               }
+                       }
+#endif
                        shared_ptr<DCPContent> dcp = boost::dynamic_pointer_cast<DCPContent>(_film->content().front());
+#ifndef DCPOMATIC_VARIANT_SWAROOP
                        DCPOMATIC_ASSERT (dcp);
+#endif
                        try {
-                               dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE)));
-                               dcp->examine (_film, shared_ptr<Job>());
+                               if (dcp) {
+                                       dcp->add_kdm (dcp::EncryptedKDM(dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE)));
+                                       dcp->examine (_film, shared_ptr<Job>());
+                               }
                        } catch (exception& e) {
                                error_dialog (this, wxString::Format (_("Could not load KDM.")), std_to_wx(e.what()));
                                d->Destroy ();
@@ -779,6 +810,15 @@ private:
                d->Destroy ();
        }
 
+       void tools_system_information ()
+       {
+               if (!_system_information_dialog) {
+                       _system_information_dialog = new SystemInformationDialog (this, _viewer);
+               }
+
+               _system_information_dialog->Show ();
+       }
+
        void help_about ()
        {
                AboutDialog* d = new AboutDialog (this);
@@ -936,6 +976,7 @@ private:
        wxMenuItem* _history_separator;
        shared_ptr<FilmViewer> _viewer;
        Controls* _controls;
+       SystemInformationDialog* _system_information_dialog;
        boost::shared_ptr<Film> _film;
        boost::signals2::scoped_connection _config_changed_connection;
        wxMenuItem* _file_add_ov;