X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_cli.cc;h=d1b8f4ef3ffcdfc258e09f2d89508bcd11a076b8;hb=7d33aff2d5e81185f3361e28c84e3f9858464ef1;hp=2d70fb578cd1b0629e904a1fb65702b3fa5c6b6f;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index 2d70fb578..d1b8f4ef3 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -35,7 +35,6 @@ #include "lib/audio_content.h" #include "lib/dcpomatic_log.h" #include -#include #include #include #include @@ -77,12 +76,12 @@ static void print_dump (shared_ptr film) { cout << film->dcp_name (true) << "\n" - << film->container()->container_nickname() << " at " << ((film->resolution() == RESOLUTION_2K) ? "2K" : "4K") << "\n" + << film->container()->container_nickname() << " at " << ((film->resolution() == Resolution::TWO_K) ? "2K" : "4K") << "\n" << (film->j2k_bandwidth() / 1000000) << "Mbit/s" << "\n" << "Output " << film->video_frame_rate() << "fps " << (film->three_d() ? "3D" : "2D") << " " << (film->audio_frame_rate() / 1000) << "kHz\n" << (film->interop() ? "Inter-Op" : "SMPTE") << " " << (film->encrypted() ? "encrypted" : "unencrypted") << "\n"; - BOOST_FOREACH (shared_ptr c, film->content ()) { + for (auto c: film->content()) { cout << "\n" << c->path(0) << "\n" << "\tat " << c->position().seconds () @@ -140,7 +139,7 @@ list_servers () ++N; /* Report the state of configured servers */ - BOOST_FOREACH (string i, Config::instance()->servers()) { + for (auto i: Config::instance()->servers()) { cout << std::left << setw(24) << i << " "; /* See if this server is on the active list; if so, remove it and note @@ -168,7 +167,7 @@ list_servers () } /* Now report any left that have been found by broadcast */ - BOOST_FOREACH (EncodeServerDescription const & i, servers) { + for (auto const& i: servers) { if (i.current_link_version()) { cout << std::left << setw(24) << i.host_name() << " UP " << i.threads() << "\n"; } else {