From 58f53485bb112896a9446771acfa2abe0a528cec Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 20 Oct 2012 19:30:04 +0100
Subject: Try to clean up stream handling wrt audio channel counts.

---
 src/lib/ffmpeg_decoder.h | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/lib/ffmpeg_decoder.h')

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 0d256b37e..339afbaef 100644
--- 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;
-- 
cgit v1.2.3