Merge.

[dcpomatic.git] / src / lib / audio_content.cc

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 909f890242dd68fbc91c5461c722a64c0456e16e..a252e4b5afae12c01c0f216afa2089144fa275cd 100644 (file)
--- 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<const AudioContent> c)
+AudioContent::take_settings_from (shared_ptr<const AudioContent> c)
 {
-       _gain = c->_gain;
-       _delay = c->_delay;
+       set_gain (c->_gain);
+       set_delay (c->_delay);
 
        size_t i = 0;
        size_t j = 0;