Changeset 854:3f08ff528e51 in roaraudio

Timestamp:

09/28/08 22:56:39 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for 32bit mixing if we have a 64bit type

File:

• roard/mixer.c (modified) (2 diffs)

roard/mixer.c

@@ -105 +105 @@
 
 int mix_clients_32bit (void * output, void ** input, int samples) {
-/*
+#ifdef ROAR_NATIVE_INT64
  int i, s;
- int c;
+ ROAR_NATIVE_INT64 c;
 
  for (s = 0; s < samples; s++) {
@@ -113 +113 @@
 
   for (i = 0; input[i]; i++)
-   c += ((int**)input)[i][s];
-
-  if ( c > 127 )
-   c = 127;
-  else if ( c < -128 )
-   c = -128;
+   c += ((ROAR_NATIVE_INT64**)input)[i][s];
+
+  if ( c > 21474836487LL )
+   c = 2147483647LL;
+  else if ( c < -2147483648LL )
+   c = -2147483648LL;
   ((int*)output)[s] = (char)c;
  }
 
- return 0;
-*/
- return 1;
+ return  0;
+#else
+ return -1;
+#endif
 }