ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed some compiler warnings 

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@220 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
spacy51 2007-12-23 13:29:50 +00:00
parent a52671188a
commit 2175eeee91
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gb/gbSound.cpp
View File

@ -186,8 +186,8 @@ static void remake_stereo_buffer()
void gbSoundReset() void gbSoundReset()
{ {
gb_effects_config.echo = 0.20; gb_effects_config.echo = 0.20f;
gb_effects_config.stereo = 0.15; gb_effects_config.stereo = 0.15f;
gb_effects_config.surround = false; gb_effects_config.surround = false;
SOUND_CLOCK_TICKS = 20000; SOUND_CLOCK_TICKS = 20000;

4
src/gb/gb_apu/Effects_Buffer.cpp
View File

@ -19,7 +19,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
int const fixed_shift = 12; int const fixed_shift = 12;
#define TO_FIXED( f ) fixed_t ((f) * ((fixed_t) 1 << fixed_shift)) #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 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; int bufs_remain = bufs_size;
do 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]; stereo_fixed_t* BLIP_RESTRICT out = (stereo_fixed_t*) &echo [echo_pos];
int const bass = BLIP_READER_BASS( *buf ); int const bass = BLIP_READER_BASS( *buf );

6
src/win32/SelectPlugin.cpp
View File

@ -54,7 +54,7 @@ void SelectPlugin::OnOK()
if (m_comboPlugin.GetCount() > 0) if (m_comboPlugin.GetCount() > 0)
{ {
int nSel = m_comboPlugin.GetCurSel(); int nSel = m_comboPlugin.GetCurSel();
if (nSel >= 0 && nSel < rpiPool.size()) if (nSel >= 0 && nSel < (int)rpiPool.size())
strcpy(theApp.pluginName, rpiPool[nSel].sFile); strcpy(theApp.pluginName, rpiPool[nSel].sFile);
} }
@ -77,10 +77,10 @@ BOOL SelectPlugin::OnInitDialog()
size_t nPluginCnt = EnumPlugins(); size_t nPluginCnt = EnumPlugins();
if (nPluginCnt > 0) 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); 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) if (_stricmp(theApp.pluginName, rpiPool[ii].sFile) == 0)
{ {