projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
[dcpomatic.git]
/
src
/
lib
/
audio_stream.cc
diff --git
a/src/lib/audio_stream.cc
b/src/lib/audio_stream.cc
index d597e82bd489bdd3bfd7088caa85dcdb76955ee1..ef0b9166514637e230d30ec339b7946c000dd3b3 100644
(file)
--- a/
src/lib/audio_stream.cc
+++ b/
src/lib/audio_stream.cc
@@
-25,8
+25,9
@@
AudioStream::AudioStream (int frame_rate, Frame length, int channels)
: _frame_rate (frame_rate)
, _length (length)
AudioStream::AudioStream (int frame_rate, Frame length, int channels)
: _frame_rate (frame_rate)
, _length (length)
+ , _mapping (AudioMapping (channels, MAX_DCP_AUDIO_CHANNELS))
{
{
- _mapping = AudioMapping (channels, MAX_DCP_AUDIO_CHANNELS);
+
}
AudioStream::AudioStream (int frame_rate, Frame length, AudioMapping mapping)
}
AudioStream::AudioStream (int frame_rate, Frame length, AudioMapping mapping)