projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't edit start trim unless it's necessary.
[dcpomatic.git]
/
src
/
lib
/
audio_mapping.h
diff --git
a/src/lib/audio_mapping.h
b/src/lib/audio_mapping.h
index 51ab0e1e52e560723d706a62357a08f83d840db1..fe9a7978939d938db88f9b98db1b11f40d804595 100644
(file)
--- a/
src/lib/audio_mapping.h
+++ b/
src/lib/audio_mapping.h
@@
-64,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;
@@
-76,11
+76,11
@@
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 = 0;
- int _output_channels = 0;
/** Linear gains */
std::vector<std::vector<float>> _gain;
};
/** Linear gains */
std::vector<std::vector<float>> _gain;
};