#include <dcp/exceptions.h>
#include <libxml++/libxml++.h>
#include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
#include <getopt.h>
#include <string>
#include <iostream>
using std::cerr;
using std::list;
using std::exception;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
using boost::optional;
class SimpleSignalManager : public SignalManager
}
if (cc.version) {
- cerr << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";
+ cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";
exit (EXIT_SUCCESS);
}
}
film->set_name (cc.name);
- film->set_container (cc.container_ratio);
+ if (cc.container_ratio) {
+ film->set_container (cc.container_ratio);
+ }
film->set_dcp_content_type (cc.dcp_content_type);
- film->set_interop (cc.standard == dcp::INTEROP);
+ film->set_interop (cc.standard == dcp::Standard::INTEROP);
film->set_use_isdcf_name (!cc.no_use_isdcf_name);
- film->set_signed (!cc.no_sign);
film->set_encrypted (cc.encrypt);
film->set_three_d (cc.threed);
- film->set_resolution (cc.fourk ? RESOLUTION_4K : RESOLUTION_2K);
+ if (cc.fourk) {
+ film->set_resolution (Resolution::FOUR_K);
+ }
if (cc.j2k_bandwidth) {
film->set_j2k_bandwidth (*cc.j2k_bandwidth);
}
- BOOST_FOREACH (CreateCLI::Content i, cc.content) {
+ for (auto i: cc.content) {
boost::filesystem::path const can = boost::filesystem::canonical (i.path);
list<shared_ptr<Content> > content;
content = content_factory (can);
}
- BOOST_FOREACH (shared_ptr<Content> j, content) {
+ for (auto j: content) {
film->examine_and_add_content (j);
}
while (signal_manager->ui_idle() > 0) {}
- BOOST_FOREACH (shared_ptr<Content> j, content) {
+ for (auto j: content) {
if (j->video) {
- j->video->set_scale (VideoContentScale(cc.content_ratio));
j->video->set_frame_type (i.frame_type);
}
}
film->set_video_frame_rate (*cc.dcp_frame_rate);
}
- BOOST_FOREACH (shared_ptr<Content> i, film->content()) {
+ for (auto i: film->content()) {
shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (i);
if (ic && ic->still()) {
ic->video->set_length (cc.still_length * 24);
}
if (jm->errors ()) {
- BOOST_FOREACH (shared_ptr<Job> i, jm->get()) {
+ for (auto i: jm->get()) {
if (i->finished_in_error()) {
cerr << i->error_summary() << "\n"
<< i->error_details() << "\n";