changeset 159:494015e90b8b

Слияние
author Ritor1
date Fri, 30 Nov 2012 09:40:51 +0600
parents dcd8af594b02 (diff) 9130272cdd48 (current diff)
children 062e8a8e09bc
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;