Remove LIBDCP_VERSION in favour of dcp::version.

The former is only set at configure which is a bit confusing,
and I can't think of a reason to have both.

diff --git a/src/cpl.cc b/src/cpl.cc
index e050c8851fe451ef8f8b314080f44f2b60bef41a..0e431cfc94b46458336ca4eb0a2319faef027c45 100644 (file)
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -51,6 +51,7 @@
 #include "reel_sound_asset.h"
 #include "reel_subtitle_asset.h"
 #include "util.h"
+#include "version.h"
 #include "warnings.h"
 #include "xml.h"
 LIBDCP_DISABLE_WARNINGS
@@ -87,8 +88,8 @@ static string const smpte_335_ns = "http://www.smpte-ra.org/reg/335/2012";
 
 CPL::CPL (string annotation_text, ContentKind content_kind, Standard standard)
        /* default _content_title_text to annotation_text */
-       : _issuer ("libdcp" LIBDCP_VERSION)
-       , _creator ("libdcp" LIBDCP_VERSION)
+       : _issuer("libdcp", dcp::version)
+       , _creator("libdcp", dcp::version)
        , _issue_date (LocalTime().as_string())
        , _annotation_text (annotation_text)
        , _content_title_text (annotation_text)

diff --git a/src/metadata.cc b/src/metadata.cc
index 750143d1e4040d7a15f5933e88ca1eb592406563..22c46b40ce60014797f9d132d0cf65c329dd0a5b 100644 (file)
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -37,9 +37,10 @@
  */
 
 
+#include "local_time.h"
 #include "metadata.h"
 #include "util.h"
-#include "local_time.h"
+#include "version.h"
 #include <asdcp/AS_DCP.h>
 #include <iomanip>
 #include <time.h>
@@ -51,7 +52,7 @@ using namespace dcp;
 MXFMetadata::MXFMetadata ()
        : company_name ("libdcp")
        , product_name ("libdcp")
-       , product_version (LIBDCP_VERSION)
+       , product_version(dcp::version)
 {
 
 }

diff --git a/tools/dcpdecryptmxf.cc b/tools/dcpdecryptmxf.cc
index 4c615f9966eb869c45c00864e3d62aa0b5e439d8..33ba79bb0ddfdeb196c12a42d41842cb43978ef8 100644 (file)
--- 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 1f76082958bf3e68a1f17f4b50ac03a6768a8896..a7138b67659ab15bfe8d8c84d71ec7949bc60499 100644 (file)
--- 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 46b506fabe8c1747c96f3e11ee50289e2ca28113..03a755180ec173493eac6357d2a68f7e35570bcf 100644 (file)
--- 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 23023fa342ebcb7bfdb862c7233d6fc27e69adf4..db4b2bce9f72202e2bbefa624d52414d3a833e7e 100644 (file)
--- 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]);