Various work on audio mapping.

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

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 1a55a84728c886549ba8eaf518c8904297e45374..ac5a705708c7db2d3227937f98b9593d372fb83a 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -455,14 +455,14 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate)
                        shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), all.audio->frames()));
                        dcp_mapped->make_silent ();
                        AudioMapping map = j->mapping ();
-                       for (int i = 0; i < map.content_channels(); ++i) {
+                       for (int i = 0; i < map.input_channels(); ++i) {
                                for (int j = 0; j < _film->audio_channels(); ++j) {
-                                       if (map.get (i, static_cast<dcp::Channel> (j)) > 0) {
+                                       if (map.get (i, j) > 0) {
                                                dcp_mapped->accumulate_channel (
                                                        all.audio.get(),
                                                        i,
                                                        j,
-                                                       map.get (i, static_cast<dcp::Channel> (j))
+                                                       map.get (i, j)
                                                        );
                                        }
                                }