diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-02-26 21:07:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-02-26 21:07:13 +0100 |
| commit | 4d86fd0dbb6a29a233577803c5541e962d4d58ef (patch) | |
| tree | ad8293c19ec2591d7b5926d0c47923db493eb197 /tools | |
| parent | de4b2a1d7f93b9f0dd2113aeff746738c19c8b43 (diff) | |
Remove LIBDCP_VERSION in favour of dcp::version.v1.8.62
The former is only set at configure which is a bit confusing,
and I can't think of a reason to have both.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dcpdecryptmxf.cc | 3 | ||||
| -rw-r--r-- | tools/dcpdiff.cc | 2 | ||||
| -rw-r--r-- | tools/dcpinfo.cc | 2 | ||||
| -rw-r--r-- | tools/dcpverify.cc | 14 |
4 files changed, 13 insertions, 8 deletions
diff --git a/tools/dcpdecryptmxf.cc b/tools/dcpdecryptmxf.cc index 4c615f99..33ba79bb 100644 --- a/tools/dcpdecryptmxf.cc +++ b/tools/dcpdecryptmxf.cc @@ -44,6 +44,7 @@ #include "mono_picture_asset.h" #include "mono_picture_asset_writer.h" #include "util.h" +#include "version.h" #include <asdcp/AS_DCP.h> #include <getopt.h> #include <iostream> @@ -125,7 +126,7 @@ main (int argc, char* argv[]) switch (c) { case 'A': - cout << "libdcp version " << LIBDCP_VERSION << "\n"; + cout << "libdcp version " << dcp::version << "\n"; exit (EXIT_SUCCESS); case 'v': verbose = true; diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc index 1f760829..a7138b67 100644 --- a/tools/dcpdiff.cc +++ b/tools/dcpdiff.cc @@ -160,7 +160,7 @@ main (int argc, char* argv[]) switch (c) { case 'V': - cout << "dcpdiff version " << LIBDCP_VERSION << "\n"; + cout << "dcpdiff version " << dcp::version << "\n"; exit (EXIT_SUCCESS); case 'h': help (argv[0]); diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index 46b506fa..03a75518 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -315,7 +315,7 @@ main (int argc, char* argv[]) switch (c) { case 'v': - cout << "libdcp version " << LIBDCP_VERSION << "\n"; + cout << "libdcp version " << dcp::version << "\n"; exit (EXIT_SUCCESS); case 'h': help (argv[0]); diff --git a/tools/dcpverify.cc b/tools/dcpverify.cc index 23023fa3..db4b2bce 100644 --- a/tools/dcpverify.cc +++ b/tools/dcpverify.cc @@ -31,10 +31,12 @@ files in the program, then also delete it here. */ -#include "verify.h" -#include "compose.hpp" + #include "common.h" +#include "compose.hpp" #include "raw_convert.h" +#include "verify.h" +#include "version.h" #include <boost/bind.hpp> #include <boost/optional.hpp> #include <boost/filesystem.hpp> @@ -42,14 +44,16 @@ #include <iostream> #include <cstdlib> -using std::cout; + using std::cerr; +using std::cout; +using std::list; using std::string; using std::vector; -using std::list; using boost::bind; using boost::optional; + static void help (string n) { @@ -98,7 +102,7 @@ main (int argc, char* argv[]) switch (c) { case 'V': - cout << "dcpverify version " << LIBDCP_VERSION << "\n"; + cout << "dcpverify version " << dcp::version << "\n"; exit (EXIT_SUCCESS); case 'h': help (argv[0]); |