Handle multiple audio streams in a single piece of content

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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 131ced61aead11dab059a600aa4f3f3b1aed024c..79dba9fdaf340716c0ca8745ae5890c8ce2b6c32 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,21 +25,22 @@
 #define DCPOMATIC_AUDIO_CONTENT_H
 
 #include "content.h"
+#include "audio_stream.h"
 #include "audio_mapping.h"
 
 namespace cxml {
        class Node;
 }
 
+/** @class AudioContentProperty
+ *  @brief Names for properties of AudioContent.
+ */
 class AudioContentProperty
 {
 public:
-       static int const AUDIO_CHANNELS;
-       static int const AUDIO_LENGTH;
-       static int const AUDIO_FRAME_RATE;
+       static int const AUDIO_STREAMS;
        static int const AUDIO_GAIN;
        static int const AUDIO_DELAY;
-       static int const AUDIO_MAPPING;
 };
 
 /** @class AudioContent
@@ -48,8 +49,6 @@ public:
 class AudioContent : public virtual Content
 {
 public:
-       typedef int64_t Frame;
-       
        AudioContent (boost::shared_ptr<const Film>);
        AudioContent (boost::shared_ptr<const Film>, DCPTime);
        AudioContent (boost::shared_ptr<const Film>, boost::filesystem::path);
@@ -59,17 +58,13 @@ public:
        void as_xml (xmlpp::Node *) const;
        std::string technical_summary () const;
 
-       /** @return number of audio channels in the content */
-       virtual int audio_channels () const = 0;
-       /** @return the length of the audio in the content */
-       virtual ContentTime audio_length () const = 0;
-       /** @return the frame rate of the content */
-       virtual int audio_frame_rate () const = 0;
-       virtual AudioMapping audio_mapping () const = 0;
-       virtual void set_audio_mapping (AudioMapping);
-       virtual boost::filesystem::path audio_analysis_path () const;
+       virtual std::vector<AudioStreamPtr> audio_streams () const = 0;
 
+       AudioMapping audio_mapping () const;
+       void set_audio_mapping (AudioMapping);
+       boost::filesystem::path audio_analysis_path () const;
        int resampled_audio_frame_rate () const;
+       bool has_rate_above_48k () const;
 
        boost::signals2::connection analyse_audio (boost::function<void()>);
 
@@ -86,6 +81,8 @@ public:
                return _audio_delay;
        }
 
+       std::string processing_description () const;
+       
 private:
        /** Gain to apply to audio in dB */
        double _audio_gain;