Handle multiple audio streams in a single piece of content

in a similar way to the V1 patch.

1 files changed, 5 insertions, 24 deletions

diff --git a/src/lib/single_stream_audio_content.h b/src/lib/single_stream_audio_content.h
index 944d887b0..d8fcb8df0 100644
--- a/src/lib/single_stream_audio_content.h
+++ b/src/lib/single_stream_audio_content.h
@@ -40,35 +40,16 @@ public:
 
 	void as_xml (xmlpp::Node* node) const;
 
-	int audio_channels () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _audio_channels;
-	}
-
-	Frame audio_length () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _audio_length;
-	}
-	
-	int audio_frame_rate () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _audio_frame_rate;
-	}
+	std::vector<AudioStreamPtr> audio_streams () const;
 
-	AudioMapping audio_mapping () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _audio_mapping;
+	AudioStreamPtr audio_stream () const {
+		return _audio_stream;
 	}
-
-	void set_audio_mapping (AudioMapping);
-
+		
 	void take_from_audio_examiner (boost::shared_ptr<AudioExaminer>);
 
 protected:
-	int _audio_channels;
-	Frame _audio_length;
-	int _audio_frame_rate;
-	AudioMapping _audio_mapping;
+	boost::shared_ptr<AudioStream> _audio_stream;
 };
 
 #endif