Merge remote-tracking branch 'origin/master' into 2.0

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

diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index d3f497fc28ec0cdbb7398a31a12fffaa7f95ad2c..a76d83a370f703dceded47e1d5aff6e90cd472e3 100644 (file)
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -17,12 +17,17 @@
 
 */
 
+/** @file  src/lib/audio_mapping.h
+ *  @brief AudioMapping class.
+ */
+
 #ifndef DCPOMATIC_AUDIO_MAPPING_H
 #define DCPOMATIC_AUDIO_MAPPING_H
 
 #include <vector>
-#include <dcp/types.h>
 #include <boost/shared_ptr.hpp>
+#include <dcp/types.h>
+#include <libcxml/cxml.h>
 
 namespace xmlpp {
        class Node;
@@ -32,7 +37,9 @@ namespace cxml {
        class Node;
 }
 
-/** A many-to-many mapping from some content channels to DCP channels.
+/** @class AudioMapping.
+ *  @brief 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.
@@ -42,7 +49,7 @@ class AudioMapping
 public:
        AudioMapping ();
        AudioMapping (int channels);
-       AudioMapping (boost::shared_ptr<const cxml::Node>, int);
+       AudioMapping (cxml::ConstNodePtr, int);
 
        /* Default copy constructor is fine */
        
@@ -56,6 +63,8 @@ public:
        int content_channels () const {
                return _content_channels;
        }
+
+       std::string digest () const;
        
 private:
        void setup (int);