# HG changeset patch
# User Ritor1
# Date 1354246851 -21600
# Node ID 494015e90b8b5ad58850e6cd7fcb0101f8728570
# Parent  dcd8af594b02bc0959bb09d3e3931a1d15213566# Parent  9130272cdd48a96336deddfd5d6a44d40c2e3cac
Слияние

diff -r 9130272cdd48 -r 494015e90b8b AudioPlayer.cpp
--- a/AudioPlayer.cpp	Fri Nov 30 00:23:11 2012 +0600
+++ b/AudioPlayer.cpp	Fri Nov 30 09:40:51 2012 +0600
@@ -1528,7 +1528,8 @@
         while ( v2 < v1->uMixerChannels );
         v2 = 0;
       }
-      v29 = __OFSUB__(v1->uMixerChannels, v2);
+      //v29 = __OFSUB__(v1->uMixerChannels, v2);
+	  v29 = v1->uMixerChannels > v2;
       v3 = v1->uMixerChannels == v2;
       v5 = v1->uMixerChannels - v2 < 0;
       v59 = v2;