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 a4fa8bd9b8472c84ecbd84b8734f3957922b379c..ef0b9166514637e230d30ec339b7946c000dd3b3 100644 (file)
--- a/src/lib/audio_stream.cc
+++ b/src/lib/audio_stream.cc
@@ -1,33 +1,38 @@
 /*
-    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);
+
 }
 
-AudioStream::AudioStream (int frame_rate, AudioMapping mapping)
+AudioStream::AudioStream (int frame_rate, Frame length, AudioMapping mapping)
        : _frame_rate (frame_rate)
+       , _length (length)
        , _mapping (mapping)
 {
 
@@ -40,16 +45,9 @@ AudioStream::set_mapping (AudioMapping mapping)
        _mapping = mapping;
 }
 
-void
-AudioStream::set_frame_rate (int frame_rate)
-{
-       boost::mutex::scoped_lock lm (_mutex);
-       _frame_rate = frame_rate;
-}
-
 int
 AudioStream::channels () const
 {
        boost::mutex::scoped_lock lm (_mutex);
-       return _mapping.content_channels ();
+       return _mapping.input_channels ();
 }