Handle multiple audio streams in a single piece of content

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

diff --git a/src/lib/single_stream_audio_content.h b/src/lib/single_stream_audio_content.h
index 944d887b0ba4ae9ec293efe9e6b1385697e9372c..d8fcb8df0193237da7d1b687b33bc915269307de 100644 (file)
--- a/src/lib/single_stream_audio_content.h
+++ b/src/lib/single_stream_audio_content.h
@@ -40,35 +40,16 @@ public:
 
        void as_xml (xmlpp::Node* node) const;
 
-       int audio_channels () const {
-               boost::mutex::scoped_lock lm (_mutex);
-               return _audio_channels;
-       }
-
-       Frame audio_length () const {
-               boost::mutex::scoped_lock lm (_mutex);
-               return _audio_length;
-       }
-       
-       int audio_frame_rate () const {
-               boost::mutex::scoped_lock lm (_mutex);
-               return _audio_frame_rate;
-       }
+       std::vector<AudioStreamPtr> audio_streams () const;
 
-       AudioMapping audio_mapping () const {
-               boost::mutex::scoped_lock lm (_mutex);
-               return _audio_mapping;
+       AudioStreamPtr audio_stream () const {
+               return _audio_stream;
        }
-
-       void set_audio_mapping (AudioMapping);
-
+               
        void take_from_audio_examiner (boost::shared_ptr<AudioExaminer>);
 
 protected:
-       int _audio_channels;
-       Frame _audio_length;
-       int _audio_frame_rate;
-       AudioMapping _audio_mapping;
+       boost::shared_ptr<AudioStream> _audio_stream;
 };
 
 #endif