19940a8e1ff462e567fbf79ccf5ce81a57444f8b from master; make dcpomatic_cli less talkati...

diff --git a/TO_PORT b/TO_PORT
index ec27f6ec653b134a543553949b2042a2b029e72e..d153948fa7d8f5a7315b1c298de8a479cbaf0961 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,4 +1,3 @@
-994df155c9d1f6256cdcf51c355a74ebad24288b
 ccb883a479cb341c686fc4237763f483d15e1ec5
 8e5f3e2d989a119f41ba4c69434545c0929e92e0
 468a7437c8ec82a8f74ae30197a2c5b04100b75d

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 0307cac9c9712ddb2205a2aab1aae4bedba7df80..36929db36434f8929de3f7ffd3fad95accf0d1e4 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -129,13 +129,6 @@ main (int argc, char* argv[])
                new JSONServer (json_port.get ());
        }
 
-       cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
-       char buf[256];
-       if (gethostname (buf, 256) == 0) {
-               cout << " on " << buf;
-       }
-       cout << "\n";
-
        shared_ptr<Film> film;
        try {
                film.reset (new Film (film_dir));
@@ -155,8 +148,10 @@ main (int argc, char* argv[])
                        }
                }
        }
-               
-       cout << "\nMaking DCP for " << film->name() << "\n";
+
+       if (progress) {
+               cout << "\nMaking DCP for " << film->name() << "\n";
+       }
 
        film->make_dcp ();