Various more hacks; basically trying to remove Regions as an unnecessary complexity.

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

diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index e8e86b60386bc505f7db64e8295181f9f9bca34c..1ef4b3f026514526bbb26e0157d218581ab4fcc8 100644 (file)
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -1,3 +1,5 @@
+/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
+
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -41,6 +43,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,10 +56,17 @@ 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;
        }
+
+        int output_audio_frame_rate (boost::shared_ptr<const Film>) const;
+
+       AudioMapping audio_mapping () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _audio_mapping;
+       }
        
        static bool valid_file (boost::filesystem::path);
 
@@ -64,4 +74,5 @@ private:
        int _audio_channels;
        ContentAudioFrame _audio_length;
        int _audio_frame_rate;
+       AudioMapping _audio_mapping;
 };