X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsingle_stream_audio_content.h;h=ad4de46ea22d0f63fec6ec35eb84700c77a50a63;hb=a9936a35fbae63311b1132e6283bf28db1d8c233;hp=588c250fe7282fdeec15e1305f7ef4496a2b6a4d;hpb=2cf3da72a017eebf741dfb9a5ec158df94a4e7b7;p=dcpomatic.git

diff --git a/src/lib/single_stream_audio_content.h b/src/lib/single_stream_audio_content.h
index 588c250fe..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
@@ -17,6 +17,10 @@
 
 */
 
+/** @file  src/lib/single_stream_audio_content.h
+ *  @brief SingleStreamAudioContent class.
+ */
+
 #ifndef DCPOMATIC_SINGLE_STREAM_AUDIO_CONTENT_H
 #define DCPOMATIC_SINGLE_STREAM_AUDIO_CONTENT_H
 
@@ -24,45 +28,30 @@
 
 class AudioExaminer;
 
+/** @class SingleStreamAudioContent
+ *  @brief A piece of AudioContent that has a single audio stream.
+ */
 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;
 
-	/* AudioContent */
-	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