X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.h;h=0b2ee2e461fe6b001d98509b6481efb61a214657;hb=f58d9e44302151dea9f594acd9fc27a331fa77fb;hp=0c5287eaf776708f61d246b16d302357edb8b8ed;hpb=996b0c06e23bcb6b300d7b8799df94993692e07d;p=dcpomatic.git

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 0c5287eaf..0b2ee2e46 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -37,23 +35,31 @@ public:
 	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::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>, std::vector<boost::shared_ptr<Content> >);
 
 	void as_xml (xmlpp::Node *) const;
+	std::string technical_summary () const;
 
-        virtual int audio_channels () const = 0;
-        virtual ContentAudioFrame audio_length () const = 0;
-        virtual int content_audio_frame_rate () const = 0;
+	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;
 	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);
@@ -68,6 +74,8 @@ public:
 		return _audio_delay;
 	}
 
+	Frame time_to_content_audio_frames (DCPTime, DCPTime) const;
+	
 private:
 	/** Gain to apply to audio in dB */
 	float _audio_gain;