diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-02-28 11:09:38 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-19 23:04:32 +0100 |
| commit | 17e80bc37eea735629e13f068005653428c44cce (patch) | |
| tree | c7d89d73f77fd69182b620c6a65b6e57722b4175 /src/lib/audio_merger.h | |
| parent | 67826e691516e9bbb468ab62737e81e5e2eeeedf (diff) | |
Some comments and a few small cleanups.
Diffstat (limited to 'src/lib/audio_merger.h')
| -rw-r--r-- | src/lib/audio_merger.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h index 87bda7f8b..ffca29c57 100644 --- a/src/lib/audio_merger.h +++ b/src/lib/audio_merger.h @@ -17,22 +17,28 @@ */ +/** @file src/audio_merger.h + * @brief AudioMerger class. + */ + #include "audio_buffers.h" #include "dcpomatic_time.h" #include "util.h" +/** @class AudioMerger. + * @brief A class that can merge audio data from many sources. + */ class AudioMerger { public: AudioMerger (int frame_rate); - /** Pull audio up to a given time; after this call, no more data can be pushed - * before the specified time. - */ std::list<std::pair<boost::shared_ptr<AudioBuffers>, DCPTime> > pull (DCPTime time); void push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time); private: + Frame frames (DCPTime t) const; + class Buffer { public: |