diff -ur audacious-plugins-2.2-orig/src/adplug/core/ksm.cxx audacious-plugins-2.2/src/adplug/core/ksm.cxx --- audacious-plugins-2.2-orig/src/adplug/core/ksm.cxx 2009-12-14 17:25:31.000000000 -0500 +++ audacious-plugins-2.2/src/adplug/core/ksm.cxx 2009-12-14 17:30:54.000000000 -0500 @@ -310,7 +310,7 @@ { for (i = 0; i < 11; i++) instbuf[i] = inst[trinst[11]][i]; - instbuf[1] = ((instbuf[1] & 192) | (trvol[11]) ^ 63); + instbuf[1] = ((instbuf[1] & 192) | ((trvol[11]) ^ 63)); setinst (6, instbuf[0], instbuf[1], instbuf[2], instbuf[3], instbuf[4], instbuf[5], instbuf[6], instbuf[7], instbuf[8], instbuf[9], instbuf[10]); @@ -318,8 +318,8 @@ instbuf[i] = inst[trinst[12]][i]; for (i = 5; i < 11; i++) instbuf[i] = inst[trinst[15]][i]; - instbuf[1] = ((instbuf[1] & 192) | (trvol[12]) ^ 63); - instbuf[6] = ((instbuf[6] & 192) | (trvol[15]) ^ 63); + instbuf[1] = ((instbuf[1] & 192) | ((trvol[12]) ^ 63)); + instbuf[6] = ((instbuf[6] & 192) | ((trvol[15]) ^ 63)); setinst (7, instbuf[0], instbuf[1], instbuf[2], instbuf[3], instbuf[4], instbuf[5], instbuf[6], instbuf[7], instbuf[8], instbuf[9], instbuf[10]); @@ -327,8 +327,8 @@ instbuf[i] = inst[trinst[14]][i]; for (i = 5; i < 11; i++) instbuf[i] = inst[trinst[13]][i]; - instbuf[1] = ((instbuf[1] & 192) | (trvol[14]) ^ 63); - instbuf[6] = ((instbuf[6] & 192) | (trvol[13]) ^ 63); + instbuf[1] = ((instbuf[1] & 192) | ((trvol[14]) ^ 63)); + instbuf[6] = ((instbuf[6] & 192) | ((trvol[13]) ^ 63)); setinst (8, instbuf[0], instbuf[1], instbuf[2], instbuf[3], instbuf[4], instbuf[5], instbuf[6], instbuf[7], instbuf[8], instbuf[9], instbuf[10]); diff -ur audacious-plugins-2.2-orig/src/adplug/core/s3m.cxx audacious-plugins-2.2/src/adplug/core/s3m.cxx --- audacious-plugins-2.2-orig/src/adplug/core/s3m.cxx 2009-12-14 17:25:31.000000000 -0500 +++ audacious-plugins-2.2/src/adplug/core/s3m.cxx 2009-12-14 17:39:52.000000000 -0500 @@ -624,8 +624,8 @@ opl->write (0xa0 + chan, channel[chan].freq & 255); if (channel[chan].key) opl->write (0xb0 + chan, - ((channel[chan].freq & 768) >> 8) + - (channel[chan].oct << 2) | 32); + (((channel[chan].freq & 768) >> 8) + + (channel[chan].oct << 2)) | 32); else opl->write (0xb0 + chan, ((channel[chan].freq & 768) >> 8) + (channel[chan].oct << 2));