X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_mapping.h;h=51ab0e1e52e560723d706a62357a08f83d840db1;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=8add0ec8350ee3179d7c053881fcda927276c999;hpb=e13e5cd4cfda39b0a0b77ed8036e14e15f93ec2e;p=dcpomatic.git

diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index 8add0ec83..51ab0e1e5 100644
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,29 +18,35 @@
 
 */
 
+
 /** @file  src/lib/audio_mapping.h
  *  @brief AudioMapping class.
  */
 
+
 #ifndef DCPOMATIC_AUDIO_MAPPING_H
 #define DCPOMATIC_AUDIO_MAPPING_H
 
+
+#include <dcp/types.h>
 #include <libcxml/cxml.h>
 #include <vector>
 
+
 namespace xmlpp {
 	class Node;
 }
 
 class AudioProcessor;
 
+
 /** @class AudioMapping.
  *  @brief A many-to-many mapping of audio channels.
  */
 class AudioMapping
 {
 public:
-	AudioMapping ();
+	AudioMapping () {}
 	AudioMapping (int input_channels, int output_channels);
 	AudioMapping (cxml::ConstNodePtr, int);
 
@@ -51,8 +57,11 @@ public:
 	void make_zero ();
 	void make_default (AudioProcessor const * processor, boost::optional<boost::filesystem::path> filename = boost::optional<boost::filesystem::path>());
 
+	void set (dcp::Channel input_channel, int output_channel, float);
 	void set (int input_channel, int output_channel, float);
+	void set (int input_channel, dcp::Channel output_channel, float);
 	float get (int input_channel, int output_channel) const;
+	float get (int input_channel, dcp::Channel output_channel) const;
 
 	int input_channels () const {
 		return _input_channels;
@@ -70,9 +79,11 @@ public:
 private:
 	void setup (int input_channels, int output_channels);
 
-	int _input_channels;
-	int _output_channels;
-	std::vector<std::vector<float> > _gain;
+	int _input_channels = 0;
+	int _output_channels = 0;
+	/** Linear gains */
+	std::vector<std::vector<float>> _gain;
 };
 
+
 #endif