Make DCPExaminer::size() optional and deal with the consequences.

[dcpomatic.git] / src / wx / content_menu.cc

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 73591eaed0bc0e43b2e0fd1f68272aad80c4ca96..4af5a71b708d66f118d336e1412445274883e4a2 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -24,7 +24,9 @@
 #include "content_menu.h"
 #include "content_properties_dialog.h"
 #include "dir_dialog.h"
+#include "file_dialog.h"
 #include "film_viewer.h"
+#include "id.h"
 #include "repeat_dialog.h"
 #include "timeline_video_content_view.h"
 #include "timeline_audio_content_view.h"
@@ -73,8 +75,7 @@ using namespace dcpomatic;
 
 
 enum {
-       /* Start at 256 so we can have IDs on _cpl_menu from 1 to 255 */
-       ID_repeat = 256,
+       ID_repeat = DCPOMATIC_CONTENT_MENU,
        ID_join,
        ID_find_missing,
        ID_properties,
@@ -136,7 +137,7 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
        _views = v;
 
        int const N = _cpl_menu->GetMenuItemCount();
-       for (int i = 1; i <= N; ++i) {
+       for (int i = DCPOMATIC_CPL_MENU; i < DCPOMATIC_CPL_MENU + N; ++i) {
                _cpl_menu->Delete (i);
        }
 
@@ -167,8 +168,7 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
                        try {
                                auto cpls = dcp::find_and_resolve_cpls (dcp->directories(), true);
                                _choose_cpl->Enable (cpls.size() > 1);
-                               /* We can't have 0 as a menu item ID on OS X */
-                               int id = 1;
+                               int id = DCPOMATIC_CPL_MENU;
                                for (auto i: cpls) {
                                        auto item = _cpl_menu->AppendRadioItem (
                                                id++,
@@ -365,13 +365,13 @@ ContentMenu::find_missing ()
        boost::filesystem::path path;
 
        if ((ic && !ic->still ()) || dc) {
-               auto d = make_wx<wxDirDialog>(nullptr, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST);
-               r = d->ShowModal ();
-               path = wx_to_std (d->GetPath());
+               wxDirDialog dialog(nullptr, _("Choose a folder"), wxT(""), wxDD_DIR_MUST_EXIST);
+               r = dialog.ShowModal();
+               path = wx_to_std(dialog.GetPath());
        } else {
-               auto d = make_wx<wxFileDialog>(nullptr, _("Choose a file"), wxT (""), wxT (""), wxT ("*.*"));
-               r = d->ShowModal ();
-               path = wx_to_std (d->GetPath());
+               wxFileDialog dialog(nullptr, _("Choose a file"), wxT(""), wxT(""), wxT("*.*"));
+               r = dialog.ShowModal();
+               path = wx_to_std(dialog.GetPath());
        }
 
        if (r == wxID_CANCEL) {
@@ -402,15 +402,15 @@ ContentMenu::kdm ()
        auto dcp = dynamic_pointer_cast<DCPContent> (_content.front());
        DCPOMATIC_ASSERT (dcp);
 
-       auto d = make_wx<wxFileDialog>(_parent, _("Select KDM"));
+       FileDialog dialog(_parent, _("Select KDM"), wxT("XML files|*.xml|All files|*.*"), 0, "AddKDMPath");
 
-       if (d->ShowModal() != wxID_OK) {
+       if (!dialog.show()) {
                return;
        }
 
        optional<dcp::EncryptedKDM> kdm;
        try {
-               kdm = dcp::EncryptedKDM (dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE));
+               kdm = dcp::EncryptedKDM(dcp::file_to_string(dialog.path(), MAX_KDM_SIZE));
        } catch (exception& e) {
                error_dialog (_parent, _("Could not load KDM"), std_to_wx(e.what()));
                return;
@@ -548,12 +548,13 @@ ContentMenu::auto_crop ()
                DCPOMATIC_ASSERT (film);
                auto const content = _content.front();
                auto const current_crop = content->video->actual_crop();
+               auto const video_size_guess = content->video->size().get_value_or(dcp::Size(1998, 1080));
                _viewer.set_crop_guess(
                        dcpomatic::Rect<float>(
-                               static_cast<float>(std::max(0, crop.left - current_crop.left)) / content->video->size().width,
-                               static_cast<float>(std::max(0, crop.top - current_crop.top)) / content->video->size().height,
-                               1.0f - (static_cast<float>(std::max(0, crop.left - current_crop.left + crop.right - current_crop.right)) / content->video->size().width),
-                               1.0f - (static_cast<float>(std::max(0, crop.top - current_crop.top + crop.bottom - current_crop.bottom)) / content->video->size().height)
+                               static_cast<float>(std::max(0, crop.left - current_crop.left)) / video_size_guess.width,
+                               static_cast<float>(std::max(0, crop.top - current_crop.top)) / video_size_guess.height,
+                               1.0f - (static_cast<float>(std::max(0, crop.left - current_crop.left + crop.right - current_crop.right)) / video_size_guess.width),
+                               1.0f - (static_cast<float>(std::max(0, crop.top - current_crop.top + crop.bottom - current_crop.bottom)) / video_size_guess.height)
                                ));
        };