X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=b9ae4707a3420cfc150927952a5baccdaba82346;hb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;hp=367c30103e77812927878d0f2f31062e995cc647;hpb=05654d0e1799746a9df3ccab040c92e0ed825cac;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 367c30103..b9ae4707a 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
@@ -20,12 +20,12 @@
 #ifndef DCPOMATIC_FFMPEG_CONTENT_H
 #define DCPOMATIC_FFMPEG_CONTENT_H
 
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/lexical_cast.hpp>
 #include "video_content.h"
 #include "audio_content.h"
 #include "subtitle_content.h"
 #include "audio_mapping.h"
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/lexical_cast.hpp>
 
 struct AVFormatContext;
 struct AVStream;
@@ -33,7 +33,8 @@ struct AVStream;
 class Filter;
 class FFmpegSubtitleStream;
 class FFmpegAudioStream;
-class ffmpeg_pts_offset_test;
+struct ffmpeg_pts_offset_test;
+struct audio_sampling_rate_test;
 
 class FFmpegContentProperty : public VideoContentProperty
 {
@@ -41,7 +42,6 @@ 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;
 };
 
@@ -59,19 +59,19 @@ public:
 	void examine (boost::shared_ptr<Job>);
 	std::string summary () const;
 	std::string technical_summary () const;
-	std::string information () const;
 	void as_xml (xmlpp::Node *) const;
 	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;
 
 	void set_filters (std::vector<Filter const *> const &);
 	
@@ -85,15 +85,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);
@@ -101,22 +96,21 @@ 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);
 		return _first_video;
 	}
 
-	bool has_subtitle_during (ContentTimePeriod) const;
+	std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
 
 private:
-	friend class ffmpeg_pts_offset_test;
+	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;