diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-05 00:05:32 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-05 14:36:27 +0100 |
| commit | fe99eae4b95c5fcf2f3730efad4a18d0cb5c29bc (patch) | |
| tree | 265ca14896f63eeff210d602c5f11ed19d800ebf /tools | |
| parent | 7b717db244554300ebed8eade8421ee3faa28d33 (diff) | |
MXF -> Asset in lots of places.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dcpdiff.cc | 7 | ||||
| -rw-r--r-- | tools/dcpinfo.cc | 16 |
2 files changed, 9 insertions, 14 deletions
diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc index c2a454cf..2cc10e90 100644 --- a/tools/dcpdiff.cc +++ b/tools/dcpdiff.cc @@ -46,7 +46,6 @@ help (string n) << " -V, --version show libdcp version\n" << " -h, --help show this help\n" << " -v, --verbose be verbose\n" - << " -n, --mxf-filenames allow differing MXF filenames\n" << " --cpl-annotation-texts allow differing CPL annotation texts\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" @@ -115,7 +114,6 @@ main (int argc, char* argv[]) { "version", no_argument, 0, 'V'}, { "help", no_argument, 0, 'h'}, { "verbose", no_argument, 0, 'v'}, - { "mxf-filenames", no_argument, 0, 'n'}, { "mean-pixel", required_argument, 0, 'm'}, { "std-dev-pixel", required_argument, 0, 's'}, { "keep-going", no_argument, 0, 'k'}, @@ -126,7 +124,7 @@ main (int argc, char* argv[]) { 0, 0, 0, 0 } }; - int c = getopt_long (argc, argv, "Vhvnm:s:kACD:", long_options, &option_index); + int c = getopt_long (argc, argv, "Vhvm:s:kACD:", long_options, &option_index); if (c == -1) { break; @@ -142,9 +140,6 @@ main (int argc, char* argv[]) case 'v': verbose = true; break; - case 'n': - options.mxf_filenames_can_differ = true; - break; case 'm': options.max_mean_pixel_error = atof (optarg); break; diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index 119a2106..965088c2 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -20,8 +20,8 @@ #include "dcp.h" #include "exceptions.h" #include "reel.h" -#include "sound_mxf.h" -#include "picture_mxf.h" +#include "sound_asset.h" +#include "picture_asset.h" #include "subtitle_asset.h" #include "reel_picture_asset.h" #include "reel_sound_asset.h" @@ -54,22 +54,22 @@ help (string n) static void main_picture (shared_ptr<Reel> reel) { - if (reel->main_picture() && reel->main_picture()->mxf()) { + if (reel->main_picture() && reel->main_picture()->asset()) { cout << " Picture: " - << reel->main_picture()->mxf()->size().width + << reel->main_picture()->asset()->size().width << "x" - << reel->main_picture()->mxf()->size().height << "\n"; + << reel->main_picture()->asset()->size().height << "\n"; } } static void main_sound (shared_ptr<Reel> reel) { - if (reel->main_sound() && reel->main_sound()->mxf()) { + if (reel->main_sound() && reel->main_sound()->asset()) { cout << " Sound: " - << reel->main_sound()->mxf()->channels() + << reel->main_sound()->asset()->channels() << " channels at " - << reel->main_sound()->mxf()->sampling_rate() << "Hz\n"; + << reel->main_sound()->asset()->sampling_rate() << "Hz\n"; } } |