Basics of DCP import.

1 files changed, 4 insertions, 32 deletions

diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index dcd6cb55d..75c723518 100644
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -23,13 +23,13 @@
 extern "C" {
 #include <libavutil/audioconvert.h>
 }
-#include "audio_content.h"
+#include "single_stream_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);
@@ -39,43 +39,15 @@ public:
 		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;
-	}
-	
-	int audio_frame_rate () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _audio_frame_rate;
-	}
-
-	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;
-	ContentTime _audio_length;
-	int _audio_frame_rate;
-	AudioMapping _audio_mapping;
 };
 
 #endif