Remove configuration of servers.

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

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 8727761fd583b9d554129a895ffd476f2ce43793..1f3d47fe84d1cb1b129de4fe084d2bc365b5b047 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -21,16 +21,18 @@
 #include <iomanip>
 #include <getopt.h>
 #include <libdcp/version.h>
-#include "film.h"
-#include "filter.h"
-#include "transcode_job.h"
-#include "job_manager.h"
-#include "util.h"
-#include "scaler.h"
-#include "version.h"
-#include "cross.h"
-#include "config.h"
-#include "log.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"
 
 using std::string;
 using std::cerr;
@@ -114,9 +116,10 @@ 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 ();
        }
 
        cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
@@ -167,7 +170,7 @@ 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";