Another try at sorting out the thorny question of timing.

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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 2bfc20656879b61c999a843df329e07e9b071337..9bf53e0ab4d044ac379c6f45decd7d00ba4f932f 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -17,28 +17,67 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_CONTENT_H
-#define DVDOMATIC_AUDIO_CONTENT_H
+#ifndef DCPOMATIC_AUDIO_CONTENT_H
+#define DCPOMATIC_AUDIO_CONTENT_H
 
 #include "content.h"
-#include "util.h"
+#include "audio_mapping.h"
 
 namespace cxml {
        class Node;
 }
 
+class AudioContentProperty
+{
+public:
+       static int const AUDIO_CHANNELS;
+       static int const AUDIO_LENGTH;
+       static int const AUDIO_FRAME_RATE;
+       static int const AUDIO_GAIN;
+       static int const AUDIO_DELAY;
+       static int const AUDIO_MAPPING;
+};
+
 class AudioContent : public virtual Content
 {
 public:
-       AudioContent (boost::filesystem::path);
-       AudioContent (boost::shared_ptr<const cxml::Node>);
+       typedef int64_t Frame;
+       
+       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 (AudioContent const &);
 
+       void as_xml (xmlpp::Node *) const;
+
         virtual int audio_channels () const = 0;
-        virtual ContentAudioFrame audio_length () const = 0;
-        virtual int audio_frame_rate () const = 0;
-        virtual int64_t audio_channel_layout () const = 0;
+        virtual AudioContent::Frame 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;
+
+       void analyse_audio (boost::function<void()>);
+       boost::filesystem::path audio_analysis_path () const;
+
+       void set_audio_gain (float);
+       void set_audio_delay (int);
        
+       float audio_gain () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _audio_gain;
+       }
+
+       int audio_delay () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _audio_delay;
+       }
+
+private:
+       /** Gain to apply to audio in dB */
+       float _audio_gain;
+       /** Delay to apply to audio (positive moves audio later) in milliseconds */
+       int _audio_delay;
 };
 
 #endif