X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_stream.h;h=a7e204065432c4a33e011a69e594e228e7efc2c6;hb=c7916079e06d985121842962b9736a6673e22dfe;hp=4dce27d4aaec1958344c7fdd4f379489803a9f85;hpb=615762376308039521e8030797d496ad8d09206e;p=dcpomatic.git

diff --git a/src/lib/audio_stream.h b/src/lib/audio_stream.h
index 4dce27d4a..a7e204065 100644
--- a/src/lib/audio_stream.h
+++ b/src/lib/audio_stream.h
@@ -1,19 +1,20 @@
 /*
-    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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,6 +22,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 +30,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,18 +46,25 @@ public:
 		return _frame_rate;
 	}
 
+	Frame length () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _length;
+	}
+
 	int channels () const;
 
 protected:
 	mutable boost::mutex _mutex;
 
 private:
-	friend class audio_sampling_rate_test;
-	
+	friend struct audio_sampling_rate_test;
+	friend struct player_time_calculation_test3;
+
 	int _frame_rate;
+	Frame _length;
 	AudioMapping _mapping;
 };
 
-typedef boost::shared_ptr<AudioStream> AudioStreamPtr;
+typedef std::shared_ptr<AudioStream> AudioStreamPtr;
 
 #endif