#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>
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)
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 ()
<< "\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 "
{
while (true) {
int N = 0;
- list<EncodeServerDescription> servers = EncodeServerFinder::instance()->servers();
+ auto servers = EncodeServerFinder::instance()->servers();
/* This is a bit fiddly because we want to list configured servers that are down as well
as all those (configured and found by broadcast) that are up.
++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
the number of threads it is offering.
*/
optional<int> threads;
- list<EncodeServerDescription>::iterator j = servers.begin ();
+ auto j = servers.begin ();
while (j != servers.end ()) {
if (i == j->host_name() && j->current_link_version()) {
threads = j->threads();
- list<EncodeServerDescription>::iterator tmp = j;
+ auto tmp = j;
++tmp;
servers.erase (j);
j = tmp;
}
/* 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 {
}
if (servers) {
- FILE* f = fopen_boost (*servers, "r");
+ auto f = fopen_boost (*servers, "r");
if (!f) {
cerr << "Could not open servers list file " << *servers << "\n";
exit (EXIT_FAILURE);
dcpomatic_log = film->log ();
- ContentList content = film->content ();
- for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) {
- vector<boost::filesystem::path> paths = (*i)->paths ();
- for (vector<boost::filesystem::path>::const_iterator j = paths.begin(); j != paths.end(); ++j) {
- if (!boost::filesystem::exists (*j)) {
- cerr << argv[0] << ": content file " << *j << " not found.\n";
+ for (auto i: film->content()) {
+ auto paths = i->paths();
+ for (auto j: paths) {
+ if (!boost::filesystem::exists(j)) {
+ cerr << argv[0] << ": content file " << j << " not found.\n";
exit (EXIT_FAILURE);
}
}