|
From: Yoda-JM <yo...@us...> - 2009-07-18 20:04:55
|
Module: performous
Branch: master
Commit: c8892b11a258b989974d3b40c8528265faa56439
Author: Vincent Le Ligeour <yo...@us...>
Date: Sat Jul 18 22:04:13 2009 +0200
Fixed stream consume when no frame need to be consumed
---
game/audio.hh | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/game/audio.hh b/game/audio.hh
index 876ca3c..ca4da4c 100644
--- a/game/audio.hh
+++ b/game/audio.hh
@@ -90,12 +90,10 @@ struct Stream {
bool consume(double duration) {
std::vector<int16_t> buf;
unsigned int samples = srate * duration;
+ if( samples == 0 ) return true;
mpeg.audioQueue.tryPop(buf, samples);
- if( buf.size() == samples ) {
- return true;
- } else {
- return false;
- }
+ if( buf.size() == samples ) return true;
+ return false;
}
/// crossfades songs
template <typename RndIt> void playmix(RndIt outbuf, unsigned int maxSamples) {
|