X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.h;h=df6527ed094bc75883a7fda86496328e27aef557;hb=d75e4c652fac5d3c65b42b03249f3c6e0836f772;hp=540839d695241be94e769bb6e42218b4128e3d50;hpb=94201bd2a5a4cb391b7f2bdeba56b928fed7cfe1;p=dcpomatic.git

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 540839d69..df6527ed0 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 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
@@ -25,24 +25,22 @@
 #define DCPOMATIC_AUDIO_CONTENT_H
 
 #include "content.h"
+#include "audio_stream.h"
 #include "audio_mapping.h"
 
 namespace cxml {
 	class Node;
 }
 
-class AudioProcessor;
-
+/** @class AudioContentProperty
+ *  @brief Names for properties of AudioContent.
+ */
 class AudioContentProperty
 {
 public:
-	static int const AUDIO_CHANNELS;
-	static int const AUDIO_LENGTH;
-	static int const AUDIO_FRAME_RATE;
+	static int const AUDIO_STREAMS;
 	static int const AUDIO_GAIN;
 	static int const AUDIO_DELAY;
-	static int const AUDIO_MAPPING;
-	static int const AUDIO_PROCESSOR;
 };
 
 /** @class AudioContent
@@ -51,8 +49,6 @@ public:
 class AudioContent : public virtual Content
 {
 public:
-	typedef int64_t Frame;
-	
 	AudioContent (boost::shared_ptr<const Film>);
 	AudioContent (boost::shared_ptr<const Film>, DCPTime);
 	AudioContent (boost::shared_ptr<const Film>, boost::filesystem::path);
@@ -62,24 +58,16 @@ public:
 	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;
-	/** @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;
+	virtual std::vector<AudioStreamPtr> audio_streams () const = 0;
 
+	AudioMapping audio_mapping () const;
+	void set_audio_mapping (AudioMapping);
 	int resampled_audio_frame_rate () const;
-	int processed_audio_channels () const;
-
-	boost::signals2::connection analyse_audio (boost::function<void()>);
+	bool has_rate_above_48k () const;
+	std::vector<std::string> audio_channel_names () const;
 
 	void set_audio_gain (double);
 	void set_audio_delay (int);
-	void set_audio_processor (AudioProcessor const *);
 	
 	double audio_gain () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -91,17 +79,13 @@ public:
 		return _audio_delay;
 	}
 
-	AudioProcessor const * audio_processor () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _audio_processor;
-	}
+	std::string processing_description () const;
 	
 private:
 	/** Gain to apply to audio in dB */
 	double _audio_gain;
 	/** Delay to apply to audio (positive moves audio later) in milliseconds */
 	int _audio_delay;
-	AudioProcessor const * _audio_processor;
 };
 
 #endif