Try to fix some warnings.

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

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 2a91831341fc506bbd1ed739febb19db3c02c946..e5cadd7942870f90512d57f2320fc1cd2f2e7a88 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -35,6 +35,7 @@
 #include "lib/dcp_examiner.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/audio_content.h"
+#include "lib/config.h"
 #include <dcp/cpl.h>
 #include <dcp/exceptions.h>
 #include <wx/wx.h>
@@ -131,7 +132,7 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
                                /* We can't have 0 as a menu item ID on OS X */
                                int id = 1;
                                BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls) {
-                                       wxMenuItem* item = _cpl_menu->AppendCheckItem (
+                                       wxMenuItem* item = _cpl_menu->AppendRadioItem (
                                                id++,
                                                wxString::Format (
                                                        "%s (%s)",
@@ -141,9 +142,11 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
                                                );
                                        item->Check (dcp->cpl() && dcp->cpl() == i->id());
                                }
-                       } catch (dcp::DCPReadError) {
+                       } catch (dcp::DCPReadError &) {
                                /* The DCP is probably missing */
-                       } catch (dcp::KDMDecryptionError) {
+                       } catch (dcp::KDMDecryptionError &) {
+                               /* We have an incorrect KDM */
+                       } catch (KDMError &) {
                                /* We have an incorrect KDM */
                        }
                } else {
@@ -206,7 +209,7 @@ ContentMenu::join ()
        }
 
        try {
-               shared_ptr<FFmpegContent> joined (new FFmpegContent (film, fc));
+               shared_ptr<FFmpegContent> joined (new FFmpegContent(fc));
                film->remove_content (_content);
                film->examine_and_add_content (joined);
        } catch (JoinError& e) {
@@ -303,9 +306,9 @@ ContentMenu::find_missing ()
 
        if (r == wxID_OK) {
                if (dc) {
-                       content.push_back (shared_ptr<DCPContent> (new DCPContent (film, path)));
+                       content.push_back (shared_ptr<DCPContent>(new DCPContent(path)));
                } else {
-                       content = content_factory (film, path);
+                       content = content_factory (path);
                }
        }
 
@@ -377,7 +380,7 @@ ContentMenu::kdm ()
                try {
                        dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE)));
                } catch (exception& e) {
-                       error_dialog (_parent, wxString::Format (_("Could not load KDM.")), std_to_wx(e.what()));
+                       error_dialog (_parent, _("Could not load KDM"), std_to_wx(e.what()));
                        d->Destroy ();
                        return;
                }
@@ -412,7 +415,9 @@ ContentMenu::ov ()
 void
 ContentMenu::properties ()
 {
-       ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, _content.front ());
+       shared_ptr<Film> film = _film.lock ();
+       DCPOMATIC_ASSERT (film);
+       ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, film, _content.front());
        d->ShowModal ();
        d->Destroy ();
 }