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/decoder.h | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 85b256f5b..2285cf4f9 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -81,17 +81,14 @@ public:
 		return _video_frame;
 	}
 
-	virtual std::vector<Stream> audio_streams () const {
-		return std::vector<Stream> ();
+	virtual std::vector<AudioStream> audio_streams () const {
+		return std::vector<AudioStream> ();
 	}
 	
-	virtual std::vector<Stream> subtitle_streams () const {
-		return std::vector<Stream> ();
+	virtual std::vector<SubtitleStream> subtitle_streams () const {
+		return std::vector<SubtitleStream> ();
 	}
 
-	virtual void set_audio_stream (Stream s) {}
-	virtual void set_subtitle_stream (Stream s) {}
-	
 	/** Emitted when a video frame is ready.
 	 *  First parameter is the frame.
 	 *  Second parameter is its index within the content.
-- 
cgit v1.2.3