X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_mapping.cc;h=5e8bf4d04713de054caddefd383eb18167b71395;hb=d710869f0a42285e81c72c1e5b9e76886e0d190a;hp=0f330dc2b8ba3acef6c44febec62e199a6b85970;hpb=444809fb888ed99803f2d19c94d3faef067cf348;p=dcpomatic.git

diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index 0f330dc2b..5e8bf4d04 100644
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -18,19 +18,21 @@
 
 */
 
+
 #include "audio_mapping.h"
 #include "audio_processor.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 +46,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,6 +56,7 @@ AudioMapping::AudioMapping (int input_channels, int output_channels)
 	setup (input_channels, output_channels);
 }
 
+
 void
 AudioMapping::setup (int input_channels, int output_channels)
 {
@@ -74,6 +71,7 @@ AudioMapping::setup (int input_channels, int output_channels)
 	make_zero ();
 }
 
+
 void
 AudioMapping::make_zero ()
 {
@@ -84,6 +82,7 @@ AudioMapping::make_zero ()
 	}
 }
 
+
 struct ChannelRegex
 {
 	ChannelRegex (string regex_, int channel_)
@@ -95,6 +94,7 @@ struct ChannelRegex
 	int channel;
 };
 
+
 void
 AudioMapping::make_default (AudioProcessor const * processor, optional<boost::filesystem::path> filename)
 {
@@ -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;
 					}
@@ -134,7 +134,7 @@ AudioMapping::make_default (AudioProcessor const * processor, optional<boost::fi
 
 			if (!guessed) {
 				/* If we have no idea, just put it on centre */
-				set (0, static_cast<int>(dcp::CENTRE), 1);
+				set (0, static_cast<int>(dcp::Channel::CENTRE), 1);
 			}
 		} else {
 			/* 1:1 mapping */
@@ -145,25 +145,26 @@ 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) {
 		/* Old-style: on/off mapping */
 		for (auto i: node->node_children ("Map")) {
-			set (i->number_child<int>("ContentIndex"), static_cast<dcp::Channel>(i->number_child<int>("DCP")), 1);
+			set (i->number_child<int>("ContentIndex"), i->number_child<int>("DCP"), 1);
 		}
 	} else {
 		for (auto i: node->node_children("Gain")) {
 			if (state_version < 32) {
 				set (
 					i->number_attribute<int>("Content"),
-					static_cast<dcp::Channel>(i->number_attribute<int>("DCP")),
+					i->number_attribute<int>("DCP"),
 					raw_convert<float>(i->content())
 					);
 			} else {
@@ -177,6 +178,21 @@ AudioMapping::AudioMapping (cxml::ConstNodePtr node, int state_version)
 	}
 }
 
+
+void
+AudioMapping::set (dcp::Channel input_channel, int output_channel, float g)
+{
+	set (static_cast<int>(input_channel), output_channel, g);
+}
+
+
+void
+AudioMapping::set (int input_channel, dcp::Channel output_channel, float g)
+{
+	set (input_channel, static_cast<int>(output_channel), g);
+}
+
+
 void
 AudioMapping::set (int input_channel, int output_channel, float g)
 {
@@ -185,6 +201,14 @@ AudioMapping::set (int input_channel, int output_channel, float g)
 	_gain[input_channel][output_channel] = g;
 }
 
+
+float
+AudioMapping::get (int input_channel, dcp::Channel output_channel) const
+{
+	return get (input_channel, static_cast<int>(output_channel));
+}
+
+
 float
 AudioMapping::get (int input_channel, int output_channel) const
 {
@@ -193,6 +217,7 @@ AudioMapping::get (int input_channel, int output_channel) const
 	return _gain[input_channel][output_channel];
 }
 
+
 void
 AudioMapping::as_xml (xmlpp::Node* node) const
 {
@@ -209,6 +234,7 @@ AudioMapping::as_xml (xmlpp::Node* node) const
 	}
 }
 
+
 /** @return a string which is unique for a given AudioMapping configuration, for
  *  differentiation between different AudioMappings.
  */
@@ -227,6 +253,7 @@ AudioMapping::digest () const
 	return digester.get ();
 }
 
+
 list<int>
 AudioMapping::mapped_output_channels () const
 {
@@ -236,8 +263,8 @@ AudioMapping::mapped_output_channels () const
 
 	for (auto const& i: _gain) {
 		for (auto j: dcp::used_audio_channels()) {
-			if (abs(i[j]) > minus_96_db) {
-				mapped.push_back (j);
+			if (abs(i[static_cast<int>(j)]) > minus_96_db) {
+				mapped.push_back (static_cast<int>(j));
 			}
 		}
 	}
@@ -248,6 +275,7 @@ AudioMapping::mapped_output_channels () const
 	return mapped;
 }
 
+
 void
 AudioMapping::unmap_all ()
 {