X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbroadcast_info.cc;h=98175a6da668a3bade384287c396c52684c46444;hb=96d18362580de93c9310fb993c37083ad2338aed;hp=cdc63cae11bfa5826cd59d3e178dedcd9da95579;hpb=a473d630eb165272992e90f8d854b1d66ec0be63;p=ardour.git

diff --git a/libs/ardour/broadcast_info.cc b/libs/ardour/broadcast_info.cc
index cdc63cae11..98175a6da6 100644
--- a/libs/ardour/broadcast_info.cc
+++ b/libs/ardour/broadcast_info.cc
@@ -22,14 +22,13 @@
 #include <iostream>
 #include <sstream>
 #include <iomanip>
+#include <vector>
 
 #include <glibmm.h>
 
-#include "ardour/svn_revision.h"
-#include "ardour/ardour.h"
+#include "ardour/revision.h"
 #include "ardour/session.h"
-
-#include "pbd/convert.h"
+#include "ardour/session_metadata.h"
 
 using namespace PBD;
 
@@ -39,15 +38,15 @@ namespace ARDOUR
 static void
 snprintf_bounded_null_filled (char* target, size_t target_size, char const * fmt, ...)
 {
-	char buf[target_size+1];
+	std::vector<char> buf(target_size+1);
 	va_list ap;
 
 	va_start (ap, fmt);
-	vsnprintf (buf, target_size+1, fmt, ap);
+	vsnprintf (&buf[0], target_size+1, fmt, ap);
 	va_end (ap);
 
 	memset (target, 0, target_size);
-	memcpy (target, buf, target_size);
+	memcpy (target, &buf[0], target_size);
 
 }
 
@@ -80,23 +79,30 @@ BroadcastInfo::set_originator (std::string const & str)
 }
 
 void
-BroadcastInfo::set_originator_ref_from_session (Session const & session)
+BroadcastInfo::set_originator_ref_from_session (Session const & /*session*/)
 {
 	_has_info = true;
 
 	/* random code is 9 digits */
 
-	int random_code = random() % 999999999;
+	int random_code = g_random_int() % 999999999;
 
 	/* 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 << PROGRAM_NAME << revision;
+
+	/* https://tech.ebu.ch/docs/r/r099.pdf
+	 * CC Country code: (2 characters) based on the ISO 3166-1 standard
+	 * OOO Organisation code: (3 characters) based on the EBU facility codes, Tech 3279
+	 * NNNNNNNNNNNN Serial number: (12 characters extracted from the recorder model and serial number) This should identify the machine’s type and serial number.
+	 * HHMMSS OriginationTime (6 characters,) from the <OriginationTime> field of the BWF.
+	 * RRRRRRRRR Random Number (9 characters 0-9) Generated locally by the recorder using some reasonably random algorithm.
+	 */
 	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(),
-		  serial_number.str().c_str(),
+		  SessionMetadata::Metadata()->country().substr (0, 2).c_str(),
+		  SessionMetadata::Metadata()->organization().substr (0, 3).c_str(),
+		  serial_number.str().substr (0, 12).c_str(),
 		  _time.tm_hour,
 		  _time.tm_min,
 		  _time.tm_sec,