projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Logging improvements to allow prettier displays in the server GUI.
[dcpomatic.git]
/
src
/
lib
/
sndfile_decoder.h
diff --git
a/src/lib/sndfile_decoder.h
b/src/lib/sndfile_decoder.h
index 2900afea0b3f258aaa5c1031328a716b800f9bef..da9016ee09a958c26211df60e4ae68b6a1d9620d 100644
(file)
--- a/
src/lib/sndfile_decoder.h
+++ b/
src/lib/sndfile_decoder.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
3
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,30
+17,22
@@
*/
*/
-#include <sndfile.h>
-#include "decoder.h"
#include "audio_decoder.h"
#include "audio_decoder.h"
+#include "sndfile_base.h"
class SndfileContent;
class SndfileContent;
-class SndfileDecoder : public AudioDecoder
+class SndfileDecoder : public
Sndfile, public
AudioDecoder
{
public:
{
public:
- SndfileDecoder (boost::shared_ptr<const
Film>, boost::shared_ptr<const SndfileContent>
);
+ SndfileDecoder (boost::shared_ptr<const
SndfileContent> c, bool fast
);
~SndfileDecoder ();
~SndfileDecoder ();
- bool pass ();
-
- int audio_channels () const;
- ContentAudioFrame audio_length () const;
- int audio_frame_rate () const;
-
private:
private:
-
SNDFILE* open_file (sf_count_t &
);
- void
close_file (SNDFILE*
);
+
bool pass (
);
+ void
seek (ContentTime, bool
);
- boost::shared_ptr<const SndfileContent> _sndfile_content;
- SNDFILE* _sndfile;
- SF_INFO _info;
- ContentAudioFrame _remaining;
+ int64_t _done;
+ int64_t _remaining;
+ float* _deinterleave_buffer;
};
};