Store audio length in AudioStream.

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

diff --git a/src/lib/audio_stream.h b/src/lib/audio_stream.h
index 757d2ea296e3b8876d9761da35b0bba796a3cc49..bf7b284f88cbd4eccd7ee10e6b9d646207dedf5d 100644 (file)
--- a/src/lib/audio_stream.h
+++ b/src/lib/audio_stream.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2016 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
@@ -21,6 +21,7 @@
 #define DCPOMATIC_AUDIO_STREAM_H
 
 #include "audio_mapping.h"
+#include "types.h"
 #include <boost/thread/mutex.hpp>
 
 struct audio_sampling_rate_test;
@@ -28,11 +29,11 @@ struct audio_sampling_rate_test;
 class AudioStream
 {
 public:
-       AudioStream (int frame_rate, int channels);
-       AudioStream (int frame_rate, AudioMapping mapping);
-       
+       AudioStream (int frame_rate, Frame length, int channels);
+       AudioStream (int frame_rate, Frame length, AudioMapping mapping);
+       virtual ~AudioStream () {}
+
        void set_mapping (AudioMapping mapping);
-       void set_frame_rate (int frame_rate);
 
        AudioMapping mapping () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -44,6 +45,11 @@ public:
                return _frame_rate;
        }
 
+       Frame length () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _length;
+       }
+
        int channels () const;
 
 protected:
@@ -51,8 +57,10 @@ protected:
 
 private:
        friend struct audio_sampling_rate_test;
-       
+       friend struct player_time_calculation_test3;
+
        int _frame_rate;
+       Frame _length;
        AudioMapping _mapping;
 };