summaryrefslogtreecommitdiff
path: root/libs/ardour/broadcast_info.cc
diff options
context:
space:
mode:
authorBen Loftis <ben@glw.com>2012-04-18 17:46:29 +0000
committerBen Loftis <ben@glw.com>2012-04-18 17:46:29 +0000
commit45ac9c8861be4b4290fdf64f2bea8e300ab13e8f (patch)
treeedfef34a7500d6e8be05cc677b333f57f4f21be3 /libs/ardour/broadcast_info.cc
parentc7c9c1bd2622b86ca4494098c80463fe15afeca4 (diff)
add User metadata. user metadata is edited from the same dialog and read/writable using the same mechanism as session metadata, but it is stored in the ardour.rc file instead of with the session. Importing metadata from another session does not change user metadata. SessionMetadata is now a singleton that is available to the session object and the various config objects.
git-svn-id: svn://localhost/ardour2/branches/3.0@12014 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/broadcast_info.cc')
-rw-r--r--libs/ardour/broadcast_info.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ardour/broadcast_info.cc b/libs/ardour/broadcast_info.cc
index cdc63cae11..af760629ff 100644
--- a/libs/ardour/broadcast_info.cc
+++ b/libs/ardour/broadcast_info.cc
@@ -28,6 +28,7 @@
#include "ardour/svn_revision.h"
#include "ardour/ardour.h"
#include "ardour/session.h"
+#include "ardour/session_metadata.h"
#include "pbd/convert.h"
@@ -94,8 +95,8 @@ BroadcastInfo::set_originator_ref_from_session (Session const & session)
serial_number << "ARDOUR" << "r" << std::setfill('0') << std::right << std::setw(5) << svn_revision;
snprintf_bounded_null_filled (info->originator_reference, sizeof (info->originator_reference), "%2s%3s%12s%02d%02d%02d%9d",
- session.config.get_bwf_country_code().c_str(),
- session.config.get_bwf_organization_code().c_str(),
+ SessionMetadata::Metadata()->country().c_str(),
+ SessionMetadata::Metadata()->organization().c_str(),
serial_number.str().c_str(),
_time.tm_hour,
_time.tm_min,