Fix build.

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

diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index 772a12eca6dc1782aa99fcdf72cb67465e55c060..57814272d75a8ee84f400b7854ebafa67e7bbdce 100644 (file)
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -22,9 +22,6 @@
 #include <getopt.h>
 #include <libdcp/test_mode.h>
 #include <libdcp/version.h>
-#ifdef DVDOMATIC_WINDOWS
-#include "winsock2.h"
-#endif
 #include "format.h"
 #include "film.h"
 #include "filter.h"
@@ -36,6 +33,8 @@
 #include "scaler.h"
 #include "version.h"
 #include "cross.h"
+#include "config.h"
+#include "log.h"
 
 using namespace std;
 using namespace boost;
@@ -44,8 +43,10 @@ static void
 help (string n)
 {
        cerr << "Syntax: " << n << " [OPTION] <FILM>\n"
+            << "  -v, --version      show DVD-o-matic version\n"
             << "  -h, --help         show this help\n"
             << "  -d, --deps         list DVD-o-matic dependency details and quit\n"
+            << "  -c, --config       list configuration settings that affect output and quit\n"
             << "  -t, --test         run in test mode (repeatable UUID generation, timestamps etc.)\n"
             << "  -n, --no-progress  do not print progress to stdout\n"
             << "\n"
@@ -58,24 +59,31 @@ main (int argc, char* argv[])
        string film_dir;
        bool test_mode = false;
        bool progress = true;
+       int log_level = 1;
 
        int option_index = 0;
        while (1) {
                static struct option long_options[] = {
+                       { "version", no_argument, 0, 'v'},
                        { "help", no_argument, 0, 'h'},
                        { "deps", no_argument, 0, 'd'},
+                       { "config", no_argument, 0, 'c'},
                        { "test", no_argument, 0, 't'},
                        { "no-progress", no_argument, 0, 'n'},
+                       { "log-level", required_argument, 0, 'l' },
                        { 0, 0, 0, 0 }
                };
 
-               int c = getopt_long (argc, argv, "hdtn", long_options, &option_index);
+               int c = getopt_long (argc, argv, "vhdctnl:", long_options, &option_index);
 
                if (c == -1) {
                        break;
                }
 
                switch (c) {
+               case 'v':
+                       cout << "dvdomatic version " << dvdomatic_version << " " << dvdomatic_git_commit << "\n";
+                       exit (EXIT_SUCCESS);
                case 'h':
                        help (argv[0]);
                        exit (EXIT_SUCCESS);
@@ -88,6 +96,18 @@ main (int argc, char* argv[])
                case 'n':
                        progress = false;
                        break;
+               case 'c':
+                       cout << "Colour LUT " << colour_lut_index_to_name (Config::instance()->colour_lut_index()) << "; "
+                            << "J2K bandwidth " << Config::instance()->j2k_bandwidth() << "; ";
+#ifdef DVDOMATIC_DEBUG
+                       cout << "built in debug mode\n";
+#else
+                       cout << "built in optimised mode\n";
+#endif                 
+                       exit (EXIT_SUCCESS);
+               case 'l':
+                       log_level = atoi (optarg);
+                       break;
                }
        }
 
@@ -120,8 +140,10 @@ main (int argc, char* argv[])
                exit (EXIT_FAILURE);
        }
 
+       film->log()->set_level ((Log::Level) log_level);
+
        cout << "\nMaking ";
-       if (film->dcp_ab ()) {
+       if (film->dcp_ab()) {
                cout << "A/B ";
        }
        cout << "DCP for " << film->name() << "\n";
@@ -132,14 +154,14 @@ main (int argc, char* argv[])
 
        film->make_dcp (true);
 
-       list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
-
        bool all_done = false;
        bool first = true;
        while (!all_done) {
 
                dvdomatic_sleep (5);
 
+               list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
+
                if (!first && progress) {
                        cout << "\033[" << jobs.size() << "A";
                        cout.flush ();