X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.h;h=1ceb01f780edd20cb91fc4849527e9d27df64d5a;hb=8102046b2f29e0c7b234c29bf204b056cb30e64f;hp=0c5287eaf776708f61d246b16d302357edb8b8ed;hpb=64a2f1bb6a7b972607fa363631ef7a47444e8217;p=dcpomatic.git

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 0c5287eaf..1ceb01f78 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -1,7 +1,5 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
-    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
@@ -19,6 +17,10 @@
 
 */
 
+/** @file  src/lib/audio_content.h
+ *  @brief AudioContent and AudioContentProperty classes.
+ */
+
 #ifndef DCPOMATIC_AUDIO_CONTENT_H
 #define DCPOMATIC_AUDIO_CONTENT_H
 
@@ -37,23 +39,38 @@ public:
 	static int const AUDIO_FRAME_RATE;
 	static int const AUDIO_GAIN;
 	static int const AUDIO_DELAY;
+	static int const AUDIO_MAPPING;
 };
 
+/** @class AudioContent
+ *  @brief Parent class for content which may contain audio data.
+ */
 class AudioContent : public virtual Content
 {
 public:
-	AudioContent (boost::shared_ptr<const Film>, Time);
+	typedef int64_t Frame;
+	
+	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 (AudioContent const &);
+	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;
-
-        virtual int audio_channels () const = 0;
-        virtual ContentAudioFrame audio_length () const = 0;
-        virtual int content_audio_frame_rate () const = 0;
-	virtual int output_audio_frame_rate () const = 0;
+	std::string technical_summary () const;
+
+	/** @return number of audio channels in the content */
+	virtual int audio_channels () 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);
+	virtual boost::filesystem::path audio_analysis_path () const;
+
+	int resampled_audio_frame_rate () const;
+
+	boost::signals2::connection analyse_audio (boost::function<void()>);
 
 	void set_audio_gain (float);
 	void set_audio_delay (int);