|
From: Tapio V. <aa...@us...> - 2010-08-21 14:12:38
|
Module: performous
Branch: master
Commit: 0a01e08641b058d8aa0cbd2d49dc55280c2d9513
Author: Tapio Vierros <tap...@gm...>
Date: Sat Aug 21 17:10:24 2010 +0300
Disable "pitch shifter".
---
game/audio.cc | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/game/audio.cc b/game/audio.cc
index d4c2227..374b366 100644
--- a/game/audio.cc
+++ b/game/audio.cc
@@ -170,6 +170,8 @@ public:
Buffer mixbuf(end - begin);
for (Tracks::iterator it = tracks.begin(), itend = tracks.end(); it != itend; ++it) {
Track& t = *it->second;
+// FIXME: Include this code bit once there is a sane pitch shifting algorithm
+#if 0
// if (it->first == "guitar") std::cout << t.pitchFactor << std::endl;
if (t.pitchFactor != 0) { // Pitch shift
Buffer tempbuf(end - begin);
@@ -183,7 +185,9 @@ public:
while (b != tempbuf.end())
*m++ += (*b++);
// Otherwise just get the audio and mix it straight away
- } else if (t.mpeg.audioQueue(&*mixbuf.begin(), &*mixbuf.end(), m_pos, t.fadeLevel)) eof = false;
+ } else
+#endif
+ if (t.mpeg.audioQueue(&*mixbuf.begin(), &*mixbuf.end(), m_pos, t.fadeLevel)) eof = false;
}
m_pos += samples;
for (size_t i = 0, iend = mixbuf.size(); i != iend; ++i) {
|