X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_content.h;h=3b61eee64a848253ec6afe439dc778be67beeea4;hb=77fd65d0dd95506b5b51802ab58b6bd5eae60dc7;hp=30eb23a4ed38e89bea2883274306647e9568d9a5;hpb=951a81dbb75db9850ee0226f74a575af7335a576;p=dcpomatic.git

diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index 30eb23a4e..3b61eee64 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>
 }
@@ -40,21 +43,20 @@ public:
 	std::string summary () const;
 	std::string information () const;
 	void as_xml (xmlpp::Node *) const;
-	boost::shared_ptr<Content> clone () const;
 	Time 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 {
+	AudioContent::Frame audio_length () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _audio_length;
 	}
 	
-        int content_audio_frame_rate () const {
+	int content_audio_frame_rate () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _audio_frame_rate;
 	}
@@ -72,7 +74,9 @@ public:
 
 private:
 	int _audio_channels;
-	ContentAudioFrame _audio_length;
+	AudioContent::Frame _audio_length;
 	int _audio_frame_rate;
 	AudioMapping _audio_mapping;
 };
+
+#endif