X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=04523b117a49b51784e8ddc3c5cfb2286bc4cf33;hb=3b67c79bf4534e72a7eceaa6e566e7b7c949e4f7;hp=76ba43567d9961ea2c1798c3ebfe13fb27e9772b;hpb=59e769023c392c332331567a1aea94660002c463;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 76ba43567..04523b117 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -34,14 +34,13 @@ class Filter;
 class FFmpegSubtitleStream;
 class FFmpegAudioStream;
 struct ffmpeg_pts_offset_test;
+struct audio_sampling_rate_test;
 
 class FFmpegContentProperty : public VideoContentProperty
 {
 public:
 	static int const SUBTITLE_STREAMS;
 	static int const SUBTITLE_STREAM;
-	static int const AUDIO_STREAMS;
-	static int const AUDIO_STREAM;
 	static int const FILTERS;
 };
 
@@ -63,14 +62,12 @@ public:
 	DCPTime full_length () const;
 
 	std::string identifier () const;
+
+	/* VideoContent */
+	void set_default_colour_conversion ();
 	
 	/* AudioContent */
-	int audio_channels () const;
-	ContentTime audio_length () const;
-	int audio_frame_rate () const;
-	AudioMapping audio_mapping () const;
-	void set_audio_mapping (AudioMapping);
-	boost::filesystem::path audio_analysis_path () const;
+	std::vector<AudioStreamPtr> audio_streams () const;
 
 	/* SubtitleContent */
 	bool has_subtitles () const;
@@ -87,15 +84,10 @@ public:
 		return _subtitle_stream;
 	}
 
-	std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams () const {
+	std::vector<boost::shared_ptr<FFmpegAudioStream> > ffmpeg_audio_streams () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _audio_streams;
 	}
-	
-	boost::shared_ptr<FFmpegAudioStream> audio_stream () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _audio_stream;
-	}
 
 	std::vector<Filter const *> filters () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -103,7 +95,6 @@ public:
 	}
 
 	void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
-	void set_audio_stream (boost::shared_ptr<FFmpegAudioStream>);
 
 	boost::optional<ContentTime> first_video () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -114,11 +105,11 @@ public:
 
 private:
 	friend struct ffmpeg_pts_offset_test;
+	friend struct audio_sampling_rate_test;
 	
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
 	boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
 	std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
-	boost::shared_ptr<FFmpegAudioStream> _audio_stream;
 	boost::optional<ContentTime> _first_video;
 	/** Video filters that should be used when generating DCPs */
 	std::vector<Filter const *> _filters;