Merge master.

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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 10114e10d606e1f13f9920f83898ff59f51d50af..cecc8f13d65c1a0875a0dca0f0b2e383a37eb20c 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -43,7 +43,7 @@ class AudioContent : public virtual Content
 public:
        typedef int64_t Frame;
        
-       AudioContent (boost::shared_ptr<const Film>, Time);
+       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> >);
@@ -52,14 +52,14 @@ public:
        std::string technical_summary () const;
 
        virtual int audio_channels () const = 0;
-       virtual AudioContent::Frame audio_length () 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;
+       virtual boost::filesystem::path audio_analysis_path () const;
 
        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);
@@ -74,8 +74,6 @@ public:
                return _audio_delay;
        }
 
-       Frame time_to_content_audio_frames (Time, Time) const;
-       
 private:
        /** Gain to apply to audio in dB */
        float _audio_gain;