Rename AudioContent frame_rate methods and move resampled_audio_frame_rate into Audio...

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

diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index c88764c1b22808e953d696d55f3cc50d2ce017de..bbc5111ffa8184747b22c887e808f80e74f92d62 100644 (file)
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -52,18 +52,16 @@ public:
                return _audio_channels;
        }
        
-       AudioContent::Frame audio_length () const {
+       ContentTime audio_length () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _audio_length;
        }
        
-       int content_audio_frame_rate () const {
+       int audio_frame_rate () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _audio_frame_rate;
        }
 
-       int output_audio_frame_rate () const;
-
        AudioMapping audio_mapping () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _audio_mapping;
@@ -75,7 +73,7 @@ public:
 
 private:
        int _audio_channels;
-       AudioContent::Frame _audio_length;
+       ContentTime _audio_length;
        int _audio_frame_rate;
        AudioMapping _audio_mapping;
 };