Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 58d00e6860906fdd40662ff53f3567e0db6c3fa3..d30db02d775709d270eb75eed7a421aa1c877907 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -46,8 +46,10 @@ public:
        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 (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 AudioContent::Frame audio_length () const = 0;
@@ -55,9 +57,9 @@ public:
        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;
 
-       void analyse_audio (boost::function<void()>);
-       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);