#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 "ardour/session_metadata.h"
-#include "pbd/convert.h"
-
using namespace PBD;
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);
}
}
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 << "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(),