diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-07 19:07:35 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-07 19:07:35 +0000 |
| commit | 978be856218cc15f059b7e267811e7302c37b24d (patch) | |
| tree | 41b97f950dbc5c30953abe4e98ca5053bdff73bc /src/lib/audio_merger.h | |
| parent | ae0e45e03ab168de0d291cfa1520beedd6a0a899 (diff) | |
Remove template from TimedAudioBuffers; a couple of small fixes.
Diffstat (limited to 'src/lib/audio_merger.h')
| -rw-r--r-- | src/lib/audio_merger.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h index 121b21095..756e5ab31 100644 --- a/src/lib/audio_merger.h +++ b/src/lib/audio_merger.h @@ -29,9 +29,9 @@ public: /** Pull audio up to a given time; after this call, no more data can be pushed * before the specified time. */ - TimedAudioBuffers<DCPTime> pull (DCPTime time); + TimedAudioBuffers pull (DCPTime time); void push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time); - TimedAudioBuffers<DCPTime> flush (); + TimedAudioBuffers flush (); void clear (DCPTime t); private: |