X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_stream.cc;h=ef0b9166514637e230d30ec339b7946c000dd3b3;hb=3df4d6271a6a660fdce143dcd65467c402e98976;hp=8e260b34643c216a20d9be290520beedc6a50d85;hpb=3db1df492e1009ee28641cdc593a139df156e8d7;p=dcpomatic.git diff --git a/src/lib/audio_stream.cc b/src/lib/audio_stream.cc index 8e260b346..ef0b91665 100644 --- a/src/lib/audio_stream.cc +++ b/src/lib/audio_stream.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2015-2016 Carl Hetherington - 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 . */ @@ -24,8 +25,9 @@ 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, Frame length, AudioMapping mapping)