X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_stream.cc;h=f771d44a2ffc7845737ab4f91a565285cc2ccfc0;hb=f3617efde1751ac9e55f692369dc4ba3c6350ca8;hp=ef0b9166514637e230d30ec339b7946c000dd3b3;hpb=5804d3e5e13740fda7239d26c6b10cb2aeba4f95;p=dcpomatic.git

diff --git a/src/lib/audio_stream.cc b/src/lib/audio_stream.cc
index ef0b91665..f771d44a2 100644
--- a/src/lib/audio_stream.cc
+++ b/src/lib/audio_stream.cc
@@ -18,26 +18,35 @@
 
 */
 
+
 #include "audio_stream.h"
 #include "audio_mapping.h"
-#include "util.h"
+#include "constants.h"
+
+
+using boost::optional;
 
-AudioStream::AudioStream (int frame_rate, Frame length, int channels)
+
+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))
+	, _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)
+	, _bit_depth(bit_depth)
 {
 
 }
 
+
 void
 AudioStream::set_mapping (AudioMapping mapping)
 {
@@ -45,9 +54,18 @@ AudioStream::set_mapping (AudioMapping mapping)
 	_mapping = mapping;
 }
 
+
 int
 AudioStream::channels () const
 {
 	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;
+}
+