projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Emit no audio from DCPs if none is mapped
[dcpomatic.git]
/
src
/
lib
/
audio_mapping.h
diff --git
a/src/lib/audio_mapping.h
b/src/lib/audio_mapping.h
index 6c7d67203781d14986dfe5406212ad62f643cf14..fe9a7978939d938db88f9b98db1b11f40d804595 100644
(file)
--- a/
src/lib/audio_mapping.h
+++ b/
src/lib/audio_mapping.h
@@
-1,43
+1,52
@@
/*
/*
- Copyright (C) 2013-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
+
/** @file src/lib/audio_mapping.h
* @brief AudioMapping class.
*/
/** @file src/lib/audio_mapping.h
* @brief AudioMapping class.
*/
+
#ifndef DCPOMATIC_AUDIO_MAPPING_H
#define DCPOMATIC_AUDIO_MAPPING_H
#ifndef DCPOMATIC_AUDIO_MAPPING_H
#define DCPOMATIC_AUDIO_MAPPING_H
+
+#include <dcp/types.h>
#include <libcxml/cxml.h>
#include <vector>
#include <libcxml/cxml.h>
#include <vector>
+
namespace xmlpp {
class Node;
}
namespace xmlpp {
class Node;
}
+class AudioProcessor;
+
+
/** @class AudioMapping.
* @brief A many-to-many mapping of audio channels.
*/
class AudioMapping
{
public:
/** @class AudioMapping.
* @brief A many-to-many mapping of audio channels.
*/
class AudioMapping
{
public:
- AudioMapping ()
;
+ AudioMapping ()
{}
AudioMapping (int input_channels, int output_channels);
AudioMapping (cxml::ConstNodePtr, int);
AudioMapping (int input_channels, int output_channels);
AudioMapping (cxml::ConstNodePtr, int);
@@
-46,16
+55,20
@@
public:
void as_xml (xmlpp::Node *) const;
void make_zero ();
void as_xml (xmlpp::Node *) const;
void make_zero ();
+ void make_default (AudioProcessor const * processor, boost::optional<boost::filesystem::path> filename = boost::optional<boost::filesystem::path>());
+ void set (dcp::Channel input_channel, int output_channel, float);
void set (int input_channel, int output_channel, float);
void set (int input_channel, int output_channel, float);
+ void set (int input_channel, dcp::Channel output_channel, float);
float get (int input_channel, int output_channel) const;
float get (int input_channel, int output_channel) const;
+ float get (int input_channel, dcp::Channel output_channel) const;
int input_channels () const {
int input_channels () const {
- return _
input_channels
;
+ return _
gain.size()
;
}
int output_channels () const {
}
int output_channels () const {
- return _
output_channels
;
+ return _
gain.empty() ? 0 : _gain[0].size()
;
}
std::string digest () const;
}
std::string digest () const;
@@
-63,12
+76,14
@@
public:
std::list<int> mapped_output_channels () const;
void unmap_all ();
std::list<int> mapped_output_channels () const;
void unmap_all ();
+ void take_from(AudioMapping const& other);
+
private:
void setup (int input_channels, int output_channels);
private:
void setup (int input_channels, int output_channels);
- int _input_channels;
- int _output_channels;
- std::vector<std::vector<float> > _gain;
+ /** Linear gains */
+ std::vector<std::vector<float>> _gain;
};
};
+
#endif
#endif