Mercurial > hg > svapp
comparison audioio/AudioGenerator.cpp @ 346:0e4332efcc7d tony_integration
Fix failure to take note level into account in playback
author | Chris Cannam |
---|---|
date | Wed, 07 May 2014 15:11:20 +0100 |
parents | 5c69d40a0e30 |
children | f8e1ca25dd80 |
comparison
equal
deleted
inserted
replaced
345:a4b8f0864835 | 346:0e4332efcc7d |
---|---|
549 on.frequency = ni->getFrequency(); | 549 on.frequency = ni->getFrequency(); |
550 on.level = float(ni->velocity) / 127.0; | 550 on.level = float(ni->velocity) / 127.0; |
551 on.pan = pan; | 551 on.pan = pan; |
552 | 552 |
553 #ifdef DEBUG_AUDIO_GENERATOR | 553 #ifdef DEBUG_AUDIO_GENERATOR |
554 cout << "mixModel [clip]: adding note at frame " << noteFrame << ", frame offset " << on.frameOffset << " frequency " << on.frequency << endl; | 554 cout << "mixModel [clip]: adding note at frame " << noteFrame << ", frame offset " << on.frameOffset << " frequency " << on.frequency << ", level " << on.level << endl; |
555 #endif | 555 #endif |
556 | 556 |
557 starts.push_back(on); | 557 starts.push_back(on); |
558 noteOffs.insert | 558 noteOffs.insert |
559 (NoteOff(on.frequency, noteFrame + ni->duration)); | 559 (NoteOff(on.frequency, noteFrame + ni->duration)); |