projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add uid/euid to macOS debug message.
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_cli.cc
diff --git
a/src/tools/dcpomatic_cli.cc
b/src/tools/dcpomatic_cli.cc
index 13efb6b1958dd537060b7dafcee37d9a49955525..95f2f40397ecf95c0d763948b784123f68d18a9b 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 "lib/audio_content.h"
#include "lib/dcpomatic_log.h"
#include <dcp/version.h>
-#include <boost/foreach.hpp>
#include <getopt.h>
#include <iostream>
#include <iomanip>
#include <getopt.h>
#include <iostream>
#include <iomanip>
@@
-47,9
+46,9
@@
using std::vector;
using std::pair;
using std::setw;
using std::list;
using std::pair;
using std::setw;
using std::list;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using boost::optional;
using boost::optional;
-using
boost
::dynamic_pointer_cast;
+using
std
::dynamic_pointer_cast;
static void
help (string n)
static void
help (string n)
@@
-68,6
+67,7
@@
help (string n)
<< " -d, --dcp-path echo DCP's path to stdout on successful completion (implies -n)\n"
<< " -c, --config <dir> directory containing config.xml and cinemas.xml\n"
<< " --dump just dump a summary of the film's settings; don't encode\n"
<< " -d, --dcp-path echo DCP's path to stdout on successful completion (implies -n)\n"
<< " -c, --config <dir> directory containing config.xml and cinemas.xml\n"
<< " --dump just dump a summary of the film's settings; don't encode\n"
+ << " --no-check don't check project's content files for changes before making the DCP\n"
<< "\n"
<< "<FILM> is the film directory.\n";
}
<< "\n"
<< "<FILM> is the film directory.\n";
}
@@
-76,12
+76,12
@@
static void
print_dump (shared_ptr<Film> film)
{
cout << film->dcp_name (true) << "\n"
print_dump (shared_ptr<Film> film)
{
cout << film->dcp_name (true) << "\n"
- << film->container()->container_nickname() << " at " << ((film->resolution() == R
ESOLUTION_2
K) ? "2K" : "4K") << "\n"
+ << film->container()->container_nickname() << " at " << ((film->resolution() == R
esolution::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";
<< (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 ()
cout << "\n"
<< c->path(0) << "\n"
<< "\tat " << c->position().seconds ()
@@
-92,11
+92,13
@@
print_dump (shared_ptr<Film> film)
if (c->video) {
cout << "\t" << c->video->size().width << "x" << c->video->size().height << "\n"
<< "\t" << c->active_video_frame_rate(film) << "fps\n"
if (c->video) {
cout << "\t" << c->video->size().width << "x" << c->video->size().height << "\n"
<< "\t" << c->active_video_frame_rate(film) << "fps\n"
- << "\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";
+ << "\tcrop left " << c->video->requested_left_crop()
+ << " right " << c->video->requested_right_crop()
+ << " top " << c->video->requested_top_crop()
+ << " bottom " << c->video->requested_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 "
if (c->video->colour_conversion()) {
if (c->video->colour_conversion().get().preset()) {
cout << "\tcolour conversion "
@@
-123,7
+125,7
@@
list_servers ()
{
while (true) {
int N = 0;
{
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.
/* 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.
@@
-137,18
+139,18
@@
list_servers ()
++N;
/* Report the state of configured 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
the number of threads it is offering.
*/
optional<int> threads;
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();
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;
++tmp;
servers.erase (j);
j = tmp;
@@
-165,7
+167,7
@@
list_servers ()
}
/* Now report any left that have been found by broadcast */
}
/* 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 (i.current_link_version()) {
cout << std::left << setw(24) << i.host_name() << " UP " << i.threads() << "\n";
} else {
@@
-175,7
+177,7
@@
list_servers ()
}
}
}
}
- dcpomatic_sleep (1);
+ dcpomatic_sleep
_seconds
(1);
for (int i = 0; i < N; ++i) {
cout << "\033[1A\033[2K";
for (int i = 0; i < N; ++i) {
cout << "\033[1A\033[2K";
@@
-198,6
+200,7
@@
main (int argc, char* argv[])
bool list_servers_ = false;
bool dcp_path = false;
optional<boost::filesystem::path> config;
bool list_servers_ = false;
bool dcp_path = false;
optional<boost::filesystem::path> config;
+ bool check = true;
int option_index = 0;
while (true) {
int option_index = 0;
while (true) {
@@
-216,10
+219,11
@@
main (int argc, char* argv[])
{ "config", required_argument, 0, 'c' },
/* Just using A, B, C ... from here on */
{ "dump", no_argument, 0, 'A' },
{ "config", required_argument, 0, 'c' },
/* Just using A, B, C ... from here on */
{ "dump", no_argument, 0, 'A' },
+ { "no-check", no_argument, 0, 'B' },
{ 0, 0, 0, 0 }
};
{ 0, 0, 0, 0 }
};
- int c = getopt_long (argc, argv, "vhfnrt:j:kAs:ldc:", long_options, &option_index);
+ int c = getopt_long (argc, argv, "vhfnrt:j:kAs:ldc:
B
", long_options, &option_index);
if (c == -1) {
break;
if (c == -1) {
break;
@@
-266,6
+270,9
@@
main (int argc, char* argv[])
case 'c':
config = optarg;
break;
case 'c':
config = optarg;
break;
+ case 'B':
+ check = false;
+ break;
}
}
}
}
@@
-274,7
+281,7
@@
main (int argc, char* argv[])
}
if (servers) {
}
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);
if (!f) {
cerr << "Could not open servers list file " << *servers << "\n";
exit (EXIT_FAILURE);
@@
-334,12
+341,11
@@
main (int argc, char* argv[])
dcpomatic_log = film->log ();
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);
}
}
exit (EXIT_FAILURE);
}
}
@@
-349,12
+355,12
@@
main (int argc, char* argv[])
cout << "\nMaking DCP for " << film->name() << "\n";
}
cout << "\nMaking DCP for " << film->name() << "\n";
}
- film->make_dcp (
false
);
+ film->make_dcp (
check ? TranscodeJob::ChangedBehaviour::STOP : TranscodeJob::ChangedBehaviour::IGNORE
);
bool const error = show_jobs_on_console (progress);
if (keep_going) {
while (true) {
bool const error = show_jobs_on_console (progress);
if (keep_going) {
while (true) {
- dcpomatic_sleep (3600);
+ dcpomatic_sleep
_seconds
(3600);
}
}
}
}