projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basics of splitting up Decoder tree like Content.
[dcpomatic.git]
/
src
/
lib
/
sndfile_decoder.h
diff --git
a/src/lib/sndfile_decoder.h
b/src/lib/sndfile_decoder.h
index 52590ef24a3b99bc841edff4687b2a97ced69a9c..d3f9342b3a0ca6a71ea02350049042bfe04a8dd1 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
6
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,21
@@
*/
*/
-#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
Audio
Decoder
+class SndfileDecoder : public
Sndfile, public
Decoder
{
public:
{
public:
- SndfileDecoder (boost::shared_ptr<const SndfileContent> c);
+ SndfileDecoder (boost::shared_ptr<const SndfileContent> c
, bool fast, boost::shared_ptr<Log> log
);
~SndfileDecoder ();
~SndfileDecoder ();
+private:
+ bool pass (PassReason, bool);
void seek (ContentTime, bool);
void seek (ContentTime, bool);
- int audio_channels () const;
- ContentTime audio_length () const;
- int audio_frame_rate () const;
-
-private:
- bool pass ();
-
- boost::shared_ptr<const SndfileContent> _sndfile_content;
- SNDFILE* _sndfile;
- SF_INFO _info;
int64_t _done;
int64_t _remaining;
float* _deinterleave_buffer;
int64_t _done;
int64_t _remaining;
float* _deinterleave_buffer;