Add Piece::audio_gain().

diff --git a/src/lib/piece.cc b/src/lib/piece.cc
index 2a4f012689eafc19798978d11fb722ba0ba11cdd..5c4563c0e5220dbfcd55c45f01f1b6083178d285 100644 (file)
--- a/src/lib/piece.cc
+++ b/src/lib/piece.cc
@@ -156,3 +156,10 @@ Piece::resampled_audio_frame_rate (shared_ptr<const Film> film) const
        return content->audio->resampled_frame_rate (film);
 }
 
+
+double
+Piece::audio_gain () const
+{
+       DCPOMATIC_ASSERT (content->audio);
+       return content->audio->gain();
+}

diff --git a/src/lib/piece.h b/src/lib/piece.h
index 04159e58f207cfafb9c6cf6e188f4dc63b1b7beb..eea5021ca110315364add0c54401a608108c2b2c 100644 (file)
--- a/src/lib/piece.h
+++ b/src/lib/piece.h
@@ -61,6 +61,7 @@ public:
        std::shared_ptr<PlayerVideo> player_video (ContentVideo video, std::shared_ptr<const Film> film, dcp::Size container_size) const;
 
        int resampled_audio_frame_rate (std::shared_ptr<const Film> film) const;
+       double audio_gain () const;
 
        std::shared_ptr<Content> content;
        std::shared_ptr<Decoder> decoder;

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 451a0018a57dfe6d07efdc166d88ebcb287495c6..d95cf661e1c3d0286bed63561eb6adc90f493886 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -869,9 +869,6 @@ Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_a
                return;
        }
 
-       auto content = piece->content->audio;
-       DCPOMATIC_ASSERT (content);
-
        int const rfr = piece->resampled_audio_frame_rate (_film);
 
        /* Compute time in the DCP */
@@ -905,9 +902,9 @@ Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_a
 
        /* Gain */
 
-       if (content->gain() != 0) {
+       if (piece->audio_gain() != 0) {
                auto gain = make_shared<AudioBuffers>(content_audio.audio);
-               gain->apply_gain (content->gain());
+               gain->apply_gain (piece->audio_gain());
                content_audio.audio = gain;
        }