X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_mapping.h;h=1a3c16ef9a2da957581e650de7b4f06c7c947ab8;hp=e37beaeb26eb77dce33fd0a75a7ab8dee51d1086;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c

diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index e37beaeb2..1a3c16ef9 100644
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -1,19 +1,20 @@
 /*
     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/>.
 
 */
 
@@ -25,62 +26,50 @@
 #define DCPOMATIC_AUDIO_MAPPING_H
 
 #include <libcxml/cxml.h>
-#include <dcp/types.h>
-#include <boost/shared_ptr.hpp>
 #include <vector>
 
 namespace xmlpp {
 	class Node;
 }
 
-namespace cxml {
-	class Node;
-}
-
 /** @class AudioMapping.
- *  @brief 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 are mapped to each DCP channel
- *  by a linear gain.
+ *  @brief A many-to-many mapping of audio channels.
  */
 class AudioMapping
 {
 public:
 	AudioMapping ();
-	AudioMapping (int channels);
+	AudioMapping (int input_channels, int output_channels);
 	AudioMapping (cxml::ConstNodePtr, int);
 
 	/* Default copy constructor is fine */
-	
+
 	void as_xml (xmlpp::Node *) const;
 
-	void make_default ();
+	void make_zero ();
 
-	void set (int, dcp::Channel, float);
-	float get (int, dcp::Channel) const;
+	void set (int input_channel, int output_channel, float);
+	float get (int input_channel, int output_channel) const;
 
-	int content_channels () const {
-		return _content_channels;
+	int input_channels () const {
+		return _input_channels;
 	}
 
-	void set_name (int channel, std::string name);
-	std::string name (int channel) const {
-		return _name[channel];
+	int output_channels () const {
+		return _output_channels;
 	}
 
 	std::string digest () const;
 
-	std::list<dcp::Channel> mapped_dcp_channels () const;
+	std::list<int> mapped_output_channels () const;
 	void unmap_all ();
-	
+
 private:
-	void setup (int);
-	void make_zero ();
-	
-	int _content_channels;
+	void setup (int input_channels, int output_channels);
+
+	int _input_channels;
+	int _output_channels;
 	std::vector<std::vector<float> > _gain;
-	std::vector<std::string> _name;
 };
 
 #endif