Compiles; strange hang on adding content to a film.

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

diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index 27c5f3615bde9c5477e79f02ebe2906ed7b16cc8..0623aa6f054748f9f56cada8573b736a7ce30e79 100644 (file)
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -41,6 +41,7 @@ public:
        std::string information () const;
        void as_xml (xmlpp::Node *) const;
        boost::shared_ptr<Content> clone () const;
+       Time length (boost::shared_ptr<const Film>) const;
 
         /* AudioContent */
         int audio_channels () const {
@@ -53,15 +54,13 @@ public:
                return _audio_length;
        }
        
-        int audio_frame_rate () const {
+        int content_audio_frame_rate () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _audio_frame_rate;
        }
-       
-        int64_t audio_channel_layout () const {
-               return av_get_default_channel_layout (audio_channels ());
-       }
 
+        int output_audio_frame_rate (boost::shared_ptr<const Film>) const;
+       
        static bool valid_file (boost::filesystem::path);
 
 private: