e1lama/stk
1
0
Fork 0
mirror of https://github.com/thestk/stk synced 2026-01-16 06:21:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Version 4.1.2

Browse Source
This commit is contained in:
Gary Scavone
2009-03-24 23:02:13 -04:00
committed by Stephen Sinclair
parent 6e0d1955a8
commit 586b0add5f
125 changed files with 7301 additions and 5337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Shakers.cpp
View File

@@ -344,7 +344,7 @@ int Shakers :: setupName(char* instr)
}
#if defined(_STK_DEBUG_)
cerr << "Shakers: Setting instrument to " << instrs[which] << endl;
std::cerr << "Shakers: Setting instrument to " << instrs[which] << std::endl;
#endif
return this->setupNum(which);
@@ -795,14 +795,14 @@ int Shakers :: setupNum(int inst)
void Shakers :: noteOn(MY_FLOAT frequency, MY_FLOAT amplitude)
{
// Yep ... pretty kludgey, but it works!
int noteNum = (int) ((12*log(frequency/220)/log(2)) + 57.01) % 32;
int noteNum = (int) ((12*log(frequency/220.0)/log(2.0)) + 57.01) % 32;
if (instType != noteNum) instType = this->setupNum(noteNum);
shakeEnergy += amplitude * MAX_SHAKE * 0.1;
if (shakeEnergy > MAX_SHAKE) shakeEnergy = MAX_SHAKE;
if (instType==10 || instType==3) ratchetPos += 1;
#if defined(_STK_DEBUG_)
cerr << "Shakers: NoteOn frequency = " << frequency << ", amplitude = " << amplitude << endl;
std::cerr << "Shakers: NoteOn frequency = " << frequency << ", amplitude = " << amplitude << std::endl;
#endif
}
@@ -891,11 +891,11 @@ void Shakers :: controlChange(int number, MY_FLOAT value)
MY_FLOAT norm = value * ONE_OVER_128;
if ( norm < 0 ) {
norm = 0.0;
cerr << "Shakers: Control value less than zero!" << endl;
std::cerr << "Shakers: Control value less than zero!" << std::endl;
}
else if ( norm > 1.0 ) {
norm = 1.0;
cerr << "Shakers: Control value greater than 128.0!" << endl;
std::cerr << "Shakers: Control value greater than 128.0!" << std::endl;
}
MY_FLOAT temp;
@@ -982,10 +982,10 @@ void Shakers :: controlChange(int number, MY_FLOAT value)
this->setupNum(instType);
}
else
cerr << "Shakers: Undefined Control Number (" << number << ")!!" << endl;
std::cerr << "Shakers: Undefined Control Number (" << number << ")!!" << std::endl;
#if defined(_STK_DEBUG_)
cerr << "Shakers: controlChange number = " << number << ", value = " << value << endl;
std::cerr << "Shakers: controlChange number = " << number << ", value = " << value << std::endl;
#endif
}