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 b696b57a54b9c98be0605e8fd004bd33e994d6df..0623aa6f054748f9f56cada8573b736a7ce30e79 100644 (file)
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -17,6 +17,9 @@
 
 */
 
+extern "C" {
+#include <libavutil/audioconvert.h>
+}
 #include "audio_content.h"
 
 namespace cxml {
@@ -33,15 +36,35 @@ public:
                return boost::dynamic_pointer_cast<SndfileContent> (Content::shared_from_this ());
        }
        
+       void examine (boost::shared_ptr<Film>, boost::shared_ptr<Job>, bool);
        std::string summary () const;
        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;
-        ContentAudioFrame audio_length () const;
-        int audio_frame_rate () const;
-        int64_t audio_channel_layout () const;
+        int audio_channels () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _audio_channels;
+       }
+       
+        ContentAudioFrame audio_length () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _audio_length;
+       }
+       
+        int content_audio_frame_rate () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _audio_frame_rate;
+       }
 
+        int output_audio_frame_rate (boost::shared_ptr<const Film>) const;
+       
        static bool valid_file (boost::filesystem::path);
+
+private:
+       int _audio_channels;
+       ContentAudioFrame _audio_length;
+       int _audio_frame_rate;
 };