X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_content.h;h=f5a2e38b1310a0fb8f4bac0ea7f3e4ebf4933a3a;hb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;hp=bbc5111ffa8184747b22c887e808f80e74f92d62;hpb=40b3ced17b7fff8badfaa8ec2201a8186cdc7dc2;p=dcpomatic.git

diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index bbc5111ff..f5a2e38b1 100644
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-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
@@ -20,62 +20,44 @@
 #ifndef DCPOMATIC_SNDFILE_CONTENT_H
 #define DCPOMATIC_SNDFILE_CONTENT_H
 
+#include "single_stream_audio_content.h"
 extern "C" {
 #include <libavutil/audioconvert.h>
 }
-#include "audio_content.h"
 
 namespace cxml {
 	class Node;
 }
 
-class SndfileContent : public AudioContent
+class SndfileContent : public SingleStreamAudioContent
 {
 public:
 	SndfileContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-	SndfileContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int);
+	SndfileContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int);
 
 	boost::shared_ptr<SndfileContent> shared_from_this () {
 		return boost::dynamic_pointer_cast<SndfileContent> (Content::shared_from_this ());
 	}
 	
+	DCPTime full_length () const;
+	
 	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;
-	DCPTime full_length () 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;
-	}
+	void take_from_audio_examiner (boost::shared_ptr<AudioExaminer>);
 	
-	int audio_frame_rate () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _audio_frame_rate;
-	}
+	static bool valid_file (boost::filesystem::path);
 
-	AudioMapping audio_mapping () const {
+private:
+	Frame audio_length () const {
 		boost::mutex::scoped_lock lm (_mutex);
-		return _audio_mapping;
+		return _audio_length;
 	}
-
-	void set_audio_mapping (AudioMapping);
 	
-	static bool valid_file (boost::filesystem::path);
-
-private:
-	int _audio_channels;
-	ContentTime _audio_length;
-	int _audio_frame_rate;
-	AudioMapping _audio_mapping;
+	Frame _audio_length;
 };
 
 #endif