Merge master.

[dcpomatic.git] / src / lib / audio_mapping.h

diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index ed2c3f28d28517eb9aaeb4a13c1380c84a85cf64..f3096764c79c248ddb3bb0a0519efbd6caaa9f8f 100644 (file)
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -20,8 +20,8 @@
 #ifndef DCPOMATIC_AUDIO_MAPPING_H
 #define DCPOMATIC_AUDIO_MAPPING_H
 
-#include <list>
-#include <libdcp/types.h>
+#include <vector>
+#include <dcp/types.h>
 #include <boost/shared_ptr.hpp>
 
 namespace xmlpp {
@@ -32,29 +32,36 @@ 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
 {
 public:
        AudioMapping ();
        AudioMapping (int);
-       AudioMapping (boost::shared_ptr<const cxml::Node>);
+       AudioMapping (boost::shared_ptr<const cxml::Node>, int);
 
        /* Default copy constructor is fine */
        
        void as_xml (xmlpp::Node *) const;
 
-       void add (int, libdcp::Channel);
+       void make_default ();
 
-       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;
-       std::list<libdcp::Channel> content_to_dcp (int) const;
+       void set (int, dcp::Channel, float);
+       float get (int, dcp::Channel) const;
 
+       int content_channels () const {
+               return _content_channels;
+       }
+       
 private:
-       std::list<std::pair<int, libdcp::Channel> > _content_to_dcp;
+       void setup (int);
+       
+       int _content_channels;
+       std::vector<std::vector<float> > _gain;
 };
 
 #endif