projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reword again: Text -> Caption and Plain -> Text.
[dcpomatic.git]
/
src
/
lib
/
resampler.h
diff --git
a/src/lib/resampler.h
b/src/lib/resampler.h
index 359598b122b17b4f1dbe30139eaba8ce91409bbe..4b19dc511b891e988c33b4a89b22af8c78da4eb9 100644
(file)
--- a/
src/lib/resampler.h
+++ b/
src/lib/resampler.h
@@
-31,8
+31,9
@@
public:
Resampler (int, int, int);
~Resampler ();
Resampler (int, int, int);
~Resampler ();
-
std::pair<boost::shared_ptr<const AudioBuffers>, Frame> run (boost::shared_ptr<const AudioBuffers>, Frame
);
+
boost::shared_ptr<const AudioBuffers> run (boost::shared_ptr<const AudioBuffers>
);
boost::shared_ptr<const AudioBuffers> flush ();
boost::shared_ptr<const AudioBuffers> flush ();
+ void reset ();
void set_fast ();
private:
void set_fast ();
private:
@@
-40,6
+41,4
@@
private:
int _in_rate;
int _out_rate;
int _channels;
int _in_rate;
int _out_rate;
int _channels;
- boost::optional<Frame> _next_in;
- boost::optional<Frame> _next_out;
};
};