projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unnecessary and unused changes from grygorii
[ardour.git]
/
libs
/
ardour
/
broadcast_info.cc
diff --git
a/libs/ardour/broadcast_info.cc
b/libs/ardour/broadcast_info.cc
index cdc63cae11bfa5826cd59d3e178dedcd9da95579..a08d2c7991c6b0044bea6625b0a7c969db05066b 100644
(file)
--- a/
libs/ardour/broadcast_info.cc
+++ b/
libs/ardour/broadcast_info.cc
@@
-22,14
+22,13
@@
#include <iostream>
#include <sstream>
#include <iomanip>
#include <iostream>
#include <sstream>
#include <iomanip>
+#include <vector>
#include <glibmm.h>
#include <glibmm.h>
-#include "ardour/svn_revision.h"
-#include "ardour/ardour.h"
+#include "ardour/revision.h"
#include "ardour/session.h"
#include "ardour/session.h"
-
-#include "pbd/convert.h"
+#include "ardour/session_metadata.h"
using namespace PBD;
using namespace PBD;
@@
-39,15
+38,15
@@
namespace ARDOUR
static void
snprintf_bounded_null_filled (char* target, size_t target_size, char const * fmt, ...)
{
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);
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);
va_end (ap);
memset (target, 0, target_size);
- memcpy (target,
buf
, target_size);
+ memcpy (target,
&buf[0]
, target_size);
}
}
@@
-80,22
+79,22
@@
BroadcastInfo::set_originator (std::string const & str)
}
void
}
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 */
{
_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 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",
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,
serial_number.str().c_str(),
_time.tm_hour,
_time.tm_min,