mirror of
https://github.com/thestk/stk
synced 2026-04-23 15:48:37 +00:00
Version 4.1.2
This commit is contained in:
committed by
Stephen Sinclair
parent
6e0d1955a8
commit
586b0add5f
@@ -49,7 +49,7 @@ void Drone :: setFrequency(MY_FLOAT frequency)
|
||||
{
|
||||
MY_FLOAT freakency = frequency;
|
||||
if ( frequency <= 0.0 ) {
|
||||
cerr << "Drone: setFrequency parameter is less than or equal to zero!" << endl;
|
||||
std::cerr << "Drone: setFrequency parameter is less than or equal to zero!" << std::endl;
|
||||
freakency = 220.0;
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ void Drone :: noteOn(MY_FLOAT frequency, MY_FLOAT amplitude)
|
||||
this->pluck(amplitude);
|
||||
|
||||
#if defined(_STK_DEBUG_)
|
||||
cerr << "Drone: NoteOn frequency = " << frequency << ", amplitude = " << amplitude << endl;
|
||||
std::cerr << "Drone: NoteOn frequency = " << frequency << ", amplitude = " << amplitude << std::endl;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -81,16 +81,16 @@ void Drone :: noteOff(MY_FLOAT amplitude)
|
||||
{
|
||||
loopGain = (MY_FLOAT) 1.0 - amplitude;
|
||||
if ( loopGain < 0.0 ) {
|
||||
cerr << "Drone: noteOff amplitude greater than 1.0!" << endl;
|
||||
std::cerr << "Drone: noteOff amplitude greater than 1.0!" << std::endl;
|
||||
loopGain = 0.0;
|
||||
}
|
||||
else if ( loopGain > 1.0 ) {
|
||||
cerr << "Drone: noteOff amplitude less than or zero!" << endl;
|
||||
std::cerr << "Drone: noteOff amplitude less than or zero!" << std::endl;
|
||||
loopGain = (MY_FLOAT) 0.99999;
|
||||
}
|
||||
|
||||
#if defined(_STK_DEBUG_)
|
||||
cerr << "Drone: NoteOff amplitude = " << amplitude << endl;
|
||||
std::cerr << "Drone: NoteOff amplitude = " << amplitude << std::endl;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ LIBRARY += @frameworks@
|
||||
REALTIME = @realtime@
|
||||
ifeq ($(REALTIME),yes)
|
||||
OBJECTS += RtMidi.o RtAudio.o RtWvOut.o Thread.o Socket.o
|
||||
DEFS += @sound_api@
|
||||
DEFS += @audio_apis@
|
||||
DEFS += @midiator@
|
||||
endif
|
||||
|
||||
@@ -66,4 +66,4 @@ Drone.o: Drone.cpp
|
||||
$(CC) $(CFLAGS) $(DEFS) -c Drone.cpp -o $(OBJECT_PATH)/$@
|
||||
|
||||
VoicDrum.o: VoicDrum.cpp
|
||||
$(CC) $(CFLAGS) $(DEFS) -c VoicDrum.cpp -o $(OBJECT_PATH)/$@
|
||||
$(CC) $(CFLAGS) $(DEFS) -c VoicDrum.cpp -o $(OBJECT_PATH)/$@
|
||||
|
||||
@@ -1 +1 @@
|
||||
wish < tcl/Raga.tcl | ragamat -ip
|
||||
wish < tcl/Raga.tcl | ./ragamat -ip
|
||||
|
||||
@@ -40,16 +40,16 @@ Tabla :: ~Tabla()
|
||||
void Tabla :: noteOn(MY_FLOAT instrument, MY_FLOAT amplitude)
|
||||
{
|
||||
#if defined(_STK_DEBUG_)
|
||||
cerr << "Tabla: NoteOn instrument = " << instrument << ", amplitude = " << amplitude << endl;
|
||||
std::cerr << "Tabla: NoteOn instrument = " << instrument << ", amplitude = " << amplitude << std::endl;
|
||||
#endif
|
||||
|
||||
MY_FLOAT gain = amplitude;
|
||||
if ( amplitude > 1.0 ) {
|
||||
cerr << "Tabla: noteOn amplitude parameter is greater than 1.0!" << endl;
|
||||
std::cerr << "Tabla: noteOn amplitude parameter is greater than 1.0!" << std::endl;
|
||||
gain = 1.0;
|
||||
}
|
||||
else if ( amplitude < 0.0 ) {
|
||||
cerr << "Tabla: noteOn amplitude parameter is less than 0.0!" << endl;
|
||||
std::cerr << "Tabla: noteOn amplitude parameter is less than 0.0!" << std::endl;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -115,9 +115,9 @@ void Tabla :: noteOn(MY_FLOAT instrument, MY_FLOAT amplitude)
|
||||
}
|
||||
|
||||
#if defined(_STK_DEBUG_)
|
||||
cerr << "Number Sounding = " << nSounding << endl;
|
||||
for (i=0; i<nSounding; i++) cerr << sounding[i] << " ";
|
||||
cerr << "\n";
|
||||
std::cerr << "Number Sounding = " << nSounding << std::endl;
|
||||
for (i=0; i<nSounding; i++) std::cerr << sounding[i] << " ";
|
||||
std::cerr << "\n";
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -40,16 +40,16 @@ VoicDrum :: ~VoicDrum()
|
||||
void VoicDrum :: noteOn(MY_FLOAT instrument, MY_FLOAT amplitude)
|
||||
{
|
||||
#if defined(_STK_DEBUG_)
|
||||
cerr << "VoicDrum: NoteOn instrument = " << instrument << ", amplitude = " << amplitude << endl;
|
||||
std::cerr << "VoicDrum: NoteOn instrument = " << instrument << ", amplitude = " << amplitude << std::endl;
|
||||
#endif
|
||||
|
||||
MY_FLOAT gain = amplitude;
|
||||
if ( amplitude > 1.0 ) {
|
||||
cerr << "VoicDrum: noteOn amplitude parameter is greater than 1.0!" << endl;
|
||||
std::cerr << "VoicDrum: noteOn amplitude parameter is greater than 1.0!" << std::endl;
|
||||
gain = 1.0;
|
||||
}
|
||||
else if ( amplitude < 0.0 ) {
|
||||
cerr << "VoicDrum: noteOn amplitude parameter is less than 0.0!" << endl;
|
||||
std::cerr << "VoicDrum: noteOn amplitude parameter is less than 0.0!" << std::endl;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -112,9 +112,9 @@ void VoicDrum :: noteOn(MY_FLOAT instrument, MY_FLOAT amplitude)
|
||||
}
|
||||
|
||||
#if defined(_STK_DEBUG_)
|
||||
cerr << "Number Sounding = " << nSounding << endl;
|
||||
for (i=0; i<nSounding; i++) cerr << sounding[i] << " ";
|
||||
cerr << "\n";
|
||||
std::cerr << "Number Sounding = " << nSounding << std::endl;
|
||||
for (i=0; i<nSounding; i++) std::cerr << sounding[i] << " ";
|
||||
std::cerr << "\n";
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user