Merge master.

4 files changed, 3 insertions, 34 deletions

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index c75f8f953..b0a67c6d9 100644
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -74,7 +74,7 @@ main (int argc, char* argv[])
 	dcpomatic_setup ();
 
 	string name;
-	DCPContentType const * dcp_content_type = DCPContentType::from_dci_name ("TST");
+	DCPContentType const * dcp_content_type = DCPContentType::from_isdcf_name ("TST");
 	Ratio const * container_ratio = 0;
 	Ratio const * content_ratio = 0;
 	int still_length = 10;
@@ -110,7 +110,7 @@ main (int argc, char* argv[])
 			name = optarg;
 			break;
 		case 'c':
-			dcp_content_type = DCPContentType::from_dci_name (optarg);
+			dcp_content_type = DCPContentType::from_isdcf_name (optarg);
 			if (dcp_content_type == 0) {
 				cerr << "Bad DCP content type.\n";
 				help (argv[0]);
diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc
index f43dd10bc..56802d8ae 100644
--- a/src/tools/dcpomatic_server_cli.cc
+++ b/src/tools/dcpomatic_server_cli.cc
@@ -52,7 +52,7 @@ help (string n)
 {
 	cerr << "Syntax: " << n << " [OPTION]\n"
 	     << "  -v, --version      show DCP-o-matic version\n"
-	     << "  -h, --help	      show this help\n"
+	     << "  -h, --help         show this help\n"
 	     << "  -t, --threads      number of parallel encoding threads to use\n"
 	     << "  --verbose          be verbose to stdout\n"
 	     << "  --log              write a log file of activity\n";
diff --git a/src/tools/update_dialog.cc b/src/tools/update_dialog.cc
deleted file mode 100644
index e69de29bb..000000000
--- a/src/tools/update_dialog.cc
+++ /dev/null
diff --git a/src/tools/update_dialog.h b/src/tools/update_dialog.h
deleted file mode 100644
index 8b499ebcc..000000000
--- a/src/tools/update_dialog.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-class UpdateDialog
-{
-public:
-	UpdateDialog (wxWindow *);
-
-private:
-	wxGauge* _gauge;
-	wxStaticText* _message;
-	boost::thread* _thread;
-	boost::optional<UpdateChecker::Result> _result;
-	std::string _stable;
-};