comparison playercode/mplayer.c @ 17:80fa6dd10e14

Fix some C++ 'ism's
author darius
date Thu, 23 Apr 1998 22:54:49 +0000
parents 437e8455d862
children
comparison
equal deleted inserted replaced
16:e5529b6e3b1c 17:80fa6dd10e14
217 if (!(pf->voice[t].kick) && Voice_Stopped(t)) { 217 if (!(pf->voice[t].kick) && Voice_Stopped(t)) {
218 return t; 218 return t;
219 } 219 }
220 } 220 }
221 221
222 tvol = 0xffffff UL; 222 tvol = 0xffffff;
223 t = 0; 223 t = 0;
224 p = 0; 224 p = 0;
225 a = pf->voice; 225 a = pf->voice;
226 for (k = 0; k < md_sngchn; k++, a++) { 226 for (k = 0; k < md_sngchn; k++, a++) {
227 if (!a->kick) { 227 if (!a->kick) {
2451 tmpvol /= 16384L; /* tmpvol is max 32768 */ 2451 tmpvol /= 16384L; /* tmpvol is max 32768 */
2452 aout->totalvol = tmpvol >> 2; /* totalvolume used to determine 2452 aout->totalvol = tmpvol >> 2; /* totalvolume used to determine
2453 * samplevolume */ 2453 * samplevolume */
2454 tmpvol *= envvol; /* * max 256 */ 2454 tmpvol *= envvol; /* * max 256 */
2455 tmpvol *= pf->volume; /* * max 128 */ 2455 tmpvol *= pf->volume; /* * max 128 */
2456 tmpvol /= 4194304 UL; 2456 tmpvol /= 4194304;
2457 2457
2458 if ((aout->masterchn != -1) && pf->control[aout->masterchn].muted) /* Channel Muting Line */ 2458 if ((aout->masterchn != -1) && pf->control[aout->masterchn].muted) /* Channel Muting Line */
2459 Voice_SetVolume(t, 0); 2459 Voice_SetVolume(t, 0);
2460 else 2460 else
2461 Voice_SetVolume(t, tmpvol); 2461 Voice_SetVolume(t, tmpvol);