X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbroadcast_info.cc;h=98175a6da668a3bade384287c396c52684c46444;hb=b32ca9e9d94affba4cb194d57267e185cc6d5553;hp=f956e1207d167d5d55de450375b994066d05f2ba;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git diff --git a/libs/ardour/broadcast_info.cc b/libs/ardour/broadcast_info.cc index f956e1207d..98175a6da6 100644 --- a/libs/ardour/broadcast_info.cc +++ b/libs/ardour/broadcast_info.cc @@ -19,17 +19,16 @@ */ #include "ardour/broadcast_info.h" - +#include #include #include +#include #include -#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,35 +38,21 @@ namespace ARDOUR static void snprintf_bounded_null_filled (char* target, size_t target_size, char const * fmt, ...) { - char buf[target_size+1]; + std::vector 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); } -BroadcastInfo::BroadcastInfo () : - _has_info (false) +BroadcastInfo::BroadcastInfo () { - info = new SF_BROADCAST_INFO; - memset (info, 0, sizeof (*info)); - - // Note: Set version to 1 when UMID is used, otherwise version should stay at 0 - info->version = 0; - time_t rawtime; - std::time (&rawtime); - _time = *localtime (&rawtime); -} - -BroadcastInfo::~BroadcastInfo () -{ - delete info; } void @@ -77,155 +62,7 @@ BroadcastInfo::set_from_session (Session const & session, int64_t time_ref) set_time_reference (time_ref); set_origination_time (); set_originator (); - set_originator_ref (session); -} - -bool -BroadcastInfo::load_from_file (std::string const & filename) -{ - SNDFILE * file = 0; - SF_INFO info; - - info.format = 0; - - if (!(file = sf_open (filename.c_str(), SFM_READ, &info))) { - update_error(); - return false; - } - - bool ret = load_from_file (file); - - sf_close (file); - return ret; -} - -bool -BroadcastInfo::load_from_file (SNDFILE* sf) -{ - if (sf_command (sf, SFC_GET_BROADCAST_INFO, info, sizeof (*info)) != SF_TRUE) { - update_error(); - _has_info = false; - return false; - } - - _has_info = true; - return true; -} - -std::string -BroadcastInfo::get_description () const -{ - return info->description; -} - -int64_t -BroadcastInfo::get_time_reference () const -{ - if (!_has_info) { - return 0; - } - - int64_t ret = (uint32_t) info->time_reference_high; - ret <<= 32; - ret |= (uint32_t) info->time_reference_low; - return ret; -} - -struct tm -BroadcastInfo::get_origination_time () const -{ - struct tm ret; - - std::string date = info->origination_date; - ret.tm_year = atoi (date.substr (0, 4)) - 1900; - ret.tm_mon = atoi (date.substr (5, 2)); - ret.tm_mday = atoi (date.substr (8, 2)); - - std::string time = info->origination_time; - ret.tm_hour = atoi (time.substr (0,2)); - ret.tm_min = atoi (time.substr (3,2)); - ret.tm_sec = atoi (time.substr (6,2)); - - return ret; -} - -std::string -BroadcastInfo::get_originator () const -{ - return info->originator; -} - -std::string -BroadcastInfo::get_originator_ref () const -{ - return info->originator_reference; -} - -bool -BroadcastInfo::write_to_file (std::string const & filename) -{ - SNDFILE * file = 0; - SF_INFO info; - - info.format = 0; - - if (!(file = sf_open (filename.c_str(), SFM_RDWR, &info))) { - update_error(); - return false; - } - - bool ret = write_to_file (file); - - sf_close (file); - return ret; -} - -bool -BroadcastInfo::write_to_file (SNDFILE* sf) -{ - if (sf_command (sf, SFC_SET_BROADCAST_INFO, info, sizeof (*info)) != SF_TRUE) { - update_error(); - return false; - } - - return true; -} - -void -BroadcastInfo::set_description (std::string const & desc) -{ - _has_info = true; - - snprintf_bounded_null_filled (info->description, sizeof (info->description), desc.c_str()); -} - -void -BroadcastInfo::set_time_reference (int64_t when) -{ - _has_info = true; - - info->time_reference_high = (when >> 32); - info->time_reference_low = (when & 0xffffffff); -} - -void -BroadcastInfo::set_origination_time (struct tm * now) -{ - _has_info = true; - - if (now) { - _time = *now; - } - - snprintf_bounded_null_filled (info->origination_date, sizeof (info->origination_date), "%4d-%02d-%02d", - _time.tm_year + 1900, - _time.tm_mon + 1, - _time.tm_mday); - - snprintf_bounded_null_filled (info->origination_time, sizeof (info->origination_time), "%02d:%02d:%02d", - _time.tm_hour, - _time.tm_min, - _time.tm_sec); + set_originator_ref_from_session (session); } void @@ -234,7 +71,7 @@ BroadcastInfo::set_originator (std::string const & str) _has_info = true; if (!str.empty()) { - snprintf_bounded_null_filled (info->originator, sizeof (info->originator), str.c_str()); + AudioGrapher::BroadcastInfo::set_originator (str); return; } @@ -242,28 +79,30 @@ BroadcastInfo::set_originator (std::string const & str) } void -BroadcastInfo::set_originator_ref (Session const & session, std::string const & str) +BroadcastInfo::set_originator_ref_from_session (Session const & /*session*/) { _has_info = true; - if (!str.empty()) { - snprintf_bounded_null_filled (info->originator_reference, sizeof (info->originator_reference), str.c_str()); - return; - } - /* 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 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, @@ -271,13 +110,5 @@ BroadcastInfo::set_originator_ref (Session const & session, std::string const & } -void -BroadcastInfo::update_error () -{ - char errbuf[256]; - sf_error_str (0, errbuf, sizeof (errbuf) - 1); - error = errbuf; -} - } // namespace ARDOUR