Merge master.

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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index e1b38bd97003c8c19b456b082e763750dc17ae25..18d88bccb98542d2a54adae4a75ac5aaf4702bed 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -52,7 +52,7 @@ 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;
@@ -74,8 +74,6 @@ public:
                return _audio_delay;
        }
 
-       Frame time_to_content_audio_frames (DCPTime, DCPTime) const;
-       
 private:
        /** Gain to apply to audio in dB */
        float _audio_gain;