[Scummvm-cvs-logs] SF.net SVN: scummvm: [31550] scummvm/trunk/engines/agi/sound.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Thu Apr 17 20:28:28 CEST 2008
Revision: 31550
http://scummvm.svn.sourceforge.net/scummvm/?rev=31550&view=rev
Author: lordhoto
Date: 2008-04-17 11:28:28 -0700 (Thu, 17 Apr 2008)
Log Message:
-----------
Fixed gcc warnings.
Modified Paths:
--------------
scummvm/trunk/engines/agi/sound.cpp
Modified: scummvm/trunk/engines/agi/sound.cpp
===================================================================
--- scummvm/trunk/engines/agi/sound.cpp 2008-04-17 18:00:48 UTC (rev 31549)
+++ scummvm/trunk/engines/agi/sound.cpp 2008-04-17 18:28:28 UTC (rev 31550)
@@ -754,18 +754,18 @@
}
// TODO/FIXME: Implement correctly and fully (Take velocity into account etc)
-void IIgsChannelInfo::noteOn(uint8 note, uint8 velocity) {
- this->origNote = note;
+void IIgsChannelInfo::noteOn(uint8 noteParam, uint8 velocity) {
+ this->origNote = noteParam;
this->startEnvVol = intToFrac(0);
rewind();
const IIgsWaveInfo *waveInfo = NULL;
for (uint i = 0; i < ins->oscList.count; i++)
- if (ins->oscList(i).waves[0].top >= note)
+ if (ins->oscList(i).waves[0].top >= noteParam)
waveInfo = &ins->oscList(i).waves[0];
assert(waveInfo != NULL);
this->relocatedSample = this->unrelocatedSample + waveInfo->addr;
this->posAdd = intToFrac(0);
- this->note = intToFrac(note) + doubleToFrac(waveInfo->relPitch/256.0);
+ this->note = intToFrac(noteParam) + doubleToFrac(waveInfo->relPitch/256.0);
this->vol = doubleToFrac(fracToDouble(this->envVol) * fracToDouble(this->chanVol) / 127.0);
this->loop = (waveInfo->mode == OSC_MODE_LOOP);
this->size = waveInfo->size - waveInfo->addr;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list