X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_content.h;h=dcd6cb55d0e1735bb977ca6ce947d8b9399c4939;hb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;hp=e3b775e8bad9eda6674065ce0a903e22c3bf6259;hpb=adf17c5e1992186c7f8d63d9cffd087311164ffa;p=dcpomatic.git

diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index e3b775e8b..dcd6cb55d 100644
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -33,7 +33,7 @@ class SndfileContent : public AudioContent
 {
 public:
 	SndfileContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-	SndfileContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
+	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 ());
@@ -41,29 +41,27 @@ public:
 	
 	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;
-	Time length () const;
+	DCPTime full_length () const;
 
-        /* AudioContent */
-        int audio_channels () const {
+	/* AudioContent */
+	int audio_channels () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _audio_channels;
 	}
 	
-        AudioContent::Frame audio_length () const {
+	ContentTime audio_length () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _audio_length;
 	}
 	
-        int content_audio_frame_rate () const {
+	int audio_frame_rate () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _audio_frame_rate;
 	}
 
-	int output_audio_frame_rate () const;
-
 	AudioMapping audio_mapping () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _audio_mapping;
@@ -75,7 +73,7 @@ public:
 
 private:
 	int _audio_channels;
-	AudioContent::Frame _audio_length;
+	ContentTime _audio_length;
 	int _audio_frame_rate;
 	AudioMapping _audio_mapping;
 };