X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_audio_stream.h;h=aae982f9e81ff6ecaff40f62b384dc893cf067dc;hb=refs%2Fheads%2F2404-assertion;hp=a754ec5748440d00d7fc38b57bbe49683d946077;hpb=97d25da42455d0ed93c2eebe023883767bb12d53;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_audio_stream.h b/src/lib/ffmpeg_audio_stream.h
index a754ec574..aae982f9e 100644
--- a/src/lib/ffmpeg_audio_stream.h
+++ b/src/lib/ffmpeg_audio_stream.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,29 +18,32 @@
 
 */
 
-#include "ffmpeg_stream.h"
+
 #include "audio_stream.h"
 #include "dcpomatic_time.h"
+#include "ffmpeg_stream.h"
+
 
 struct ffmpeg_pts_offset_test;
 
+
 class FFmpegAudioStream : public FFmpegStream, public AudioStream
 {
 public:
-	FFmpegAudioStream (std::string name, int id, int frame_rate, Frame length, int channels)
+	FFmpegAudioStream(std::string name, int id, int frame_rate, Frame length, int channels, int bit_depth)
 		: FFmpegStream (name, id)
-		, AudioStream (frame_rate, length, channels)
+		, AudioStream(frame_rate, length, channels, bit_depth)
 	{}
 
-	FFmpegAudioStream (std::string name, std::string codec_name_, int id, int frame_rate, Frame length, int channels)
+	FFmpegAudioStream(std::string name, std::string codec_name_, int id, int frame_rate, Frame length, int channels, int bit_depth)
 		: FFmpegStream (name, id)
-		, AudioStream (frame_rate, length, channels)
+		, AudioStream(frame_rate, length, channels, bit_depth)
 		, codec_name (codec_name_)
 	{}
 
-	FFmpegAudioStream (std::string name, int id, int frame_rate, Frame length, AudioMapping mapping)
+	FFmpegAudioStream(std::string name, int id, int frame_rate, Frame length, AudioMapping mapping, int bit_depth)
 		: FFmpegStream (name, id)
-		, AudioStream (frame_rate, length, mapping)
+		, AudioStream(frame_rate, length, mapping, bit_depth)
 	{}
 
 	FFmpegAudioStream (cxml::ConstNodePtr, int);
@@ -49,7 +52,7 @@ public:
 
 	/* XXX: should probably be locked */
 
-	boost::optional<ContentTime> first_audio;
+	boost::optional<dcpomatic::ContentTime> first_audio;
 	boost::optional<std::string> codec_name;
 
 private:
@@ -58,6 +61,7 @@ private:
 	/* Constructor for tests */
 	FFmpegAudioStream ()
 		: FFmpegStream ("", 0)
-		, AudioStream (0, 0, 0)
+		, AudioStream(0, 0, 0, 0)
 	{}
 };
+