Fix crashes when using templates in some cases (#2491).

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

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 192a500680d1f0b7811e8ac7efdee434a7dc53e4..7083de714dcf411946c65598cdaf07d23e52ee32 100644 (file)
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -314,6 +314,9 @@ AudioContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p
        if (stream) {
                p.push_back (UserProperty(UserProperty::AUDIO, _("Channels"), stream->channels()));
                p.push_back (UserProperty(UserProperty::AUDIO, _("Content sample rate"), stream->frame_rate(), _("Hz")));
+               if (auto bits = stream->bit_depth()) {
+                       p.push_back(UserProperty(UserProperty::AUDIO, _("Content bit depth"), *bits, _("bits")));
+               }
        }
 
        FrameRateChange const frc (_parent->active_video_frame_rate(film), film->video_frame_rate());
@@ -406,7 +409,9 @@ AudioContent::take_settings_from (shared_ptr<const AudioContent> c)
        size_t j = 0;
 
        while (i < _streams.size() && j < c->_streams.size()) {
-               _streams[i]->set_mapping (c->_streams[j]->mapping());
+               auto mapping = _streams[i]->mapping();
+               mapping.take_from(c->_streams[j]->mapping());
+               _streams[i]->set_mapping(mapping);
                ++i;
                ++j;
        }