diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-02 22:08:41 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-02 22:08:41 +0100 |
| commit | 2f9e6bc1478d28f1b040ada6c901e6683ff7ac64 (patch) | |
| tree | c504ed8ff8e8741142e8e2fce45fabe8df3d36e6 /src | |
| parent | 43db901b50575daf978621384264d5c0131ecf06 (diff) | |
Use version.cc contents instead of DVDOMATIC_VERSION.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/film.cc | 3 | ||||
| -rw-r--r-- | src/tools/dvdomatic.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 90c410546..2db03f6a6 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -49,6 +49,7 @@ #include "decoder_factory.h" #include "config.h" #include "check_hashes_job.h" +#include "version.h" using namespace std; using namespace boost; @@ -483,7 +484,7 @@ Film::make_dcp (bool transcode, int freq) throw BadSettingError ("name", "cannot contain slashes"); } - log()->log (String::compose ("DVD-o-matic %1 using %2", DVDOMATIC_VERSION, dependency_version_summary())); + log()->log (String::compose ("DVD-o-matic %1 git %2 using %3", dvdomatic_version, dvdomatic_git_commit, dependency_version_summary())); { char buffer[128]; diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 9ff2c1ddc..5f0028b75 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -350,7 +350,7 @@ public: { wxAboutDialogInfo info; info.SetName (_("DVD-o-matic")); - info.SetVersion (wxT (DVDOMATIC_VERSION)); + info.SetVersion (std_to_wx (String::compose ("DVD-o-matic version %1 git %2", dvdomatic_version, dvdomatic_git_commit))); info.SetDescription (_("Free, open-source DCP generation from almost anything.")); info.SetCopyright (_("(C) Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen")); wxArrayString authors; |