/*
- Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
#include "content_menu.h"
#include "repeat_dialog.h"
#include "wx_util.h"
#include <dcp/decrypted_kdm.h>
#include <wx/wx.h>
#include <wx/dirdlg.h>
-#include <boost/foreach.hpp>
#include <iostream>
+
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;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
+using std::make_shared;
using boost::optional;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
ID_remove
};
+
ContentMenu::ContentMenu (wxWindow* p)
: _menu (new wxMenu)
, _parent (p)
_repeat->Enable (!_content.empty ());
int n = 0;
- BOOST_FOREACH (shared_ptr<Content> i, _content) {
+ for (auto i: _content) {
if (dynamic_pointer_cast<FFmpegContent> (i)) {
++n;
}
_re_examine->Enable (!_content.empty ());
if (_content.size() == 1) {
- shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
+ auto dcp = dynamic_pointer_cast<DCPContent> (_content.front());
if (dcp) {
_kdm->Enable (dcp->encrypted ());
_ov->Enable (dcp->needs_assets ());
_set_dcp_settings->Enable (static_cast<bool>(dcp));
try {
DCPExaminer ex (dcp, true);
- list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
+ auto 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->AppendRadioItem (
+ for (auto i: cpls) {
+ auto item = _cpl_menu->AppendRadioItem (
id++,
wxString::Format (
"%s (%s)",
- std_to_wx(i->annotation_text()).data(),
+ std_to_wx(i->annotation_text().get_value_or("")).data(),
std_to_wx(i->id()).data()
)
);
void
ContentMenu::set_dcp_settings ()
{
- shared_ptr<Film> film = _film.lock ();
+ auto film = _film.lock ();
if (!film) {
return;
}
DCPOMATIC_ASSERT (_content.size() == 1);
- shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent>(_content.front());
+ auto dcp = dynamic_pointer_cast<DCPContent>(_content.front());
DCPOMATIC_ASSERT (dcp);
copy_dcp_details_to_film (dcp, film);
}
return;
}
- RepeatDialog* d = new RepeatDialog (_parent);
+ auto d = new RepeatDialog (_parent);
if (d->ShowModal() != wxID_OK) {
d->Destroy ();
return;
}
- shared_ptr<Film> film = _film.lock ();
+ auto film = _film.lock ();
if (!film) {
return;
}
_views.clear ();
}
+
void
ContentMenu::join ()
{
- vector<shared_ptr<Content> > fc;
- BOOST_FOREACH (shared_ptr<Content> i, _content) {
- shared_ptr<FFmpegContent> f = dynamic_pointer_cast<FFmpegContent> (i);
+ vector<shared_ptr<Content>> fc;
+ for (auto i: _content) {
+ auto f = dynamic_pointer_cast<FFmpegContent> (i);
if (f) {
fc.push_back (f);
}
DCPOMATIC_ASSERT (fc.size() > 1);
- shared_ptr<Film> film = _film.lock ();
+ auto film = _film.lock ();
if (!film) {
return;
}
try {
- shared_ptr<FFmpegContent> joined (new FFmpegContent(fc));
+ auto joined = make_shared<FFmpegContent>(fc);
film->remove_content (_content);
film->examine_and_add_content (joined);
} catch (JoinError& e) {
}
}
+
void
ContentMenu::remove ()
{
return;
}
- shared_ptr<Film> film = _film.lock ();
+ auto film = _film.lock ();
if (!film) {
return;
}
/* Special case: we only remove FFmpegContent if its video view is selected;
if not, and its audio view is selected, we unmap the audio.
*/
- BOOST_FOREACH (shared_ptr<Content> i, _content) {
- shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (i);
+ for (auto i: _content) {
+ auto fc = dynamic_pointer_cast<FFmpegContent> (i);
if (!fc) {
continue;
}
shared_ptr<TimelineVideoContentView> video;
shared_ptr<TimelineAudioContentView> audio;
- BOOST_FOREACH (shared_ptr<TimelineContentView> j, _views) {
- shared_ptr<TimelineVideoContentView> v = dynamic_pointer_cast<TimelineVideoContentView> (j);
- shared_ptr<TimelineAudioContentView> a = dynamic_pointer_cast<TimelineAudioContentView> (j);
+ for (auto j: _views) {
+ auto v = dynamic_pointer_cast<TimelineVideoContentView>(j);
+ auto a = dynamic_pointer_cast<TimelineAudioContentView>(j);
if (v && v->content() == fc) {
video = v;
} else if (a && a->content() == fc) {
}
if (!video && audio) {
- AudioMapping m = fc->audio->mapping ();
+ auto m = fc->audio->mapping ();
m.unmap_all ();
fc->audio->set_mapping (m);
handled = true;
_views.clear ();
}
+
void
ContentMenu::find_missing ()
{
return;
}
- shared_ptr<const Film> film = _film.lock ();
+ auto film = _film.lock ();
if (!film) {
return;
}
/* XXX: a bit nasty */
- shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (_content.front ());
- shared_ptr<DCPContent> dc = dynamic_pointer_cast<DCPContent> (_content.front ());
+ auto ic = dynamic_pointer_cast<ImageContent> (_content.front());
+ auto dc = dynamic_pointer_cast<DCPContent> (_content.front());
int r = wxID_CANCEL;
boost::filesystem::path path;
if ((ic && !ic->still ()) || dc) {
- wxDirDialog* d = new wxDirDialog (0, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST);
+ auto d = new wxDirDialog (0, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST);
r = d->ShowModal ();
path = wx_to_std (d->GetPath ());
d->Destroy ();
} else {
- wxFileDialog* d = new wxFileDialog (0, _("Choose a file"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE);
+ auto d = new wxFileDialog (0, _("Choose a file"), wxT (""), wxT (""), wxT ("*.*"));
r = d->ShowModal ();
path = wx_to_std (d->GetPath ());
d->Destroy ();
}
- list<shared_ptr<Content> > content;
+ list<shared_ptr<Content>> content;
if (r == wxID_OK) {
if (dc) {
- content.push_back (shared_ptr<DCPContent>(new DCPContent(path)));
+ content.push_back (make_shared<DCPContent>(path));
} else {
content = content_factory (path);
}
return;
}
- BOOST_FOREACH (shared_ptr<Content> i, content) {
- shared_ptr<Job> j (new ExamineContentJob (film, i));
+ for (auto i: content) {
+ auto j = make_shared<ExamineContentJob>(film, i);
j->Finished.connect (
bind (
&ContentMenu::maybe_found_missing,
this,
- boost::weak_ptr<Job> (j),
- boost::weak_ptr<Content> (_content.front ()),
- boost::weak_ptr<Content> (i)
+ std::weak_ptr<Job> (j),
+ std::weak_ptr<Content> (_content.front ()),
+ std::weak_ptr<Content> (i)
)
);
void
ContentMenu::re_examine ()
{
- shared_ptr<Film> film = _film.lock ();
+ auto film = _film.lock ();
if (!film) {
return;
}
- BOOST_FOREACH (shared_ptr<Content> i, _content) {
+ for (auto i: _content) {
JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (film, i)));
}
}
void
ContentMenu::maybe_found_missing (weak_ptr<Job> j, weak_ptr<Content> oc, weak_ptr<Content> nc)
{
- shared_ptr<Job> job = j.lock ();
+ auto job = j.lock ();
if (!job || !job->finished_ok ()) {
return;
}
- shared_ptr<Content> old_content = oc.lock ();
- shared_ptr<Content> new_content = nc.lock ();
+ auto old_content = oc.lock ();
+ auto new_content = nc.lock ();
DCPOMATIC_ASSERT (old_content);
DCPOMATIC_ASSERT (new_content);
ContentMenu::kdm ()
{
DCPOMATIC_ASSERT (!_content.empty ());
- shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
+ auto dcp = dynamic_pointer_cast<DCPContent> (_content.front());
DCPOMATIC_ASSERT (dcp);
- wxFileDialog* d = new wxFileDialog (_parent, _("Select KDM"));
+ auto d = new wxFileDialog (_parent, _("Select KDM"));
if (d->ShowModal() == wxID_OK) {
optional<dcp::EncryptedKDM> kdm;
DCPExaminer ex (dcp, true);
bool kdm_matches_any_cpl = false;
- BOOST_FOREACH (shared_ptr<dcp::CPL> i, ex.cpls()) {
+ for (auto i: ex.cpls()) {
if (i->id() == kdm->cpl_id()) {
kdm_matches_any_cpl = true;
}
dcp->add_kdm (*kdm);
- shared_ptr<Film> film = _film.lock ();
+ auto film = _film.lock ();
DCPOMATIC_ASSERT (film);
- JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (film, dcp)));
+ JobManager::instance()->add (make_shared<ExamineContentJob>(film, dcp));
}
d->Destroy ();
ContentMenu::ov ()
{
DCPOMATIC_ASSERT (!_content.empty ());
- shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
+ auto dcp = dynamic_pointer_cast<DCPContent> (_content.front());
DCPOMATIC_ASSERT (dcp);
- wxDirDialog* d = new wxDirDialog (_parent, _("Select OV"));
+ auto d = new wxDirDialog (_parent, _("Select OV"));
if (d->ShowModal() == wxID_OK) {
- dcp->add_ov (wx_to_std (d->GetPath ()));
+ 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)));
+ JobManager::instance()->add (make_shared<ExamineContentJob>(film, dcp));
}
d->Destroy ();
void
ContentMenu::properties ()
{
- shared_ptr<Film> film = _film.lock ();
+ auto film = _film.lock ();
DCPOMATIC_ASSERT (film);
- ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, film, _content.front());
+ auto d = new ContentPropertiesDialog (_parent, film, _content.front());
d->ShowModal ();
d->Destroy ();
}
void
ContentMenu::advanced ()
{
- ContentAdvancedDialog* d = new ContentAdvancedDialog (_parent, _content.front());
+ auto d = new ContentAdvancedDialog (_parent, _content.front());
d->ShowModal ();
d->Destroy ();
}
}
DCPOMATIC_ASSERT (!_content.empty ());
- shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
+ auto dcp = dynamic_pointer_cast<DCPContent> (_content.front());
DCPOMATIC_ASSERT (dcp);
DCPExaminer ex (dcp, true);
- list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
+ auto 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 ();
+ auto i = cpls.begin ();
for (int j = 0; j < ev.GetId() - 1; ++j) {
++i;
}
dcp->set_cpl ((*i)->id ());
- shared_ptr<Film> film = _film.lock ();
+ auto film = _film.lock ();
DCPOMATIC_ASSERT (film);
- JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (film, dcp)));
+ JobManager::instance()->add (make_shared<ExamineContentJob>(film, dcp));
}