projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename TYPE_DEBUG_PLAYER to TYPE_DEBUG_VIDEO_VIEW.
[dcpomatic.git]
/
src
/
lib
/
audio_stream.cc
diff --git
a/src/lib/audio_stream.cc
b/src/lib/audio_stream.cc
index 8e260b34643c216a20d9be290520beedc6a50d85..ef0b9166514637e230d30ec339b7946c000dd3b3 100644
(file)
--- a/
src/lib/audio_stream.cc
+++ b/
src/lib/audio_stream.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2015-2016 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.
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
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/>.
*/
*/
@@
-24,8
+25,9
@@
AudioStream::AudioStream (int frame_rate, Frame length, int channels)
: _frame_rate (frame_rate)
, _length (length)
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)
}
AudioStream::AudioStream (int frame_rate, Frame length, AudioMapping mapping)