diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-11 22:39:20 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-11 22:39:20 +0100 |
| commit | cc27c2716f755305d67f1e1ba828ecf37f8405dd (patch) | |
| tree | 224d2b1c469bc671e6b826e8a535f61f6459bc81 /src/tools | |
| parent | 4ddf91dda7d84f169e4b905fd41cf747f4a0102c (diff) | |
| parent | 491daf8790f35611052d8954d5d74df275dcda18 (diff) | |
Merge master.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 7 | ||||
| -rw-r--r-- | src/tools/dcpomatic_cli.cc | 16 |
2 files changed, 4 insertions, 19 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index e67703b22..8c7f09ae7 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -338,13 +338,12 @@ private: void file_changed (boost::filesystem::path f) { - stringstream s; - s << wx_to_std (_("DCP-o-matic")); + string s = wx_to_std (_("DCP-o-matic")); if (!f.empty ()) { - s << " - " << f.string (); + s += " - " + f.string (); } - SetTitle (std_to_wx (s.str())); + SetTitle (std_to_wx (s)); } void file_new () diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index 7dd820b95..8c33b7d83 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -33,7 +33,6 @@ #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; @@ -53,7 +52,6 @@ help (string 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"; @@ -65,7 +63,6 @@ main (int argc, char* argv[]) string film_dir; bool progress = true; bool no_remote = false; - int json_port = 0; bool keep_going = false; int option_index = 0; @@ -77,12 +74,11 @@ main (int argc, char* argv[]) { "flags", no_argument, 0, 'f'}, { "no-progress", no_argument, 0, 'n'}, { "no-remote", no_argument, 0, 'r'}, - { "json", required_argument, 0, 'j' }, { "keep-going", no_argument, 0, 'k' }, { 0, 0, 0, 0 } }; - int c = getopt_long (argc, argv, "vhdfnrj:k", long_options, &option_index); + int c = getopt_long (argc, argv, "vhdfnrk", long_options, &option_index); if (c == -1) { break; @@ -107,9 +103,6 @@ main (int argc, char* argv[]) case 'r': no_remote = true; break; - case 'j': - json_port = atoi (optarg); - break; case 'k': keep_going = true; break; @@ -130,10 +123,6 @@ main (int argc, char* argv[]) ServerFinder::instance()->disable (); } - if (json_port) { - new JSONServer (json_port); - } - cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit; char buf[256]; if (gethostname (buf, 256) == 0) { @@ -151,9 +140,6 @@ main (int argc, char* argv[]) } 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 (); |