Merge branch '1.0' into 1.0-seek

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

diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index a2de8306bbf376457788bb77884d4a523bbabee0..9a507b550e958a8d0928adf2f1a9733eb79db708 100644 (file)
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -32,26 +32,38 @@ 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 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;
+       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;
 };