Merge master.

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

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index bc95f622da36f6cbfd7fb286ec03ff6d4e5efb4e..acd1335e62d5e5ef57c469232e429db29c22e6c6 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -20,19 +20,20 @@
 #include <iostream>
 #include <iomanip>
 #include <getopt.h>
-#include <libdcp/version.h>
-#include "format.h"
-#include "film.h"
-#include "filter.h"
-#include "transcode_job.h"
-#include "job_manager.h"
-#include "ab_transcode_job.h"
-#include "util.h"
-#include "scaler.h"
-#include "version.h"
-#include "cross.h"
-#include "config.h"
-#include "log.h"
+#include <dcp/version.h>
+#include "lib/film.h"
+#include "lib/filter.h"
+#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"
+#include "lib/log.h"
+#include "lib/ui_signaller.h"
+#include "lib/server_finder.h"
+#include "lib/json_server.h"
 
 using std::string;
 using std::cerr;
@@ -49,8 +50,11 @@ help (string 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"
+            << "  -j, --json <port>  run a JSON server on the specified port\n"
+            << "  -k, --keep-going   keep running even when the job is complete\n"
             << "\n"
             << "<FILM> is the film directory.\n";
 }
@@ -61,7 +65,8 @@ main (int argc, char* argv[])
        string film_dir;
        bool progress = true;
        bool no_remote = false;
-       int log_level = 0;
+       int json_port = 0;
+       bool keep_going = false;
 
        int option_index = 0;
        while (1) {
@@ -69,13 +74,15 @@ main (int argc, char* argv[])
                        { "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' },
+                       { "keep-going", no_argument, 0, 'k' },
                        { 0, 0, 0, 0 }
                };
 
-               int c = getopt_long (argc, argv, "vhdnrl:", long_options, &option_index);
+               int c = getopt_long (argc, argv, "vhdfnrj:k", long_options, &option_index);
 
                if (c == -1) {
                        break;
@@ -91,14 +98,20 @@ main (int argc, char* argv[])
                case 'd':
                        cout << dependency_version_summary () << "\n";
                        exit (EXIT_SUCCESS);
+               case 'f':
+                       cout << dcpomatic_cxx_flags << "\n";
+                       exit (EXIT_SUCCESS);
                case 'n':
                        progress = false;
                        break;
                case 'r':
                        no_remote = true;
                        break;
-               case 'l':
-                       log_level = atoi (optarg);
+               case 'j':
+                       json_port = atoi (optarg);
+                       break;
+               case 'k':
+                       keep_going = true;
                        break;
                }
        }
@@ -111,9 +124,14 @@ main (int argc, char* argv[])
        film_dir = argv[optind];
                        
        dcpomatic_setup ();
+       ui_signaller = new UISignaller ();
 
        if (no_remote) {
-               Config::instance()->set_servers (vector<ServerDescription*> ());
+               ServerFinder::instance()->disable ();
+       }
+
+       if (json_port) {
+               new JSONServer (json_port);
        }
 
        cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
@@ -132,16 +150,10 @@ main (int argc, char* argv[])
                exit (EXIT_FAILURE);
        }
 
-       film->log()->set_level ((Log::Level) log_level);
-
-       cout << "\nMaking ";
-       if (film->ab()) {
-               cout << "A/B ";
-       }
-       cout << "DCP for " << film->name() << "\n";
+       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";
+//     pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());
+//     cout << "Filters: " << f.first << " " << f.second << "\n";
 
        film->make_dcp ();
 
@@ -168,12 +180,12 @@ main (int argc, char* argv[])
                        if (progress) {
                                cout << (*i)->name() << ": ";
                                
-                               float const p = (*i)->overall_progress ();
+                               float const p = (*i)->progress ();
                                
                                if (p >= 0) {
-                                       cout << (*i)->status() << "                         \n";
+                                       cout << (*i)->status() << "                         \n";
                                } else {
-                                       cout << ": Running           \n";
+                                       cout << ": Running           \n";
                                }
                        }
 
@@ -199,6 +211,17 @@ main (int argc, char* argv[])
                }
        }
 
+       if (keep_going) {
+               while (1) {
+                       dcpomatic_sleep (3600);
+               }
+       }
+
+       /* This is just to stop valgrind reporting leaks due to JobManager
+          indirectly holding onto codecs.
+       */
+       JobManager::drop ();
+       
        return error ? EXIT_FAILURE : EXIT_SUCCESS;
 }