X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_mapping.h;h=6c7d67203781d14986dfe5406212ad62f643cf14;hb=2e62b2c0de47fc8e5bcb5466b2876f9b23d2ae84;hp=7bf974c2292a4a03ecc726df51ba1d0bfe5c4f56;hpb=39bc73fe192f932ed6695eb87b19de446e8b4f55;p=dcpomatic.git

diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index 7bf974c22..6c7d67203 100644
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,51 +17,57 @@
 
 */
 
+/** @file  src/lib/audio_mapping.h
+ *  @brief AudioMapping class.
+ */
+
 #ifndef DCPOMATIC_AUDIO_MAPPING_H
 #define DCPOMATIC_AUDIO_MAPPING_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <dcp/types.h>
 #include <libcxml/cxml.h>
+#include <vector>
 
 namespace xmlpp {
 	class Node;
 }
 
-namespace cxml {
-	class Node;
-}
-
-/** 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.
+/** @class AudioMapping.
+ *  @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 input_channel, int output_channel, float);
+	float get (int input_channel, int output_channel) const;
 
-	void set (int, dcp::Channel, float);
-	float get (int, dcp::Channel) const;
+	int input_channels () const {
+		return _input_channels;
+	}
 
-	int content_channels () const {
-		return _content_channels;
+	int output_channels () const {
+		return _output_channels;
 	}
-	
+
+	std::string digest () const;
+
+	std::list<int> mapped_output_channels () const;
+	void unmap_all ();
+
 private:
-	void setup (int);
-	
-	int _content_channels;
+	void setup (int input_channels, int output_channels);
+
+	int _input_channels;
+	int _output_channels;
 	std::vector<std::vector<float> > _gain;
 };