X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fsingle_stream_audio_content.h;h=ad4de46ea22d0f63fec6ec35eb84700c77a50a63;hp=fcfaf14ca1b211edf805d279b88744fd99b97488;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d

diff --git a/src/lib/single_stream_audio_content.h b/src/lib/single_stream_audio_content.h
index fcfaf14ca..ad4de46ea 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
@@ -36,39 +36,22 @@ class SingleStreamAudioContent : public AudioContent
 public:
 	SingleStreamAudioContent (boost::shared_ptr<const Film>);
 	SingleStreamAudioContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-	SingleStreamAudioContent (boost::shared_ptr<const Film> f, cxml::ConstNodePtr node, int version);
+	SingleStreamAudioContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr node, int version);
 
 	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;
+	void add_properties (std::list<std::pair<std::string, std::string> > &) const;
+
+	boost::shared_ptr<AudioStream> _audio_stream;
 };
 
 #endif