X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsingle_stream_audio_content.h;h=d8fcb8df0193237da7d1b687b33bc915269307de;hb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;hp=fcfaf14ca1b211edf805d279b88744fd99b97488;hpb=f90d74f7a0382f0dc63eef81bd553d7a7b38edb2;p=dcpomatic.git

diff --git a/src/lib/single_stream_audio_content.h b/src/lib/single_stream_audio_content.h
index fcfaf14ca..d8fcb8df0 100644
--- a/src/lib/single_stream_audio_content.h
+++ b/src/lib/single_stream_audio_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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;
-	}
-	
-	ContentTime 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;
-	ContentTime _audio_length;
-	int _audio_frame_rate;
-	AudioMapping _audio_mapping;
+	boost::shared_ptr<AudioStream> _audio_stream;
 };
 
 #endif