projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show audio bit depth in content properties (#559).
[dcpomatic.git]
/
src
/
lib
/
audio_stream.cc
diff --git
a/src/lib/audio_stream.cc
b/src/lib/audio_stream.cc
index bd53c9b26aa2d4a26f3713b9cc4dfd152903cc16..f771d44a2ffc7845737ab4f91a565285cc2ccfc0 100644
(file)
--- a/
src/lib/audio_stream.cc
+++ b/
src/lib/audio_stream.cc
@@
-24,19
+24,24
@@
#include "constants.h"
#include "constants.h"
-AudioStream::AudioStream (int frame_rate, Frame length, int channels)
+using boost::optional;
+
+
+AudioStream::AudioStream(int frame_rate, Frame length, int channels, optional<int> bit_depth)
: _frame_rate (frame_rate)
, _length (length)
, _mapping (AudioMapping (channels, MAX_DCP_AUDIO_CHANNELS))
: _frame_rate (frame_rate)
, _length (length)
, _mapping (AudioMapping (channels, MAX_DCP_AUDIO_CHANNELS))
+ , _bit_depth(bit_depth)
{
}
{
}
-AudioStream::AudioStream
(int frame_rate, Frame length, AudioMapping mapping
)
+AudioStream::AudioStream
(int frame_rate, Frame length, AudioMapping mapping, optional<int> bit_depth
)
: _frame_rate (frame_rate)
, _length (length)
, _mapping (mapping)
: _frame_rate (frame_rate)
, _length (length)
, _mapping (mapping)
+ , _bit_depth(bit_depth)
{
}
{
}
@@
-56,3
+61,11
@@
AudioStream::channels () const
boost::mutex::scoped_lock lm (_mutex);
return _mapping.input_channels ();
}
boost::mutex::scoped_lock lm (_mutex);
return _mapping.input_channels ();
}
+
+optional<int>
+AudioStream::bit_depth() const
+{
+ boost::mutex::scoped_lock lm(_mutex);
+ return _bit_depth;
+}
+