projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4da1517
)
Clarify logic.
author
Carl Hetherington
<cth@carlh.net>
Thu, 11 Sep 2014 22:17:01 +0000
(23:17 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 11 Sep 2014 22:17:01 +0000
(23:17 +0100)
src/lib/audio_decoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/audio_decoder.cc
b/src/lib/audio_decoder.cc
index 12580c5f64972fd64498697e1f5dce7b4635af3d..bd9dff8c98a695945e12c5957510ff7da84223a6 100644
(file)
--- a/
src/lib/audio_decoder.cc
+++ b/
src/lib/audio_decoder.cc
@@
-79,7
+79,7
@@
AudioDecoder::get_audio (AudioFrame frame, AudioFrame length, bool accurate)
*/
if (accurate) {
/* Keep stuffing data into _decoded_audio until we have enough data, or the subclass does not want to give us any more */
*/
if (accurate) {
/* Keep stuffing data into _decoded_audio until we have enough data, or the subclass does not want to give us any more */
- while (
_decoded_audio.frame > frame || (_decoded_audio.frame + _decoded_audio.audio->frames()) < end
&& !pass ()) {}
+ while (
(_decoded_audio.frame > frame || (_decoded_audio.frame + _decoded_audio.audio->frames()) < end)
&& !pass ()) {}
decoded_offset = frame - _decoded_audio.frame;
} else {
while (_decoded_audio.audio->frames() < length && !pass ()) {}
decoded_offset = frame - _decoded_audio.frame;
} else {
while (_decoded_audio.audio->frames() < length && !pass ()) {}