Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

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

diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index 725109ae66031cd0d43583f964ce86fde3a96b09..b436d757988a3e054657d627b6d9258fde308380 100644 (file)
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -1,28 +1,30 @@
 /*
     Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "audio_mapping.h"
 #include "util.h"
-#include "md5_digester.h"
+#include "digester.h"
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
+#include <iostream>
 
 using std::list;
 using std::cout;
@@ -118,6 +120,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];
 }
 
@@ -143,7 +147,7 @@ AudioMapping::as_xml (xmlpp::Node* node) const
 string
 AudioMapping::digest () const
 {
-       MD5Digester digester;
+       Digester digester;
        digester.add (_input_channels);
        digester.add (_output_channels);
        for (int i = 0; i < _input_channels; ++i) {