Merge master; specify libdcp-1.0.

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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 73a00ca7d70f3b7862e93accf6168129b1fba4ea..0b2ee2e461fe6b001d98509b6481efb61a214657 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -41,21 +41,24 @@ public:
 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;
 
-       void analyse_audio (boost::function<void()>);
+       boost::signals2::connection analyse_audio (boost::function<void()>);
        boost::filesystem::path audio_analysis_path () const;
 
        void set_audio_gain (float);
@@ -71,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;