Fix some confusions with FFmpeg audio streams.

[dcpomatic.git] / src / lib / ffmpeg_content.h

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index b2a492e683e323bb671d3d894faaa913738f2f46..de222b0dee4805d2a02e2c954089295aa5fde1b6 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -1,5 +1,5 @@
 /*
-    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
     it under the terms of the GNU General Public License as published by
@@ -20,12 +20,8 @@
 #ifndef DCPOMATIC_FFMPEG_CONTENT_H
 #define DCPOMATIC_FFMPEG_CONTENT_H
 
-#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>
+#include "content.h"
+#include "audio_stream.h"
 
 struct AVFormatContext;
 struct AVStream;
@@ -33,18 +29,20 @@ struct AVStream;
 class Filter;
 class FFmpegSubtitleStream;
 class FFmpegAudioStream;
+class VideoContent;
 struct ffmpeg_pts_offset_test;
 struct audio_sampling_rate_test;
 
-class FFmpegContentProperty : public VideoContentProperty
+class FFmpegContentProperty
 {
 public:
        static int const SUBTITLE_STREAMS;
+       /** The chosen subtitle stream, or something about it */
        static int const SUBTITLE_STREAM;
        static int const FILTERS;
 };
 
-class FFmpegContent : public VideoContent, public AudioContent, public SubtitleContent
+class FFmpegContent : public Content
 {
 public:
        FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path);
@@ -63,18 +61,15 @@ 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;
 
        void set_filters (std::vector<Filter const *> const &);
 
+       void changed (int property);
+
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _subtitle_streams;
@@ -85,10 +80,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);
@@ -102,18 +94,19 @@ public:
                return _first_video;
        }
 
-       std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+       std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
+       std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
 
-protected:
-       void add_properties (std::list<std::pair<std::string, std::string> > &) const;
+       void signal_subtitle_stream_changed ();
 
 private:
+       void add_properties (std::list<UserProperty> &) const;
+
        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;
@@ -122,7 +115,7 @@ private:
        AVColorPrimaries _color_primaries;
        AVColorTransferCharacteristic _color_trc;
        AVColorSpace _colorspace;
-       int _bits_per_pixel;
+       boost::optional<int> _bits_per_pixel;
 };
 
 #endif