X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Faudio_content.h;h=18d88bccb98542d2a54adae4a75ac5aaf4702bed;hb=a4c19a34244aeaf183c25878933b570fc5c0ee34;hp=87858488cec8a1f4ae416dc636241b43acadc7f7;hpb=21ce34c2cd04a2e7e133ff693b84c054182f4f91;p=dcpomatic.git

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 87858488c..18d88bccb 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -21,7 +21,7 @@
 #define DCPOMATIC_AUDIO_CONTENT_H
 
 #include "content.h"
-#include "util.h"
+#include "audio_mapping.h"
 
 namespace cxml {
 	class Node;
@@ -33,19 +33,52 @@ public:
 	static int const AUDIO_CHANNELS;
 	static int const AUDIO_LENGTH;
 	static int const AUDIO_FRAME_RATE;
+	static int const AUDIO_GAIN;
+	static int const AUDIO_DELAY;
+	static int const AUDIO_MAPPING;
 };
 
 class AudioContent : public virtual Content
 {
 public:
-	AudioContent (boost::filesystem::path);
-	AudioContent (boost::shared_ptr<const cxml::Node>);
-	AudioContent (AudioContent 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 (boost::shared_ptr<const Film>) const = 0;
+	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 (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
+
+	void as_xml (xmlpp::Node *) const;
+	std::string technical_summary () const;
+
+	virtual int audio_channels () const = 0;
+	virtual ContentTime audio_length () const = 0;
+	virtual int content_audio_frame_rate () const = 0;
+	virtual int output_audio_frame_rate () const = 0;
+	virtual AudioMapping audio_mapping () const = 0;
+	virtual void set_audio_mapping (AudioMapping) = 0;
+
+	boost::signals2::connection analyse_audio (boost::function<void()>);
+	boost::filesystem::path audio_analysis_path () const;
+
+	void set_audio_gain (float);
+	void set_audio_delay (int);
+	
+	float audio_gain () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _audio_gain;
+	}
+
+	int audio_delay () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _audio_delay;
+	}
+
+private:
+	/** Gain to apply to audio in dB */
+	float _audio_gain;
+	/** Delay to apply to audio (positive moves audio later) in milliseconds */
+	int _audio_delay;
 };
 
 #endif