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

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

diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index 496300b48a746931f419748231f24f70364f4493..e86e2e2ac6820499cd551ddaed17ffe8e7f30019 100644 (file)
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -22,6 +22,7 @@
 #include <dcp/raw_convert.h>
 #include "audio_mapping.h"
 #include "util.h"
+#include "md5_digester.h"
 
 using std::list;
 using std::cout;
@@ -39,7 +40,7 @@ AudioMapping::AudioMapping ()
 
 }
 
-/** Create a default AudioMapping for a given channel count.
+/** Create an empty AudioMapping for a given channel count.
  *  @param channels Number of channels.
  */
 AudioMapping::AudioMapping (int channels)
@@ -78,7 +79,7 @@ AudioMapping::make_default ()
        }
 }
 
-AudioMapping::AudioMapping (shared_ptr<const cxml::Node> node, int state_version)
+AudioMapping::AudioMapping (cxml::ConstNodePtr node, int state_version)
 {
        setup (node->number_child<int> ("ContentChannels"));
 
@@ -126,3 +127,20 @@ AudioMapping::as_xml (xmlpp::Node* node) const
                }
        }
 }
+
+/** @return a string which is unique for a given AudioMapping configuration, for
+ *  differentiation between different AudioMappings.
+ */
+string
+AudioMapping::digest () const
+{
+       MD5Digester digester;
+       digester.add (_content_channels);
+       for (int i = 0; i < _content_channels; ++i) {
+               for (int j = 0; j < MAX_DCP_AUDIO_CHANNELS; ++j) {
+                       digester.add (_gain[i][j]);
+               }
+       }
+
+       return digester.get ();
+}