No-op: remove all trailing whitespace.

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

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index cff5eaed83ebe022707b0c8861b9203ae027d4cc..5c2b5496d3de187bb0b4987d674b6d77563d91ba 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -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;
 };
 
@@ -55,7 +54,7 @@ public:
        boost::shared_ptr<FFmpegContent> shared_from_this () {
                return boost::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ());
        }
-       
+
        void examine (boost::shared_ptr<Job>);
        std::string summary () const;
        std::string technical_summary () const;
@@ -66,20 +65,15 @@ public:
 
        /* VideoContent */
        void set_default_colour_conversion ();
-       
+
        /* AudioContent */
-       int audio_channels () const;
-       Frame 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 &);
-       
+
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _subtitle_streams;
@@ -90,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);
@@ -106,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);
@@ -117,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;