Tweak ordering.

[libdcp.git] / tools / dcpdiff.cc

diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc
index a820463f725e5e2aafd0e9a69e58aa790f28a2b4..af0e18548419a51a989d40f3b7a3c32b73a80398 100644 (file)
--- a/tools/dcpdiff.cc
+++ b/tools/dcpdiff.cc
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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,
+    libdcp 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.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "dcp.h"
@@ -48,6 +62,8 @@ help (string n)
             << "  -v, --verbose                be verbose\n"
             << "      --cpl-annotation-texts   allow differing CPL annotation texts\n"
             << "      --reel-annotation-texts  allow differing reel annotation texts\n"
+            << "  -a, --annotation-texts       allow different CPL and reel annotation texts\n"
+            << "  -d, --issue-dates            allow different issue dates\n"
             << "  -m, --mean-pixel             maximum allowed mean pixel error (default 5)\n"
             << "  -s, --std-dev-pixel          maximum allowed standard deviation of pixel error (default 5)\n"
             << "      --key                    hexadecimal key to use to decrypt MXFs\n"
@@ -64,6 +80,7 @@ note (NoteType t, string n)
 {
        if (t == DCP_ERROR || verbose) {
                cout << " " << n << "\n";
+               cout.flush ();
        }
 }
 
@@ -106,7 +123,7 @@ main (int argc, char* argv[])
        options.max_std_dev_pixel_error = 5;
        options.reel_hashes_can_differ = true;
        options.reel_annotation_texts_can_differ = false;
-       bool keep_going = false;
+       options.keep_going = false;
        bool ignore_missing_assets = false;
        optional<string> key;
 
@@ -119,6 +136,8 @@ main (int argc, char* argv[])
                        { "mean-pixel", required_argument, 0, 'm'},
                        { "std-dev-pixel", required_argument, 0, 's'},
                        { "keep-going", no_argument, 0, 'k'},
+                       { "annotation-texts", no_argument, 0, 'a'},
+                       { "issue-dates", no_argument, 0, 'd'},
                        /* From here we're using random capital letters for the short option */
                        { "ignore-missing-assets", no_argument, 0, 'A'},
                        { "cpl-annotation-texts", no_argument, 0, 'C'},
@@ -127,7 +146,7 @@ main (int argc, char* argv[])
                        { 0, 0, 0, 0 }
                };
 
-               int c = getopt_long (argc, argv, "Vhvm:s:kACD:E", long_options, &option_index);
+               int c = getopt_long (argc, argv, "Vhvm:s:kadACD:E", long_options, &option_index);
 
                if (c == -1) {
                        break;
@@ -150,7 +169,13 @@ main (int argc, char* argv[])
                        options.max_std_dev_pixel_error = atof (optarg);
                        break;
                case 'k':
-                       keep_going = true;
+                       options.keep_going = true;
+                       break;
+               case 'a':
+                       options.cpl_annotation_texts_can_differ = options.reel_annotation_texts_can_differ = true;
+                       break;
+               case 'd':
+                       options.issue_dates_can_differ = true;
                        break;
                case 'A':
                        ignore_missing_assets = true;
@@ -183,8 +208,8 @@ main (int argc, char* argv[])
                exit (EXIT_FAILURE);
        }
 
-       DCP* a = load_dcp (argv[optind], keep_going, ignore_missing_assets, key);
-       DCP* b = load_dcp (argv[optind + 1], keep_going, ignore_missing_assets, key);
+       DCP* a = load_dcp (argv[optind], options.keep_going, ignore_missing_assets, key);
+       DCP* b = load_dcp (argv[optind + 1], options.keep_going, ignore_missing_assets, key);
 
        /* I think this is just below the LSB at 16-bits (ie the 8th most significant bit at 24-bit) */
        options.max_audio_sample_error = 255;