Various fixes to push audio vaguely in the right direction.

1 files changed, 0 insertions, 66 deletions

diff --git a/src/lib/audio_decoder_stream.h b/src/lib/audio_decoder_stream.h
deleted file mode 100644
index b2ab65ac0..000000000
--- a/src/lib/audio_decoder_stream.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
-
-    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.
-
-    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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#ifndef DCPOMATIC_AUDIO_DECODER_STREAM_H
-#define DCPOMATIC_AUDIO_DECODER_STREAM_H
-
-#include "audio_stream.h"
-#include "content_audio.h"
-#include "dcpomatic_time.h"
-#include <boost/shared_ptr.hpp>
-
-class AudioContent;
-class AudioDecoder;
-class Resampler;
-class Log;
-class Decoder;
-
-class AudioDecoderStream
-{
-public:
-	AudioDecoderStream (boost::shared_ptr<const AudioContent>, AudioStreamPtr, Decoder* decoder, AudioDecoder* audio_decoder, boost::shared_ptr<Log> log);
-
-	void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
-	void flush ();
-	void set_fast ();
-
-	boost::optional<ContentTime> position () const;
-
-private:
-
-	void reset_decoded ();
-	void add (boost::shared_ptr<const AudioBuffers>);
-
-	boost::shared_ptr<const AudioContent> _content;
-	AudioStreamPtr _stream;
-	Decoder* _decoder;
-	AudioDecoder* _audio_decoder;
-	boost::shared_ptr<Log> _log;
-	boost::shared_ptr<Resampler> _resampler;
-	boost::optional<Frame> _position;
-	/** Currently-available decoded audio data */
-	ContentAudio _decoded;
-	/** The time of an accurate seek after which we have not yet received any actual
-	    data at the seek time.
-	*/
-	boost::optional<ContentTime> _seek_reference;
-};
-
-#endif