|
From: Tapio V. <aa...@us...> - 2010-08-21 14:02:34
|
Module: performous
Branch: joinmenu
Commit: a4bb2770370587465c39261ae8a55aff8fe6e192
Author: Tapio Vierros <tap...@gm...>
Date: Wed Aug 18 19:54:17 2010 +0300
Fix audio sync on 32bit machines.
---
game/audio.cc | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/game/audio.cc b/game/audio.cc
index ab2679f..84fdc7c 100644
--- a/game/audio.cc
+++ b/game/audio.cc
@@ -66,7 +66,7 @@ class Music {
bool m_preview;
static ptime getTime() { return microsec_clock::universal_time(); }
- time_duration durationOf(size_t samples) const { return microseconds(1e6 * samples / srate / 2.0); }
+ time_duration durationOf(int64_t samples) const { return microseconds(1e6 * samples / srate / 2.0); }
/**
* Timing code for precise monotonic time. Very simple, far from perfect.
* This function is called at a beginning of the audio callback, before modifying m_pos
@@ -78,7 +78,6 @@ class Music {
m_baseTime = getTime() - begin; // Recalibrate base time to beginning of the song
}
-
public:
double fadeLevel;
double fadeRate;
|