Changeset 4179:6c778830ad9b in roaraudio

Timestamp:

08/14/10 14:47:45 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

clip volume scale on small error and error out on big error

File:

• libroar/vs.c (modified) (2 diffs)

libroar/vs.c

@@ -342 +342 @@
  struct roar_mixer_settings mixer;
  size_t i;
+ register float s;
 
  if ( !(vss->flags & FLAG_STREAM) ) {
@@ -353 +354 @@
  }
 
- for (i = 0; i < channels; i++)
-  mixer.mixer[i] = c[i] * 65535.0;
+ for (i = 0; i < channels; i++) {
+  s = c[i] * 65535.0;
+  if ( s > 66190.0 || s < -655.0 ) {
+   _seterr(ROAR_ERROR_RANGE);
+   return -1;
+  } else if ( s > 65535.0 ) {
+   s = 65535.0;
+  } else if ( s <     0.0 ) {
+   s = 0.0;
+  }
+  mixer.mixer[i] = s;
+ }
 
  mixer.scale = 65535;