projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up _last_video_time to make it more like _last_audio_time.
[dcpomatic.git]
/
src
/
lib
/
audio_decoder.h
diff --git
a/src/lib/audio_decoder.h
b/src/lib/audio_decoder.h
index 1da8a676f37c7f59c3deeb46a166829e60ff1687..c104d8201971a3b1ee98bf72dfed3f58f619945c 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
-2017
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/>.
*/
*/
@@
-24,33
+25,35
@@
#ifndef DCPOMATIC_AUDIO_DECODER_H
#define DCPOMATIC_AUDIO_DECODER_H
#ifndef DCPOMATIC_AUDIO_DECODER_H
#define DCPOMATIC_AUDIO_DECODER_H
-#include "audio_source.h"
#include "decoder.h"
#include "decoder.h"
-extern "C" {
-#include <libswresample/swresample.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 AudioContent;
+class AudioDecoderStream;
+class Log;
/** @class AudioDecoder.
* @brief Parent class for audio decoders.
*/
/** @class AudioDecoder.
* @brief Parent class for audio decoders.
*/
-class AudioDecoder : public
AudioSource, 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>);
- ~AudioDecoder ();
-
-protected:
+ AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent> content, boost::shared_ptr<Log> log);
- void audio (boost::shared_ptr<const AudioBuffers>, Time);
- bool audio_done () const;
+ ContentTime position () const;
+ void emit (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
+ void seek ();
- Time _next_audio;
- boost::shared_ptr<const AudioContent> _audio_content;
+ boost::signals2::signal<void (AudioStreamPtr, ContentAudio)> Data;
-private:
- SwrContext* _swr_context;
+private:
+ /** Frame after the last one that was emitted from Data for each AudioStream */
+ std::map<AudioStreamPtr, Frame> _positions;
};
#endif
};
#endif