X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.cc;h=b866d3ecf14f65abfb99278fa6e35d6f0e9b25af;hb=de2af791bdfdcd653752cba970e59efc7bf810c7;hp=2944357bac7fe0f279bb8da163915c1e730f65e9;hpb=43494601da412259814fdb1345950329cc4aa849;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 2944357ba..b866d3ecf 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -1,19 +1,20 @@
 /*
-    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/>.
 
 */
 
@@ -21,6 +22,8 @@
 #include "audio_buffers.h"
 #include "audio_decoder_stream.h"
 #include "audio_content.h"
+#include "log.h"
+#include "compose.hpp"
 #include <boost/foreach.hpp>
 #include <iostream>
 
@@ -29,27 +32,20 @@
 using std::cout;
 using std::map;
 using boost::shared_ptr;
+using boost::optional;
 
-AudioDecoder::AudioDecoder (shared_ptr<const AudioContent> content, bool fast)
-	: _audio_content (content)
-	, _ignore_audio (false)
-	, _fast (fast)
+AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, shared_ptr<Log> log)
+	: DecoderPart (parent, log)
 {
-	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)
-{
-	return _streams[stream]->get (frame, length, accurate);
-}
-
 void
-AudioDecoder::audio (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
+AudioDecoder::emit (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
 {
-	if (_ignore_audio) {
+	if (ignore ()) {
 		return;
 	}
 
@@ -82,22 +78,27 @@ AudioDecoder::audio (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data,
 void
 AudioDecoder::flush ()
 {
-	for (map<AudioStreamPtr, shared_ptr<AudioDecoderStream> >::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
+	for (StreamMap::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
 		i->second->flush ();
 	}
 }
 
 void
-AudioDecoder::seek (ContentTime t, bool accurate)
+AudioDecoder::set_fast ()
 {
-	for (map<AudioStreamPtr, shared_ptr<AudioDecoderStream> >::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
-		i->second->seek (t, accurate);
+	for (StreamMap::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
+		i->second->set_fast ();
 	}
 }
 
-/** Set this player never to produce any audio data */
-void
-AudioDecoder::set_ignore_audio ()
+optional<ContentTime>
+AudioDecoder::position () const
 {
-	_ignore_audio = true;
+	optional<ContentTime> pos;
+	for (StreamMap::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
+		if (!pos || (i->second->position() && i->second->position().get() < pos.get())) {
+			pos = i->second->position();
+		}
+	}
+	return pos;
 }