X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.cc;h=9801a68da90a0c1cb8d9505451742940adf205e6;hb=f113b2aaca7a65f7b37e12a7d9f3f99e2d834e81;hp=20c8ea1ea812c60b7b33fd62a8d1300fe8c3958d;hpb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 20c8ea1ea..9801a68da 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -1,25 +1,27 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-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_decoder.h"
 #include "audio_buffers.h"
 #include "audio_decoder_stream.h"
+#include "audio_content.h"
 #include <boost/foreach.hpp>
 #include <iostream>
 
@@ -29,23 +31,50 @@ using std::cout;
 using std::map;
 using boost::shared_ptr;
 
-AudioDecoder::AudioDecoder (shared_ptr<const AudioContent> content)
-	: _audio_content (content)
+AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, shared_ptr<Log> log)
+	: DecoderPart (parent)
 {
-	BOOST_FOREACH (AudioStreamPtr i, content->audio_streams ()) {
-		_streams[i] = shared_ptr<AudioDecoderStream> (new AudioDecoderStream (_audio_content, i, this));
+	BOOST_FOREACH (AudioStreamPtr i, content->streams ()) {
+		_streams[i] = shared_ptr<AudioDecoderStream> (new AudioDecoderStream (content, i, parent, this, log));
 	}
 }
 
 ContentAudio
-AudioDecoder::get_audio (AudioStreamPtr stream, Frame frame, Frame length, bool accurate)
+AudioDecoder::get (AudioStreamPtr stream, Frame frame, Frame length, bool accurate)
 {
 	return _streams[stream]->get (frame, length, accurate);
 }
 
 void
-AudioDecoder::audio (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
+AudioDecoder::give (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
 {
+	if (ignore ()) {
+		return;
+	}
+
+	if (_streams.find (stream) == _streams.end ()) {
+
+		/* This method can be called with an unknown stream during the following sequence:
+		   - Add KDM to some DCP content.
+		   - Content gets re-examined.
+		   - SingleStreamAudioContent::take_from_audio_examiner creates a new stream.
+		   - Some content property change signal is delivered so Player::Changed is emitted.
+		   - Film viewer to re-gets the frame.
+		   - Player calls DCPDecoder pass which calls this method on the new stream.
+
+		   At this point the AudioDecoder does not know about the new stream.
+
+		   Then
+		   - Some other property change signal is delivered which marks the player's pieces invalid.
+		   - Film viewer re-gets again.
+		   - Everything is OK.
+
+		   In this situation it is fine for us to silently drop the audio.
+		*/
+
+		return;
+	}
+
 	_streams[stream]->audio (data, time);
 }
 
@@ -64,3 +93,11 @@ AudioDecoder::seek (ContentTime t, bool accurate)
 		i->second->seek (t, accurate);
 	}
 }
+
+void
+AudioDecoder::set_fast ()
+{
+	for (map<AudioStreamPtr, shared_ptr<AudioDecoderStream> >::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
+		i->second->set_fast ();
+	}
+}