X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=a252e4b5afae12c01c0f216afa2089144fa275cd;hb=14cccb179fff7bbbf422e13f9d2e3264239c93c7;hp=909f890242dd68fbc91c5461c722a64c0456e16e;hpb=22745fd3831b94ace2ca80909fee6fae937a0d09;p=dcpomatic.git diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 909f89024..a252e4b5a 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -250,14 +250,14 @@ AudioContent::processing_description () const } if (not_resampled && resampled) { - return String::compose (_("Some audio will be resampled to %1kHz"), resampled_frame_rate ()); + return String::compose (_("Some audio will be resampled to %1Hz"), resampled_frame_rate ()); } if (!not_resampled && resampled) { if (same) { - return String::compose (_("Audio will be resampled from %1kHz to %2kHz"), common_frame_rate.get(), resampled_frame_rate ()); + return String::compose (_("Audio will be resampled from %1Hz to %2Hz"), common_frame_rate.get(), resampled_frame_rate ()); } else { - return String::compose (_("Audio will be resampled to %1kHz"), resampled_frame_rate ()); + return String::compose (_("Audio will be resampled to %1Hz"), resampled_frame_rate ()); } } @@ -381,10 +381,10 @@ AudioContent::set_stream (AudioStreamPtr stream) } void -AudioContent::use_template (shared_ptr c) +AudioContent::take_settings_from (shared_ptr c) { - _gain = c->_gain; - _delay = c->_delay; + set_gain (c->_gain); + set_delay (c->_delay); size_t i = 0; size_t j = 0;