Decode DCP audio too.

1 files changed, 15 insertions, 2 deletions

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index a2793c788..24a59dd34 100644
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -18,10 +18,11 @@
 */
 
 #include "video_examiner.h"
+#include "audio_examiner.h"
 
 class DCPContent;
 
-class DCPExaminer : public VideoExaminer
+class DCPExaminer : public VideoExaminer, public AudioExaminer
 {
 public:
 	DCPExaminer (boost::shared_ptr<const DCPContent>);
@@ -42,12 +43,24 @@ public:
 		return _name;
 	}
 
+	int audio_channels () const {
+		return _audio_channels.get_value_or (0);
+	}
+	
+	ContentTime audio_length () const {
+		return _audio_length;
+	}
+	
+	int audio_frame_rate () const {
+		return _audio_frame_rate.get_value_or (48000);
+	}
+
 private:
 	boost::optional<float> _video_frame_rate;
 	boost::optional<dcp::Size> _video_size;
 	ContentTime _video_length;
-	/* XXX: used? */
 	boost::optional<int> _audio_channels;
 	boost::optional<int> _audio_frame_rate;
+	ContentTime _audio_length;
 	std::string _name;
 };