From f0640e24ff28848de44ce7d813187bfde1f055c7 Mon Sep 17 00:00:00 2001 From: Louis-Joseph Fournier Date: Wed, 13 Jan 2016 15:39:51 +0100 Subject: [PATCH] NotePlayer: don't forget to apply volume --- src/audio/FreqPlayer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/audio/FreqPlayer.cpp b/src/audio/FreqPlayer.cpp index 1c4aa70..4701319 100644 --- a/src/audio/FreqPlayer.cpp +++ b/src/audio/FreqPlayer.cpp @@ -17,13 +17,13 @@ #include #include -//#include +#include #include "FreqPlayer.hpp" template FreqPlayer::FreqPlayer(int _rate): freq(440), - volume(0.2), + volume(0.5), rate(_rate), n_frame(0), waveform(W_SINUS) @@ -62,7 +62,7 @@ template<> double FreqPlayer::max() { return 1; } template double FreqPlayer::radius() { - double ret = (n_frame++) * k; + double ret = (double) (n_frame++) * k; /* to update frequency factor, wait current radius to go to beginning * in interval [0, 2PI] @@ -83,7 +83,7 @@ template sample_t FreqPlayer::AudioFrame() { switch (waveform) { case W_SINUS: - return (double) sin(radius()) * max(); + return (double) sin(radius()) * max() * volume; default: return 0;