Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index ca175912b31c0b7969933622d2b49751b0b2bece..906e79bd89b089a777d8c727fd42c886f066c69a 100644 (file)
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -23,6 +23,7 @@
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
+#include <iostream>
 
 using std::list;
 using std::cout;
@@ -56,7 +57,7 @@ AudioMapping::setup (int input_channels, int output_channels)
 {
        _input_channels = input_channels;
        _output_channels = output_channels;
-       
+
        _gain.resize (_input_channels);
        for (int i = 0; i < _input_channels; ++i) {
                _gain[i].resize (_output_channels);
@@ -118,6 +119,8 @@ AudioMapping::set (int input_channel, int output_channel, float g)
 float
 AudioMapping::get (int input_channel, int output_channel) const
 {
+       DCPOMATIC_ASSERT (input_channel < int (_gain.size()));
+       DCPOMATIC_ASSERT (output_channel < int (_gain[0].size()));
        return _gain[input_channel][output_channel];
 }
 
@@ -161,7 +164,7 @@ AudioMapping::mapped_output_channels () const
        static float const minus_96_db = 0.000015849;
 
        list<int> mapped;
-       
+
        for (vector<vector<float> >::const_iterator i = _gain.begin(); i != _gain.end(); ++i) {
                for (size_t j = 0; j < i->size(); ++j) {
                        if (abs ((*i)[j]) > minus_96_db) {
@@ -172,7 +175,7 @@ AudioMapping::mapped_output_channels () const
 
        mapped.sort ();
        mapped.unique ();
-       
+
        return mapped;
 }