X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_content.h;h=dcd6cb55d0e1735bb977ca6ce947d8b9399c4939;hb=04533b9cf34ce8089113015715083ee9c5b2b001;hp=c88764c1b22808e953d696d55f3cc50d2ce017de;hpb=a5b59faff75265d3256ad0dbd9f0c69e51e31ce4;p=dcpomatic.git

diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index c88764c1b..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>, 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 ());
@@ -52,18 +52,16 @@ public:
 		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;
 };