X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_stream.cc;h=43e4c5ec13d924fe4baef0e2981c4167c500673f;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=2119d08344566ef48e9f6a9186079035abd7b1ca;hpb=f9fcc34179a6f86425427741c60d8876099d3ed3;p=dcpomatic.git

diff --git a/src/lib/audio_stream.cc b/src/lib/audio_stream.cc
index 2119d0834..43e4c5ec1 100644
--- a/src/lib/audio_stream.cc
+++ b/src/lib/audio_stream.cc
@@ -1,39 +1,47 @@
 /*
-    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/>.
 
 */
 
+
 #include "audio_stream.h"
 #include "audio_mapping.h"
 #include "util.h"
 
-AudioStream::AudioStream (int frame_rate, int channels)
+
+AudioStream::AudioStream (int frame_rate, Frame length, int channels)
 	: _frame_rate (frame_rate)
+	, _length (length)
+	, _mapping (AudioMapping (channels, MAX_DCP_AUDIO_CHANNELS))
 {
-	_mapping = AudioMapping (channels, MAX_DCP_AUDIO_CHANNELS);
+
 }
 
-AudioStream::AudioStream (int frame_rate, AudioMapping mapping)
+
+AudioStream::AudioStream (int frame_rate, Frame length, AudioMapping mapping)
 	: _frame_rate (frame_rate)
+	, _length (length)
 	, _mapping (mapping)
 {
 
 }
 
+
 void
 AudioStream::set_mapping (AudioMapping mapping)
 {
@@ -41,6 +49,7 @@ AudioStream::set_mapping (AudioMapping mapping)
 	_mapping = mapping;
 }
 
+
 int
 AudioStream::channels () const
 {