Tidy up equality options slightly.

1 files changed, 14 insertions, 9 deletions

diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc
index 73097ccd..07bb6296 100644
--- a/tools/dcpdiff.cc
+++ b/tools/dcpdiff.cc
@@ -14,6 +14,7 @@ help (string n)
 	cerr << "Syntax: " << n << " [OPTION] <DCP> <DCP>\n"
 	     << "  -b, --bitwise      bitwise check\n"
 	     << "  -v, --version      show libdcp version\n"
+	     << "  -d, --verbose      be verbose\n"
 	     << "  -h, --help         show this help\n"
 	     << "\n"
 	     << "The <DCP>s are the DCP directories to compare.\n"
@@ -24,7 +25,9 @@ help (string n)
 int
 main (int argc, char* argv[])
 {
-	bool bitwise = false;
+	EqualityOptions options;
+	options.flags = EqualityFlags (LIBDCP_METADATA | MXF_INSPECT);
+	options.verbose = false;
 	
 	int option_index = 0;
 	while (1) {
@@ -32,10 +35,11 @@ main (int argc, char* argv[])
 			{ "bitwise", no_argument, 0, 'b'},
 			{ "version", no_argument, 0, 'v'},
 			{ "help", no_argument, 0, 'h'},
+			{ "verbose", no_argument, 0, 'd'},
 			{ 0, 0, 0, 0 }
 		};
 
-		int c = getopt_long (argc, argv, "bvh", long_options, &option_index);
+		int c = getopt_long (argc, argv, "bvhd", long_options, &option_index);
 
 		if (c == -1) {
 			break;
@@ -43,7 +47,7 @@ main (int argc, char* argv[])
 
 		switch (c) {
 		case 'b':
-			bitwise = true;
+			options.flags = EqualityFlags (options.flags | MXF_BITWISE);
 			break;
 		case 'v':
 			cout << "dcpdiff version " << LIBDCP_VERSION << "\n";
@@ -51,6 +55,9 @@ main (int argc, char* argv[])
 		case 'h':
 			help (argv[0]);
 			exit (EXIT_SUCCESS);
+		case 'd':
+			options.verbose = true;
+			break;
 		}
 	}
 
@@ -85,14 +92,12 @@ main (int argc, char* argv[])
 		exit (EXIT_FAILURE);
 	}
 
-	EqualityFlags flags = EqualityFlags (LIBDCP_METADATA | MXF_INSPECT);
-	if (bitwise) {
-		flags = EqualityFlags (flags | MXF_BITWISE);
-	}
+	options.max_mean_pixel_error = 5;
+	options.max_std_dev_pixel_error = 5;
 
-	list<string> notes = a->equals (*b, flags, 5, 5);
+	list<string> notes = a->equals (*b, options);
 	if (notes.empty ()) {
-		cout << "DCPs identical\n";
+		cout << "DCPs equal\n";
 		exit (EXIT_SUCCESS);
 	}