Remove unnecessary non-const operator[].

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

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 5098e84898cdf04e9aec2894b070dbb60722e253..acd3b81b4295e817d54de91c9f3787b144b95886 100644 (file)
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -97,12 +97,6 @@ AudioContent::AudioContent (Content* parent, cxml::ConstNodePtr node)
        _fade_in = ContentTime(node->optional_number_child<ContentTime::Type>("AudioFadeIn").get_value_or(0));
        _fade_out = ContentTime(node->optional_number_child<ContentTime::Type>("AudioFadeOut").get_value_or(0));
        _use_same_fades_as_video = node->optional_bool_child("AudioUseSameFadesAsVideo").get_value_or(false);
-
-       /* Backwards compatibility */
-       auto r = node->optional_number_child<double>("AudioVideoFrameRate");
-       if (r) {
-               _parent->set_video_frame_rate (r.get());
-       }
 }
 
 
@@ -404,6 +398,8 @@ AudioContent::take_settings_from (shared_ptr<const AudioContent> c)
 {
        set_gain (c->_gain);
        set_delay (c->_delay);
+       set_fade_in (c->fade_in());
+       set_fade_out (c->fade_out());
 
        size_t i = 0;
        size_t j = 0;
@@ -424,11 +420,13 @@ AudioContent::modify_position (shared_ptr<const Film> film, DCPTime& pos) const
 
 
 void
-AudioContent::modify_trim_start (ContentTime& trim) const
+AudioContent::modify_trim_start(shared_ptr<const Film> film, ContentTime& trim) const
 {
-       DCPOMATIC_ASSERT (!_streams.empty());
-       /* XXX: we're in trouble if streams have different rates */
-       trim = trim.round (_streams.front()->frame_rate());
+       /* When this trim is used it the audio will have been resampled, and using the
+        * DCP rate here reduces the chance of rounding errors causing audio glitches
+        * due to errors in placement of audio frames (#2373).
+        */
+       trim = trim.round(film ? film->audio_frame_rate() : 48000);
 }