projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add AudioMapping::take_from().
[dcpomatic.git]
/
src
/
lib
/
audio_mapping.h
diff --git
a/src/lib/audio_mapping.h
b/src/lib/audio_mapping.h
index 6bac0a7d8eb43fa2f8e5ea2f50091267a005ebec..fe9a7978939d938db88f9b98db1b11f40d804595 100644
(file)
--- a/
src/lib/audio_mapping.h
+++ b/
src/lib/audio_mapping.h
@@
-18,30
+18,35
@@
*/
*/
+
/** @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 <dcp/types.h>
#include <libcxml/cxml.h>
#include <vector>
+
namespace xmlpp {
class Node;
}
class AudioProcessor;
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);
@@
-59,11
+64,11
@@
public:
float get (int input_channel, dcp::Channel output_channel) const;
int input_channels () const {
float get (int input_channel, dcp::Channel output_channel) 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;
@@
-71,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