X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_mapping.cc;h=b8aa6249f5faf11697331bb15ff6236a1e0b61c9;hb=bb3a9a12116a4b2a5bc1fef38e73853f576a773a;hp=7734d168afb3040a28b4cca27076e6f62e4ee94b;hpb=28111007e2e6fd62f5810be780706ae1618bd33f;p=dcpomatic.git

diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index 7734d168a..b8aa6249f 100644
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -18,19 +18,22 @@
 
 */
 
+
 #include "audio_mapping.h"
 #include "audio_processor.h"
+#include "constants.h"
+#include "dcpomatic_assert.h"
 #include "digester.h"
-#include "util.h"
-#include "warnings.h"
 #include <dcp/raw_convert.h>
+#include <dcp/warnings.h>
 #include <libcxml/cxml.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/regex.hpp>
 #include <iostream>
 
+
 using std::list;
 using std::cout;
 using std::make_pair;
@@ -44,12 +47,6 @@ using std::dynamic_pointer_cast;
 using boost::optional;
 using dcp::raw_convert;
 
-AudioMapping::AudioMapping ()
-	: _input_channels (0)
-	, _output_channels (0)
-{
-
-}
 
 /** Create an empty AudioMapping.
  *  @param input_channels Number of input channels.
@@ -60,30 +57,30 @@ AudioMapping::AudioMapping (int input_channels, int output_channels)
 	setup (input_channels, output_channels);
 }
 
+
 void
 AudioMapping::setup (int input_channels, int output_channels)
 {
-	_input_channels = input_channels;
-	_output_channels = output_channels;
-
-	_gain.resize (_input_channels);
-	for (int i = 0; i < _input_channels; ++i) {
-		_gain[i].resize (_output_channels);
+	_gain.resize(input_channels);
+	for (int i = 0; i < input_channels; ++i) {
+		_gain[i].resize(output_channels);
 	}
 
 	make_zero ();
 }
 
+
 void
 AudioMapping::make_zero ()
 {
-	for (int i = 0; i < _input_channels; ++i) {
-		for (int j = 0; j < _output_channels; ++j) {
-			_gain[i][j] = 0;
+	for (auto& input: _gain) {
+		for (auto& output: input) {
+			output = 0;
 		}
 	}
 }
 
+
 struct ChannelRegex
 {
 	ChannelRegex (string regex_, int channel_)
@@ -95,6 +92,7 @@ struct ChannelRegex
 	int channel;
 };
 
+
 void
 AudioMapping::make_default (AudioProcessor const * processor, optional<boost::filesystem::path> filename)
 {
@@ -106,9 +104,11 @@ AudioMapping::make_default (AudioProcessor const * processor, optional<boost::fi
 		ChannelRegex(".*[\\._-]LFE[\\._-].*", 3),
 		ChannelRegex(".*[\\._-]Lss[\\._-].*", 4),
 		ChannelRegex(".*[\\._-]Lsr[\\._-].*", 6),
+		ChannelRegex(".*[\\._-]Lrs[\\._-].*", 6),
 		ChannelRegex(".*[\\._-]Ls[\\._-].*", 4),
 		ChannelRegex(".*[\\._-]Rss[\\._-].*", 5),
 		ChannelRegex(".*[\\._-]Rsr[\\._-].*", 7),
+		ChannelRegex(".*[\\._-]Rrs[\\._-].*", 7),
 		ChannelRegex(".*[\\._-]Rs[\\._-].*", 5),
 	};
 
@@ -125,7 +125,7 @@ AudioMapping::make_default (AudioProcessor const * processor, optional<boost::fi
 			if (filename) {
 				for (int i = 0; i < regexes; ++i) {
 					boost::regex e (regex[i].regex, boost::regex::icase);
-					if (boost::regex_match(filename->string(), e) && regex[i].channel < output_channels()) {
+					if (boost::regex_match(filename->filename().string(), e) && regex[i].channel < output_channels()) {
 						set (0, regex[i].channel, 1);
 						guessed = true;
 					}
@@ -145,12 +145,13 @@ AudioMapping::make_default (AudioProcessor const * processor, optional<boost::fi
 	}
 }
 
+
 AudioMapping::AudioMapping (cxml::ConstNodePtr node, int state_version)
 {
 	if (state_version < 32) {
-		setup (node->number_child<int> ("ContentChannels"), MAX_DCP_AUDIO_CHANNELS);
+		setup (node->number_child<int>("ContentChannels"), MAX_DCP_AUDIO_CHANNELS);
 	} else {
-		setup (node->number_child<int> ("InputChannels"), node->number_child<int> ("OutputChannels"));
+		setup (node->number_child<int>("InputChannels"), node->number_child<int>("OutputChannels"));
 	}
 
 	if (state_version <= 5) {
@@ -216,14 +217,18 @@ AudioMapping::get (int input_channel, int output_channel) const
 	return _gain[input_channel][output_channel];
 }
 
+
 void
 AudioMapping::as_xml (xmlpp::Node* node) const
 {
-	node->add_child ("InputChannels")->add_child_text (raw_convert<string> (_input_channels));
-	node->add_child ("OutputChannels")->add_child_text (raw_convert<string> (_output_channels));
+	auto const input = input_channels();
+	auto const output = output_channels();
+
+	node->add_child("InputChannels")->add_child_text(raw_convert<string>(input));
+	node->add_child("OutputChannels")->add_child_text(raw_convert<string>(output));
 
-	for (int c = 0; c < _input_channels; ++c) {
-		for (int d = 0; d < _output_channels; ++d) {
+	for (int c = 0; c < input; ++c) {
+		for (int d = 0; d < output; ++d) {
 			auto t = node->add_child ("Gain");
 			t->set_attribute ("Input", raw_convert<string> (c));
 			t->set_attribute ("Output", raw_convert<string> (d));
@@ -232,6 +237,7 @@ AudioMapping::as_xml (xmlpp::Node* node) const
 	}
 }
 
+
 /** @return a string which is unique for a given AudioMapping configuration, for
  *  differentiation between different AudioMappings.
  */
@@ -239,17 +245,18 @@ string
 AudioMapping::digest () const
 {
 	Digester digester;
-	digester.add (_input_channels);
-	digester.add (_output_channels);
-	for (int i = 0; i < _input_channels; ++i) {
-		for (int j = 0; j < _output_channels; ++j) {
-			digester.add (_gain[i][j]);
+	digester.add(input_channels());
+	digester.add(output_channels());
+	for (auto const& input: _gain) {
+		for (auto output: input) {
+			digester.add(output);
 		}
 	}
 
 	return digester.get ();
 }
 
+
 list<int>
 AudioMapping::mapped_output_channels () const
 {
@@ -271,6 +278,7 @@ AudioMapping::mapped_output_channels () const
 	return mapped;
 }
 
+
 void
 AudioMapping::unmap_all ()
 {
@@ -280,3 +288,18 @@ AudioMapping::unmap_all ()
 		}
 	}
 }
+
+
+void
+AudioMapping::take_from(AudioMapping const& other)
+{
+	auto input = std::min(input_channels(), other.input_channels());
+	auto output = std::min(output_channels(), other.output_channels());
+
+	for (auto i = 0; i < input; ++i) {
+		for (auto o = 0; o < output; ++o) {
+			set(i, o, other.get(i, o));
+		}
+	}
+}
+