diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-02 13:02:30 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-02 13:02:30 +0000 |
| commit | 3dfdd5795cf6514e15fdbece54c28f3bddc2aadc (patch) | |
| tree | 0b6a71d8d5c8be03ff424da5c5b0b42fb5f3018a /src/lib/player.h | |
| parent | 30e45dd697afc053f2d7be4ee2bc154e5061ad80 (diff) | |
Rationalise video/audio frame types.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index 897c6116b..5f7c553a0 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -149,7 +149,7 @@ private: void do_seek (DCPTime, bool); void flush (); void emit_black (); - void emit_silence (OutputAudioFrame); + void emit_silence (AudioFrame); void film_changed (Film::Property); void update_subtitle (); void emit_video (boost::weak_ptr<Piece>, boost::shared_ptr<DecodedVideo>); @@ -171,7 +171,7 @@ private: /** The time after the last audio that we emitted */ DCPTime _audio_position; - AudioMerger<DCPTime, AudioContent::Frame> _audio_merger; + AudioMerger<DCPTime, AudioFrame> _audio_merger; libdcp::Size _video_container_size; boost::shared_ptr<PlayerImage> _black_frame; |