projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
const fix.
[dcpomatic.git]
/
src
/
lib
/
audio_decoder.h
diff --git
a/src/lib/audio_decoder.h
b/src/lib/audio_decoder.h
index a295df0ccbbf9d770b7f60afb0926ec99c56f659..25d858681eea36e6e4ed0f6605526f88a37c49d2 100644
(file)
--- a/
src/lib/audio_decoder.h
+++ b/
src/lib/audio_decoder.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012 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.
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
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/>.
*/
*/
@@
-25,34
+26,33
@@
#define DCPOMATIC_AUDIO_DECODER_H
#include "decoder.h"
#define DCPOMATIC_AUDIO_DECODER_H
#include "decoder.h"
-#include "content.h"
-#include "audio_content.h"
-#include "decoded.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 AudioBuffers;
-class Resampler;
+class AudioContent;
+class AudioDecoderStream;
+class Log;
/** @class AudioDecoder.
* @brief Parent class for audio decoders.
*/
/** @class AudioDecoder.
* @brief Parent class for audio decoders.
*/
-class AudioDecoder : public
virtual Decoder
+class AudioDecoder : public
boost::enable_shared_from_this<AudioDecoder>, public DecoderPart
{
public:
{
public:
- AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>);
-
- boost::shared_ptr<const AudioContent> audio_content () const {
- return _audio_content;
- }
+ AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent> content, boost::shared_ptr<Log> log);
-protected:
+ ContentTime position () const;
+ void emit (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
+ void seek ();
- void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
- void flush ();
+ boost::signals2::signal<void (AudioStreamPtr, ContentAudio)> Data;
- boost::shared_ptr<const AudioContent> _audio_content;
- boost::shared_ptr<Resampler> _resampler;
- /* End time of last audio that we wrote to _pending; only used for flushing the resampler */
- ContentTime _last_audio;
+private:
+ std::map<AudioStreamPtr, Frame> _positions;
};
#endif
};
#endif