projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Be more careful about allowing possibly-trouble-causing characters in DCP filenames.
[dcpomatic.git]
/
src
/
lib
/
audio_decoder.h
diff --git
a/src/lib/audio_decoder.h
b/src/lib/audio_decoder.h
index a56847daf293588c0003b166c9054d0188e61f8a..cdb643ceeabef373aa5ada3f705168beed574766 100644
(file)
--- a/
src/lib/audio_decoder.h
+++ b/
src/lib/audio_decoder.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2016 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/>.
*/
*/
@@
-27,6
+28,7
@@
#include "decoder.h"
#include "content_audio.h"
#include "audio_stream.h"
#include "decoder.h"
#include "content_audio.h"
#include "audio_stream.h"
+#include "decoder_part.h"
#include <boost/enable_shared_from_this.hpp>
class AudioBuffers;
#include <boost/enable_shared_from_this.hpp>
class AudioBuffers;
@@
-37,10
+39,10
@@
class Log;
/** @class AudioDecoder.
* @brief Parent class for audio decoders.
*/
/** @class AudioDecoder.
* @brief Parent class for audio decoders.
*/
-class AudioDecoder : public boost::enable_shared_from_this<AudioDecoder>
+class AudioDecoder : public boost::enable_shared_from_this<AudioDecoder>
, public DecoderPart
{
public:
{
public:
- AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent>, boo
l fast, boo
st::shared_ptr<Log> log);
+ AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent>, boost::shared_ptr<Log> log);
/** Try to fetch some audio from a specific place in this content.
* @param frame Frame to start from (after resampling, if applicable)
/** Try to fetch some audio from a specific place in this content.
* @param frame Frame to start from (after resampling, if applicable)
@@
-48,24
+50,20
@@
public:
* @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.
*/
* @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);
-
- void set_ignore_audio ();
+ ContentAudio get (AudioStreamPtr stream, Frame time, Frame length, bool accurate);
- bool fast () const {
- return _fast;
- }
+ void set_fast ();
- void
audio
(AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
+ void
give
(AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
void flush ();
void seek (ContentTime t, bool accurate);
void flush ();
void seek (ContentTime t, bool accurate);
+ boost::optional<ContentTime> position () const;
+
private:
private:
- boost::shared_ptr<const AudioContent> _audio_content;
/** An AudioDecoderStream object to manage each stream in _audio_content */
/** An AudioDecoderStream object to manage each stream in _audio_content */
- std::map<AudioStreamPtr, boost::shared_ptr<AudioDecoderStream> > _streams;
- bool _ignore_audio;
- bool _fast;
+ typedef std::map<AudioStreamPtr, boost::shared_ptr<AudioDecoderStream> > StreamMap;
+ StreamMap _streams;
};
#endif
};
#endif