diff options
author | 2015-05-19 01:20:53 +0200 | |
---|---|---|
committer | 2015-05-20 01:42:51 +0200 | |
commit | 39d1154e31fdf47bb224dfe8067a05d7f3f2d0eb (patch) | |
tree | 76c5b0a1978b5227e28e3eaa2878f6baeca9bc4e /src/emu/sound/aica.c | |
parent | ea1a9f07932cda47fede842a3ad6f920f91c9098 (diff) |
Another round of -Wextra -Wdouble-promotion fixes. (nw)
Diffstat (limited to 'src/emu/sound/aica.c')
-rw-r--r-- | src/emu/sound/aica.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/emu/sound/aica.c b/src/emu/sound/aica.c index f7751a89e93..25023db43cc 100644 --- a/src/emu/sound/aica.c +++ b/src/emu/sound/aica.c @@ -433,9 +433,9 @@ void aica_device::Init() for(i=0;i<0x400;++i) { - float envDB=((float)(3*(i-0x3ff)))/32.0; + float envDB=((float)(3*(i-0x3ff)))/32.0f; float scale=(float)(1<<SHIFT); - m_EG_TABLE[i]=(INT32)(pow(10.0,envDB/20.0)*scale); + m_EG_TABLE[i]=(INT32)(powf(10.0f,envDB/20.0f)*scale); } for(i=0;i<0x20000;++i) @@ -458,7 +458,7 @@ void aica_device::Init() if(iTL&0x40) SegaDB-=24.0f; if(iTL&0x80) SegaDB-=48.0f; - TL=pow(10.0,SegaDB/20.0); + TL=powf(10.0f,SegaDB/20.0f); SegaDB=0; if(iPAN&0x1) SegaDB-=3.0f; @@ -467,7 +467,7 @@ void aica_device::Init() if(iPAN&0x8) SegaDB-=24.0f; if((iPAN&0xf)==0xf) PAN=0.0; - else PAN=pow(10.0,SegaDB/20.0); + else PAN=powf(10.0f,SegaDB/20.0f); if(iPAN<0x10) { @@ -481,12 +481,12 @@ void aica_device::Init() } if(iSDL) - fSDL=pow(10.0,(SDLT[iSDL])/20.0); + fSDL=powf(10.0f,(SDLT[iSDL])/20.0f); else fSDL=0.0; - m_LPANTABLE[i]=FIX((4.0*LPAN*TL*fSDL)); - m_RPANTABLE[i]=FIX((4.0*RPAN*TL*fSDL)); + m_LPANTABLE[i]=FIX((4.0f*LPAN*TL*fSDL)); + m_RPANTABLE[i]=FIX((4.0f*RPAN*TL*fSDL)); } m_ARTABLE[0]=m_DRTABLE[0]=0; //Infinite time @@ -497,7 +497,7 @@ void aica_device::Init() t=ARTimes[i]; //In ms if(t!=0.0) { - step=(1023*1000.0)/((float) 44100.0f*t); + step=(1023*1000.0)/(44100.0*t); scale=(double) (1<<EG_SHIFT); m_ARTABLE[i]=(int) (step*scale); } @@ -505,7 +505,7 @@ void aica_device::Init() m_ARTABLE[i]=1024<<EG_SHIFT; t=DRTimes[i]; //In ms - step=(1023*1000.0)/((float) 44100.0f*t); + step=(1023*1000.0)/(44100.0*t); scale=(double) (1<<EG_SHIFT); m_DRTABLE[i]=(int) (step*scale); } @@ -1596,12 +1596,12 @@ void aica_device::AICALFO_Init() float limit=PSCALE[s]; for(i=-128;i<128;++i) { - m_PSCALES[s][i+128]=CENTS(((limit*(float) i)/128.0)); + m_PSCALES[s][i+128]=CENTS(((limit*(float) i)/128.0f)); } limit=-ASCALE[s]; for(i=0;i<256;++i) { - m_ASCALES[s][i]=DB(((limit*(float) i)/256.0)); + m_ASCALES[s][i]=DB(((limit*(float) i)/256.0f)); } } } @@ -1633,7 +1633,7 @@ signed int aica_device::AICAALFO_Step(AICA_LFO_t *LFO) void aica_device::AICALFO_ComputeStep(AICA_LFO_t *LFO,UINT32 LFOF,UINT32 LFOWS,UINT32 LFOS,int ALFO) { - float step=(float) LFOFreq[LFOF]*256.0/(float)44100.0; + float step=(float) LFOFreq[LFOF]*256.0f/(float)44100.0f; LFO->phase_step=(unsigned int) ((float) (1<<LFO_SHIFT)*step); if(ALFO) { |