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

NotePlayer: don't forget to apply volume

Browse source
This commit is contained in:
Louis-Joseph Fournier 2016-01-13 15:39:51 +01:00
parent 176ff48ce3
commit f0640e24ff
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/audio/FreqPlayer.cpp
View file

@ -17,13 +17,13 @@
#include <math.h> #include <math.h>
#include <stdint.h> #include <stdint.h>
//#include <iostream> #include <iostream>
#include "FreqPlayer.hpp" #include "FreqPlayer.hpp"
template<typename sample_t> FreqPlayer<sample_t>::FreqPlayer(int _rate): template<typename sample_t> FreqPlayer<sample_t>::FreqPlayer(int _rate):
freq(440), freq(440),
volume(0.2), volume(0.5),
rate(_rate), rate(_rate),
n_frame(0), n_frame(0),
waveform(W_SINUS) waveform(W_SINUS)
@ -62,7 +62,7 @@ template<> double FreqPlayer<double>::max() { return 1; }
template<typename sample_t> double FreqPlayer<sample_t>::radius() template<typename sample_t> double FreqPlayer<sample_t>::radius()
{ {
double ret = (n_frame++) * k; double ret = (double) (n_frame++) * k;
/* to update frequency factor, wait current radius to go to beginning /* to update frequency factor, wait current radius to go to beginning
* in interval [0, 2PI] * in interval [0, 2PI]
@ -83,7 +83,7 @@ template<typename sample_t> sample_t FreqPlayer<sample_t>::AudioFrame()
{ {
switch (waveform) { switch (waveform) {
case W_SINUS: case W_SINUS:
return (double) sin(radius()) * max(); return (double) sin(radius()) * max() * volume;
default: default:
return 0; return 0;