More enum class additions.

[dcpomatic.git] / src / tools / dcpomatic_cli.cc

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 6a243e126e6a9140cf693a70c5067683758cca0a..d1b8f4ef3ffcdfc258e09f2d89508bcd11a076b8 100644 (file)
--- 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 <dcp/version.h>
-#include <boost/foreach.hpp>
 #include <getopt.h>
 #include <iostream>
 #include <iomanip>
@@ -47,9 +46,9 @@ using std::vector;
 using std::pair;
 using std::setw;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 
 static void
 help (string n)
@@ -77,12 +76,12 @@ static void
 print_dump (shared_ptr<Film> 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<Content> c, film->content ()) {
+       for (auto c: film->content()) {
                cout << "\n"
                     << c->path(0) << "\n"
                     << "\tat " << c->position().seconds ()
@@ -96,8 +95,10 @@ print_dump (shared_ptr<Film> film)
                             << "\tcrop left " << c->video->left_crop()
                             << " right " << c->video->right_crop()
                             << " top " << c->video->top_crop()
-                            << " bottom " << c->video->bottom_crop() << "\n"
-                            << "\tscale " << c->video->scale().name() << "\n";
+                            << " bottom " << c->video->bottom_crop() << "\n";
+                       if (c->video->custom_ratio()) {
+                               cout << "\tscale to custom ratio " << *c->video->custom_ratio() << ":1\n";
+                       }
                        if (c->video->colour_conversion()) {
                                if (c->video->colour_conversion().get().preset()) {
                                        cout << "\tcolour conversion "
@@ -138,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
@@ -166,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 {