Merge master.

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

diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index 30eb23a4ed38e89bea2883274306647e9568d9a5..04d157131843470640dd0567b675d6521d1b116c 100644 (file)
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef DCPOMATIC_SNDFILE_CONTENT_H
+#define DCPOMATIC_SNDFILE_CONTENT_H
+
 extern "C" {
 #include <libavutil/audioconvert.h>
 }
@@ -30,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>, boost::shared_ptr<const cxml::Node>, int);
 
        boost::shared_ptr<SndfileContent> shared_from_this () {
                return boost::dynamic_pointer_cast<SndfileContent> (Content::shared_from_this ());
@@ -38,23 +41,23 @@ public:
        
        void examine (boost::shared_ptr<Job>);
        std::string summary () const;
+       std::string technical_summary () const;
        std::string information () const;
        void as_xml (xmlpp::Node *) const;
-       boost::shared_ptr<Content> clone () const;
-       Time length () const;
+       DCPTime full_length () const;
 
-        /* AudioContent */
-        int audio_channels () const {
+       /* AudioContent */
+       int audio_channels () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _audio_channels;
        }
        
-        ContentAudioFrame audio_length () const {
+       ContentTime audio_length () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _audio_length;
        }
        
-        int content_audio_frame_rate () const {
+       int content_audio_frame_rate () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _audio_frame_rate;
        }
@@ -72,7 +75,9 @@ public:
 
 private:
        int _audio_channels;
-       ContentAudioFrame _audio_length;
+       ContentTime _audio_length;
        int _audio_frame_rate;
        AudioMapping _audio_mapping;
 };
+
+#endif