No-op; rename a whole load of wx constants to their shorter equivalents.

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

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index a96461c301643bda66464dff5b756b8b858c7e2b..9f3b6333ab4550c866348120b66fb496ddc3ab9d 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -36,6 +36,7 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/audio_content.h"
 #include <dcp/cpl.h>
+#include <dcp/exceptions.h>
 #include <wx/wx.h>
 #include <wx/dirdlg.h>
 #include <boost/foreach.hpp>
@@ -50,7 +51,7 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
 enum {
-       /* Start at 256 so we can have IDs on _cpl_menu from 0 to 255 */
+       /* Start at 256 so we can have IDs on _cpl_menu from 1 to 255 */
        ID_repeat = 256,
        ID_join,
        ID_find_missing,
@@ -79,21 +80,25 @@ ContentMenu::ContentMenu (wxWindow* p)
        _menu->AppendSeparator ();
        _remove = _menu->Append (ID_remove, _("Remove"));
 
-       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::repeat, this), ID_repeat);
-       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::join, this), ID_join);
-       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::find_missing, this), ID_find_missing);
-       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::properties, this), ID_properties);
-       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::re_examine, this), ID_re_examine);
-       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::kdm, this), ID_kdm);
-       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::ov, this), ID_ov);
-       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::remove, this), ID_remove);
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::repeat, this), ID_repeat);
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::join, this), ID_join);
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::find_missing, this), ID_find_missing);
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::properties, this), ID_properties);
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::re_examine, this), ID_re_examine);
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::kdm, this), ID_kdm);
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::ov, this), ID_ov);
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::remove, this), ID_remove);
 
-       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::cpl_selected, this, _1), 0, ID_repeat);
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::cpl_selected, this, _1), 1, ID_repeat - 1);
 }
 
 ContentMenu::~ContentMenu ()
 {
        delete _menu;
+
+       BOOST_FOREACH (boost::signals2::connection& i, _job_connections) {
+               i.disconnect ();
+       }
 }
 
 void
@@ -104,7 +109,7 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
        _views = v;
 
        int const N = _cpl_menu->GetMenuItemCount();
-       for (int i = 0; i < N; ++i) {
+       for (int i = 1; i <= N; ++i) {
                _cpl_menu->Delete (i);
        }
 
@@ -128,20 +133,25 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
                if (dcp) {
                        _kdm->Enable (dcp->encrypted ());
                        _ov->Enable (dcp->needs_assets ());
-                       DCPExaminer ex (dcp);
-                       list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
-                       _choose_cpl->Enable (cpls.size() > 1);
-                       int id = 0;
-                       BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls) {
-                               wxMenuItem* item = _cpl_menu->AppendCheckItem (
-                                       id++,
-                                       wxString::Format (
-                                               "%s (%s)",
-                                               std_to_wx(i->annotation_text()).data(),
-                                               std_to_wx(i->id()).data()
-                                               )
-                                       );
-                               item->Check (dcp->cpl() && dcp->cpl() == i->id());
+                       try {
+                               DCPExaminer ex (dcp);
+                               list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
+                               _choose_cpl->Enable (cpls.size() > 1);
+                               /* 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 (
+                                               id++,
+                                               wxString::Format (
+                                                       "%s (%s)",
+                                                       std_to_wx(i->annotation_text()).data(),
+                                                       std_to_wx(i->id()).data()
+                                                       )
+                                               );
+                                       item->Check (dcp->cpl() && dcp->cpl() == i->id());
+                               }
+                       } catch (dcp::DCPReadError) {
+                               /* The DCP is probably missing */
                        }
                } else {
                        _kdm->Enable (false);
@@ -306,13 +316,15 @@ ContentMenu::find_missing ()
 
        shared_ptr<Job> j (new ExamineContentJob (film, content));
 
-       _job_connection = j->Finished.connect (
-               bind (
-                       &ContentMenu::maybe_found_missing,
-                       this,
-                       boost::weak_ptr<Job> (j),
-                       boost::weak_ptr<Content> (_content.front ()),
-                       boost::weak_ptr<Content> (content)
+       _job_connections.push_back (
+               j->Finished.connect (
+                       bind (
+                               &ContentMenu::maybe_found_missing,
+                               this,
+                               boost::weak_ptr<Job> (j),
+                               boost::weak_ptr<Content> (_content.front ()),
+                               boost::weak_ptr<Content> (content)
+                               )
                        )
                );
 
@@ -328,7 +340,7 @@ ContentMenu::re_examine ()
        }
 
        BOOST_FOREACH (shared_ptr<Content> i, _content) {
-               film->examine_content (i);
+               JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (film, i)));
        }
 }
 
@@ -373,7 +385,7 @@ ContentMenu::kdm ()
 
                shared_ptr<Film> film = _film.lock ();
                DCPOMATIC_ASSERT (film);
-               film->examine_content (dcp);
+               JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (film, dcp)));
        }
 
        d->Destroy ();
@@ -392,7 +404,7 @@ ContentMenu::ov ()
                dcp->add_ov (wx_to_std (d->GetPath ()));
                shared_ptr<Film> film = _film.lock ();
                DCPOMATIC_ASSERT (film);
-               film->examine_content (dcp);
+               JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (film, dcp)));
        }
 
        d->Destroy ();
@@ -415,15 +427,16 @@ ContentMenu::cpl_selected (wxCommandEvent& ev)
 
        DCPExaminer ex (dcp);
        list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
-       DCPOMATIC_ASSERT (ev.GetId() < int (cpls.size()));
+       DCPOMATIC_ASSERT (ev.GetId() > 0);
+       DCPOMATIC_ASSERT (ev.GetId() <= int (cpls.size()));
 
        list<shared_ptr<dcp::CPL> >::const_iterator i = cpls.begin ();
-       for (int j = 0; j < ev.GetId(); ++j) {
+       for (int j = 0; j < ev.GetId() - 1; ++j) {
                ++i;
        }
 
        dcp->set_cpl ((*i)->id ());
        shared_ptr<Film> film = _film.lock ();
        DCPOMATIC_ASSERT (film);
-       film->examine_content (dcp);
+       JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (film, dcp)));
 }