#include "lib/job_manager.h"
#include "lib/exceptions.h"
#include "lib/dcp_content.h"
+#include "lib/dcp_examiner.h"
#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>
using std::cout;
using std::vector;
using std::exception;
+using std::list;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
enum {
- ID_repeat = 1,
+ /* Start at 256 so we can have IDs on _cpl_menu from 1 to 255 */
+ ID_repeat = 256,
ID_join,
ID_find_missing,
ID_properties,
ID_re_examine,
ID_kdm,
+ ID_ov,
+ ID_choose_cpl,
ID_remove
};
_find_missing = _menu->Append (ID_find_missing, _("Find missing..."));
_properties = _menu->Append (ID_properties, _("Properties..."));
_re_examine = _menu->Append (ID_re_examine, _("Re-examine..."));
+ _menu->AppendSeparator ();
_kdm = _menu->Append (ID_kdm, _("Add KDM..."));
+ _ov = _menu->Append (ID_ov, _("Add OV..."));
+ _cpl_menu = new wxMenu ();
+ _choose_cpl = _menu->Append (ID_choose_cpl, _("Choose CPL..."), _cpl_menu);
_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::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), 1, ID_repeat - 1);
}
ContentMenu::~ContentMenu ()
{
delete _menu;
+
+ BOOST_FOREACH (boost::signals2::connection& i, _job_connections) {
+ i.disconnect ();
+ }
}
void
_film = film;
_content = c;
_views = v;
+
+ int const N = _cpl_menu->GetMenuItemCount();
+ for (int i = 1; i <= N; ++i) {
+ _cpl_menu->Delete (i);
+ }
+
_repeat->Enable (!_content.empty ());
int n = 0;
if (_content.size() == 1) {
shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
- _kdm->Enable (dcp && dcp->encrypted ());
+ if (dcp) {
+ _kdm->Enable (dcp->encrypted ());
+ _ov->Enable (dcp->needs_assets ());
+ 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);
+ _ov->Enable (false);
+ _choose_cpl->Enable (false);
+ }
} else {
_kdm->Enable (false);
}
_remove->Enable (!_content.empty ());
+
_parent->PopupMenu (_menu, p);
}
try {
shared_ptr<FFmpegContent> joined (new FFmpegContent (film, fc));
- BOOST_FOREACH (shared_ptr<Content> i, _content) {
- film->remove_content (i);
- }
- film->add_content (joined);
+ film->remove_content (_content);
+ film->examine_and_add_content (joined);
} catch (JoinError& e) {
error_dialog (_parent, std_to_wx (e.what ()));
}
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)
+ )
)
);
}
BOOST_FOREACH (shared_ptr<Content> i, _content) {
- film->examine_content (i);
+ JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (film, i)));
}
}
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 ();
+}
+
+void
+ContentMenu::ov ()
+{
+ DCPOMATIC_ASSERT (!_content.empty ());
+ shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
+ DCPOMATIC_ASSERT (dcp);
+
+ wxDirDialog* d = new wxDirDialog (_parent, _("Select OV"));
+
+ if (d->ShowModal() == wxID_OK) {
+ dcp->add_ov (wx_to_std (d->GetPath ()));
+ shared_ptr<Film> film = _film.lock ();
+ DCPOMATIC_ASSERT (film);
+ JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (film, dcp)));
}
d->Destroy ();
d->ShowModal ();
d->Destroy ();
}
+
+void
+ContentMenu::cpl_selected (wxCommandEvent& ev)
+{
+ DCPOMATIC_ASSERT (!_content.empty ());
+ shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
+ DCPOMATIC_ASSERT (dcp);
+
+ DCPExaminer ex (dcp);
+ list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
+ 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() - 1; ++j) {
+ ++i;
+ }
+
+ dcp->set_cpl ((*i)->id ());
+ shared_ptr<Film> film = _film.lock ();
+ DCPOMATIC_ASSERT (film);
+ JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (film, dcp)));
+}
projects / dcpomatic.git / blobdiff