Merge master.

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

diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index 248d2570eca8a3eee084bfbfe4df957f85f55bf8..f3096764c79c248ddb3bb0a0519efbd6caaa9f8f 100644 (file)
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -20,43 +20,48 @@
 #ifndef DCPOMATIC_AUDIO_MAPPING_H
 #define DCPOMATIC_AUDIO_MAPPING_H
 
-#include <list>
-#include <string>
-#include <libdcp/types.h>
+#include <vector>
+#include <dcp/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 are mapped to each DCP channel
+ *  by a linear gain.
+ */
 class AudioMapping
 {
 public:
-       void as_xml (xmlpp::Node *) const;
-       void set_from_xml (ContentList const &, boost::shared_ptr<const cxml::Node>);
+       AudioMapping ();
+       AudioMapping (int);
+       AudioMapping (boost::shared_ptr<const cxml::Node>, int);
+
+       /* Default copy constructor is fine */
        
-       struct Channel {
-               Channel (boost::weak_ptr<const AudioContent> c, int i)
-                       : content (c)
-                       , index (i)
-               {}
-               
-               boost::weak_ptr<const AudioContent> content;
-               int index;
-       };
-
-       void add (Channel, libdcp::Channel);
-
-       int dcp_channels () const;
-       std::list<Channel> dcp_to_content (libdcp::Channel) const;
-       std::list<std::pair<Channel, libdcp::Channel> > content_to_dcp () const {
-               return _content_to_dcp;
-       }
+       void as_xml (xmlpp::Node *) const;
 
-       std::list<Channel> content_channels () const;
-       std::list<libdcp::Channel> content_to_dcp (Channel) const;
+       void make_default ();
 
+       void set (int, dcp::Channel, float);
+       float get (int, dcp::Channel) const;
+
+       int content_channels () const {
+               return _content_channels;
+       }
+       
 private:
-       std::list<std::pair<Channel, libdcp::Channel> > _content_to_dcp;
+       void setup (int);
+       
+       int _content_channels;
+       std::vector<std::vector<float> > _gain;
 };
 
-extern bool operator== (AudioMapping::Channel const &, AudioMapping::Channel const &);
-
 #endif