*/
+
#include "audio_mapping.h"
#include "audio_processor.h"
#include "digester.h"
#include <boost/regex.hpp>
#include <iostream>
+
using std::list;
using std::cout;
using std::make_pair;
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.
setup (input_channels, output_channels);
}
+
void
AudioMapping::setup (int input_channels, int output_channels)
{
make_zero ();
}
+
void
AudioMapping::make_zero ()
{
}
}
+
struct ChannelRegex
{
ChannelRegex (string regex_, int channel_)
int channel;
};
+
void
AudioMapping::make_default (AudioProcessor const * processor, optional<boost::filesystem::path> filename)
{
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 */
}
}
+
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 {
}
}
+
+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)
{
_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
{
return _gain[input_channel][output_channel];
}
+
void
AudioMapping::as_xml (xmlpp::Node* node) const
{
}
}
+
/** @return a string which is unique for a given AudioMapping configuration, for
* differentiation between different AudioMappings.
*/
return digester.get ();
}
+
list<int>
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));
}
}
}
return mapped;
}
+
void
AudioMapping::unmap_all ()
{