From 4388fff5376a6e5a6dc8d33e244a1245a728335c Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 9 Aug 2014 13:43:09 +0100
Subject: [PATCH] Properly remove JSON server; remove some unused usings;
 remove some unnecessary uses of stringstream.

---
 src/lib/audio_decoder.cc           |  1 -
 src/lib/colour_conversion.cc       |  1 -
 src/lib/encoder.cc                 |  1 -
 src/lib/ffmpeg.cc                  |  1 -
 src/lib/ffmpeg_decoder.cc          |  1 -
 src/lib/image.cc                   |  1 -
 src/lib/image_proxy.cc             |  1 -
 src/lib/playlist.cc                |  1 -
 src/lib/ratio.cc                   |  1 -
 src/lib/scp_dcp_job.cc             |  8 +++-----
 src/lib/writer.cc                  |  1 -
 src/tools/dcpomatic.cc             |  7 +++----
 src/tools/dcpomatic_cli.cc         | 16 +---------------
 src/wx/dolby_certificate_dialog.cc |  1 -
 test/film_metadata_test.cc         |  1 -
 15 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index c0ef02f65..18f4b890d 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -25,7 +25,6 @@
 
 #include "i18n.h"
 
-using std::stringstream;
 using std::list;
 using std::pair;
 using std::cout;
diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index f8675900e..e5b1104ff 100644
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -30,7 +30,6 @@
 
 using std::list;
 using std::string;
-using std::stringstream;
 using std::cout;
 using std::vector;
 using boost::shared_ptr;
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 02a271029..693fd587e 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -45,7 +45,6 @@
 
 using std::pair;
 using std::string;
-using std::stringstream;
 using std::vector;
 using std::list;
 using std::cout;
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 7ecc811be..ebe62b51f 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -32,7 +32,6 @@ extern "C" {
 
 using std::string;
 using std::cout;
-using std::stringstream;
 using boost::shared_ptr;
 using libdcp::raw_convert;
 
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index f2d434e3b..9ecc503dc 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -53,7 +53,6 @@ extern "C" {
 using std::cout;
 using std::string;
 using std::vector;
-using std::stringstream;
 using std::list;
 using std::min;
 using std::pair;
diff --git a/src/lib/image.cc b/src/lib/image.cc
index f340637dc..066f12c07 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -38,7 +38,6 @@ using std::string;
 using std::min;
 using std::cout;
 using std::cerr;
-using std::stringstream;
 using boost::shared_ptr;
 using libdcp::Size;
 
diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index ba572c727..7c212be04 100644
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -32,7 +32,6 @@
 
 using std::cout;
 using std::string;
-using std::stringstream;
 using boost::shared_ptr;
 
 ImageProxy::ImageProxy (shared_ptr<Log> log)
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 8b874aae6..c3e430082 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -40,7 +40,6 @@ using std::vector;
 using std::min;
 using std::max;
 using std::string;
-using std::stringstream;
 using std::pair;
 using boost::optional;
 using boost::shared_ptr;
diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc
index 52577d3bb..4a5b39a22 100644
--- a/src/lib/ratio.cc
+++ b/src/lib/ratio.cc
@@ -24,7 +24,6 @@
 #include "i18n.h"
 
 using std::string;
-using std::stringstream;
 using std::vector;
 
 vector<Ratio const *> Ratio::_ratios;
diff --git a/src/lib/scp_dcp_job.cc b/src/lib/scp_dcp_job.cc
index 637840813..5aade6382 100644
--- a/src/lib/scp_dcp_job.cc
+++ b/src/lib/scp_dcp_job.cc
@@ -40,7 +40,6 @@
 #define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_GENERAL);
 
 using std::string;
-using std::stringstream;
 using std::min;
 using boost::shared_ptr;
 
@@ -217,12 +216,11 @@ string
 SCPDCPJob::status () const
 {
 	boost::mutex::scoped_lock lm (_status_mutex);
-	stringstream s;
-	s << Job::status ();
+	string s = Job::status ();
 	if (!_status.empty ()) {
-		s << N_("; ") << _status;
+		s += N_("; ") + _status;
 	}
-	return s.str ();
+	return s;
 }
 
 void
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 66ddb58f7..e8d4f90a6 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -53,7 +53,6 @@ using std::pair;
 using std::string;
 using std::list;
 using std::cout;
-using std::stringstream;
 using boost::shared_ptr;
 using boost::weak_ptr;
 
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index aeb62a44e..cd2978052 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -337,13 +337,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 ff948e9fb..5cb05e11d 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 ();
 
diff --git a/src/wx/dolby_certificate_dialog.cc b/src/wx/dolby_certificate_dialog.cc
index e5bb18962..a05a3bbc7 100644
--- a/src/wx/dolby_certificate_dialog.cc
+++ b/src/wx/dolby_certificate_dialog.cc
@@ -27,7 +27,6 @@
 using std::list;
 using std::string;
 using std::vector;
-using std::stringstream;
 using std::cout;
 using boost::optional;
 using boost::algorithm::split;
diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index 7440e4338..c41e86189 100644
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -27,7 +27,6 @@
 #include "test.h"
 
 using std::string;
-using std::stringstream;
 using std::list;
 using boost::shared_ptr;
 
-- 
2.30.2