diff options
author | Carl Hetherington <carl@carlh.net> | 2010-08-19 14:58:54 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-08-19 14:58:54 +0000 |
commit | b6642d14ca64153b5731d1a3a79e4d00060541ca (patch) | |
tree | d5c2ee3b0ce0452a08f3bc950604db63f7b4118e /libs/ardour/broadcast_info.cc | |
parent | a958dd0512a29894096e67ccd41a3d879b6bc162 (diff) |
Write BWF info on export. Fixes #3398.
git-svn-id: svn://localhost/ardour2/branches/3.0@7652 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/broadcast_info.cc')
-rw-r--r-- | libs/ardour/broadcast_info.cc | 185 |
1 files changed, 5 insertions, 180 deletions
diff --git a/libs/ardour/broadcast_info.cc b/libs/ardour/broadcast_info.cc index ccdb4a331e..12fafa29fe 100644 --- a/libs/ardour/broadcast_info.cc +++ b/libs/ardour/broadcast_info.cc @@ -51,23 +51,9 @@ snprintf_bounded_null_filled (char* target, size_t target_size, char const * fmt } -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 +63,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 +72,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,15 +80,10 @@ 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; @@ -271,13 +104,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 |