Merge master.

[dcpomatic.git] / src / lib / audio_content.h

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 09f90b85c256c7f4327938d838a29e414219d6cc..57085a7651bcc285c9b32618cc768f36fc5cce33 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -31,6 +31,11 @@ namespace cxml {
        class Node;
 }
 
+class AudioProcessor;
+
+/** @class AudioContentProperty
+ *  @brief Names for properties of AudioContent.
+ */
 class AudioContentProperty
 {
 public:
@@ -40,6 +45,7 @@ public:
        static int const AUDIO_GAIN;
        static int const AUDIO_DELAY;
        static int const AUDIO_MAPPING;
+       static int const AUDIO_PROCESSOR;
 };
 
 /** @class AudioContent
@@ -50,9 +56,10 @@ 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);
-       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;
@@ -69,13 +76,15 @@ public:
        virtual boost::filesystem::path audio_analysis_path () const;
 
        int resampled_audio_frame_rate () const;
+       int processed_audio_channels () const;
 
        boost::signals2::connection analyse_audio (boost::function<void()>);
 
-       void set_audio_gain (float);
+       void set_audio_gain (double);
        void set_audio_delay (int);
+       void set_audio_processor (AudioProcessor const *);
        
-       float audio_gain () const {
+       double audio_gain () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _audio_gain;
        }
@@ -85,11 +94,17 @@ public:
                return _audio_delay;
        }
 
+       AudioProcessor const * audio_processor () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _audio_processor;
+       }
+       
 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;
+       AudioProcessor const * _audio_processor;
 };
 
 #endif