Browse Source

Clean up harmless compiler warnings

dds
PaulStoffregen 10 years ago
parent
commit
e95b0c1558
3 changed files with 9 additions and 9 deletions
  1. +4
    -4
      synth_pinknoise.cpp
  2. +2
    -2
      synth_tonesweep.h
  3. +3
    -3
      synth_waveform.h

+ 4
- 4
synth_pinknoise.cpp View File

@@ -43,10 +43,10 @@ int16_t AudioSynthNoisePink::instance_cnt = 0;
// with these coefficients: 1.190566, 0.162580, 0.002208, 0.025475, -0.001522,
// 0.007322, 0.001774, 0.004529, -0.001561, 0.000776, -0.000486, 0.002017
#define Fn(cf,m,shift) (2048*cf*(2*((m)>>shift&1)-1))
#define FA(n) Fn(1.190566,n,0)+Fn(0.162580,n,1)+Fn(0.002208,n,2)+\
Fn(0.025475,n,3)+Fn(-0.001522,n,4)+Fn(0.007322,n,5)
#define FB(n) Fn(0.001774,n,0)+Fn(0.004529,n,1)+Fn(-0.001561,n,2)+\
Fn(0.000776,n,3)+Fn(-0.000486,n,4)+Fn(0.002017,n,5)
#define FA(n) (int32_t)(Fn(1.190566,n,0)+Fn(0.162580,n,1)+Fn(0.002208,n,2)+\
Fn(0.025475,n,3)+Fn(-0.001522,n,4)+Fn(0.007322,n,5))
#define FB(n) (int32_t)(Fn(0.001774,n,0)+Fn(0.004529,n,1)+Fn(-0.001561,n,2)+\
Fn(0.000776,n,3)+Fn(-0.000486,n,4)+Fn(0.002017,n,5))
#define FA8(n) FA(n),FA(n+1),FA(n+2),FA(n+3),FA(n+4),FA(n+5),FA(n+6),FA(n+7)
#define FB8(n) FB(n),FB(n+1),FB(n+2),FB(n+3),FB(n+4),FB(n+5),FB(n+6),FB(n+7)
const int32_t AudioSynthNoisePink::pfira[64] = // 1st FIR lookup table

+ 2
- 2
synth_tonesweep.h View File

@@ -41,8 +41,8 @@ public:

private:
short tone_amp;
int tone_lo;
int tone_hi;
unsigned int tone_lo;
unsigned int tone_hi;
uint64_t tone_freq;
uint64_t tone_phase;
uint64_t tone_incr;

+ 3
- 3
synth_waveform.h View File

@@ -57,9 +57,9 @@ public AudioStream
{
public:
AudioSynthWaveform(void) :
AudioStream(0,NULL),
tone_phase(0), tone_incr(0), tone_type(0),
tone_offset(0), tone_width(0.25), arbdata(NULL)
AudioStream(0,NULL), tone_amp(0), tone_freq(0),
tone_phase(0), tone_width(0.25), tone_incr(0), tone_type(0),
tone_offset(0), arbdata(NULL)
{
}

Loading…
Cancel
Save