diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-04 20:22:47 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-04 20:22:47 +0000 |
| commit | 1b1bc528ee5ca1fee1bd33f9fb6f79cd551e3b33 (patch) | |
| tree | d60b9fb573dd8d6ab89036fb8788cd1b1c69aada /src/lib/player.h | |
| parent | 6d8bcba724be622739a749064466901486304cee (diff) | |
New DCPTime/ContentTime 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 1ef1f58b7..33ffa80f5 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 (AudioFrame); + void emit_silence (DCPTime); void film_changed (Film::Property); void update_subtitle_from_image (); void update_subtitle_from_text (); @@ -172,7 +172,7 @@ private: /** The time after the last audio that we emitted */ DCPTime _audio_position; - AudioMerger<DCPTime, AudioFrame> _audio_merger; + AudioMerger _audio_merger; dcp::Size _video_container_size; boost::shared_ptr<PlayerImage> _black_frame; |