X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_create.cc;h=14eae6b3ed643b547d8ee7f3c18754ca3db91e6f;hb=70b72b53eab0f247eb4dc605a2d669d4adb4e469;hp=857359117c3c64309b2c4a35f0c1fcba452bfa5f;hpb=2b870d03ce118f9d9146f53658d3a9a2e2626600;p=dcpomatic.git diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc index 857359117..14eae6b3e 100644 --- a/src/tools/dcpomatic_create.cc +++ b/src/tools/dcpomatic_create.cc @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -50,8 +49,8 @@ using std::cout; 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 @@ -100,19 +99,18 @@ main (int argc, char* argv[]) 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); if (cc.fourk) { - film->set_resolution (RESOLUTION_4K); + 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 > content; @@ -123,7 +121,7 @@ main (int argc, char* argv[]) content = content_factory (can); } - BOOST_FOREACH (shared_ptr j, content) { + for (auto j: content) { film->examine_and_add_content (j); } @@ -133,7 +131,7 @@ main (int argc, char* argv[]) while (signal_manager->ui_idle() > 0) {} - BOOST_FOREACH (shared_ptr j, content) { + for (auto j: content) { if (j->video) { j->video->set_frame_type (i.frame_type); } @@ -144,7 +142,7 @@ main (int argc, char* argv[]) film->set_video_frame_rate (*cc.dcp_frame_rate); } - BOOST_FOREACH (shared_ptr i, film->content()) { + for (auto i: film->content()) { shared_ptr ic = dynamic_pointer_cast (i); if (ic && ic->still()) { ic->video->set_length (cc.still_length * 24); @@ -152,7 +150,7 @@ main (int argc, char* argv[]) } if (jm->errors ()) { - BOOST_FOREACH (shared_ptr i, jm->get()) { + for (auto i: jm->get()) { if (i->finished_in_error()) { cerr << i->error_summary() << "\n" << i->error_details() << "\n";