Extract audio more correctly and neatly; support 7.1 in DCP naming; fix up lack of...

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 0d256b37e4b0152237c605744589f0f302ae95e2..339afbaef368a1b85def1b1039301ea94dd039e1 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -67,11 +67,8 @@ public:
        bool has_subtitles () const;
        int bytes_per_audio_sample () const;
 
-       std::vector<Stream> audio_streams () const;
-       std::vector<Stream> subtitle_streams () const;
-
-       void set_audio_stream (int id);
-       void set_subtitle_stream (int id);
+       std::vector<AudioStream> audio_streams () const;
+       std::vector<SubtitleStream> subtitle_streams () const;
 
 private:
 
@@ -97,8 +94,8 @@ private:
        int _subtitle_stream; ///< may be < 0 if there is no subtitle
        AVFrame* _frame;
 
-       std::vector<Stream> _audio_streams;
-       std::vector<Stream> _subtitle_streams;
+       std::vector<AudioStream> _audio_streams;
+       std::vector<SubtitleStream> _subtitle_streams;
        
        AVCodecContext* _video_codec_context;
        AVCodec* _video_codec;