Merge 1.0 in.

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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 73a00ca7d70f3b7862e93accf6168129b1fba4ea..73919105d8a339cab8e8f93df6a61f77bf146534 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -41,16 +41,18 @@ public:
 class AudioContent : public virtual Content
 {
 public:
+       typedef int64_t Frame;
+       
        AudioContent (boost::shared_ptr<const Film>, Time);
        AudioContent (boost::shared_ptr<const Film>, boost::filesystem::path);
        AudioContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
-       AudioContent (AudioContent const &);
 
        void as_xml (xmlpp::Node *) const;
+       std::string technical_summary () const;
 
-        virtual int audio_channels () const = 0;
-        virtual ContentAudioFrame audio_length () const = 0;
-        virtual int content_audio_frame_rate () const = 0;
+       virtual int audio_channels () const = 0;
+       virtual AudioContent::Frame 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;