X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.h;h=a777592c258f282b0e1dc73384f6174128a4881a;hb=de2af791bdfdcd653752cba970e59efc7bf810c7;hp=6cdaeeecf69dcd317d8ce739196c087596c20444;hpb=14e4bc18e65378332604016bd6239861a083d5bf;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 6cdaeeecf..a777592c2 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2014 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/>.
 
 */
 
@@ -27,41 +28,36 @@
 #include "decoder.h"
 #include "content_audio.h"
 #include "audio_stream.h"
+#include "decoder_part.h"
 #include <boost/enable_shared_from_this.hpp>
+#include <boost/signals2.hpp>
 
 class AudioBuffers;
 class AudioContent;
 class AudioDecoderStream;
+class Log;
 
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
  */
-class AudioDecoder : public virtual Decoder, public boost::enable_shared_from_this<AudioDecoder>
+class AudioDecoder : public boost::enable_shared_from_this<AudioDecoder>, public DecoderPart
 {
 public:
-	AudioDecoder (boost::shared_ptr<const AudioContent>);
-
-	boost::shared_ptr<const AudioContent> audio_content () const {
-		return _audio_content;
-	}
-
-	/** Try to fetch some audio from a specific place in this content.
-	 *  @param frame Frame to start from (after resampling, if applicable)
-	 *  @param length Frames to get (after resampling, if applicable)
-	 *  @param accurate true to try hard to return frames from exactly `frame', false if we don't mind nearby frames.
-	 *  @return Time-stamped audio data which may or may not be from the location (and of the length) requested.
-	 */
-	ContentAudio get_audio (AudioStreamPtr stream, Frame time, Frame length, bool accurate);
-
-protected:
-	void audio (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
+	AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent>, boost::shared_ptr<Log> log);
+
+	void set_fast ();
 	void flush ();
-	void seek (ContentTime t, bool accurate);
+
+	void emit (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
+
+	boost::signals2::signal<void (ContentAudio)> Data;
+
+	boost::optional<ContentTime> position () const;
 
 private:
-	boost::shared_ptr<const AudioContent> _audio_content;
 	/** An AudioDecoderStream object to manage each stream in _audio_content */
-	std::map<AudioStreamPtr, boost::shared_ptr<AudioDecoderStream> > _streams;
+	typedef std::map<AudioStreamPtr, boost::shared_ptr<AudioDecoderStream> > StreamMap;
+	StreamMap _streams;
 };
 
 #endif