diff options
Diffstat (limited to 'src/lib/audio_merger.h')
| -rw-r--r-- | src/lib/audio_merger.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h index a6b7637f6..54adfc85e 100644 --- a/src/lib/audio_merger.h +++ b/src/lib/audio_merger.h @@ -34,14 +34,14 @@ class AudioMerger { public: - explicit AudioMerger (int frame_rate); + explicit AudioMerger(int frame_rate); - std::list<std::pair<std::shared_ptr<AudioBuffers>, dcpomatic::DCPTime>> pull (dcpomatic::DCPTime time); - void push (std::shared_ptr<const AudioBuffers> audio, dcpomatic::DCPTime time); - void clear (); + std::list<std::pair<std::shared_ptr<AudioBuffers>, dcpomatic::DCPTime>> pull(dcpomatic::DCPTime time); + void push(std::shared_ptr<const AudioBuffers> audio, dcpomatic::DCPTime time); + void clear(); private: - Frame frames (dcpomatic::DCPTime t) const; + Frame frames(dcpomatic::DCPTime t) const; class Buffer { @@ -51,13 +51,13 @@ private: * @param t Time * @param r Frame rate. */ - Buffer (int c, int32_t f, dcpomatic::DCPTime t, int r) + Buffer(int c, int32_t f, dcpomatic::DCPTime t, int r) : audio (std::make_shared<AudioBuffers>(c, f)) , time (t) , frame_rate (r) {} - Buffer (std::shared_ptr<AudioBuffers> a, dcpomatic::DCPTime t, int r) + Buffer(std::shared_ptr<AudioBuffers> a, dcpomatic::DCPTime t, int r) : audio (a) , time (t) , frame_rate (r) @@ -67,8 +67,8 @@ private: dcpomatic::DCPTime time; int frame_rate; - dcpomatic::DCPTimePeriod period () const { - return dcpomatic::DCPTimePeriod (time, time + dcpomatic::DCPTime::from_frames (audio->frames(), frame_rate)); + dcpomatic::DCPTimePeriod period() const { + return dcpomatic::DCPTimePeriod(time, time + dcpomatic::DCPTime::from_frames(audio->frames(), frame_rate)); } }; |