Supporters.

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

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index d95b2ed99f63fac0a2c0e923c4272bedf1fa69ae..4facdd4d1a868df0e67d9cac2e28861d3434ed21 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -26,7 +26,6 @@
 #include "lib/transcode_job.h"
 #include "lib/job_manager.h"
 #include "lib/util.h"
-#include "lib/scaler.h"
 #include "lib/version.h"
 #include "lib/cross.h"
 #include "lib/config.h"
@@ -42,6 +41,7 @@ using std::vector;
 using std::pair;
 using std::list;
 using boost::shared_ptr;
+using boost::optional;
 
 static void
 help (string n)
@@ -49,7 +49,6 @@ help (string n)
        cerr << "Syntax: " << n << " [OPTION] <FILM>\n"
             << "  -v, --version      show DCP-o-matic version\n"
             << "  -h, --help         show this help\n"
-            << "  -d, --deps         list DCP-o-matic dependency details and quit\n"
             << "  -f, --flags        show flags passed to C++ compiler on build\n"
             << "  -n, --no-progress  do not print progress to stdout\n"
             << "  -r, --no-remote    do not use any remote servers\n"
@@ -65,26 +64,23 @@ main (int argc, char* argv[])
        string film_dir;
        bool progress = true;
        bool no_remote = false;
-       int log_level = 0;
-       int json_port = 0;
+       optional<int> json_port;
        bool keep_going = false;
 
        int option_index = 0;
-       while (1) {
+       while (true) {
                static struct option long_options[] = {
                        { "version", no_argument, 0, 'v'},
                        { "help", no_argument, 0, 'h'},
-                       { "deps", no_argument, 0, 'd'},
                        { "flags", no_argument, 0, 'f'},
                        { "no-progress", no_argument, 0, 'n'},
                        { "no-remote", no_argument, 0, 'r'},
-                       { "log-level", required_argument, 0, 'l' },
-                       { "json", required_argument, 0, 'j' },
+                       { "json", required_argument, 0, 'j'},
                        { "keep-going", no_argument, 0, 'k' },
                        { 0, 0, 0, 0 }
                };
 
-               int c = getopt_long (argc, argv, "vhdfnrl:j:k", long_options, &option_index);
+               int c = getopt_long (argc, argv, "vhfnrj:k", long_options, &option_index);
 
                if (c == -1) {
                        break;
@@ -97,9 +93,6 @@ main (int argc, char* argv[])
                case 'h':
                        help (argv[0]);
                        exit (EXIT_SUCCESS);
-               case 'd':
-                       cout << dependency_version_summary () << "\n";
-                       exit (EXIT_SUCCESS);
                case 'f':
                        cout << dcpomatic_cxx_flags << "\n";
                        exit (EXIT_SUCCESS);
@@ -109,9 +102,6 @@ main (int argc, char* argv[])
                case 'r':
                        no_remote = true;
                        break;
-               case 'l':
-                       log_level = atoi (optarg);
-                       break;
                case 'j':
                        json_port = atoi (optarg);
                        break;
@@ -130,13 +120,13 @@ main (int argc, char* argv[])
                        
        dcpomatic_setup ();
        ui_signaller = new UISignaller ();
-
+       
        if (no_remote) {
                ServerFinder::instance()->disable ();
        }
 
        if (json_port) {
-               new JSONServer (json_port);
+               new JSONServer (json_port.get ());
        }
 
        cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
@@ -155,12 +145,18 @@ main (int argc, char* argv[])
                exit (EXIT_FAILURE);
        }
 
-       film->log()->set_level ((Log::Level) log_level);
-
+       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";
+                               exit (EXIT_FAILURE);
+                       }
+               }
+       }
+               
        cout << "\nMaking DCP for " << film->name() << "\n";
-//     cout << "Content: " << film->content() << "\n";
-//     pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());
-//     cout << "Filters: " << f.first << " " << f.second << "\n";
 
        film->make_dcp ();
 
@@ -187,9 +183,7 @@ main (int argc, char* argv[])
                        if (progress) {
                                cout << (*i)->name() << ": ";
                                
-                               float const p = (*i)->progress ();
-                               
-                               if (p >= 0) {
+                               if ((*i)->progress ()) {
                                        cout << (*i)->status() << "                         \n";
                                } else {
                                        cout << ": Running           \n";
@@ -219,7 +213,7 @@ main (int argc, char* argv[])
        }
 
        if (keep_going) {
-               while (1) {
+               while (true) {
                        dcpomatic_sleep (3600);
                }
        }
@@ -228,6 +222,8 @@ main (int argc, char* argv[])
           indirectly holding onto codecs.
        */
        JobManager::drop ();
+
+       ServerFinder::drop ();
        
        return error ? EXIT_FAILURE : EXIT_SUCCESS;
 }