X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_format_specification.cc;h=7ed52a80e8c2b83ef2bb0972dc50fb892006f304;hb=d6b36a13a127d9b152cfe12d596ea862773f9923;hp=8b921519f71fd9ccf60ab44f4651d85f93f166db;hpb=5399425f534e2d96d07cf29f427bfa0f39d904b7;p=ardour.git diff --git a/libs/ardour/export_format_specification.cc b/libs/ardour/export_format_specification.cc index 8b921519f7..7ed52a80e8 100644 --- a/libs/ardour/export_format_specification.cc +++ b/libs/ardour/export_format_specification.cc @@ -31,7 +31,7 @@ #include "pbd/enumwriter.h" #include "pbd/convert.h" -#include "i18n.h" +#include "pbd/i18n.h" namespace ARDOUR { @@ -167,11 +167,16 @@ ExportFormatSpecification::ExportFormatSpecification (Session & s) , _silence_end (s) , _normalize (false) - , _normalize_target (1.0) + , _normalize_loudness (false) + , _normalize_dbfs (GAIN_COEFF_UNITY) + , _normalize_lufs (-23) + , _normalize_dbtp (-1) , _with_toc (false) , _with_cue (false) - , _upload (false) + , _with_mp4chaps (false) + , _soundcloud_upload (false) , _command ("") + , _analyse (true) { format_ids.insert (F_None); endiannesses.insert (E_FileDefault); @@ -182,8 +187,31 @@ ExportFormatSpecification::ExportFormatSpecification (Session & s) ExportFormatSpecification::ExportFormatSpecification (Session & s, XMLNode const & state) : session (s) + + , has_sample_format (false) + , supports_tagging (false) + , _has_broadcast_info (false) + , _channel_limit (0) + , _dither_type (D_None) + , _src_quality (SRC_SincBest) + , _tag (true) + + , _trim_beginning (false) , _silence_beginning (s) + , _trim_end (false) , _silence_end (s) + + , _normalize (false) + , _normalize_loudness (false) + , _normalize_dbfs (GAIN_COEFF_UNITY) + , _normalize_lufs (-23) + , _normalize_dbtp (-1) + , _with_toc (false) + , _with_cue (false) + , _with_mp4chaps (false) + , _soundcloud_upload (false) + , _command ("") + , _analyse (true) { _silence_beginning.type = Time::Timecode; _silence_end.type = Time::Timecode; @@ -196,6 +224,8 @@ ExportFormatSpecification::ExportFormatSpecification (ExportFormatSpecification , session (other.session) , _silence_beginning (other.session) , _silence_end (other.session) + , _soundcloud_upload (false) + , _analyse (other._analyse) { if (modify_name) { set_name (other.name() + " (copy)"); @@ -222,7 +252,10 @@ ExportFormatSpecification::ExportFormatSpecification (ExportFormatSpecification set_trim_beginning (other.trim_beginning()); set_trim_end (other.trim_end()); set_normalize (other.normalize()); - set_normalize_target (other.normalize_target()); + set_normalize_loudness (other.normalize_loudness()); + set_normalize_dbfs (other.normalize_dbfs()); + set_normalize_lufs (other.normalize_lufs()); + set_normalize_dbtp (other.normalize_dbtp()); set_tag (other.tag()); @@ -239,6 +272,7 @@ ExportFormatSpecification::~ExportFormatSpecification () XMLNode & ExportFormatSpecification::get_state () { + LocaleGuard lg; XMLNode * node; XMLNode * root = new XMLNode ("ExportFormatSpecification"); @@ -246,8 +280,10 @@ ExportFormatSpecification::get_state () root->add_property ("id", _id.to_s()); root->add_property ("with-cue", _with_cue ? "true" : "false"); root->add_property ("with-toc", _with_toc ? "true" : "false"); - root->add_property ("upload", _upload ? "true" : "false"); + root->add_property ("with-mp4chaps", _with_mp4chaps ? "true" : "false"); root->add_property ("command", _command); + root->add_property ("analyse", _analyse ? "true" : "false"); + root->add_property ("soundcloud-upload", _soundcloud_upload ? "true" : "false"); node = root->add_child ("Encoding"); node->add_property ("id", enum_2_string (format_id())); @@ -275,7 +311,10 @@ ExportFormatSpecification::get_state () node = processing->add_child ("Normalize"); node->add_property ("enabled", normalize() ? "true" : "false"); - node->add_property ("target", to_string (normalize_target(), std::dec)); + node->add_property ("loudness", normalize_loudness() ? "yes" : "no"); + node->add_property ("dbfs", to_string (normalize_dbfs(), std::dec)); + node->add_property ("lufs", to_string (normalize_lufs(), std::dec)); + node->add_property ("dbtp", to_string (normalize_dbtp(), std::dec)); XMLNode * silence = processing->add_child ("Silence"); XMLNode * start = silence->add_child ("Start"); @@ -304,6 +343,7 @@ ExportFormatSpecification::set_state (const XMLNode & root) XMLProperty const * prop; XMLNode const * child; string value; + LocaleGuard lg; if ((prop = root.property ("name"))) { _name = prop->value(); @@ -318,25 +358,37 @@ ExportFormatSpecification::set_state (const XMLNode & root) } else { _with_cue = false; } - + if ((prop = root.property ("with-toc"))) { _with_toc = string_is_affirmative (prop->value()); } else { _with_toc = false; } - - if ((prop = root.property ("upload"))) { - _upload = string_is_affirmative (prop->value()); + + if ((prop = root.property ("with-mp4chaps"))) { + _with_mp4chaps = string_is_affirmative (prop->value()); } else { - _upload = false; + _with_mp4chaps = false; } - + if ((prop = root.property ("command"))) { _command = prop->value(); } else { _command = ""; } + if ((prop = root.property ("analyse"))) { + _analyse = string_is_affirmative (prop->value()); + } else { + _analyse = false; + } + + if ((prop = root.property ("soundcloud-upload"))) { + _soundcloud_upload = string_is_affirmative (prop->value()); + } else { + _soundcloud_upload = false; + } + /* Encoding and SRC */ if ((child = root.child ("Encoding"))) { @@ -401,8 +453,25 @@ ExportFormatSpecification::set_state (const XMLNode & root) _normalize = (!prop->value().compare ("true")); } + // old formats before ~ 4.7-930ish if ((prop = child->property ("target"))) { - _normalize_target = atof (prop->value()); + _normalize_dbfs = atof (prop->value()); + } + + if ((prop = child->property ("loudness"))) { + _normalize_loudness = string_is_affirmative (prop->value()); + } + + if ((prop = child->property ("dbfs"))) { + _normalize_dbfs = atof (prop->value()); + } + + if ((prop = child->property ("lufs"))) { + _normalize_lufs = atof (prop->value()); + } + + if ((prop = child->property ("dbtp"))) { + _normalize_dbtp = atof (prop->value()); } } @@ -550,7 +619,11 @@ ExportFormatSpecification::description (bool include_name) list components; if (_normalize) { - components.push_back (_("normalize")); + if (_normalize_loudness) { + components.push_back (_("normalize loudness")); + } else { + components.push_back (_("normalize peak")); + } } if (_trim_beginning && _trim_end) { @@ -588,6 +661,9 @@ ExportFormatSpecification::description (bool include_name) case SR_96: components.push_back ("96 kHz"); break; + case SR_176_4: + components.push_back ("176.4 kHz"); + break; case SR_192: components.push_back ("192 kHz"); break; @@ -606,8 +682,8 @@ ExportFormatSpecification::description (bool include_name) components.push_back ("CUE"); } - if (_upload) { - components.push_back ("Upload"); + if (_with_mp4chaps) { + components.push_back ("MP4ch"); } if (!_command.empty()) { @@ -640,7 +716,7 @@ ExportFormatSpecification::get_option (XMLNode const * node, std::string const & XMLNodeList list (node->children ("Option")); for (XMLNodeList::iterator it = list.begin(); it != list.end(); ++it) { - XMLProperty * prop = (*it)->property ("name"); + XMLProperty const * prop = (*it)->property ("name"); if (prop && !name.compare (prop->value())) { prop = (*it)->property ("value"); if (prop) {