Properly remove JSON server; remove some unused usings; remove some unnecessary uses...

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index c0ef02f65d5ab5518dcb7e53aa145b1ff3f9a598..18f4b890d6b8878cc58eabc6a2aba5930eec6838 100644 (file)
--- 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 f8675900ef2d59019b6e79ad4f862a5ef145b00f..e5b1104ff9427525dcd374c76d146eedccfb1775 100644 (file)
--- 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 02a2710290f5c8ef6656fd3a49497dc65dbc45bc..693fd587e8bab1c8a6b2ba94253cfacc5caf6f96 100644 (file)
--- 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 7ecc811be879a5af330402829377c7697a7204c2..ebe62b51fbd412cb73956b2ae86db2c6058257ab 100644 (file)
--- 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 f2d434e3bab1415ce38b170b7ae762a82062fc6f..9ecc503dc6fb6d305375ff6729a1667b49ecdaf5 100644 (file)
--- 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 f340637dc7ebf2d515983fe6921de162045e9afa..066f12c07ea891178260f9cba58a6096b982ebe4 100644 (file)
--- 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 ba572c72733e9c636a37575ca5cc04d6c609891b..7c212be045a166704852e78f4453f1af06175a74 100644 (file)
--- 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 8b874aae6676a757b7bf4e01b4e1bb13599478ef..c3e430082ecacd2a51db12edb1e5ee536b577fc6 100644 (file)
--- 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 52577d3bbc5158f7ccdfea8a561caa0f055107c1..4a5b39a22f28b060ebf5ede3e7b27d197e7667d4 100644 (file)
--- 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 63784081356e9eb0fc4d81ea97d551a7078e224d..5aade6382d13b3442dee91ca94f98cb7fad05838 100644 (file)
--- 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 66ddb58f7e901e0c32a14aa3f5414739cc8c1c68..e8d4f90a6cbc181bb7c162cf5bf7efc1179db29c 100644 (file)
--- 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 aeb62a44e5f2cfd2b7cf5c92511fd2bec83b69a8..cd2978052add1f55409eda32784413bd5f0e84f2 100644 (file)
--- 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 ff948e9fbbae1472089acfc10594c0c914c03f0e..5cb05e11d5ce23721d5acff9c1ab530550022325 100644 (file)
--- 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 e5bb1896207fe396464624e7ca730093b8d217ab..a05a3bbc79ff58b73caecc48a70e1afb67bc0038 100644 (file)
--- 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 7440e43381e27dcb82530391f470607c13939332..c41e8618900af948c77cd85e1f8e4fabb7bd410b 100644 (file)
--- 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;