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 /src | |
| 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 'src')
| -rw-r--r-- | src/cpl.cc | 5 | ||||
| -rw-r--r-- | src/metadata.cc | 5 |
2 files changed, 6 insertions, 4 deletions
@@ -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 750143d1..22c46b40 100644 --- 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) { } |