X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_mapping.h;h=0f59cc205ee35937f6ed9727aab40aef4c9d4dcd;hp=9a507b550e958a8d0928adf2f1a9733eb79db708;hb=9cacbd6bb24d04c1b4d2b1eae313687dda4fe63b;hpb=5778f4c92793a7950f02206e735a00731c87b090

diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index 9a507b550..0f59cc205 100644
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -1,70 +1,87 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 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/>.
 
 */
 
+
+/** @file  src/lib/audio_mapping.h
+ *  @brief AudioMapping class.
+ */
+
+
 #ifndef DCPOMATIC_AUDIO_MAPPING_H
 #define DCPOMATIC_AUDIO_MAPPING_H
 
-#include <list>
-#include <libdcp/types.h>
-#include <boost/shared_ptr.hpp>
+
+#include <dcp/types.h>
+#include <libcxml/cxml.h>
+#include <vector>
+
 
 namespace xmlpp {
 	class Node;
 }
 
-namespace cxml {
-	class Node;
-}
+class AudioProcessor;
+
 
-/** A many-to-many mapping from some content channels to DCP channels.
- *  The number of content channels is set on construction and fixed,
- *  and then each of those content channels can be mapped to zero or
- *  more DCP channels.
+/** @class AudioMapping.
+ *  @brief A many-to-many mapping of audio channels.
  */
 class AudioMapping
 {
 public:
-	AudioMapping ();
-	AudioMapping (int);
-	AudioMapping (boost::shared_ptr<const cxml::Node>);
+	AudioMapping () {}
+	AudioMapping (int input_channels, int output_channels);
+	AudioMapping (cxml::ConstNodePtr, int);
 
 	/* Default copy constructor is fine */
-	
+
 	void as_xml (xmlpp::Node *) const;
 
-	void add (int, libdcp::Channel);
-	void make_default ();
+	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;
 
-	std::list<int> dcp_to_content (libdcp::Channel) const;
-	std::list<std::pair<int, libdcp::Channel> > content_to_dcp () const {
-		return _content_to_dcp;
+	int input_channels () const {
+		return _gain.size();
 	}
 
-	int content_channels () const {
-		return _content_channels;
+	int output_channels () const {
+		return _gain.empty() ? 0 : _gain[0].size();
 	}
-	
-	std::list<libdcp::Channel> content_to_dcp (int) const;
+
+	std::string digest () const;
+
+	std::list<int> mapped_output_channels () const;
+	void unmap_all ();
 
 private:
-	int _content_channels;
-	std::list<std::pair<int, libdcp::Channel> > _content_to_dcp;
+	void setup (int input_channels, int output_channels);
+
+	/** Linear gains */
+	std::vector<std::vector<float>> _gain;
 };
 
+
 #endif