Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 07:37:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

coding standard / SLOT selectAudioSourceSine440 linkage / tone gen amplitude parameter

Browse source
This commit is contained in:
Craig Hansen-Sturm 2014-09-08 11:18:14 -07:00
parent 2700d8c59d
commit 431fcbcf6c
5 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Menu.cpp
View file

@ -563,7 +563,7 @@ Menu::Menu() :
0, 0,
true, true,
appInstance->getAudio(), appInstance->getAudio(),
SLOT(selectAudioSourceSine440)); SLOT(selectAudioSourceSine440()));
QActionGroup* audioSourceGroup = new QActionGroup(audioSourceMenu); QActionGroup* audioSourceGroup = new QActionGroup(audioSourceMenu);
audioSourceGroup->addAction(pinkNoise); audioSourceGroup->addAction(pinkNoise);

20
libraries/audio/src/AudioBuffer.h
View file

@ -44,18 +44,18 @@ class AudioFrameBuffer {
public: public:
AudioFrameBuffer() AudioFrameBuffer() :
: _channelCount(0) _channelCount(0),
, _frameCount(0) _frameCount(0),
, _frameCountMax(0) _frameCountMax(0),
, _frameBuffer(NULL) { _frameBuffer(NULL) {
} }
AudioFrameBuffer(const uint16_t channelCount, const uint16_t frameCount) AudioFrameBuffer(const uint16_t channelCount, const uint16_t frameCount) :
: _channelCount(channelCount) _channelCount(channelCount),
, _frameCount(frameCount) _frameCount(frameCount),
, _frameCountMax(frameCount) _frameCountMax(frameCount),
, _frameBuffer(NULL) { _frameBuffer(NULL) {
allocateFrames(); allocateFrames();
} }

10
libraries/audio/src/AudioFilter.h
View file

@ -37,11 +37,11 @@ public:
// //
// ctor/dtor // ctor/dtor
// //
AudioBiquad() AudioBiquad() :
: _xm1(0.) _xm1(0.),
, _xm2(0.) _xm2(0.),
, _ym1(0.) _ym1(0.),
, _ym2(0.) { _ym2(0.) {
setParameters(0.,0.,0.,0.,0.); setParameters(0.,0.,0.,0.,0.);
} }

6
libraries/audio/src/AudioFilterBank.h
View file

@ -49,9 +49,9 @@ public:
// //
// ctor/dtor // ctor/dtor
// //
AudioFilterBank() AudioFilterBank() :
: _sampleRate(0.) _sampleRate(0.0f),
, _frameCount(0) { _frameCount(0) {
for (int i = 0; i < _channelCount; ++i) { for (int i = 0; i < _channelCount; ++i) {
_buffer[ i ] = NULL; _buffer[ i ] = NULL;
} }

9
libraries/audio/src/AudioSourceTone.h
View file

@ -16,6 +16,7 @@ class AudioSourceTone
{ {
static uint32_t _frameOffset; static uint32_t _frameOffset;
float32_t _frequency; float32_t _frequency;
float32_t _amplitude;
float32_t _sampleRate; float32_t _sampleRate;
float32_t _omega; float32_t _omega;
@ -30,7 +31,7 @@ public:
void initialize() { void initialize() {
_frameOffset = 0; _frameOffset = 0;
setParameters(SAMPLE_RATE, 220.0f); setParameters(SAMPLE_RATE, 220.0f, 0.9f);
} }
void finalize() { void finalize() {
@ -40,15 +41,17 @@ public:
_frameOffset = 0; _frameOffset = 0;
} }
void setParameters(const float32_t sampleRate, const float32_t frequency) { void setParameters(const float32_t sampleRate, const float32_t frequency, const float32_t amplitude) {
_sampleRate = std::max(sampleRate, 1.0f); _sampleRate = std::max(sampleRate, 1.0f);
_frequency = std::max(frequency, 1.0f); _frequency = std::max(frequency, 1.0f);
_amplitude = std::max(amplitude, 1.0f);
_omega = _frequency / _sampleRate * TWO_PI; _omega = _frequency / _sampleRate * TWO_PI;
} }
void getParameters(float32_t& sampleRate, float32_t& frequency) { void getParameters(float32_t& sampleRate, float32_t& frequency, float32_t& amplitude) {
sampleRate = _sampleRate; sampleRate = _sampleRate;
frequency = _frequency; frequency = _frequency;
amplitude = _amplitude;
} }
void render(AudioBufferFloat32& frameBuffer) { void render(AudioBufferFloat32& frameBuffer) {