[Scummvm-cvs-logs] SF.net SVN: scummvm:[55069] scummvm/trunk/sound/softsynth/opl/dbopl.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 55069
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55069&view=rev
Author:   eriktorbjorn
Date:     2010-12-30 22:43:20 +0000 (Thu, 30 Dec 2010)

Log Message:
-----------
FMOPL: Fix GCC warnings when DBOPL_WAVE is not WAVE_TABLEMUL.

Modified Paths:
--------------
    scummvm/trunk/sound/softsynth/opl/dbopl.cpp

Modified: scummvm/trunk/sound/softsynth/opl/dbopl.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/opl/dbopl.cpp	2010-12-30 22:07:12 UTC (rev 55068)
+++ scummvm/trunk/sound/softsynth/opl/dbopl.cpp	2010-12-30 22:43:20 UTC (rev 55069)
@@ -224,7 +224,7 @@
 	}
 #endif
 	return (sig >> exp);
-};
+}
 
 static Bits DB_FASTCALL WaveForm0( Bitu i, Bitu volume ) {
 	Bits neg = 0 - (( i >> 9) & 1);//Create ~0 or 0
@@ -576,7 +576,7 @@
 	return (waveBase[ index & waveMask ] * MulTable[ vol >> ENV_EXTRA ]) >> MUL_SH;
 #elif ( DBOPL_WAVE == WAVE_TABLELOG )
 	Bit32s wave = waveBase[ index & waveMask ];
-	Bit32u total = ( wave & 0x7fff ) + vol << ( 3 - ENV_EXTRA );
+	Bit32u total = ( wave & 0x7fff ) + ( vol << ( 3 - ENV_EXTRA ) );
 	Bit32s sig = ExpTable[ total & 0xff ];
 	Bit32u exp = total >> 8;
 	Bit32s neg = wave >> 16;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.