Merge master.

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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 8fc658a7660177eb47b46eb22f1418f38f87d0c5..cecc8f13d65c1a0875a0dca0f0b2e383a37eb20c 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -43,19 +41,25 @@ public:
 class AudioContent : public virtual Content
 {
 public:
-       AudioContent (boost::shared_ptr<const Film>, Time);
+       typedef int64_t Frame;
+       
+       AudioContent (boost::shared_ptr<const Film>, DCPTime);
        AudioContent (boost::shared_ptr<const Film>, boost::filesystem::path);
        AudioContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
-       AudioContent (AudioContent const &);
+       AudioContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 
        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 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;
        virtual void set_audio_mapping (AudioMapping) = 0;
+       virtual boost::filesystem::path audio_analysis_path () const;
+
+       boost::signals2::connection analyse_audio (boost::function<void()>);
 
        void set_audio_gain (float);
        void set_audio_delay (int);