diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-18 18:57:21 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-18 18:57:21 -0400 |
commit | 719818b56999d0ce5daf18c59bc26df2caa4ed5d (patch) | |
tree | ea7d5a86c95175e574ca522841ff40db23482481 /libs/ardour | |
parent | 88bf5eceea0e0aeb4eb0e99dace8fdffeea64184 (diff) | |
parent | eb7a85b8f992d0e2783c40c4809d81b17e80436c (diff) |
Merge branch 'kdev4' of https://github.com/jdekozak/ardour
Diffstat (limited to 'libs/ardour')
-rw-r--r-- | libs/ardour/ardour/revision.h (renamed from libs/ardour/ardour/svn_revision.h) | 6 | ||||
-rw-r--r-- | libs/ardour/broadcast_info.cc | 4 | ||||
-rw-r--r-- | libs/ardour/wscript | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/ardour/svn_revision.h b/libs/ardour/ardour/revision.h index 2cde280a57..9eeb1e2a9a 100644 --- a/libs/ardour/ardour/svn_revision.h +++ b/libs/ardour/ardour/revision.h @@ -17,11 +17,11 @@ */ -#ifndef __ardour_svn_revision_h__ -#define __ardour_svn_revision_h__ +#ifndef __ardour_revision_h__ +#define __ardour_revision_h__ namespace ARDOUR { - extern const char* svn_revision; + extern const char* revision; } #endif diff --git a/libs/ardour/broadcast_info.cc b/libs/ardour/broadcast_info.cc index 436c30c797..a7fa41aaf9 100644 --- a/libs/ardour/broadcast_info.cc +++ b/libs/ardour/broadcast_info.cc @@ -25,7 +25,7 @@ #include <glibmm.h> -#include "ardour/svn_revision.h" +#include "ardour/revision.h" #include "ardour/session.h" #include "ardour/session_metadata.h" @@ -89,7 +89,7 @@ BroadcastInfo::set_originator_ref_from_session (Session const & /*session*/) /* Serial number is 12 chars */ std::ostringstream serial_number; - serial_number << "ARDOUR" << "r" << std::setfill('0') << std::right << std::setw(5) << svn_revision; + serial_number << "ARDOUR" << "r" << std::setfill('0') << std::right << std::setw(5) << revision; snprintf_bounded_null_filled (info->originator_reference, sizeof (info->originator_reference), "%2s%3s%12s%02d%02d%02d%9d", SessionMetadata::Metadata()->country().c_str(), diff --git a/libs/ardour/wscript b/libs/ardour/wscript index b4a50a888b..d36b3a04aa 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -204,7 +204,7 @@ libardour_sources = [ 'source_factory.cc', 'speakers.cc', 'strip_silence.cc', - 'svn_revision.cc', + 'revision.cc', 'tape_file_matcher.cc', 'template_utils.cc', 'tempo.cc', |