summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/sound
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2015-05-19 01:20:53 +0200
committer couriersud <couriersud@arcor.de>2015-05-20 01:42:51 +0200
commit39d1154e31fdf47bb224dfe8067a05d7f3f2d0eb (patch)
tree76c5b0a1978b5227e28e3eaa2878f6baeca9bc4e /src/emu/sound
parentea1a9f07932cda47fede842a3ad6f920f91c9098 (diff)
Another round of -Wextra -Wdouble-promotion fixes. (nw)
Diffstat (limited to 'src/emu/sound')
-rw-r--r--src/emu/sound/aica.c24
-rw-r--r--src/emu/sound/k051649.c2
-rw-r--r--src/emu/sound/multipcm.c38
-rw-r--r--src/emu/sound/scsp.c22
-rw-r--r--src/emu/sound/sid.c2
-rw-r--r--src/emu/sound/x1_010.c6
6 files changed, 47 insertions, 47 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)
{
diff --git a/src/emu/sound/k051649.c b/src/emu/sound/k051649.c
index e89b1ff3b4c..d69b9f25445 100644
--- a/src/emu/sound/k051649.c
+++ b/src/emu/sound/k051649.c
@@ -121,7 +121,7 @@ void k051649_device::sound_stream_update(sound_stream &stream, stream_sample_t *
const signed char *w = voice[j].waveram;
int v=voice[j].volume * voice[j].key;
int c=voice[j].counter;
- int step = ((INT64)m_mclock * (1 << FREQ_BITS)) / (float)((voice[j].frequency + 1) * 16 * (m_rate / 32)) + 0.5;
+ int step = ((INT64)m_mclock * (1 << FREQ_BITS)) / (float)((voice[j].frequency + 1) * 16 * (m_rate / 32)) + 0.5f;
mix = m_mixer_buffer;
diff --git a/src/emu/sound/multipcm.c b/src/emu/sound/multipcm.c
index a1a340972c9..3050d07cc17 100644
--- a/src/emu/sound/multipcm.c
+++ b/src/emu/sound/multipcm.c
@@ -37,7 +37,7 @@
#include "multipcm.h"
//????
-#define MULTIPCM_CLOCKDIV (180.0)
+#define MULTIPCM_CLOCKDIV (180.0f)
ALLOW_SAVE_TYPE(STATE); // allow save_item on a non-fundamental type
@@ -161,7 +161,7 @@ void multipcm_device::EG_Calc(SLOT *slot)
#define DB(v) LFIX(pow(10.0,v/20.0))
//Convert cents to step increment
-#define CENTS(v) LFIX(pow(2.0,v/1200.0))
+#define CENTS(v) LFIX(powf(2.0f,v/1200.0f))
static int PLFO_TRI[256];
static int ALFO_TRI[256];
@@ -202,12 +202,12 @@ static void LFO_Init(void)
float limit=PSCALE[s];
for(i=-128;i<128;++i)
{
- PSCALES[s][i+128]=CENTS(((limit*(float) i)/128.0));
+ PSCALES[s][i+128]=CENTS(((limit*(float) i)/128.0f));
}
limit=-ASCALE[s];
for(i=0;i<256;++i)
{
- ASCALES[s][i]=DB(((limit*(float) i)/256.0));
+ ASCALES[s][i]=DB(((limit*(float) i)/256.0f));
}
}
}
@@ -232,7 +232,7 @@ INLINE signed int ALFO_Step(LFO_t *LFO)
void multipcm_device::LFO_ComputeStep(LFO_t *LFO,UINT32 LFOF,UINT32 LFOS,int ALFO)
{
- float step=(float) LFOFreq[LFOF]*256.0/(float) m_Rate;
+ float step=(float) LFOFreq[LFOF]*256.0f/(float) m_Rate;
LFO->phase_step=(unsigned int) ((float) (1<<LFO_SHIFT)*step);
if(ALFO)
{
@@ -453,9 +453,9 @@ void multipcm_device::device_start()
unsigned char iTL=i&0x7f;
unsigned char iPAN=(i>>7)&0xf;
- SegaDB=(float) iTL*(-24.0)/(float) 0x40;
+ SegaDB=(float) iTL*(-24.0f)/(float) 0x40;
- TL=pow(10.0,SegaDB/20.0);
+ TL=powf(10.0f,SegaDB/20.0f);
if(iPAN==0x8)
@@ -472,9 +472,9 @@ void multipcm_device::device_start()
iPAN=0x10-iPAN;
- SegaDB=(float) iPAN*(-12.0)/(float) 0x4;
+ SegaDB=(float) iPAN*(-12.0f)/(float) 0x4;
- RPAN=pow(10.0,SegaDB/20.0);
+ RPAN=pow(10.0f,SegaDB/20.0f);
if((iPAN&0x7)==7)
RPAN=0.0;
@@ -483,14 +483,14 @@ void multipcm_device::device_start()
{
RPAN=1.0;
- SegaDB=(float) iPAN*(-12.0)/(float) 0x4;
+ SegaDB=(float) iPAN*(-12.0f)/(float) 0x4;
- LPAN=pow(10.0,SegaDB/20.0);
+ LPAN=pow(10.0f,SegaDB/20.0f);
if((iPAN&0x7)==7)
LPAN=0.0;
}
- TL/=4.0;
+ TL/=4.0f;
LPANTABLE[i]=FIX((LPAN*TL));
RPANTABLE[i]=FIX((RPAN*TL));
@@ -499,7 +499,7 @@ void multipcm_device::device_start()
//Pitch steps
for(i=0;i<0x400;++i)
{
- float fcent=m_Rate*(1024.0+(float) i)/1024.0;
+ float fcent=m_Rate*(1024.0f+(float) i)/1024.0f;
m_FNS_Table[i]=(unsigned int ) ((float) (1<<SHIFT) *fcent);
}
@@ -507,8 +507,8 @@ void multipcm_device::device_start()
for(i=0;i<0x40;++i)
{
//Times are based on 44100 clock, adjust to real chip clock
- m_ARStep[i]=(float) (0x400<<EG_SHIFT)/(BaseTimes[i]*44100.0/(1000.0));
- m_DRStep[i]=(float) (0x400<<EG_SHIFT)/(BaseTimes[i]*AR2DR*44100.0/(1000.0));
+ m_ARStep[i]=(float) (0x400<<EG_SHIFT)/(float)(BaseTimes[i]*44100.0/(1000.0));
+ m_DRStep[i]=(float) (0x400<<EG_SHIFT)/(float)(BaseTimes[i]*AR2DR*44100.0/(1000.0));
}
m_ARStep[0]=m_ARStep[1]=m_ARStep[2]=m_ARStep[3]=0;
m_ARStep[0x3f]=0x400<<EG_SHIFT;
@@ -516,15 +516,15 @@ void multipcm_device::device_start()
//TL Interpolation steps
//lower
- TLSteps[0]=-(float) (0x80<<SHIFT)/(78.2*44100.0/1000.0);
+ TLSteps[0]=-(float) (0x80<<SHIFT)/(78.2f*44100.0f/1000.0f);
//raise
- TLSteps[1]=(float) (0x80<<SHIFT)/(78.2*2*44100.0/1000.0);
+ TLSteps[1]=(float) (0x80<<SHIFT)/(78.2f*2*44100.0f/1000.0f);
//build the linear->exponential ramps
for(i=0;i<0x400;++i)
{
- float db=-(96.0-(96.0*(float) i/(float) 0x400));
- lin2expvol[i]=pow(10.0,db/20.0)*(float) (1<<SHIFT);
+ float db=-(96.0f-(96.0f*(float) i/(float) 0x400));
+ lin2expvol[i]=powf(10.0f,db/20.0f)*(float) (1<<SHIFT);
}
diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c
index 9c9a9dce102..bd9995ba559 100644
--- a/src/emu/sound/scsp.c
+++ b/src/emu/sound/scsp.c
@@ -528,7 +528,7 @@ void scsp_device::init()
{
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<0x10000;++i)
@@ -551,7 +551,7 @@ void scsp_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;
@@ -560,7 +560,7 @@ void scsp_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)
{
@@ -574,12 +574,12 @@ void scsp_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
@@ -590,7 +590,7 @@ void scsp_device::init()
t=ARTimes[i]; //In ms
if(t!=0.0)
{
- step=(1023*1000.0)/((float) 44100.0f*t);
+ step=(1023*1000.0)/( 44100.0f*t);
scale=(double) (1<<EG_SHIFT);
m_ARTABLE[i]=(int) (step*scale);
}
@@ -598,7 +598,7 @@ void scsp_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);
}
@@ -1506,12 +1506,12 @@ void scsp_device::LFO_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));
}
}
}
@@ -1542,7 +1542,7 @@ signed int scsp_device::ALFO_Step(SCSP_LFO_t *LFO)
void scsp_device::LFO_ComputeStep(SCSP_LFO_t *LFO,UINT32 LFOF,UINT32 LFOWS,UINT32 LFOS,int ALFO)
{
- float step=(float) LFOFreq[LFOF]*256.0/(float)44100;
+ float step=(float) LFOFreq[LFOF]*256.0f/(float)44100;
LFO->phase_step=(unsigned int) ((float) (1<<LFO_SHIFT)*step);
if(ALFO)
{
diff --git a/src/emu/sound/sid.c b/src/emu/sound/sid.c
index a5c8e8377ac..375095e7401 100644
--- a/src/emu/sound/sid.c
+++ b/src/emu/sound/sid.c
@@ -174,7 +174,7 @@ static void filterTableInit(running_machine &machine)
uk = 0;
for ( rk = 0; rk < 0x800; rk++ )
{
- filterTable[uk] = (((exp(rk/0x800*log(400.0))/60.0)+0.05)
+ filterTable[uk] = (((expf(rk/0x800*logf(400.0f))/60.0f)+0.05f)
*filterRefFreq) / sample_rate;
if ( filterTable[uk] < yMin )
filterTable[uk] = yMin;
diff --git a/src/emu/sound/x1_010.c b/src/emu/sound/x1_010.c
index 588907a0401..1025f9d99d4 100644
--- a/src/emu/sound/x1_010.c
+++ b/src/emu/sound/x1_010.c
@@ -216,7 +216,7 @@ void x1_010_device::sound_stream_update(sound_stream &stream, stream_sample_t **
// Meta Fox does write the frequency register, but this is a hack to make it "work" with the current setup
// This is broken for Arbalester (it writes 8), but that'll be fixed later.
if( freq == 0 ) freq = 4;
- smp_step = (UINT32)((float)m_base_clock/8192.0
+ smp_step = (UINT32)((float)m_base_clock/8192.0f
*freq*(1<<FREQ_BASE_BITS)/(float)m_rate);
if( smp_offs == 0 ) {
LOG_SOUND(( "Play sample %p - %p, channel %X volume %d:%d freq %X step %X offset %X\n",
@@ -239,11 +239,11 @@ void x1_010_device::sound_stream_update(sound_stream &stream, stream_sample_t **
start = (INT8 *)&(m_reg[reg->volume*128+0x1000]);
smp_offs = m_smp_offset[ch];
freq = (reg->pitch_hi<<8)+reg->frequency;
- smp_step = (UINT32)((float)m_base_clock/128.0/1024.0/4.0*freq*(1<<FREQ_BASE_BITS)/(float)m_rate);
+ smp_step = (UINT32)((float)m_base_clock/128.0f/1024.0f/4.0f*freq*(1<<FREQ_BASE_BITS)/(float)m_rate);
env = (UINT8 *)&(m_reg[reg->end*128]);
env_offs = m_env_offset[ch];
- env_step = (UINT32)((float)m_base_clock/128.0/1024.0/4.0*reg->start*(1<<ENV_BASE_BITS)/(float)m_rate);
+ env_step = (UINT32)((float)m_base_clock/128.0f/1024.0f/4.0f*reg->start*(1<<ENV_BASE_BITS)/(float)m_rate);
/* Print some more debug info */
if( smp_offs == 0 ) {
LOG_SOUND(( "Play waveform %X, channel %X volume %X freq %4X step %X offset %X\n",