projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
08fa1ee
)
Another attempt to fix clang build.
author
Carl Hetherington
<cth@carlh.net>
Sun, 29 Dec 2013 21:35:24 +0000
(21:35 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 29 Dec 2013 21:35:24 +0000
(21:35 +0000)
src/lib/player.cc
patch
|
blob
|
history
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index 24c5f2aada52a790fe05aa075e9fc7899a6c14cd..96d23a82b38c3244cec08e01f68016d43f52f60c 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-131,7
+131,7
@@
Player::pass ()
}
if (earliest_audio != TIME_MAX) {
- TimedAudioBuffers<DCPTime> tb = _audio_merger.pull (max (
0L
, earliest_audio));
+ TimedAudioBuffers<DCPTime> tb = _audio_merger.pull (max (
int64_t (0)
, earliest_audio));
Audio (tb.audio, tb.time);
/* This assumes that the audio_frames_to_time conversion is exact
so that there are no accumulated errors caused by rounding.