Add Piece::resampled_audio_frame_rate().

diff --git a/src/lib/piece.cc b/src/lib/piece.cc
index dd6a8ff230b3e477ecf563ff0e8e98b4c0e7a0ea..2a4f012689eafc19798978d11fb722ba0ba11cdd 100644 (file)
--- a/src/lib/piece.cc
+++ b/src/lib/piece.cc
@@ -147,3 +147,12 @@ Piece::player_video (ContentVideo video, shared_ptr<const Film> film, dcp::Size
                false
                );
 }
+
+
+int
+Piece::resampled_audio_frame_rate (shared_ptr<const Film> film) const
+{
+       DCPOMATIC_ASSERT (content->audio);
+       return content->audio->resampled_frame_rate (film);
+}
+

diff --git a/src/lib/piece.h b/src/lib/piece.h
index 5997e0fd6caa40f026f5396d80cc367c0a3cafac..04159e58f207cfafb9c6cf6e188f4dc63b1b7beb 100644 (file)
--- a/src/lib/piece.h
+++ b/src/lib/piece.h
@@ -60,6 +60,8 @@ 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;
+
        std::shared_ptr<Content> content;
        std::shared_ptr<Decoder> decoder;
        boost::optional<dcpomatic::DCPTimePeriod> ignore_video;

diff --git a/src/lib/player.cc b/src/lib/player.cc
index e1a86e227ca02b8d5e10a55dc4eec50930da144c..451a0018a57dfe6d07efdc166d88ebcb287495c6 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -872,7 +872,7 @@ Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_a
        auto content = piece->content->audio;
        DCPOMATIC_ASSERT (content);
 
-       int const rfr = content->resampled_frame_rate (_film);
+       int const rfr = piece->resampled_audio_frame_rate (_film);
 
        /* Compute time in the DCP */
        auto time = piece->resampled_audio_to_dcp (content_audio.frame, _film);