projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various work on audio mapping.
[dcpomatic.git]
/
src
/
lib
/
audio_stream.cc
diff --git
a/src/lib/audio_stream.cc
b/src/lib/audio_stream.cc
index a4fa8bd9b8472c84ecbd84b8734f3957922b379c..bf55e025502aeac06d9fefeff44c438d9a23f598 100644
(file)
--- a/
src/lib/audio_stream.cc
+++ b/
src/lib/audio_stream.cc
@@
-19,11
+19,12
@@
#include "audio_stream.h"
#include "audio_mapping.h"
#include "audio_stream.h"
#include "audio_mapping.h"
+#include "util.h"
AudioStream::AudioStream (int frame_rate, int channels)
: _frame_rate (frame_rate)
{
AudioStream::AudioStream (int frame_rate, int channels)
: _frame_rate (frame_rate)
{
- _mapping = AudioMapping (channels);
+ _mapping = AudioMapping (channels
, MAX_DCP_AUDIO_CHANNELS
);
}
AudioStream::AudioStream (int frame_rate, AudioMapping mapping)
}
AudioStream::AudioStream (int frame_rate, AudioMapping mapping)
@@
-51,5
+52,5
@@
int
AudioStream::channels () const
{
boost::mutex::scoped_lock lm (_mutex);
AudioStream::channels () const
{
boost::mutex::scoped_lock lm (_mutex);
- return _mapping.
conten
t_channels ();
+ return _mapping.
inpu
t_channels ();
}
}