Merge master.

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

diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index 191d625277307ea933fa13f1877ffa7494eab965..dcd6cb55d0e1735bb977ca6ce947d8b9399c4939 100644 (file)
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -33,7 +33,7 @@ class SndfileContent : public AudioContent
 {
 public:
        SndfileContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-       SndfileContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
+       SndfileContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int);
 
        boost::shared_ptr<SndfileContent> shared_from_this () {
                return boost::dynamic_pointer_cast<SndfileContent> (Content::shared_from_this ());
@@ -44,7 +44,7 @@ public:
        std::string technical_summary () const;
        std::string information () const;
        void as_xml (xmlpp::Node *) const;
-       Time full_length () const;
+       DCPTime full_length () const;
 
        /* AudioContent */
        int audio_channels () const {
@@ -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;
 };