X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_mapping.h;h=9a507b550e958a8d0928adf2f1a9733eb79db708;hb=f0e95aa5b7ada81a1c40f06facab2e94e45ab26c;hp=3c471d3f4f16aaead62df787c4c7666e5226e8aa;hpb=21ce34c2cd04a2e7e133ff693b84c054182f4f91;p=dcpomatic.git

diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index 3c471d3f4..9a507b550 100644
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -21,29 +21,49 @@
 #define DCPOMATIC_AUDIO_MAPPING_H
 
 #include <list>
-#include <string>
 #include <libdcp/types.h>
 #include <boost/shared_ptr.hpp>
-#include "audio_content.h"
 
+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 can be mapped to zero or
+ *  more DCP channels.
+ */
 class AudioMapping
 {
 public:
+	AudioMapping ();
+	AudioMapping (int);
+	AudioMapping (boost::shared_ptr<const cxml::Node>);
+
+	/* Default copy constructor is fine */
+	
 	void as_xml (xmlpp::Node *) const;
-	void set_from_xml (boost::shared_ptr<const cxml::Node>);
 
 	void add (int, libdcp::Channel);
+	void make_default ();
 
-	int dcp_channels () 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;
 	}
 
-	std::list<int> content_channels () const;
+	int content_channels () const {
+		return _content_channels;
+	}
+	
 	std::list<libdcp::Channel> content_to_dcp (int) const;
 
 private:
+	int _content_channels;
 	std::list<std::pair<int, libdcp::Channel> > _content_to_dcp;
 };