X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_content.h;h=94f46fea34f5650f4fd9f8832ac76027505ae5d7;hb=8aeb741ccbe2edb528e98a431bf55459a6836a9b;hp=27c5f3615bde9c5477e79f02ebe2906ed7b16cc8;hpb=9bdd8cc51942a13e360dde4efc04b3ca417c8b94;p=dcpomatic.git

diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index 27c5f3615..94f46fea3 100644
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef DCPOMATIC_SNDFILE_CONTENT_H
+#define DCPOMATIC_SNDFILE_CONTENT_H
+
 extern "C" {
 #include <libavutil/audioconvert.h>
 }
@@ -29,43 +32,52 @@ namespace cxml {
 class SndfileContent : public AudioContent
 {
 public:
-	SndfileContent (boost::filesystem::path);
-	SndfileContent (boost::shared_ptr<const cxml::Node>);
+	SndfileContent (boost::shared_ptr<const Film>, boost::filesystem::path);
+	SndfileContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int);
 
 	boost::shared_ptr<SndfileContent> shared_from_this () {
 		return boost::dynamic_pointer_cast<SndfileContent> (Content::shared_from_this ());
 	}
 	
-	void examine (boost::shared_ptr<Film>, boost::shared_ptr<Job>, bool);
+	void examine (boost::shared_ptr<Job>);
 	std::string summary () const;
+	std::string technical_summary () const;
 	std::string information () const;
 	void as_xml (xmlpp::Node *) const;
-	boost::shared_ptr<Content> clone () const;
+	DCPTime full_length () const;
 
-        /* AudioContent */
-        int audio_channels () const {
+	/* AudioContent */
+	int audio_channels () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _audio_channels;
 	}
 	
-        ContentAudioFrame audio_length () const {
+	AudioFrame audio_length () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _audio_length;
 	}
 	
-        int audio_frame_rate () const {
+	int content_audio_frame_rate () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _audio_frame_rate;
 	}
-	
-        int64_t audio_channel_layout () const {
-		return av_get_default_channel_layout (audio_channels ());
+
+	int output_audio_frame_rate () const;
+
+	AudioMapping audio_mapping () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _audio_mapping;
 	}
 
+	void set_audio_mapping (AudioMapping);
+	
 	static bool valid_file (boost::filesystem::path);
 
 private:
 	int _audio_channels;
-	ContentAudioFrame _audio_length;
+	AudioFrame _audio_length;
 	int _audio_frame_rate;
+	AudioMapping _audio_mapping;
 };
+
+#endif