X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.h;h=336a98629bae47b103cdb0d3d88e15ced581cfaa;hb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad;hp=0b2ee2e461fe6b001d98509b6481efb61a214657;hpb=b299c1873bf23414061d551843275c77a9256a05;p=dcpomatic.git

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 0b2ee2e46..336a98629 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 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
@@ -17,6 +17,10 @@
 
 */
 
+/** @file  src/lib/audio_content.h
+ *  @brief AudioContent and AudioContentProperty classes.
+ */
+
 #ifndef DCPOMATIC_AUDIO_CONTENT_H
 #define DCPOMATIC_AUDIO_CONTENT_H
 
@@ -38,6 +42,9 @@ public:
 	static int const AUDIO_MAPPING;
 };
 
+/** @class AudioContent
+ *  @brief Parent class for content which may contain audio data.
+ */
 class AudioContent : public virtual Content
 {
 public:
@@ -45,26 +52,30 @@ public:
 	
 	AudioContent (boost::shared_ptr<const Film>, DCPTime);
 	AudioContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-	AudioContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
+	AudioContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr);
 	AudioContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 
 	void as_xml (xmlpp::Node *) const;
 	std::string technical_summary () const;
 
+	/** @return number of audio channels in the content */
 	virtual int audio_channels () const = 0;
-	virtual AudioFrame audio_length () const = 0;
-	virtual int content_audio_frame_rate () const = 0;
-	virtual int output_audio_frame_rate () const = 0;
+	/** @return the length of the audio in the content */
+	virtual ContentTime audio_length () const = 0;
+	/** @return the frame rate of the content */
+	virtual int audio_frame_rate () const = 0;
 	virtual AudioMapping audio_mapping () const = 0;
-	virtual void set_audio_mapping (AudioMapping) = 0;
+	virtual void set_audio_mapping (AudioMapping);
+	virtual boost::filesystem::path audio_analysis_path () const;
+
+	int resampled_audio_frame_rate () const;
 
 	boost::signals2::connection analyse_audio (boost::function<void()>);
-	boost::filesystem::path audio_analysis_path () const;
 
-	void set_audio_gain (float);
+	void set_audio_gain (double);
 	void set_audio_delay (int);
 	
-	float audio_gain () const {
+	double audio_gain () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _audio_gain;
 	}
@@ -74,11 +85,9 @@ public:
 		return _audio_delay;
 	}
 
-	Frame time_to_content_audio_frames (DCPTime, DCPTime) const;
-	
 private:
 	/** Gain to apply to audio in dB */
-	float _audio_gain;
+	double _audio_gain;
 	/** Delay to apply to audio (positive moves audio later) in milliseconds */
 	int _audio_delay;
 };