X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=666322669c071015bc5d9d864727adeeb72c5a07;hp=9f82be9c3751e18a404591a8ee900e318d1e63d2;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=3ef438f90729d78ad579bbeb7933b3cf4f09c10c

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 9f82be9c3..666322669 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -1,27 +1,28 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #ifndef DCPOMATIC_FFMPEG_CONTENT_H
 #define DCPOMATIC_FFMPEG_CONTENT_H
 
-#include "audio_content.h"
-#include "subtitle_content.h"
+#include "content.h"
+#include "audio_stream.h"
 
 struct AVFormatContext;
 struct AVStream;
@@ -33,7 +34,7 @@ class VideoContent;
 struct ffmpeg_pts_offset_test;
 struct audio_sampling_rate_test;
 
-class FFmpegContentProperty : public VideoContentProperty
+class FFmpegContentProperty
 {
 public:
 	static int const SUBTITLE_STREAMS;
@@ -42,7 +43,7 @@ public:
 	static int const FILTERS;
 };
 
-class FFmpegContent : public AudioContent, public SubtitleContent
+class FFmpegContent : public Content
 {
 public:
 	FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path);
@@ -61,19 +62,8 @@ public:
 
 	std::string identifier () const;
 
-	/* VideoContent */
 	void set_default_colour_conversion ();
 
-	/* AudioContent */
-	std::vector<AudioStreamPtr> audio_streams () const;
-
-	/* SubtitleContent */
-	bool has_text_subtitles () const;
-	bool has_image_subtitles () const;
-	double subtitle_video_frame_rate () const {
-		return video_frame_rate ();
-	}
-
 	void set_filters (std::vector<Filter const *> const &);
 
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
@@ -86,10 +76,7 @@ public:
 		return _subtitle_stream;
 	}
 
-	std::vector<boost::shared_ptr<FFmpegAudioStream> > ffmpeg_audio_streams () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _audio_streams;
-	}
+	std::vector<boost::shared_ptr<FFmpegAudioStream> > ffmpeg_audio_streams () const;
 
 	std::vector<Filter const *> filters () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -108,18 +95,14 @@ public:
 
 	void signal_subtitle_stream_changed ();
 
-	boost::shared_ptr<VideoContent> video;
-
-protected:
+private:
 	void add_properties (std::list<UserProperty> &) const;
 
-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::optional<ContentTime> _first_video;
 	/** Video filters that should be used when generating DCPs */
 	std::vector<Filter const *> _filters;