projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New DCPTime/ContentTime types.
[dcpomatic.git]
/
src
/
lib
/
player.h
diff --git
a/src/lib/player.h
b/src/lib/player.h
index 1ef1f58b7bb693a76b875f3b30bd79be42d7c057..33ffa80f585aab368d41f178bdc74f691abb297a 100644
(file)
--- 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 do_seek (DCPTime, bool);
void flush ();
void emit_black ();
- void emit_silence (
AudioFra
me);
+ void emit_silence (
DCPTi
me);
void film_changed (Film::Property);
void update_subtitle_from_image ();
void update_subtitle_from_text ();
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;
/** 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;
dcp::Size _video_container_size;
boost::shared_ptr<PlayerImage> _black_frame;