# HG changeset patch # User darius # Date 893372089 0 # Node ID 80fa6dd10e145ec171e08b1174790d20ecaf78fe # Parent e5529b6e3b1ccaa15ad4944872390179ca14597d Fix some C++ 'ism's diff -r e5529b6e3b1c -r 80fa6dd10e14 playercode/mdriver.c --- a/playercode/mdriver.c Thu Apr 23 07:35:49 1998 +0000 +++ b/playercode/mdriver.c Thu Apr 23 22:54:49 1998 +0000 @@ -261,7 +261,7 @@ return; tmp = (ULONG) vol *(ULONG) md_volume * ((voice < md_sngchn) ? (ULONG) md_musicvolume : (ULONG) md_sndfxvolume); - md_driver->VoiceSetVolume(voice, tmp / 16384 UL); + md_driver->VoiceSetVolume(voice, tmp / 16384); } diff -r e5529b6e3b1c -r 80fa6dd10e14 playercode/mplayer.c --- a/playercode/mplayer.c Thu Apr 23 07:35:49 1998 +0000 +++ b/playercode/mplayer.c Thu Apr 23 22:54:49 1998 +0000 @@ -219,7 +219,7 @@ } } - tvol = 0xffffff UL; + tvol = 0xffffff; t = 0; p = 0; a = pf->voice; @@ -2453,7 +2453,7 @@ * samplevolume */ tmpvol *= envvol; /* * max 256 */ tmpvol *= pf->volume; /* * max 128 */ - tmpvol /= 4194304 UL; + tmpvol /= 4194304; if ((aout->masterchn != -1) && pf->control[aout->masterchn].muted) /* Channel Muting Line */ Voice_SetVolume(t, 0);