diff --git a/src/gb/gbSound.cpp b/src/gb/gbSound.cpp index dc0cd5aa..1691d1e5 100644 --- a/src/gb/gbSound.cpp +++ b/src/gb/gbSound.cpp @@ -186,8 +186,8 @@ static void remake_stereo_buffer() void gbSoundReset() { - gb_effects_config.echo = 0.20; - gb_effects_config.stereo = 0.15; + gb_effects_config.echo = 0.20f; + gb_effects_config.stereo = 0.15f; gb_effects_config.surround = false; SOUND_CLOCK_TICKS = 20000; diff --git a/src/gb/gb_apu/Effects_Buffer.cpp b/src/gb/gb_apu/Effects_Buffer.cpp index 65b68845..f3a7dcc0 100644 --- a/src/gb/gb_apu/Effects_Buffer.cpp +++ b/src/gb/gb_apu/Effects_Buffer.cpp @@ -19,7 +19,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ int const fixed_shift = 12; #define TO_FIXED( f ) fixed_t ((f) * ((fixed_t) 1 << fixed_shift)) -#define FROM_FIXED( f ) (f >> fixed_shift) +#define FROM_FIXED( f ) ((f) >> fixed_shift) int const max_read = 2560; // determines minimum delay @@ -505,7 +505,7 @@ void Effects_Buffer::mix_effects( blip_sample_t* out_, int pair_count ) int bufs_remain = bufs_size; do { - if ( buf->non_silent() && buf->echo == echo_phase ) + if ( buf->non_silent() && ( buf->echo == (bool)echo_phase ) ) { stereo_fixed_t* BLIP_RESTRICT out = (stereo_fixed_t*) &echo [echo_pos]; int const bass = BLIP_READER_BASS( *buf ); diff --git a/src/win32/SelectPlugin.cpp b/src/win32/SelectPlugin.cpp index d2ed5e45..44cce033 100644 --- a/src/win32/SelectPlugin.cpp +++ b/src/win32/SelectPlugin.cpp @@ -54,7 +54,7 @@ void SelectPlugin::OnOK() if (m_comboPlugin.GetCount() > 0) { int nSel = m_comboPlugin.GetCurSel(); - if (nSel >= 0 && nSel < rpiPool.size()) + if (nSel >= 0 && nSel < (int)rpiPool.size()) strcpy(theApp.pluginName, rpiPool[nSel].sFile); } @@ -77,10 +77,10 @@ BOOL SelectPlugin::OnInitDialog() size_t nPluginCnt = EnumPlugins(); if (nPluginCnt > 0) { - for (int i = 0; i < rpiPool.size(); i++) + for (size_t i = 0; i < rpiPool.size(); i++) m_comboPlugin.AddString(rpiPool[i].sDesc); - for (int ii = 0; ii < rpiPool.size(); ii++) + for (size_t ii = 0; ii < rpiPool.size(); ii++) { if (_stricmp(theApp.pluginName, rpiPool[ii].sFile) == 0) {