- Updated fmod_wrap.h for FMOD 4.14.

- Set note velocity back to using a linear sounding volume curve, although
  it's now used to scale channel volume and expression, so recompute_amp()
  is still only doing one volume curve lookup.
- Fixed: TimidityMIDIDevice caused a crash at the end of a non-looping song.


SVN r920 (trunk)
This commit is contained in:
Randy Heit 2008-04-16 20:02:16 +00:00
commit 42c80b3ee5
9 changed files with 89 additions and 72 deletions

View file

@ -173,8 +173,8 @@ void Renderer::recompute_amp(Voice *v)
int panning = v->panning;
double vol = channel[chan].volume / 16383.f;
double expr = channel[chan].expression / 16383.f;
double vel = /*calc_vol*/(v->velocity / 127.f);
double tempamp = vel * calc_vol(vol * expr) * v->sample->volume;
double vel = v->velocity / 127.f;
double tempamp = calc_vol(vol * expr * vel) * v->sample->volume;
if (panning >= 0x1DBB && panning < 0x2244)
{