medvedych/SailTuner
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Player: triangle wave form

Browse source
This commit is contained in:
Louis-Joseph Fournier 2016-01-14 16:18:15 +01:00
parent 4adb701d34
commit 8c681db1cd
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/audio/FreqPlayer.cpp
View file

@ -26,7 +26,7 @@ template<typename sample_t> FreqPlayer<sample_t>::FreqPlayer(int _rate):
volume(0.5), volume(0.5),
rate(_rate), rate(_rate),
n_frame(0), n_frame(0),
waveform(W_SINUS) waveform(W_TRIANGLE)
{ {
k = K(); k = K();
k_update = -1; // invalid: don't update k_update = -1; // invalid: don't update
@ -68,13 +68,31 @@ template<typename sample_t> double FreqPlayer<sample_t>::radius()
template<typename sample_t> sample_t FreqPlayer<sample_t>::AudioFrame() template<typename sample_t> sample_t FreqPlayer<sample_t>::AudioFrame()
{ {
double r = radius();
double v;
switch (waveform) { switch (waveform) {
case W_SINUS: case W_SINUS:
return (double) sin(radius()) * max() * volume; v = sin(r);
break;
case W_TRIANGLE:
r = fmod(r, M_PI * 2);
if (r <= M_PI / 2) v = r;
else if (r <= M_PI * 1.5) v = M_PI - r;
else v = r - M_PI * 2;
v /= (M_PI / 2);
break;
default: default:
return 0; v = 0;
break;
} }
return v * max() * volume;
} }
template<typename sample_t> void FreqPlayer<sample_t>::WriteAudio(sample_t *out, int nb_frame, bool stop) template<typename sample_t> void FreqPlayer<sample_t>::WriteAudio(sample_t *out, int nb_frame, bool stop)

2
src/audio/FreqPlayer.hpp
View file

@ -27,7 +27,7 @@
template<typename sample_t> class FreqPlayer { template<typename sample_t> class FreqPlayer {
public: public:
/// waveform style /// waveform style
enum WAVEFORM { W_SINUS }; enum WAVEFORM { W_SINUS, W_TRIANGLE };
private: private:
/// current frequency /// current frequency